Skip to content

Commit

Permalink
Created CloudShader, Fixed URP
Browse files Browse the repository at this point in the history 
TODO: enable tranparency effect on VR, change colors in scene
  • Loading branch information
@cedi-code
cedi-code committed Jul 6, 2020
1 parent 848dbe9 commit 7f6de83
Show file tree
Hide file tree
Showing 25 changed files with 3,131 additions and 126 deletions.
2 changes: 1 addition & 1 deletion Assets/Materials/ActiveMaterial.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 1, b: 0.29543853, a: 0.09019608}
- _BaseColor: {r: 0, g: 1, b: 0.29543853, a: 0.4745098}
- _Color: {r: 0, g: 1, b: 0.29543853, a: 0.09019608}
- _EmissionColor: {r: 0, g: 0.3207547, b: 0.03454279, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
18 changes: 16 additions & 2 deletions Assets/Materials/CloudMaterial.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,21 @@ Material:
serializedVersion: 3
m_TexEnvs: []
m_Floats:
- Vector1_37F2A07E: 0.1
- Vector1_62892E34: 1
- Vector1_37F2A07E: 0.04
- Vector1_4074C868: 0.3
- Vector1_5ED40136: 20
- Vector1_62892E34: 4
- Vector1_6BAC9A68: 0.01
- Vector1_8E963D5: -1
- Vector1_AECCD54A: 2
- Vector1_C4072198: 3
- Vector1_C7F9BC69: 15
- Vector1_DFA4C9D3: 2
- Vector1_ED18166C: 1000
- Vector1_F0BE3006: 2
- Vector1_F3A863FF: 16
m_Colors:
- Color_4089CE7A: {r: 0.6431373, g: 0.82773715, b: 0.8509804, a: 0.27058825}
- Color_982234E: {r: 1, g: 1, b: 1, a: 0.80784315}
- Vector4_B6649628: {r: 0, g: 1, b: -0.3, a: 2.7}
- Vector4_F9BF86A4: {r: 1, g: 0, b: 0, a: 90}
10 changes: 5 additions & 5 deletions Assets/Materials/HandMaterial.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ Material:
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
Expand All @@ -104,7 +104,7 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.8786142, g: 0.4669811, b: 1, a: 1}
- _Color: {r: 0.8786142, g: 0.4669811, b: 1, a: 1}
- _EmissionColor: {r: 0.3207547, g: 0.3207547, b: 0.3207547, a: 1}
- _BaseColor: {r: 0.70139635, g: 0.4292453, b: 1, a: 1}
- _Color: {r: 0.70139635, g: 0.4292453, b: 1, a: 1}
- _EmissionColor: {r: 0.22789499, g: 0, b: 0.5283019, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
10 changes: 5 additions & 5 deletions Assets/Materials/HandMaterialButton.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: HandMaterialButton
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2050
Expand Down Expand Up @@ -82,7 +82,7 @@ Material:
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0
- _Smoothness: 0.429
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
Expand All @@ -91,9 +91,9 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.8786142, g: 0.4669811, b: 1, a: 1}
- _BaseColor: {r: 0.7349441, g: 0.3484336, b: 0.8490566, a: 1}
- _Color: {r: 0.8786142, g: 0.4669811, b: 1, a: 1}
- _EmissionColor: {r: 0.3207547, g: 0.3207547, b: 0.3207547, a: 1}
- _EmissionColor: {r: 0.2718076, g: 0, b: 0.3584906, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
--- !u!114 &2623867871874917788
MonoBehaviour:
Expand Down
90 changes: 90 additions & 0 deletions Assets/Materials/Standard.mat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6413126322968818995
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 1
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Standard
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _SPECULAR_SETUP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2050
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 0
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
8 changes: 8 additions & 0 deletions Assets/Materials/Standard.mat.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Materials/TestMaterialActive.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.70139635, g: 0.4292453, b: 1, a: 1}
- _BaseColor: {r: 0.5509322, g: 0.27634388, b: 0.8490566, a: 1}
- _Color: {r: 0.70139635, g: 0.4292453, b: 1, a: 1}
- _EmissionColor: {r: 0.22789499, g: 0, b: 0.5283019, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
4 changes: 2 additions & 2 deletions Assets/Materials/VirtualHandMaterial.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 0.9905014, b: 1, a: 0.62352943}
- _BaseColor: {r: 0, g: 0.7935257, b: 1, a: 0.6392157}
- _Color: {r: 0, g: 0.9905014, b: 1, a: 0.62352943}
- _EmissionColor: {r: 0.46226418, g: 0.46226418, b: 0.46226418, a: 1}
- _EmissionColor: {r: 0, g: 0.28048778, b: 0.5, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
Binary file added Assets/Models/SkyDisk2.fbx
View file
Binary file not shown.
96 changes: 96 additions & 0 deletions Assets/Models/SkyDisk2.fbx.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

76 changes: 75 additions & 1 deletion Assets/Scenes/LearnScene.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ PrefabInstance:
- target: {fileID: 5350694906563349282, guid: 9db22fe81ddd57448bd02a84072a8882,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.54
value: 1.4
objectReference: {fileID: 0}
- target: {fileID: 5350694906563349282, guid: 9db22fe81ddd57448bd02a84072a8882,
type: 3}
Expand Down Expand Up @@ -2053,6 +2053,80 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1704639129}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1951520389
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_LocalPosition.y
value: -15
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -1504981713932161579, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 80ea432031eb1af4da9b29f2ef3a2e40, type: 2}
- target: {fileID: -927199367670048503, guid: 9a6c256b56bcdd449babd3ad63692ea6,
type: 3}
propertyPath: m_Name
value: SkyDisk2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9a6c256b56bcdd449babd3ad63692ea6, type: 3}
--- !u!1001 &1958347475
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit 7f6de83

Please sign in to comment.