change: rounded trail shader detection

ureishi · Jul 17, 2024 · 851d08a · 851d08a
1 parent 8b65487
commit 851d08a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/Assets/QvPen/Runtime/UdonAsset/SerializedUdonPrograms/1064dc79ec16c944793e0bfc45718c46.asset b/Assets/QvPen/Runtime/UdonAsset/SerializedUdonPrograms/1064dc79ec16c944793e0bfc45718c46.asset
diff --git a/Assets/QvPen/Runtime/UdonScript/QvPen_Pen.cs b/Assets/QvPen/Runtime/UdonScript/QvPen_Pen.cs
@@ -13,7 +13,7 @@ namespace QvPen.UdonScript
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
     public class QvPen_Pen : UdonSharpBehaviour
     {
-        public const string _version = "v3.2.13";
+        public const string _version = "v3.2.14";
 
         #region Field
 
@@ -240,7 +240,20 @@ public void _UpdateInkData()
             trailRenderer.widthMultiplier = inkWidth;
 #else
             var material = manager.pcInkMaterial;
-            if (material && material.shader == manager.roundedTrailShader)
+
+            var isRoundedTrailShader = false;
+
+            if (material)
+            {
+                var shader = material.shader;
+                if (shader)
+                {
+                    isRoundedTrailShader = shader == manager.roundedTrailShader;
+                    isRoundedTrailShader |= shader.name.Contains("rounded_trail");
+                }
+            }
+
+            if (isRoundedTrailShader)
             {
                 inkPrefab.widthMultiplier = 0f;
                 trailRenderer.widthMultiplier = 0f;

diff --git a/Assets/QvPen/package.json b/Assets/QvPen/package.json
@@ -1,10 +1,10 @@
 {
   "name": "net.ureishi.qvpen",
   "displayName": "QvPen",
-  "version": "3.2.13",
+  "version": "3.2.14",
   "unity": "2019.4",
   "description": "VRChat World Pen.",
-  "url": "https://github.com/ureishi/QvPen/releases/download/v3.2.13/net.ureishi.qvpen-3.2.13.zip",
+  "url": "https://github.com/ureishi/QvPen/releases/download/v3.2.14/net.ureishi.qvpen-3.2.14.zip",
   "vpmDependencies": {
     "com.vrchat.worlds": "^3.4.0"
   },

diff --git a/Assets/QvPen/version.txt b/Assets/QvPen/version.txt