Revision 175:f9f5640c2a3a Assets/Standard Assets/Water (Pro Only)/Water4/Sources/Shaders/FX-SimpleWater4.shader
| b/Assets/Standard Assets/Water (Pro Only)/Water4/Sources/Shaders/FX-SimpleWater4.shader | ||
|---|---|---|
| 1 |
// Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld' |
|
| 2 |
|
|
| 1 | 3 |
#warning Upgrade NOTE: unity_Scale shader variable was removed; replaced 'unity_Scale.w' with '1.0' |
| 2 | 4 |
|
| 3 | 5 |
Shader "FX/SimpleWater4" {
|
| ... | ... | |
| 123 | 125 |
{
|
| 124 | 126 |
v2f o; |
| 125 | 127 |
|
| 126 |
half3 worldSpaceVertex = mul(_Object2World,(v.vertex)).xyz;
|
|
| 128 |
half3 worldSpaceVertex = mul(unity_ObjectToWorld,(v.vertex)).xyz;
|
|
| 127 | 129 |
half3 vtxForAni = (worldSpaceVertex).xzz * 1.0; |
| 128 | 130 |
|
| 129 | 131 |
half3 nrml; |
| ... | ... | |
| 220 | 222 |
{
|
| 221 | 223 |
v2f_noGrab o; |
| 222 | 224 |
|
| 223 |
half3 worldSpaceVertex = mul(_Object2World,(v.vertex)).xyz;
|
|
| 225 |
half3 worldSpaceVertex = mul(unity_ObjectToWorld,(v.vertex)).xyz;
|
|
| 224 | 226 |
half3 vtxForAni = (worldSpaceVertex).xzz * 1.0; |
| 225 | 227 |
|
| 226 | 228 |
half3 nrml; |
| ... | ... | |
| 303 | 305 |
{
|
| 304 | 306 |
v2f_simple o; |
| 305 | 307 |
|
| 306 |
half3 worldSpaceVertex = mul(_Object2World, v.vertex).xyz;
|
|
| 308 |
half3 worldSpaceVertex = mul(unity_ObjectToWorld, v.vertex).xyz;
|
|
| 307 | 309 |
half2 tileableUv = worldSpaceVertex.xz; |
| 308 | 310 |
|
| 309 | 311 |
o.bumpCoords.xyzw = (tileableUv.xyxy + _Time.xxxx * _BumpDirection.xyzw) * _BumpTiling.xyzw; |
Also available in: Unified diff