Skip to content

Commit 7f6de83

Browse files
committed
Created CloudShader, Fixed URP
TODO: enable tranparency effect on VR, change colors in scene
1 parent 848dbe9 commit 7f6de83

25 files changed

Lines changed: 3131 additions & 126 deletions

Assets/Materials/ActiveMaterial.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Material:
105105
- _WorkflowMode: 1
106106
- _ZWrite: 0
107107
m_Colors:
108-
- _BaseColor: {r: 0, g: 1, b: 0.29543853, a: 0.09019608}
108+
- _BaseColor: {r: 0, g: 1, b: 0.29543853, a: 0.4745098}
109109
- _Color: {r: 0, g: 1, b: 0.29543853, a: 0.09019608}
110110
- _EmissionColor: {r: 0, g: 0.3207547, b: 0.03454279, a: 1}
111111
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

Assets/Materials/CloudMaterial.mat

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,21 @@ Material:
2121
serializedVersion: 3
2222
m_TexEnvs: []
2323
m_Floats:
24-
- Vector1_37F2A07E: 0.1
25-
- Vector1_62892E34: 1
24+
- Vector1_37F2A07E: 0.04
25+
- Vector1_4074C868: 0.3
26+
- Vector1_5ED40136: 20
27+
- Vector1_62892E34: 4
28+
- Vector1_6BAC9A68: 0.01
29+
- Vector1_8E963D5: -1
30+
- Vector1_AECCD54A: 2
31+
- Vector1_C4072198: 3
32+
- Vector1_C7F9BC69: 15
33+
- Vector1_DFA4C9D3: 2
34+
- Vector1_ED18166C: 1000
35+
- Vector1_F0BE3006: 2
36+
- Vector1_F3A863FF: 16
2637
m_Colors:
38+
- Color_4089CE7A: {r: 0.6431373, g: 0.82773715, b: 0.8509804, a: 0.27058825}
39+
- Color_982234E: {r: 1, g: 1, b: 1, a: 0.80784315}
40+
- Vector4_B6649628: {r: 0, g: 1, b: -0.3, a: 2.7}
2741
- Vector4_F9BF86A4: {r: 1, g: 0, b: 0, a: 90}

Assets/Materials/HandMaterial.mat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ Material:
8787
- _DstBlend: 0
8888
- _EnvironmentReflections: 1
8989
- _GlossMapScale: 1
90-
- _Glossiness: 0
90+
- _Glossiness: 0.5
9191
- _GlossyReflections: 1
9292
- _Metallic: 0
9393
- _Mode: 0
9494
- _OcclusionStrength: 1
9595
- _Parallax: 0.02
9696
- _QueueOffset: 0
9797
- _ReceiveShadows: 1
98-
- _Smoothness: 0
98+
- _Smoothness: 0.5
9999
- _SmoothnessTextureChannel: 0
100100
- _SpecularHighlights: 1
101101
- _SrcBlend: 1
@@ -104,7 +104,7 @@ Material:
104104
- _WorkflowMode: 1
105105
- _ZWrite: 1
106106
m_Colors:
107-
- _BaseColor: {r: 0.8786142, g: 0.4669811, b: 1, a: 1}
108-
- _Color: {r: 0.8786142, g: 0.4669811, b: 1, a: 1}
109-
- _EmissionColor: {r: 0.3207547, g: 0.3207547, b: 0.3207547, a: 1}
107+
- _BaseColor: {r: 0.70139635, g: 0.4292453, b: 1, a: 1}
108+
- _Color: {r: 0.70139635, g: 0.4292453, b: 1, a: 1}
109+
- _EmissionColor: {r: 0.22789499, g: 0, b: 0.5283019, a: 1}
110110
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

Assets/Materials/HandMaterialButton.mat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: HandMaterialButton
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 4
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: 2050
@@ -82,7 +82,7 @@ Material:
8282
- _Parallax: 0.02
8383
- _QueueOffset: 0
8484
- _ReceiveShadows: 1
85-
- _Smoothness: 0
85+
- _Smoothness: 0.429
8686
- _SmoothnessTextureChannel: 0
8787
- _SpecularHighlights: 1
8888
- _SrcBlend: 1
@@ -91,9 +91,9 @@ Material:
9191
- _WorkflowMode: 1
9292
- _ZWrite: 1
9393
m_Colors:
94-
- _BaseColor: {r: 0.8786142, g: 0.4669811, b: 1, a: 1}
94+
- _BaseColor: {r: 0.7349441, g: 0.3484336, b: 0.8490566, a: 1}
9595
- _Color: {r: 0.8786142, g: 0.4669811, b: 1, a: 1}
96-
- _EmissionColor: {r: 0.3207547, g: 0.3207547, b: 0.3207547, a: 1}
96+
- _EmissionColor: {r: 0.2718076, g: 0, b: 0.3584906, a: 1}
9797
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
9898
--- !u!114 &2623867871874917788
9999
MonoBehaviour:

Assets/Materials/Standard.mat

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-6413126322968818995
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 1
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 6
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: Standard
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_ShaderKeywords: _SPECULAR_SETUP
26+
m_LightmapFlags: 4
27+
m_EnableInstancingVariants: 0
28+
m_DoubleSidedGI: 0
29+
m_CustomRenderQueue: 2050
30+
stringTagMap:
31+
RenderType: Opaque
32+
disabledShaderPasses: []
33+
m_SavedProperties:
34+
serializedVersion: 3
35+
m_TexEnvs:
36+
- _BaseMap:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _BumpMap:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _EmissionMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _MainTex:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _MetallicGlossMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _OcclusionMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _SpecGlossMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
m_Floats:
65+
- _AlphaClip: 0
66+
- _Blend: 0
67+
- _BumpScale: 1
68+
- _Cull: 2
69+
- _Cutoff: 0.5
70+
- _DstBlend: 0
71+
- _EnvironmentReflections: 1
72+
- _GlossMapScale: 0
73+
- _Glossiness: 0
74+
- _GlossyReflections: 0
75+
- _Metallic: 0
76+
- _OcclusionStrength: 1
77+
- _QueueOffset: 0
78+
- _ReceiveShadows: 1
79+
- _Smoothness: 0.5
80+
- _SmoothnessTextureChannel: 0
81+
- _SpecularHighlights: 1
82+
- _SrcBlend: 1
83+
- _Surface: 0
84+
- _WorkflowMode: 0
85+
- _ZWrite: 1
86+
m_Colors:
87+
- _BaseColor: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 1}
88+
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
89+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
90+
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

Assets/Materials/Standard.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.

Assets/Materials/TestMaterialActive.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Material:
104104
- _WorkflowMode: 1
105105
- _ZWrite: 1
106106
m_Colors:
107-
- _BaseColor: {r: 0.70139635, g: 0.4292453, b: 1, a: 1}
107+
- _BaseColor: {r: 0.5509322, g: 0.27634388, b: 0.8490566, a: 1}
108108
- _Color: {r: 0.70139635, g: 0.4292453, b: 1, a: 1}
109109
- _EmissionColor: {r: 0.22789499, g: 0, b: 0.5283019, a: 1}
110110
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

Assets/Materials/VirtualHandMaterial.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Material:
105105
- _WorkflowMode: 1
106106
- _ZWrite: 0
107107
m_Colors:
108-
- _BaseColor: {r: 0, g: 0.9905014, b: 1, a: 0.62352943}
108+
- _BaseColor: {r: 0, g: 0.7935257, b: 1, a: 0.6392157}
109109
- _Color: {r: 0, g: 0.9905014, b: 1, a: 0.62352943}
110-
- _EmissionColor: {r: 0.46226418, g: 0.46226418, b: 0.46226418, a: 1}
110+
- _EmissionColor: {r: 0, g: 0.28048778, b: 0.5, a: 1}
111111
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

Assets/Models/SkyDisk2.fbx

292 KB
Binary file not shown.

Assets/Models/SkyDisk2.fbx.meta

Lines changed: 96 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)