From 3f000050425aa93efba360ae79e7b655c8404083 Mon Sep 17 00:00:00 2001 From: AcChosen Date: Wed, 9 Aug 2023 09:31:11 -0400 Subject: [PATCH] 2.4.1 Cleanup --- .gitignore | 6 +++++- .../Editor/VRSLInspector.cs | 10 +++++----- .../Editor/VRSLStyles.cs | 2 +- .../Editor/VRSL_ManagerWindow.cs | 3 ++- .../com.acchosen.vr-stage-lighting/Runtime/VERSION.txt | 2 +- Packages/com.acchosen.vr-stage-lighting/package.json | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index b149f75..c914afb 100644 --- a/.gitignore +++ b/.gitignore @@ -64,4 +64,8 @@ crashlytics-build.properties .idea/.idea.vpm-package-maker/.idea Assets/PackageMakerWindowData.asset* .idea -.vscode \ No newline at end of file +.vscode +Thry/Config.json +bakery_times.log +Thry/persistent_data +Thry/preset_cache.txt diff --git a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs index 1acadc5..25ce387 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs +++ b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLInspector.cs @@ -145,8 +145,8 @@ public class VRSLInspector : ShaderGUI MaterialProperty _GradientMod = null; MaterialProperty _GradientModGOBO = null; MaterialProperty _RenderMode = null; - MaterialProperty _ZWrite = null; - MaterialProperty _AlphaToCoverage = null; + // MaterialProperty _ZWrite = null; + // MaterialProperty _AlphaToCoverage = null; // MaterialProperty _InsideConeNormalMap = null; //Volumetric Control Specific @@ -185,9 +185,9 @@ public class VRSLInspector : ShaderGUI MaterialProperty _ProjectionRangeOrigin = null; MaterialProperty _EnableSpin = null; MaterialProperty _LegacyGoboRange = null; - MaterialProperty _BlendSrc = null; + //MaterialProperty _BlendSrc = null; MaterialProperty _BlendDst = null; - MaterialProperty _BlendOp = null; + // MaterialProperty _BlendOp = null; MaterialProperty _ProjectionCutoff = null; MaterialProperty _ProjectionOriginCutoff = null; MaterialProperty _ClippingThreshold = null; @@ -265,7 +265,7 @@ public class VRSLInspector : ShaderGUI MaterialProperty _ColorSat = null; MaterialProperty _ScaleFactor = null; MaterialProperty _ReferenceDistance = null; - MaterialProperty _UVScale = null; + // MaterialProperty _UVScale = null; MaterialProperty _RemoveTextureArtifact = null; MaterialProperty _UsePreMultiplyAlpha = null; MaterialProperty _LightSourceViewSpaceRadius = null; diff --git a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLStyles.cs b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLStyles.cs index 78efd89..f3221ef 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLStyles.cs +++ b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSLStyles.cs @@ -10,7 +10,7 @@ public class VRSLStyles : MonoBehaviour { public static Texture logo = Resources.Load("VRStageLighting-Logo") as Texture; - public static string ver = "VR Stage Lighting ver:" + " 2.4"; + public static string ver = "VR Stage Lighting ver:" + " 2.4.1"; public static void DepthPassWarning() { diff --git a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSL_ManagerWindow.cs b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSL_ManagerWindow.cs index 8714518..f9d4af6 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Editor/VRSL_ManagerWindow.cs +++ b/Packages/com.acchosen.vr-stage-lighting/Editor/VRSL_ManagerWindow.cs @@ -601,7 +601,7 @@ public class VRSL_ManagerWindow : EditorWindow { static float tiltRangeOff = -180f; public static Texture logo, github, twitter, discord; public bool legacyFixtures; - public static string ver = "VR Stage Lighting ver:" + " 2.4"; + public static string ver = "VR Stage Lighting ver:" + " 2.4.1"; public static bool hasLocalPanel, hasDepthLight; private static VRSL_LocalUIControlPanel panel; @@ -711,6 +711,7 @@ public class VRSL_ManagerWindow : EditorWindow { } catch(Exception e) { + e.GetType(); wasSuccessful = false; } return wasSuccessful; diff --git a/Packages/com.acchosen.vr-stage-lighting/Runtime/VERSION.txt b/Packages/com.acchosen.vr-stage-lighting/Runtime/VERSION.txt index a625450..58073ef 100644 --- a/Packages/com.acchosen.vr-stage-lighting/Runtime/VERSION.txt +++ b/Packages/com.acchosen.vr-stage-lighting/Runtime/VERSION.txt @@ -1 +1 @@ -2.3.1 \ No newline at end of file +2.4.1 \ No newline at end of file diff --git a/Packages/com.acchosen.vr-stage-lighting/package.json b/Packages/com.acchosen.vr-stage-lighting/package.json index 1e2ebbf..55deca7 100644 --- a/Packages/com.acchosen.vr-stage-lighting/package.json +++ b/Packages/com.acchosen.vr-stage-lighting/package.json @@ -1,7 +1,7 @@ { "name":"com.acchosen.vr-stage-lighting", "displayName":"VR Stage Lighting", - "version":"2.4.0", + "version":"2.4.1", "description":"A collection of HLSL shaders, UdonSharp scripts, 3D models, prefabs, and assets designed to emulate the real control, quality, and complexity of professional stage lighting into VRChat in as many ways as possible.", "url":"https://github.com/AcChosen/VR-Stage-Lighting", "author":{