Skip to content

Commit 1df6683

Browse files
sakumanaokiclaude
sakumanaoki
and
claude
committed
2nd TextureのTRANSFORM/SAMPLEマクロとProgress計算を独自キーワードで分離
- TRANSFORM_ALPHA_TRANSITION_MAP_SECONDを1stのMap Modeから独立させる - SAMPLE_ALPHA_TRANSITION_MAP_SECONDを2nd独自キーワードで分岐 - Vertex ShaderのProgress計算を全パスで2nd独自キーワードに変更 (Unlit, ShadowCaster, DepthNormals) - 全4シェーダーにshader_feature_local pragmaとPropertiesを追加 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 40bb03a commit 1df6683

8 files changed

Lines changed: 57 additions & 23 deletions

‎Assets/Nova/Runtime/Core/Shaders/ParticlesUber.hlsl‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -445,19 +445,21 @@ SamplerState GetEmissionMapSamplerState()
445445
// Transforms the alpha transition map UV by the scale/bias property
446446
#ifdef _ALPHA_TRANSITION_MAP_MODE_2D
447447
#define TRANSFORM_ALPHA_TRANSITION_MAP(texcoord) TRANSFORM_TEX(texcoord, _AlphaTransitionMap);
448-
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
449-
#define TRANSFORM_ALPHA_TRANSITION_MAP_SECOND(texcoord) TRANSFORM_TEX(texcoord, _AlphaTransitionMapSecondTexture);
450-
#endif
451448
#elif _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY
452449
#define TRANSFORM_ALPHA_TRANSITION_MAP(texcoord) TRANSFORM_TEX(texcoord, _AlphaTransitionMap2DArray);
453-
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
454-
#define TRANSFORM_ALPHA_TRANSITION_MAP_SECOND(texcoord) TRANSFORM_TEX(texcoord, _AlphaTransitionMapSecondTexture2DArray);
455-
#endif
456450
#elif _ALPHA_TRANSITION_MAP_MODE_3D
457451
#define TRANSFORM_ALPHA_TRANSITION_MAP(texcoord) TRANSFORM_TEX(texcoord, _AlphaTransitionMap3D);
458-
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
459-
#define TRANSFORM_ALPHA_TRANSITION_MAP_SECOND(texcoord) TRANSFORM_TEX(texcoord, _AlphaTransitionMapSecondTexture3D);
460452
#endif
453+
454+
// Transforms the alpha transition map second texture UV by the scale/bias property
455+
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
456+
#ifdef _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D
457+
#define TRANSFORM_ALPHA_TRANSITION_MAP_SECOND(texcoord) TRANSFORM_TEX(texcoord, _AlphaTransitionMapSecondTexture);
458+
#elif _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY
459+
#define TRANSFORM_ALPHA_TRANSITION_MAP_SECOND(texcoord) TRANSFORM_TEX(texcoord, _AlphaTransitionMapSecondTexture2DArray);
460+
#elif _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
461+
#define TRANSFORM_ALPHA_TRANSITION_MAP_SECOND(texcoord) TRANSFORM_TEX(texcoord, _AlphaTransitionMapSecondTexture3D);
462+
#endif
461463
#endif
462464

463465
// Transforms the alpha transition map UV by the scale/bias property
@@ -554,25 +556,27 @@ void ApplyColorCorrection(in out float3 color)
554556
// Sample the alpha transition map.
555557
#ifdef _ALPHA_TRANSITION_MAP_MODE_2D
556558
#define SAMPLE_ALPHA_TRANSITION_MAP(uv, progress) SAMPLE_TEXTURE2D(_AlphaTransitionMap, sampler_AlphaTransitionMap, uv);
557-
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
558-
#define SAMPLE_ALPHA_TRANSITION_MAP_SECOND(uv, progress) SAMPLE_TEXTURE2D(_AlphaTransitionMapSecondTexture, sampler_AlphaTransitionMapSecondTexture, uv);
559-
#endif
560559
#elif _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY
561560
#define SAMPLE_ALPHA_TRANSITION_MAP(uv, progress) SAMPLE_TEXTURE2D_ARRAY(_AlphaTransitionMap2DArray, sampler_AlphaTransitionMap2DArray, uv, progress);
562-
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
563-
#define SAMPLE_ALPHA_TRANSITION_MAP_SECOND(uv, progress) SAMPLE_TEXTURE2D_ARRAY(_AlphaTransitionMapSecondTexture2DArray, sampler_AlphaTransitionMapSecondTexture2DArray, uv, progress);
564-
#endif
565561
#elif _ALPHA_TRANSITION_MAP_MODE_3D
566562
#define SAMPLE_ALPHA_TRANSITION_MAP(uv, progress) SAMPLE_TEXTURE3D_LOD(_AlphaTransitionMap3D, sampler_AlphaTransitionMap3D, float3(uv, progress), 0);
567-
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
568-
#define SAMPLE_ALPHA_TRANSITION_MAP_SECOND(uv, progress) SAMPLE_TEXTURE3D_LOD(_AlphaTransitionMapSecondTexture3D, sampler_AlphaTransitionMapSecondTexture3D, float3(uv, progress), 0);
569-
#endif
570563
#endif
571564

572565
#ifndef SAMPLE_ALPHA_TRANSITION_MAP
573566
#define SAMPLE_ALPHA_TRANSITION_MAP(uv, progress) half4(0, 0, 0, 1)
574567
#endif
575568

569+
// Sample the alpha transition map second texture.
570+
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
571+
#ifdef _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D
572+
#define SAMPLE_ALPHA_TRANSITION_MAP_SECOND(uv, progress) SAMPLE_TEXTURE2D(_AlphaTransitionMapSecondTexture, sampler_AlphaTransitionMapSecondTexture, uv);
573+
#elif _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY
574+
#define SAMPLE_ALPHA_TRANSITION_MAP_SECOND(uv, progress) SAMPLE_TEXTURE2D_ARRAY(_AlphaTransitionMapSecondTexture2DArray, sampler_AlphaTransitionMapSecondTexture2DArray, uv, progress);
575+
#elif _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
576+
#define SAMPLE_ALPHA_TRANSITION_MAP_SECOND(uv, progress) SAMPLE_TEXTURE3D_LOD(_AlphaTransitionMapSecondTexture3D, sampler_AlphaTransitionMapSecondTexture3D, float3(uv, progress), 0);
577+
#endif
578+
#endif
579+
576580
void ModulateAlphaTransitionProgress(in out half progress, half vertexAlpha)
577581
{
578582
#if defined(_FADE_TRANSITION_ENABLED) || defined(_DISSOLVE_TRANSITION_ENABLED)

‎Assets/Nova/Runtime/Core/Shaders/ParticlesUberDepthNormalsCore.hlsl‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,16 @@ VaryingsDrawDepth vert(AttributesDrawDepth input)
342342
#endif
343343
#endif
344344

345+
#endif
346+
347+
// Transition Map Progress for Second Texture
345348
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
349+
#if defined(_ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY) || defined(_ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D)
346350
float transitionMapProgressSecond = _AlphaTransitionMapSecondTextureProgress + GET_CUSTOM_COORD(_AlphaTransitionMapSecondTextureProgressCoord);
347351
float sliceCountSecond = _AlphaTransitionMapSecondTextureSliceCount;
348-
#ifdef _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY
352+
#ifdef _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY
349353
output.transitionEmissionProgressesSecond.x = FlipBookProgress(transitionMapProgressSecond, sliceCountSecond);
350-
#elif _ALPHA_TRANSITION_MAP_MODE_3D
354+
#elif _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
351355
output.transitionEmissionProgressesSecond.x = FlipBookBlendingProgress(transitionMapProgressSecond, sliceCountSecond);
352356
#endif
353357
#endif

‎Assets/Nova/Runtime/Core/Shaders/ParticlesUberLit.shader‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ Shader "Nova/Particles/UberLit"
174174
_AlphaTransitionProgressCoord("Alpha Transition Progress Coord", Float) = 0.0
175175
_DissolveSharpness("Dissolve Sharpness", Range(0.0, 1.0)) = 0.5
176176
_AlphaTransitionSecondTextureBlendMode("Alpha Transition Second Texture BlendMode", Float) = 0.0
177+
_AlphaTransitionMapSecondTextureMapMode("Alpha Transition Second Texture Map Mode", Float) = 0.0
177178
_AlphaTransitionMapSecondTexture("Alpha Transition Second Texture Map", 2D) = "white" {}
178179
_AlphaTransitionMapSecondTexture2DArray("Alpha Transition Second Texture Map 2D Array", 2DArray) = "" {}
179180
_AlphaTransitionMapSecondTexture3D("Alpha Transition Second Texture Map 3D", 3D) = "" {}
@@ -369,6 +370,7 @@ Shader "Nova/Particles/UberLit"
369370
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
370371
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
371372
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
373+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
372374
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
373375
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
374376

@@ -452,6 +454,7 @@ Shader "Nova/Particles/UberLit"
452454
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
453455
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
454456
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
457+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
455458
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
456459
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
457460

@@ -535,6 +538,7 @@ Shader "Nova/Particles/UberLit"
535538
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
536539
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
537540
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
541+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
538542
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
539543
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
540544

@@ -624,6 +628,7 @@ Shader "Nova/Particles/UberLit"
624628
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
625629
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
626630
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
631+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
627632
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
628633
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
629634

@@ -708,6 +713,7 @@ Shader "Nova/Particles/UberLit"
708713
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
709714
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
710715
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
716+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
711717
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
712718
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
713719

@@ -777,6 +783,7 @@ Shader "Nova/Particles/UberLit"
777783
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
778784
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
779785
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
786+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
780787
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
781788
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
782789

‎Assets/Nova/Runtime/Core/Shaders/ParticlesUberShadowCaster.hlsl‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,16 @@ Varyings ShadowPassVertex(Attributes input)
240240
#endif
241241
#endif
242242

243+
#endif
244+
245+
// Transition Map Progress for Second Texture
243246
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
247+
#if defined(_ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY) || defined(_ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D)
244248
float transitionMapProgressSecond = _AlphaTransitionMapSecondTextureProgress + GET_CUSTOM_COORD(_AlphaTransitionMapSecondTextureProgressCoord);
245249
float sliceCountSecond = _AlphaTransitionMapSecondTextureSliceCount;
246-
#ifdef _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY
250+
#ifdef _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY
247251
output.transitionProgressSecond = FlipBookProgress(transitionMapProgressSecond, sliceCountSecond);
248-
#elif _ALPHA_TRANSITION_MAP_MODE_3D
252+
#elif _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
249253
output.transitionProgressSecond = FlipBookBlendingProgress(transitionMapProgressSecond, sliceCountSecond);
250254
#endif
251255
#endif

‎Assets/Nova/Runtime/Core/Shaders/ParticlesUberUnlit.hlsl‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,17 +300,21 @@ Varyings vertUnlit(Attributes input, out float3 positionWS, uniform bool useEmis
300300
#endif
301301
#endif
302302

303+
#endif
304+
305+
// Transition Map Progress for Second Texture
303306
#if defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE) || defined(_ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY)
307+
#if defined(_ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY) || defined(_ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D)
304308
float transitionMapProgressSecond = _AlphaTransitionMapSecondTextureProgress + GET_CUSTOM_COORD(_AlphaTransitionMapSecondTextureProgressCoord);
305309
float sliceCountSecond = _AlphaTransitionMapSecondTextureSliceCount;
306-
#ifdef _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY
310+
#ifdef _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY
307311
// Random Row Selection for Second Texture
308312
#ifdef _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
309313
output.transitionEmissionProgressesSecond.x = FlipBookProgressWithRandomRow(transitionMapProgressSecond, sliceCountSecond, _AlphaTransitionMapSecondTextureRowCount, GET_CUSTOM_COORD(_AlphaTransitionMapSecondTextureRandomRowCoord));
310314
#else
311315
output.transitionEmissionProgressesSecond.x = FlipBookProgress(transitionMapProgressSecond, sliceCountSecond);
312316
#endif
313-
#elif _ALPHA_TRANSITION_MAP_MODE_3D
317+
#elif _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
314318
// Random Row Selection for Second Texture
315319
#ifdef _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
316320
output.transitionEmissionProgressesSecond.x = FlipBookBlendingProgressWithRandomRow(transitionMapProgressSecond, sliceCountSecond, _AlphaTransitionMapSecondTextureRowCount, GET_CUSTOM_COORD(_AlphaTransitionMapSecondTextureRandomRowCoord));

‎Assets/Nova/Runtime/Core/Shaders/ParticlesUberUnlit.shader‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ Shader "Nova/Particles/UberUnlit"
149149
_AlphaTransitionProgressCoord("Alpha Transition Progress Coord", Float) = 0.0
150150
_DissolveSharpness("Dissolve Sharpness", Range(0.0, 1.0)) = 0.5
151151
_AlphaTransitionSecondTextureBlendMode("Alpha Transition Second Texture BlendMode", Float) = 0.0
152+
_AlphaTransitionMapSecondTextureMapMode("Alpha Transition Second Texture Map Mode", Float) = 0.0
152153
_AlphaTransitionMapSecondTexture("Alpha Transition Second Texture Map", 2D) = "white" {}
153154
_AlphaTransitionMapSecondTexture2DArray("Alpha Transition Second Texture Map 2D Array", 2DArray) = "" {}
154155
_AlphaTransitionMapSecondTexture3D("Alpha Transition Second Texture Map 3D", 3D) = "" {}
@@ -315,6 +316,7 @@ Shader "Nova/Particles/UberUnlit"
315316
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
316317
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
317318
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
319+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
318320
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
319321
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
320322

@@ -397,6 +399,7 @@ Shader "Nova/Particles/UberUnlit"
397399
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
398400
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
399401
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
402+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
400403
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
401404
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
402405

@@ -478,6 +481,7 @@ Shader "Nova/Particles/UberUnlit"
478481
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
479482
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
480483
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
484+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
481485
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
482486
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
483487

@@ -562,6 +566,7 @@ Shader "Nova/Particles/UberUnlit"
562566
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
563567
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
564568
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
569+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
565570
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
566571
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
567572

@@ -647,6 +652,7 @@ Shader "Nova/Particles/UberUnlit"
647652
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
648653
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
649654
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
655+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
650656
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
651657
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
652658

@@ -714,6 +720,7 @@ Shader "Nova/Particles/UberUnlit"
714720
#pragma shader_feature_local _ _FADE_TRANSITION_ENABLED _DISSOLVE_TRANSITION_ENABLED
715721
#pragma shader_feature_local _ALPHA_TRANSITION_MAP_MODE_2D _ALPHA_TRANSITION_MAP_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_MODE_3D
716722
#pragma shader_feature_local _ _ALPHA_TRANSITION_BLEND_SECOND_TEX_AVERAGE _ALPHA_TRANSITION_BLEND_SECOND_TEX_MULTIPLY
723+
#pragma shader_feature_local _ _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_2D_ARRAY _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_MODE_3D
717724
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_RANDOM_ROW_SELECTION_ENABLED
718725
#pragma shader_feature_local_vertex _ALPHA_TRANSITION_MAP_SECOND_TEXTURE_RANDOM_ROW_SELECTION_ENABLED
719726

0 commit comments

Comments
 (0)