Skip to content

Commit 0b7018f

Browse files
author
Andy Touch
committed
- Updated Unity to 2018.1b10
- Updated render-pipelines.lightweight package to 1.1.1-preview - Added new examples for Sprites! - Renamed Shader Graphs for better organisation in Project Window and Material Inspector Shader Menu
1 parent 5b638a1 commit 0b7018f

File tree

83 files changed

+3834
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+3834
-160
lines changed

‎ShaderGraph_ExampleLibrary_Project/Assets/Ellen.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ShaderGraph_ExampleLibrary_Project/Assets/Ellen/Animations.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ShaderGraph_ExampleLibrary_Project/Assets/Ellen/Animations/EllenAnimRun.anim‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: EllenAnimRun
9+
serializedVersion: 6
10+
m_Legacy: 0
11+
m_Compressed: 0
12+
m_UseHighQualityCurve: 1
13+
m_RotationCurves: []
14+
m_CompressedRotationCurves: []
15+
m_EulerCurves: []
16+
m_PositionCurves: []
17+
m_ScaleCurves: []
18+
m_FloatCurves: []
19+
m_PPtrCurves:
20+
- curve:
21+
- time: 0
22+
value: {fileID: 21300000, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
23+
- time: 0.083333336
24+
value: {fileID: 21300002, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
25+
- time: 0.16666667
26+
value: {fileID: 21300004, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
27+
- time: 0.25
28+
value: {fileID: 21300006, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
29+
- time: 0.33333334
30+
value: {fileID: 21300008, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
31+
- time: 0.41666666
32+
value: {fileID: 21300010, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
33+
- time: 0.5
34+
value: {fileID: 21300012, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
35+
- time: 0.5833333
36+
value: {fileID: 21300014, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
37+
- time: 0.6666667
38+
value: {fileID: 21300016, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
39+
- time: 0.75
40+
value: {fileID: 21300018, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
41+
- time: 0.8333333
42+
value: {fileID: 21300020, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
43+
- time: 0.9166667
44+
value: {fileID: 21300022, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
45+
- time: 1
46+
value: {fileID: 21300024, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
47+
- time: 1.0833334
48+
value: {fileID: 21300026, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
49+
- time: 1.1666666
50+
value: {fileID: 21300028, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
51+
- time: 1.25
52+
value: {fileID: 21300030, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
53+
- time: 1.3333334
54+
value: {fileID: 21300032, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
55+
- time: 1.4166666
56+
value: {fileID: 21300034, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
57+
- time: 1.5
58+
value: {fileID: 21300036, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
59+
- time: 1.5833334
60+
value: {fileID: 21300038, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
61+
- time: 1.6666666
62+
value: {fileID: 21300040, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
63+
- time: 1.75
64+
value: {fileID: 21300042, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
65+
attribute: m_Sprite
66+
path:
67+
classID: 212
68+
script: {fileID: 0}
69+
m_SampleRate: 12
70+
m_WrapMode: 0
71+
m_Bounds:
72+
m_Center: {x: 0, y: 0, z: 0}
73+
m_Extent: {x: 0, y: 0, z: 0}
74+
m_ClipBindingConstant:
75+
genericBindings:
76+
- serializedVersion: 2
77+
path: 0
78+
attribute: 0
79+
script: {fileID: 0}
80+
typeID: 212
81+
customType: 23
82+
isPPtrCurve: 1
83+
pptrCurveMapping:
84+
- {fileID: 21300000, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
85+
- {fileID: 21300002, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
86+
- {fileID: 21300004, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
87+
- {fileID: 21300006, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
88+
- {fileID: 21300008, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
89+
- {fileID: 21300010, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
90+
- {fileID: 21300012, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
91+
- {fileID: 21300014, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
92+
- {fileID: 21300016, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
93+
- {fileID: 21300018, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
94+
- {fileID: 21300020, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
95+
- {fileID: 21300022, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
96+
- {fileID: 21300024, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
97+
- {fileID: 21300026, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
98+
- {fileID: 21300028, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
99+
- {fileID: 21300030, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
100+
- {fileID: 21300032, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
101+
- {fileID: 21300034, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
102+
- {fileID: 21300036, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
103+
- {fileID: 21300038, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
104+
- {fileID: 21300040, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
105+
- {fileID: 21300042, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
106+
m_AnimationClipSettings:
107+
serializedVersion: 2
108+
m_AdditiveReferencePoseClip: {fileID: 0}
109+
m_AdditiveReferencePoseTime: 0
110+
m_StartTime: 0
111+
m_StopTime: 1.8333334
112+
m_OrientationOffsetY: 0
113+
m_Level: 0
114+
m_CycleOffset: 0
115+
m_HasAdditiveReferencePose: 0
116+
m_LoopTime: 1
117+
m_LoopBlend: 0
118+
m_LoopBlendOrientation: 0
119+
m_LoopBlendPositionY: 0
120+
m_LoopBlendPositionXZ: 0
121+
m_KeepOriginalOrientation: 0
122+
m_KeepOriginalPositionY: 1
123+
m_KeepOriginalPositionXZ: 0
124+
m_HeightFromFeet: 0
125+
m_Mirror: 0
126+
m_EditorCurves: []
127+
m_EulerEditorCurves: []
128+
m_HasGenericRootTransform: 0
129+
m_HasMotionFloatCurves: 0
130+
m_GenerateMotionCurves: 0
131+
m_Events: []

‎ShaderGraph_ExampleLibrary_Project/Assets/Ellen/Animations/EllenAnimRun.anim.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ShaderGraph_ExampleLibrary_Project/Assets/Ellen/EllenController.controller‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!91 &9100000
4+
AnimatorController:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: EllenController
9+
serializedVersion: 5
10+
m_AnimatorParameters: []
11+
m_AnimatorLayers:
12+
- serializedVersion: 5
13+
m_Name: Base Layer
14+
m_StateMachine: {fileID: 1107821157413452824}
15+
m_Mask: {fileID: 0}
16+
m_Motions: []
17+
m_Behaviours: []
18+
m_BlendingMode: 0
19+
m_SyncedLayerIndex: -1
20+
m_DefaultWeight: 0
21+
m_IKPass: 0
22+
m_SyncedLayerAffectsTiming: 0
23+
m_Controller: {fileID: 9100000}
24+
--- !u!1102 &1102402335397774198
25+
AnimatorState:
26+
serializedVersion: 5
27+
m_ObjectHideFlags: 1
28+
m_PrefabParentObject: {fileID: 0}
29+
m_PrefabInternal: {fileID: 0}
30+
m_Name: EllenRunAnim
31+
m_Speed: 1
32+
m_CycleOffset: 0
33+
m_Transitions: []
34+
m_StateMachineBehaviours: []
35+
m_Position: {x: 50, y: 50, z: 0}
36+
m_IKOnFeet: 0
37+
m_WriteDefaultValues: 1
38+
m_Mirror: 0
39+
m_SpeedParameterActive: 0
40+
m_MirrorParameterActive: 0
41+
m_CycleOffsetParameterActive: 0
42+
m_TimeParameterActive: 0
43+
m_Motion: {fileID: 7400000, guid: 8745409f15aa84a90844c054d9c9a698, type: 2}
44+
m_Tag:
45+
m_SpeedParameter:
46+
m_MirrorParameter:
47+
m_CycleOffsetParameter:
48+
m_TimeParameter:
49+
--- !u!1107 &1107821157413452824
50+
AnimatorStateMachine:
51+
serializedVersion: 5
52+
m_ObjectHideFlags: 1
53+
m_PrefabParentObject: {fileID: 0}
54+
m_PrefabInternal: {fileID: 0}
55+
m_Name: Base Layer
56+
m_ChildStates:
57+
- serializedVersion: 1
58+
m_State: {fileID: 1102402335397774198}
59+
m_Position: {x: 413.25, y: 141, z: 0}
60+
m_ChildStateMachines: []
61+
m_AnyStateTransitions: []
62+
m_EntryTransitions: []
63+
m_StateMachineTransitions: {}
64+
m_StateMachineBehaviours: []
65+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
66+
m_EntryPosition: {x: 50, y: 120, z: 0}
67+
m_ExitPosition: {x: 800, y: 120, z: 0}
68+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
69+
m_DefaultState: {fileID: 1102402335397774198}

‎ShaderGraph_ExampleLibrary_Project/Assets/Ellen/EllenController.controller.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ShaderGraph_ExampleLibrary_Project/Assets/Ellen/Materials.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ShaderGraph_ExampleLibrary_Project/Assets/Ellen/Materials/EllenMat-BasicSpriteGraph.mat‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: EllenMat-BasicSpriteGraph
10+
m_Shader: {fileID: 4800000, guid: b92cb817adf5540dba1556d8544bcbf4, type: 3}
11+
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _ALPHATEST_ON _EMISSION _SPECULAR_SETUP
12+
m_LightmapFlags: 2
13+
m_EnableInstancingVariants: 0
14+
m_DoubleSidedGI: 0
15+
m_CustomRenderQueue: -1
16+
stringTagMap: {}
17+
disabledShaderPasses: []
18+
m_SavedProperties:
19+
serializedVersion: 3
20+
m_TexEnvs:
21+
- Texture_16358EC0:
22+
m_Texture: {fileID: 2800000, guid: 429445aeeb26a441fb0e2d02fdc4614c, type: 3}
23+
m_Scale: {x: 1, y: 1}
24+
m_Offset: {x: 0, y: 0}
25+
- _BumpMap:
26+
m_Texture: {fileID: 0}
27+
m_Scale: {x: 1, y: 1}
28+
m_Offset: {x: 0, y: 0}
29+
- _DetailAlbedoMap:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _DetailMask:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _DetailNormalMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _EmissionMap:
42+
m_Texture: {fileID: 2800000, guid: ff33d6adfeac52e419af23fad2d0abfd, type: 3}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _MainTex:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _MetallicGlossMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _OcclusionMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _ParallaxMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _SpecGlossMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
m_Floats:
66+
- _BumpScale: 1
67+
- _Cutoff: 0.5
68+
- _DetailNormalMapScale: 1
69+
- _DstBlend: 0
70+
- _GlossMapScale: 1
71+
- _Glossiness: 0
72+
- _GlossyReflections: 1
73+
- _Metallic: 0
74+
- _Mode: 1
75+
- _OcclusionStrength: 1
76+
- _Parallax: 0.02
77+
- _SmoothnessTextureChannel: 0
78+
- _SpecularHighlights: 1
79+
- _SrcBlend: 1
80+
- _UVSec: 0
81+
- _WorkflowMode: 0
82+
- _ZWrite: 1
83+
m_Colors:
84+
- _Color: {r: 1, g: 1, b: 1, a: 1}
85+
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
86+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

‎ShaderGraph_ExampleLibrary_Project/Assets/Ellen/Materials/EllenMat-BasicSpriteGraph.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)