Skip to content

Commit a5fdffa

Browse files
author
Christopher Remde
committed
WIP test asset changes
1 parent 591f7b6 commit a5fdffa

16 files changed

+1529
-313
lines changed

‎Geometry_Sequence_Player_Package‎

Submodule Geometry_Sequence_Player_Package updated 90 files

‎Unity_Test_Project/Assets/LegacyShader.mat‎

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

‎Unity_Test_Project/Assets/LegacyShader.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.

‎Unity_Test_Project/Assets/NewSurfaceShader.shader‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ Shader "Custom/NormalTest"
22
{
33
Properties
44
{
5-
5+
_MainTex ("UV (DontUse)", 2D) = "white" {}
6+
[ToggleOff] _SpecularHighlights("Specular Highlights", Float) = 1.0
67
}
78
SubShader
89
{
@@ -11,27 +12,19 @@ Shader "Custom/NormalTest"
1112

1213
CGPROGRAM
1314
// Physically based Standard lighting model, and enable shadows on all light types
14-
#pragma surface surf Standard fullforwardshadows
15-
16-
// Use shader model 3.0 target, to get nicer looking lighting
17-
#pragma target 3.0
15+
#pragma surface surf Lambert
16+
17+
sampler2D _MainTex;
1818

1919
struct Input
2020
{
2121
float4 color: Color;
22+
float2 uv_MainTex;
2223
};
2324

24-
// Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
25-
// See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
26-
// #pragma instancing_options assumeuniformscaling
27-
UNITY_INSTANCING_BUFFER_START(Props)
28-
// put more per-instance properties here
29-
UNITY_INSTANCING_BUFFER_END(Props)
30-
31-
void surf (Input IN, inout SurfaceOutputStandard o)
25+
void surf (Input IN, inout SurfaceOutput o)
3226
{
33-
o.Albedo = IN.color.rgb;
34-
o.Alpha = 1;
27+
o.Albedo.rgb = IN.color.rgb;
3528
}
3629
ENDCG
3730
}

0 commit comments

Comments
 (0)