summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryum <yum.food.vr@gmail.com>2024-07-15 16:14:57 -0700
committeryum <yum.food.vr@gmail.com>2024-07-15 16:14:57 -0700
commit8d3b2e400591f08941a02059ccfa58266eb69b04 (patch)
tree2b450d3b4c679c95789ddd9eed7d5282291ccdc1
parent3acb967c6b9afe7c040561ddffbab8fc8034c8fc (diff)
Rename v2f `vertex` to `pos`
... for compatibility with Unity shadowing code.
-rw-r--r--interpolators.cginc4
-rw-r--r--tooner_lighting.cginc28
-rw-r--r--tooner_outline_pass.cginc28
3 files changed, 30 insertions, 30 deletions
diff --git a/interpolators.cginc b/interpolators.cginc
index 0a9784e..27db59c 100644
--- a/interpolators.cginc
+++ b/interpolators.cginc
@@ -15,7 +15,7 @@ struct appdata
struct v2f
{
- float4 vertex : SV_POSITION;
+ float4 pos : SV_POSITION;
float2 uv : TEXCOORD0;
#if defined(LIGHTMAP_ON)
float2 lmuv : TEXCOORD1;
@@ -41,7 +41,7 @@ struct appdata
struct v2f
{
- float4 vertex : SV_POSITION;
+ float4 pos : SV_POSITION;
float2 uv : TEXCOORD0;
#if defined(LIGHTMAP_ON)
float2 lmuv : TEXCOORD1;
diff --git a/tooner_lighting.cginc b/tooner_lighting.cginc
index 16f3fe3..eadda2f 100644
--- a/tooner_lighting.cginc
+++ b/tooner_lighting.cginc
@@ -18,7 +18,7 @@
struct tess_data
{
- float4 vertex : INTERNALTESSPOS;
+ float4 pos : INTERNALTESSPOS;
float2 uv : TEXCOORD0;
#if defined(LIGHTMAP_ON)
float2 lmuv : TEXCOORD1;
@@ -128,12 +128,12 @@ v2f vert(appdata v)
}
#endif
- o.vertex = UnityObjectToClipPos(v.vertex);
+ o.pos = UnityObjectToClipPos(v.vertex);
o.worldPos = mul(unity_ObjectToWorld, v.vertex);
o.objPos = v.vertex;
#if defined(SSR_ENABLED)
- o.screenPos = ComputeGrabScreenPos(o.vertex);
+ o.screenPos = ComputeGrabScreenPos(o.pos);
#endif
o.normal = UnityObjectToWorldNormal(v.normal);
@@ -181,7 +181,7 @@ tess_data hull_vertex(appdata v)
UNITY_TRANSFER_INSTANCE_ID(v, o);
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
- o.vertex = v.vertex;
+ o.pos = v.vertex;
//o.vertex = UnityObjectToClipPos(v.vertex);
//o.worldPos = mul(unity_ObjectToWorld, v.vertex);
//o.objPos = v.vertex;
@@ -254,10 +254,10 @@ v2f domain(
#endif
float4 vertex =
- patch[0].vertex * baryc.x +
- patch[1].vertex * baryc.y +
- patch[2].vertex * baryc.z;
- data.vertex = UnityObjectToClipPos(vertex);
+ patch[0].pos * baryc.x +
+ patch[1].pos * baryc.y +
+ patch[2].pos * baryc.z;
+ data.pos = UnityObjectToClipPos(vertex);
data.objPos = vertex;
data.worldPos = mul(unity_ObjectToWorld, vertex);
@@ -354,9 +354,9 @@ void geom(triangle v2f tri_in[3],
// Apply transformed worldPos to other coordinate systems.
if (_Explode_Phase > 1E-6) {
- v0.vertex = UnityObjectToClipPos(v0_objPos);
- v1.vertex = UnityObjectToClipPos(v1_objPos);
- v2.vertex = UnityObjectToClipPos(v2_objPos);
+ v0.pos = UnityObjectToClipPos(v0_objPos);
+ v1.pos = UnityObjectToClipPos(v1_objPos);
+ v2.pos = UnityObjectToClipPos(v2_objPos);
}
}
#endif // __EXPLODE
@@ -395,9 +395,9 @@ void geom(triangle v2f tri_in[3],
}
#endif
- v0.vertex = UnityObjectToClipPos(v0_objPos);
- v1.vertex = UnityObjectToClipPos(v1_objPos);
- v2.vertex = UnityObjectToClipPos(v2_objPos);
+ v0.pos = UnityObjectToClipPos(v0_objPos);
+ v1.pos = UnityObjectToClipPos(v1_objPos);
+ v2.pos = UnityObjectToClipPos(v2_objPos);
}
#endif
#if defined(_CLONES)
diff --git a/tooner_outline_pass.cginc b/tooner_outline_pass.cginc
index fe10c46..09c746d 100644
--- a/tooner_outline_pass.cginc
+++ b/tooner_outline_pass.cginc
@@ -14,7 +14,7 @@
struct tess_data
{
- float4 vertex : INTERNALTESSPOS;
+ float4 pos : INTERNALTESSPOS;
float2 uv : TEXCOORD0;
float3 normal : TEXCOORD2;
};
@@ -69,7 +69,7 @@ v2f vert(appdata v)
v2f o;
o.worldPos = worldPos;
o.objPos = objPos;
- o.vertex = clipPos;
+ o.pos = clipPos;
o.normal = UnityObjectToWorldNormal(v.normal);
o.uv = v.uv0.xy;
#if defined(LIGHTMAP_ON)
@@ -105,7 +105,7 @@ tess_data hull_vertex(appdata v)
v.vertex.xyz = vertex.xyz;
tess_data o;
- o.vertex = v.vertex;
+ o.pos = v.vertex;
o.normal = normal;
o.uv = v.uv0.xy;
@@ -118,7 +118,7 @@ tess_factors patch_constant(InputPatch<tess_data, 3> patch)
tess_factors f;
#if defined(_TESSELLATION)
- float3 worldPos = mul(unity_ObjectToWorld, patch[0].vertex);
+ float3 worldPos = mul(unity_ObjectToWorld, patch[0].pos);
float factor = _Tess_Factor;
if (_Tess_Dist_Cutoff > 0 && length(_WorldSpaceCameraPos - worldPos) > _Tess_Dist_Cutoff) {
factor = 1;
@@ -166,10 +166,10 @@ v2f domain(
#endif
float4 vertex =
- patch[0].vertex * baryc.x +
- patch[1].vertex * baryc.y +
- patch[2].vertex * baryc.z;
- data.vertex = UnityObjectToClipPos(vertex);
+ patch[0].pos * baryc.x +
+ patch[1].pos * baryc.y +
+ patch[2].pos * baryc.z;
+ data.pos = UnityObjectToClipPos(vertex);
data.objPos = vertex;
data.worldPos = mul(unity_ObjectToWorld, vertex);
@@ -266,9 +266,9 @@ void geom(triangle v2f tri_in[3],
// Apply transformed worldPos to other coordinate systems.
if (_Explode_Phase > 1E-6) {
- v0.vertex = UnityObjectToClipPos(v0_objPos);
- v1.vertex = UnityObjectToClipPos(v1_objPos);
- v2.vertex = UnityObjectToClipPos(v2_objPos);
+ v0.pos = UnityObjectToClipPos(v0_objPos);
+ v1.pos = UnityObjectToClipPos(v1_objPos);
+ v2.pos = UnityObjectToClipPos(v2_objPos);
}
}
#endif // __EXPLODE
@@ -307,9 +307,9 @@ void geom(triangle v2f tri_in[3],
}
#endif
- v0.vertex = UnityObjectToClipPos(v0_objPos);
- v1.vertex = UnityObjectToClipPos(v1_objPos);
- v2.vertex = UnityObjectToClipPos(v2_objPos);
+ v0.pos = UnityObjectToClipPos(v0_objPos);
+ v1.pos = UnityObjectToClipPos(v1_objPos);
+ v2.pos = UnityObjectToClipPos(v2_objPos);
}
#endif
#if defined(_CLONES)