diff --git a/Assets/Material/AllIn13DMaterial.mat b/Assets/Material/AllIn13DMaterial.mat index 680a09e..24d0da6 100644 --- a/Assets/Material/AllIn13DMaterial.mat +++ b/Assets/Material/AllIn13DMaterial.mat @@ -8,25 +8,25 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: AllIn13DMaterial - m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Shader: {fileID: 4800000, guid: 3bc39c06ce1e4fb44bc21dcf24dde7fe, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_AFTERLIGHTING - _COLOR_RAMP_ON - _CONTRAST_BRIGHTNESS_ON + - _CUSTOM_AMBIENT_LIGHT_ON - _FADEUVSET_UV1 - _FOG_ON + - _GLITCH_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_TOON - _MATCAPBLENDMODE_MULTIPLY - _OUTLINETYPE_NONE - _RECEIVEDSHADOWSTYPE_CLASSIC - - _RECEIVE_SHADOWS_ON - _REFLECTIONS_NONE - _RIMLIGHTINGSTAGE_BEFORELIGHTINGLAST - _SHADINGMODEL_BASIC @@ -48,7 +48,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -60,15 +60,15 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BlendingNormalMapB: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6246e3fe4a63c1f4f9acec9623576fc7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BlendingNormalMapG: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BlendingNormalMapWhite: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BlendingTextureB: @@ -80,11 +80,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BlendingTextureWhite: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 2af6ba1567607124eb61349fa044375b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ColorRampTex: - m_Texture: {fileID: 2800000, guid: 55283e69304946d4f8762723477f0704, type: 3} + m_Texture: {fileID: 2800000, guid: 08f9a2382d1a04c43bbef5ce4ba09fbe, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DistortTex: @@ -92,7 +92,7 @@ Material: m_Scale: {x: 15, y: 15} m_Offset: {x: 5, y: 5} - _EmissionMap: - m_Texture: {fileID: 2800000, guid: e8745f0a17582af43aa61e323be9d994, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 10, y: 10} m_Offset: {x: 0, y: 0} - _FadeTex: @@ -112,7 +112,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 120df76dc2d17ed4cb2d4b8b08292ed9, type: 3} m_Scale: {x: 5, y: 5} m_Offset: {x: 0, y: 0} - _SSSMap: @@ -124,7 +124,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TexBlendingMask: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 5a775794f8704ba4385b9c92cf9f1224, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ThicknessMap: @@ -144,11 +144,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TriplanarNoiseTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fcb69fdadf254834880fe3c443965278, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _TriplanarTopTex: @@ -156,7 +156,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _VertexDistortionNoiseTex: - m_Texture: {fileID: 2800000, guid: fcb69fdadf254834880fe3c443965278, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _VertexExtrudeNoiseTex: @@ -188,7 +188,7 @@ Material: - _BlendingMaskSmoothnessWhite: 0.4 - _Brightness: 1 - _BrightnessLM: 0 - - _CastShadowsOn: 1 + - _CastShadowsOn: 0 - _ColorMask: 15 - _ColorRampBlend: 1 - _ColorRampLightingStage: 1 @@ -200,7 +200,7 @@ Material: - _ContrastBrightnessOn: 1 - _ContrastLM: 1 - _CullingMode: 2 - - _CustomAmbientLightOn: 0 + - _CustomAmbientLightOn: 1 - _CustomShadowColorOn: 0 - _DepthColoringOn: 0 - _DepthGlowColorIntensity: 25 @@ -228,10 +228,10 @@ Material: - _FlatNormalsEnabled: 0 - _FogOn: 1 - _GeneralAlpha: 1 - - _Glitch: 0 - - _GlitchAmount: 0.068 - - _GlitchSpeed: 0.21 - - _GlitchTiling: 2.14 + - _Glitch: 1 + - _GlitchAmount: 0.5 + - _GlitchSpeed: 1 + - _GlitchTiling: 3.51 - _GlitchWorldSpace: 1 - _GreyScaleStage: 0 - _Greyscale: 0 @@ -252,8 +252,8 @@ Material: - _Hightlights: 0 - _HightlightsStrength: 1 - _Hit: 0 - - _HitBlend: 1 - - _HitGlow: 5 + - _HitBlend: 0 + - _HitGlow: 0 - _Hologram: 0 - _HologramAccentAlpha: 0.5 - _HologramAccentFrequency: 2 @@ -315,7 +315,7 @@ Material: - _PosterizeGamma: 10 - _PosterizeNumColors: 108 - _RecalculateNormals: 0 - - _ReceiveShadows: 1 + - _ReceiveShadows: 0 - _ReceivedShadowsType: 0 - _Reflections: 0 - _ReflectionsAtten: 0.641 @@ -407,7 +407,7 @@ Material: - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} - _HighlightOffset: {r: 0, g: 0, b: 0, a: 0} - _HighlightsColor: {r: 2, g: 2, b: 2, a: 1} - - _HitColor: {r: 1, g: 1, b: 1, a: 1} + - _HitColor: {r: 0, g: 0, b: 0, a: 1} - _HologramColor: {r: 0.35, g: 0.8, b: 2, a: 1} - _HologramLineDirection: {r: 0, g: 1, b: 0, a: 0} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 1.asset b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 1.asset new file mode 100644 index 0000000..2145f98 --- /dev/null +++ b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 1.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb204018ddc8dbc43a4340c074e1a919, type: 3} + m_Name: GradientAsset_RampTexture 1 + m_EditorClassIdentifier: AllIn13DShaderAssemebly.Editor::AllIn13DShader.GradientTexture + texture: {fileID: 2800000, guid: 08f9a2382d1a04c43bbef5ce4ba09fbe, type: 3} + gradient: + serializedVersion: 2 + key0: {r: 0.015686275, g: 0.02745098, b: 0, a: 1} + key1: {r: 0.015686275, g: 0.02745098, b: 0, a: 1} + key2: {r: 0.19529413, g: 0.38980398, b: 0.007843138, a: 0} + key3: {r: 0.3529412, g: 0.69411767, b: 0.019607844, a: 0} + key4: {r: 0.3529412, g: 0.69411767, b: 0.019607844, a: 0} + key5: {r: 0.3529412, g: 0.69411767, b: 0.019607844, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 13107 + ctime2: 26214 + ctime3: 39321 + ctime4: 52428 + ctime5: 65535 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 6 + m_NumAlphaKeys: 2 diff --git a/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 1.asset.meta b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 1.asset.meta new file mode 100644 index 0000000..fd3dbb7 --- /dev/null +++ b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9467976b1f5f0c49b1b09a7faf1ca54 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 2.asset b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 2.asset new file mode 100644 index 0000000..7db092f --- /dev/null +++ b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 2.asset @@ -0,0 +1,45 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb204018ddc8dbc43a4340c074e1a919, type: 3} + m_Name: GradientAsset_RampTexture 2 + m_EditorClassIdentifier: AllIn13DShaderAssemebly.Editor::AllIn13DShader.GradientTexture + texture: {fileID: 2800000, guid: 08f9a2382d1a04c43bbef5ce4ba09fbe, type: 3} + gradient: + serializedVersion: 2 + key0: {r: 0.14532487, g: 0.1981132, b: 0.0252314, a: 1} + key1: {r: 0.5504825, g: 0.7924528, b: 0, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 30069 + ctime1: 37008 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 diff --git a/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 2.asset.meta b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 2.asset.meta new file mode 100644 index 0000000..1335a24 --- /dev/null +++ b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture 2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55e368867d07264408d52b709a239e6f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture.asset b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture.asset index 994b11e..1dd0964 100644 --- a/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture.asset +++ b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/GradientAsset_RampTexture.asset @@ -12,19 +12,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb204018ddc8dbc43a4340c074e1a919, type: 3} m_Name: GradientAsset_RampTexture m_EditorClassIdentifier: AllIn13DShaderAssemebly.Editor::AllIn13DShader.GradientTexture - texture: {fileID: 2800000, guid: 55283e69304946d4f8762723477f0704, type: 3} + texture: {fileID: 2800000, guid: 08f9a2382d1a04c43bbef5ce4ba09fbe, type: 3} gradient: serializedVersion: 2 - key0: {r: 0.13061087, g: 0.1792453, b: 0.019446427, a: 1} - key1: {r: 0.632604, g: 0.8490566, b: 0.14017442, a: 1} + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} key2: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0} key6: {r: 0, g: 0, b: 0, a: 0} key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 11758 - ctime1: 14071 + ctime0: 0 + ctime1: 65535 ctime2: 0 ctime3: 0 ctime4: 0 diff --git a/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/greenDice.png b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/greenDice.png index c64f327..63d1fce 100644 Binary files a/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/greenDice.png and b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/greenDice.png differ diff --git a/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/greenDice.png.meta b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/greenDice.png.meta index 9ac10f7..5558e73 100644 --- a/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/greenDice.png.meta +++ b/Assets/Plugins/AllIn13DShader/AllIn3DShaderConfig/Export/Gradients/greenDice.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55283e69304946d4f8762723477f0704 +guid: 08f9a2382d1a04c43bbef5ce4ba09fbe TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_AlienStatueHologram.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_AlienStatueHologram.mat index 0f0b6aa..1f4e7e9 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_AlienStatueHologram.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_AlienStatueHologram.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_AlienStatueHologram m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GLITCH_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -42,6 +45,7 @@ Material: m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +157,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -227,6 +235,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 1 @@ -241,6 +252,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 1 - _GreyscaleBlend: 0.464 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -358,14 +370,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -408,3 +424,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_BuildingsRamp1.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_BuildingsRamp1.mat index 4c3e4e1..a8dfaa4 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_BuildingsRamp1.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_BuildingsRamp1.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_BuildingsRamp1 m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _COLOR_RAMP_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _HEIGHT_GRADIENT_ON @@ -38,6 +41,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -157,6 +161,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -231,6 +239,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -245,6 +256,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: -0.03 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -364,14 +376,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -414,3 +430,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_BuildingsRamp2.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_BuildingsRamp2.mat index 26ac31a..d677069 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_BuildingsRamp2.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_BuildingsRamp2.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_BuildingsRamp2 m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _COLOR_RAMP_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _HEIGHT_GRADIENT_ON @@ -38,6 +41,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -157,6 +161,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -231,6 +239,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -245,6 +256,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: -0.03 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -364,14 +376,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -414,3 +430,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ChomperSSS.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ChomperSSS.mat index 7c570ec..7115663 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ChomperSSS.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ChomperSSS.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_ChomperSSS m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON @@ -16,6 +18,7 @@ Material: - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -46,6 +49,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -157,6 +161,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -231,6 +239,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -245,6 +256,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -362,14 +374,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -412,3 +428,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Distort.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Distort.mat index a4cc536..e16899e 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Distort.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Distort.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Distort m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -39,6 +42,7 @@ Material: stringTagMap: {} disabledShaderPasses: - FORWARDADD + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -150,6 +154,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -224,6 +232,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -238,6 +249,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -355,14 +367,18 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 1 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.04 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -405,3 +421,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_FogReceiver.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_FogReceiver.mat index 6f4a3c4..77b8cbc 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_FogReceiver.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_FogReceiver.mat @@ -16,6 +16,7 @@ Material: - _ALPHA_CUTOFF_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _DEPTH_COLORING_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_NONE @@ -160,6 +161,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -234,6 +239,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -248,6 +256,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -367,14 +376,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Ghost.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Ghost.mat index 7a6b1eb..be03818 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Ghost.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Ghost.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Ghost m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _INTERSECTION_FADE_ON @@ -39,6 +42,7 @@ Material: m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -158,6 +162,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -232,6 +240,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 0.307 - _Glitch: 0 @@ -246,6 +257,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -365,14 +377,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -415,3 +431,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GlowBlue.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GlowBlue.mat index 2e49db2..5781511 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GlowBlue.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GlowBlue.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_GlowBlue m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_NONE @@ -39,6 +42,7 @@ Material: stringTagMap: {} disabledShaderPasses: - FORWARDADD + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -158,6 +162,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -232,6 +240,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -246,6 +257,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -365,14 +377,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -415,3 +431,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GlowRed.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GlowRed.mat index c79773e..a8269ba 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GlowRed.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GlowRed.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_GlowRed m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_NONE @@ -39,6 +42,7 @@ Material: stringTagMap: {} disabledShaderPasses: - FORWARDADD + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -158,6 +162,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -232,6 +240,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -246,6 +257,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -365,14 +377,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -415,3 +431,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GroundFog.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GroundFog.mat index afa15fa..7376215 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GroundFog.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_GroundFog.mat @@ -16,6 +16,7 @@ Material: - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _DEPTH_COLORING_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_CLASSIC @@ -161,6 +162,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -235,6 +240,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -249,6 +257,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -368,14 +377,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_HandDrawn.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_HandDrawn.mat index 8928a62..3cdb7a5 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_HandDrawn.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_HandDrawn.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_HandDrawn m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HAND_DRAWN_ON @@ -39,6 +42,7 @@ Material: stringTagMap: {} disabledShaderPasses: - FORWARDADD + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -150,6 +154,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -224,6 +232,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -238,6 +249,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 1 @@ -355,14 +367,18 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.04 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -405,3 +421,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LeafsPine.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LeafsPine.mat index 638243f..baebf9b 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LeafsPine.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LeafsPine.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_LeafsPine m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_TOON @@ -39,6 +42,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -158,6 +162,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -232,6 +240,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -246,6 +257,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -364,14 +376,18 @@ Material: - _ToonSmoothness: 0.071 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.3 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 1 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -414,3 +430,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 2, g: 2, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightAniso.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightAniso.mat index 0f4c92a..b963eb4 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightAniso.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightAniso.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_LightAniso m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_FAKEGI @@ -36,6 +39,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,6 +159,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -229,6 +237,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -243,6 +254,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -362,14 +374,18 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -412,3 +428,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightDefault.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightDefault.mat index efeec11..6bc6f62 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightDefault.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightDefault.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_LightDefault m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_CLASSIC @@ -36,6 +39,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,6 +159,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -229,6 +237,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -243,6 +254,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -362,14 +374,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -412,3 +428,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightHalfLambert.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightHalfLambert.mat index 0a623c1..a780cd9 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightHalfLambert.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightHalfLambert.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_LightHalfLambert m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_HALFLAMBERT @@ -36,6 +39,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,6 +159,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -229,6 +237,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -243,6 +254,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.403 - _HandDrawn: 0 @@ -362,14 +374,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -412,3 +428,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightPBR.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightPBR.mat index 3193b49..5c2856f 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightPBR.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightPBR.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_LightPBR m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_CLASSIC @@ -36,6 +39,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,6 +159,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -229,6 +237,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -243,6 +254,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -362,14 +374,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -412,3 +428,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightToon.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightToon.mat index b303f5f..ccc57e6 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightToon.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightToon.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_LightToon m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_TOON @@ -36,6 +39,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,6 +159,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -229,6 +237,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -243,6 +254,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -362,14 +374,18 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -412,3 +428,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightToonRamp.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightToonRamp.mat index 80926fc..3a751d0 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightToonRamp.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_LightToonRamp.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_LightToonRamp m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_TOONRAMP @@ -36,6 +39,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,6 +159,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -229,6 +237,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -243,6 +254,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -362,14 +374,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -412,3 +428,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline.mat index 4582bc3..f28e022 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Outline m_Shader: {fileID: 4800000, guid: a4c8f68acf7c9844e97a36914026acb1, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON @@ -43,6 +45,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -387,6 +390,8 @@ Material: - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -429,3 +434,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline2.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline2.mat index ccd1411..9327b72 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline2.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline2.mat @@ -16,6 +16,7 @@ Material: - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -164,6 +165,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -238,6 +243,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.215 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -252,6 +260,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -371,14 +380,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline3.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline3.mat index 7c5b329..4f7cce3 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline3.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Outline3.mat @@ -16,6 +16,7 @@ Material: - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -164,6 +165,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -238,6 +243,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.215 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -252,6 +260,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -371,14 +380,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Pixel.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Pixel.mat index 5d93650..663dc94 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Pixel.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Pixel.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Pixel m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -39,6 +42,7 @@ Material: stringTagMap: {} disabledShaderPasses: - FORWARDADD + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -150,6 +154,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -224,6 +232,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -238,6 +249,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -355,14 +367,18 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.04 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -405,3 +421,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_PuppetHologram.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_PuppetHologram.mat index 5ff7a8e..d345648 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_PuppetHologram.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_PuppetHologram.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_PuppetHologram m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GLITCH_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -42,6 +45,7 @@ Material: m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -153,6 +157,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -227,6 +235,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 0.895 - _Glitch: 1 @@ -241,6 +252,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 1 - _GreyscaleBlend: 0.464 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -358,14 +370,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -408,3 +424,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScreenSpace.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScreenSpace.mat index 7d0f130..d81d683 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScreenSpace.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScreenSpace.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_ScreenSpace m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -39,6 +42,7 @@ Material: stringTagMap: {} disabledShaderPasses: - FORWARDADD + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -150,6 +154,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -224,6 +232,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -238,6 +249,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -355,14 +367,18 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.04 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -405,3 +421,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScreenspaceMapping.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScreenspaceMapping.mat index b9780b5..48b0d46 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScreenspaceMapping.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScreenspaceMapping.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_ScreenspaceMapping m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _CONTRAST_BRIGHTNESS_ON + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -48,6 +51,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -139,6 +143,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -209,6 +217,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -220,6 +231,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: -0.12 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -332,13 +344,17 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 1 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.086 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -381,3 +397,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScrollTex.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScrollTex.mat index 884e3e9..f7468df 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScrollTex.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_ScrollTex.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_ScrollTex m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -39,6 +42,7 @@ Material: stringTagMap: {} disabledShaderPasses: - FORWARDADD + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -150,6 +154,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -224,6 +232,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -238,6 +249,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -355,14 +367,18 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.04 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -405,3 +421,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpaceshipNoMatcap.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpaceshipNoMatcap.mat index a3618a6..887997f 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpaceshipNoMatcap.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpaceshipNoMatcap.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_SpaceshipNoMatcap m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _HUE_SHIFT_ON @@ -40,6 +43,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -167,6 +171,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -247,6 +255,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -261,6 +272,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -397,14 +409,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexExtrude: 0 - _VertexExtrudeNoiseXSpeed: 4 @@ -454,3 +470,4 @@ Material: - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterDither.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterDither.mat index c7c9936..273f3e9 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterDither.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterDither.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_SpitterDither m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON @@ -16,6 +18,7 @@ Material: - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _DITHER_ON + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_BY_CAM_DISTANCE_NEAR_FADE - _FADE_BY_CAM_DISTANCE_ON @@ -49,6 +52,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -160,6 +164,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -235,6 +243,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -249,6 +260,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -366,14 +378,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -416,3 +432,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterHue.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterHue.mat index 74c6aa3..41c3a0a 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterHue.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterHue.mat @@ -9,12 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_SpitterHue m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _AOMAP_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -46,6 +49,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -157,6 +161,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -231,6 +239,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -245,6 +256,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -273,9 +285,9 @@ Material: - _HologramScrollSpeed: 2 - _HueBrightness: 1 - _HueBrightnessLM: 1 - - _HueSaturation: 0.0011638999 + - _HueSaturation: 2.3956394 - _HueSaturationLM: 1 - - _HueShift: 144.89954 + - _HueShift: 4.8495197 - _HueShiftEnabled: 1 - _HueShiftLM: 0 - _InflateBlend: 1 @@ -362,14 +374,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -412,3 +428,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterSSS.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterSSS.mat index 0f28dda..d6d4169 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterSSS.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_SpitterSSS.mat @@ -9,12 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_SpitterSSS m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _AOMAP_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -45,6 +48,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -156,6 +160,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -230,6 +238,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -244,6 +255,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -361,14 +373,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -411,3 +427,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueDistortion.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueDistortion.mat index d05d5a4..17923ed 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueDistortion.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueDistortion.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_StatueDistortion m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON @@ -16,6 +18,7 @@ Material: - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -48,6 +51,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -187,6 +191,10 @@ Material: m_Texture: {fileID: 2800000, guid: b5e52e512494f434c88a1675f0e9361d, type: 3} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -262,6 +270,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.052 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -276,6 +287,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -396,8 +408,10 @@ Material: - _TopMetallic: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 @@ -405,6 +419,8 @@ Material: - _Use_Mask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.24 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 1 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -448,3 +464,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueGlitch.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueGlitch.mat index f807c8a..58cc8a5 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueGlitch.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueGlitch.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_StatueGlitch m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON @@ -16,6 +18,7 @@ Material: - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GLITCH_ON @@ -48,6 +51,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -187,6 +191,10 @@ Material: m_Texture: {fileID: 2800000, guid: b5e52e512494f434c88a1675f0e9361d, type: 3} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -262,6 +270,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.052 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 1 @@ -276,6 +287,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -396,8 +408,10 @@ Material: - _TopMetallic: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 @@ -405,6 +419,8 @@ Material: - _Use_Mask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -448,3 +464,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueInflate.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueInflate.mat index 646a4f5..1a3d884 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueInflate.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueInflate.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_StatueInflate m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON @@ -16,6 +18,7 @@ Material: - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -48,6 +51,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -187,6 +191,10 @@ Material: m_Texture: {fileID: 2800000, guid: b5e52e512494f434c88a1675f0e9361d, type: 3} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -262,6 +270,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.052 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -276,6 +287,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -396,8 +408,10 @@ Material: - _TopMetallic: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 @@ -405,6 +419,8 @@ Material: - _Use_Mask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 1 - _VertexShakeOn: 0 @@ -448,3 +464,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueShake.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueShake.mat index 51d8f3e..46509c1 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueShake.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueShake.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_StatueShake m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON @@ -16,6 +18,7 @@ Material: - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -48,6 +51,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -187,6 +191,10 @@ Material: m_Texture: {fileID: 2800000, guid: b5e52e512494f434c88a1675f0e9361d, type: 3} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -262,6 +270,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.052 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -276,6 +287,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -396,8 +408,10 @@ Material: - _TopMetallic: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 @@ -405,6 +419,8 @@ Material: - _Use_Mask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 1 @@ -448,3 +464,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueVoxel.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueVoxel.mat index 27d24f6..0cedc01 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueVoxel.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_StatueVoxel.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_StatueVoxel m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON @@ -16,6 +18,7 @@ Material: - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -48,6 +51,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -187,6 +191,10 @@ Material: m_Texture: {fileID: 2800000, guid: b5e52e512494f434c88a1675f0e9361d, type: 3} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -262,6 +270,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.052 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -276,6 +287,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -396,8 +408,10 @@ Material: - _TopMetallic: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 @@ -405,6 +419,8 @@ Material: - _Use_Mask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -448,3 +464,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Stochastic.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Stochastic.mat index 7f1adac..ad56206 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Stochastic.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_Stochastic.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Stochastic m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -39,6 +42,7 @@ Material: stringTagMap: {} disabledShaderPasses: - FORWARDADD + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -150,6 +154,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -224,6 +232,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -238,6 +249,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -355,14 +367,18 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.04 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -405,3 +421,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TestObj1SSS.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TestObj1SSS.mat index 89794a6..c226e9f 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TestObj1SSS.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TestObj1SSS.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_TestObj1SSS m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -43,6 +46,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -162,6 +166,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -236,6 +244,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.4 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -250,6 +261,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -369,14 +381,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -419,3 +435,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TextureBlend.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TextureBlend.mat index 2826b90..b4e2d6c 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TextureBlend.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TextureBlend.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_TextureBlend m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -42,6 +45,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -161,6 +165,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -235,6 +243,9 @@ Material: - _FadeOn: 0 - _FadePower: 0.42 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -249,6 +260,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: -0.12 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -368,14 +380,18 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.086 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -418,3 +434,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TreeBarkMaterial.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TreeBarkMaterial.mat index 1bc5f33..2b718fc 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TreeBarkMaterial.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/DemoMaterials/MAT_TreeBarkMaterial.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_TreeBarkMaterial m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -44,6 +47,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -135,6 +139,10 @@ Material: m_Texture: {fileID: 2800000, guid: ae1e24f5d769a4f449f65f2ab0b170c4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -205,6 +213,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -216,6 +227,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: -0.12 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -328,13 +340,17 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.086 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -377,3 +393,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Chomper.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Chomper.mat index 56a9b9e..0b48532 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Chomper.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Chomper.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Chomper m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON @@ -16,6 +18,7 @@ Material: - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _FADE_BURN_ON - _FADE_ON - _GREYSCALESTAGE_BEFORELIGHTING @@ -46,6 +49,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -157,6 +161,10 @@ Material: m_Texture: {fileID: 2800000, guid: 339398f75cfa2714d93579662d08ec9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -231,6 +239,9 @@ Material: - _FadeOn: 1 - _FadePower: 1 - _FadeTransition: 0.046 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -245,6 +256,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 0.356 - _HandDrawn: 0 @@ -362,14 +374,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -412,3 +428,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient.mat index badc1fb..3c51245 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_ColoringGradient m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_AFTERLIGHTING - _COLOR_RAMP_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_CLASSIC @@ -38,6 +41,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -157,6 +161,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -231,6 +239,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -245,6 +256,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -364,14 +376,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -414,3 +430,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient2.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient2.mat index f68e2c1..953fedd 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient2.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient2.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_ColoringGradient2 m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_AFTERLIGHTING - _COLOR_RAMP_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_CLASSIC @@ -38,6 +41,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -157,6 +161,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -231,6 +239,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -245,6 +256,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -364,14 +376,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -414,3 +430,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient3.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient3.mat index 08b724d..1d783e9 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient3.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_ColoringGradient3.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_ColoringGradient3 m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_AFTERLIGHTING - _COLOR_RAMP_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_CLASSIC @@ -38,6 +41,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -157,6 +161,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -231,6 +239,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -245,6 +256,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -364,14 +376,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -414,3 +430,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_DemoDefault.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_DemoDefault.mat index 626f3db..b8d748c 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_DemoDefault.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_DemoDefault.mat @@ -9,16 +9,19 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_DemoDefault m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _AFFECTED_BY_AMBIENT_ON - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_FAKEGI - _MATCAPBLENDMODE_MULTIPLY - _OUTLINETYPE_NONE + - _RECEIVEDSHADOWSTYPE_CLASSIC - _RECEIVE_SHADOWS_ON - _REFLECTIONS_CLASSIC - _RIMLIGHTINGSTAGE_BEFORELIGHTING @@ -30,6 +33,7 @@ Material: - _TRIPLANARNORMALSPACE_WORLD - _USE_WIND_VERTICAL_MASK m_InvalidKeywords: + - _AFFECTED_BY_AMBIENT_ON - _GLITCHWORLDSPACE_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -37,6 +41,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -156,6 +161,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -206,6 +215,7 @@ Material: - _ContrastBrightnessOn: 0 - _ContrastLM: 1 - _CullingMode: 2 + - _CustomAmbientLightOn: 0 - _CustomShadowColorOn: 0 - _Cutoff: 0.5 - _DepthColoringOn: 0 @@ -230,6 +240,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -244,6 +257,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -289,7 +303,9 @@ Material: - _MatcapBlend: 1 - _MatcapBlendMode: 0 - _MatcapIntensity: 1 + - _MaxCameraDistance: 1000 - _MaxDistanceToFade: 100 + - _MaxFadeDistance: 250 - _MaxGradientHeight: 0.75 - _MaxInflate: 0.2 - _MaxRim: 1 @@ -305,6 +321,8 @@ Material: - _NormalMapEnabled: 0 - _NormalStrength: 1 - _OcclusionStrength: 1 + - _OutlineMode: 8 + - _OutlineThickness: 1 - _OutlineType: 0 - _Parallax: 0.02 - _Pixelate: 0 @@ -313,7 +331,9 @@ Material: - _PosterizeGamma: 0.75 - _PosterizeNumColors: 8 - _RecalculateNormals: 0 + - _ReceiveShadows: 1 - _ReceiveShadowsOn: 1 + - _ReceivedShadowsType: 0 - _Reflections: 1 - _ReflectionsAtten: 0.25 - _RenderPreset: 1 @@ -330,6 +350,7 @@ Material: - _ScrollTextureX: 1 - _ScrollTextureY: 1 - _ShadingModel: 1 + - _ShadowCutoff: 0.2 - _ShakeBlend: 1 - _ShakeSpeedMult: 1 - _Shininess: 16 @@ -342,6 +363,7 @@ Material: - _SpecularToonSmoothness: 0 - _SpherizeNormals: 0 - _SrcBlend: 1 + - _StencilRef: 1 - _StochasticSampling: 0 - _StochasticScale: 3.464 - _StochasticSkew: 0.57735026 @@ -355,14 +377,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -384,6 +410,7 @@ Material: m_Colors: - _AOColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 0.7618894, g: 0.78882486, b: 0.835, a: 1} + - _CustomAmbientColor: {r: 0.65, g: 0.65, b: 0.65, a: 1} - _DepthGlowColor: {r: 1, g: 0.9869999, b: 0.6, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} @@ -396,6 +423,7 @@ Material: - _HitColor: {r: 1, g: 1, b: 1, a: 1} - _HologramColor: {r: 0.35, g: 0.8, b: 2, a: 1} - _HologramLineDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RimOffset: {r: 0, g: 0, b: 0, a: 0} - _SSSColor: {r: 1, g: 1, b: 1, a: 1} @@ -403,3 +431,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_FloorCircular.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_FloorCircular.mat index 382e1df..81fff1d 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_FloorCircular.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_FloorCircular.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_FloorCircular m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _AOMAP_ON @@ -43,6 +45,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -410,6 +413,8 @@ Material: - _Use_Mask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -453,3 +458,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Food.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Food.mat index b30d1bc..25644ec 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Food.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Food.mat @@ -9,10 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Food m_Shader: {fileID: 4800000, guid: a4c8f68acf7c9844e97a36914026acb1, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_TOON @@ -36,6 +39,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,6 +159,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -229,6 +237,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -243,6 +254,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -362,14 +374,18 @@ Material: - _ToonSmoothness: 0.018 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -412,3 +428,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Grass.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Grass.mat index 3a56fbd..f65100f 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Grass.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Grass.mat @@ -9,12 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Grass m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _DEPTH_COLORING_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_TOON @@ -40,6 +43,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -159,6 +163,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -233,6 +241,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -247,6 +258,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -365,14 +377,18 @@ Material: - _ToonSmoothness: 0.071 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.157 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -415,3 +431,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 2, g: 2, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Knight.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Knight.mat index 1df99e7..28f7aa9 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Knight.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Knight.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Knight m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -46,6 +49,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -149,6 +153,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -225,6 +233,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -236,6 +247,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: -0.12 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -361,8 +373,10 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 @@ -371,6 +385,8 @@ Material: - _VertexColorBlendingMode: 0 - _VertexColorMode: 0 - _VertexDistortionAmount: 0.086 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexExtrude: 0 - _VertexExtrudeNoiseXSpeed: 4 @@ -417,3 +433,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_KnightMetal.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_KnightMetal.mat index 16e7210..fafbd6b 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_KnightMetal.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_KnightMetal.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_KnightMetal m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -47,6 +50,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -150,6 +154,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -226,6 +234,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -237,6 +248,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: -0.12 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -362,8 +374,10 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 @@ -372,6 +386,8 @@ Material: - _VertexColorBlendingMode: 0 - _VertexColorMode: 0 - _VertexDistortionAmount: 0.086 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexExtrude: 0 - _VertexExtrudeNoiseXSpeed: 4 @@ -418,3 +434,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Leafs.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Leafs.mat index 20aa4cd..ac658e7 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Leafs.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Leafs.mat @@ -9,12 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Leafs m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _DEPTH_COLORING_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_TOON @@ -40,6 +43,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -159,6 +163,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -233,6 +241,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -247,6 +258,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -365,14 +377,18 @@ Material: - _ToonSmoothness: 0.071 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.5 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -415,3 +431,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 2, g: 2, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_LeafsPine.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_LeafsPine.mat index dc04c40..f3d7540 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_LeafsPine.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_LeafsPine.mat @@ -9,12 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_LeafsPine m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _DEPTH_COLORING_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_TOON @@ -40,6 +43,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -159,6 +163,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -233,6 +241,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -247,6 +258,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -365,14 +377,18 @@ Material: - _ToonSmoothness: 0.071 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.5 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -415,3 +431,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 2, g: 2, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Platform.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Platform.mat index 5f209bf..aa1628b 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Platform.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Platform.mat @@ -9,12 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Platform m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _COLOR_RAMP_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _HUE_SHIFT_ON @@ -41,6 +44,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -168,6 +172,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -248,6 +256,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -262,6 +273,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -398,14 +410,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 4.23 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexExtrude: 0 - _VertexExtrudeNoiseXSpeed: 4 @@ -455,3 +471,4 @@ Material: - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Rock.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Rock.mat index 191449c..e51ecc6 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Rock.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Rock.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Rock m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _DEPTH_COLORING_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_TOON @@ -37,6 +40,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -128,6 +132,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -198,6 +206,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -209,6 +220,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -321,13 +333,17 @@ Material: - _ToonSmoothness: 0.027 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.428 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -370,3 +386,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Skeleton.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Skeleton.mat index 6e3ea8a..2280a0a 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Skeleton.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Skeleton.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Skeleton m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -46,6 +49,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -149,6 +153,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -225,6 +233,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -236,6 +247,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: -0.12 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -361,8 +373,10 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 @@ -371,6 +385,8 @@ Material: - _VertexColorBlendingMode: 0 - _VertexColorMode: 0 - _VertexDistortionAmount: 0.086 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexExtrude: 0 - _VertexExtrudeNoiseXSpeed: 4 @@ -417,3 +433,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_SkeletonEyes.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_SkeletonEyes.mat index d398914..7c193f9 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_SkeletonEyes.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_SkeletonEyes.mat @@ -15,6 +15,7 @@ Material: - _ALBEDOVERTEXCOLORMODE_REPLACE - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _LIGHTMODEL_CLASSIC @@ -160,6 +161,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -234,6 +239,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -248,6 +256,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -373,14 +382,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Spaceship.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Spaceship.mat index 3741b74..37faed7 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Spaceship.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_Spaceship.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_Spaceship m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _ALPHA_CUTOFF_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _HUE_SHIFT_ON @@ -40,6 +43,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -167,6 +171,10 @@ Material: m_Texture: {fileID: 2800000, guid: a26b9f1a12d33184ab5e89d304e441ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -247,6 +255,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -261,6 +272,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -397,14 +409,18 @@ Material: - _ToonSmoothness: 0.5 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexExtrude: 0 - _VertexExtrudeNoiseXSpeed: 4 @@ -454,3 +470,4 @@ Material: - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_StoneBox.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_StoneBox.mat index 196207a..2ff209d 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_StoneBox.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_StoneBox.mat @@ -9,12 +9,15 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_StoneBox m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _AOMAP_ON - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _EMISSION_ON + - _FADEUVSET_UV1 - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - _HIGHLIGHTS_ON @@ -43,6 +46,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -182,6 +186,10 @@ Material: m_Texture: {fileID: 2800000, guid: b5e52e512494f434c88a1675f0e9361d, type: 3} m_Scale: {x: 3, y: 3} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 2800000, guid: 8175cba73bf87af41aeba7bbd2f3c4cd, type: 3} m_Scale: {x: 1, y: 1} @@ -257,6 +265,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -271,6 +282,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: 0 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -391,8 +403,10 @@ Material: - _TopMetallic: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UVSec: 0 - _UseCustomTime: 0 @@ -400,6 +414,8 @@ Material: - _Use_Mask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -443,3 +459,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 4, g: 4, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_TreeBarkMaterial.mat b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_TreeBarkMaterial.mat index afc0c62..450dbf9 100644 --- a/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_TreeBarkMaterial.mat +++ b/Assets/Plugins/AllIn13DShader/Demo/Materials/Presets/MAT_TreeBarkMaterial.mat @@ -9,11 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: MAT_TreeBarkMaterial m_Shader: {fileID: 4800000, guid: 0dde7f0097aeb2541aea684ca0ad0e3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALBEDOVERTEXCOLORMODE_REPLACE - _CAST_SHADOWS_ON - _COLORRAMPLIGHTINGSTAGE_BEFORELIGHTING - _DEPTH_COLORING_ON + - _FADEUVSET_UV1 - _FADE_BURN_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL @@ -44,6 +47,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -135,6 +139,10 @@ Material: m_Texture: {fileID: 2800000, guid: ae1e24f5d769a4f449f65f2ab0b170c4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TriplanarNoiseTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _TriplanarTopNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -205,6 +213,9 @@ Material: - _FadeOn: 0 - _FadePower: 1 - _FadeTransition: 0.2 + - _FadeUVSet: 0 + - _FlatNormalsBlend: 1 + - _FlatNormalsEnabled: 0 - _FogOn: 0 - _GeneralAlpha: 1 - _Glitch: 0 @@ -216,6 +227,7 @@ Material: - _GreyScaleStage: 0 - _Greyscale: 0 - _GreyscaleBlend: 1 + - _GreyscaleBlending: 1 - _GreyscaleLuminosity: -0.12 - _HalfLambertWrap: 1 - _HandDrawn: 0 @@ -328,13 +340,17 @@ Material: - _ToonSmoothness: 0 - _TopNormalStrength: 1 - _TriplanarMappingOn: 0 + - _TriplanarNoiseTransitionOn: 0 - _TriplanarNormalSpace: 1 - _TriplanarSharpness: 15 + - _TriplanarTransitionPower: 0.75 - _UVDistortion: 0 - _UseCustomTime: 0 - _UseVerticalMask: 1 - _VertexColorBlending: 1 - _VertexDistortionAmount: 0.086 + - _VertexDistortionNoiseSpeedX: 4 + - _VertexDistortionNoiseSpeedY: 4 - _VertexDistortionOn: 0 - _VertexInflate: 0 - _VertexShakeOn: 0 @@ -377,3 +393,4 @@ Material: - _ShakeSpeed: {r: 41, g: 49, b: 45, a: 0} - _VertexDistortionNoiseSpeed: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 807dd8e..deb4118 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -180,7 +180,7 @@ Camera: near clip plane: 0.3 far clip plane: 1000 field of view: 60 - orthographic: 0 + orthographic: 1 orthographic size: 5 m_Depth: -1 m_CullingMask: diff --git a/Assets/Settings/PC_RPAsset.asset b/Assets/Settings/PC_RPAsset.asset index 9b2b046..373756e 100644 --- a/Assets/Settings/PC_RPAsset.asset +++ b/Assets/Settings/PC_RPAsset.asset @@ -54,19 +54,19 @@ MonoBehaviour: m_ReflectionProbeBlending: 1 m_ReflectionProbeBoxProjection: 1 m_ReflectionProbeAtlas: 1 - m_ShadowDistance: 50 - m_ShadowCascadeCount: 4 + m_ShadowDistance: 0 + m_ShadowCascadeCount: 1 m_Cascade2Split: 0.25 m_Cascade3Split: {x: 0.1, y: 0.3} m_Cascade4Split: {x: 0.12299999, y: 0.2926, z: 0.53599995} - m_CascadeBorder: 0.107758604 + m_CascadeBorder: 0.15161829 m_ShadowDepthBias: 0.1 m_ShadowNormalBias: 0.5 m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 1 m_ConservativeEnclosingSphere: 1 m_NumIterationsEnclosingSphere: 64 - m_SoftShadowQuality: 3 + m_SoftShadowQuality: 1 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index e70caf9..5ea0c69 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -135,7 +135,7 @@ MonoBehaviour: passOperation: 2 failOperation: 0 zFailOperation: 0 - m_ShadowTransparentReceive: 1 + m_ShadowTransparentReceive: 0 m_RenderingMode: 2 m_DepthPrimingMode: 0 m_CopyDepthMode: 0 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index f55198a..fb7fc10 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -6,7 +6,7 @@ QualitySettings: serializedVersion: 5 m_CurrentQuality: 1 m_QualitySettings: - - serializedVersion: 4 + - serializedVersion: 5 name: Mobile pixelLightCount: 2 shadows: 2 @@ -34,6 +34,7 @@ QualitySettings: adaptiveVsyncExtraA: 0 adaptiveVsyncExtraB: 0 lodBias: 1 + meshLodThreshold: 1 maximumLODLevel: 0 enableLODCrossFade: 1 streamingMipmapsActive: 0 @@ -47,8 +48,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858, - type: 2} + customRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858, type: 2} terrainQualityOverrides: 0 terrainPixelError: 1 terrainDetailDensityScale: 1 @@ -60,7 +60,7 @@ QualitySettings: terrainMaxTrees: 50 excludedTargetPlatforms: - Standalone - - serializedVersion: 4 + - serializedVersion: 5 name: PC pixelLightCount: 2 shadows: 2 @@ -88,6 +88,7 @@ QualitySettings: adaptiveVsyncExtraA: 0 adaptiveVsyncExtraB: 0 lodBias: 2 + meshLodThreshold: 1 maximumLODLevel: 0 enableLODCrossFade: 1 streamingMipmapsActive: 0 @@ -101,8 +102,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, - type: 2} + customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2} terrainQualityOverrides: 0 terrainPixelError: 1 terrainDetailDensityScale: 1 @@ -122,6 +122,7 @@ QualitySettings: GameCoreXboxOne: 1 Lumin: 0 Nintendo Switch: 1 + Nintendo Switch 2: 1 PS4: 1 PS5: 1 Server: 0