v1.0.1

izayoijiichan · Aug 13, 2020 · 238bcb5 · 238bcb5
1 parent e7c4aac
commit 238bcb5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Change Log
 
+## [1.0.1] - 2020-08-13
+- Fixes
+  - [UniShaderStandardParticleUtility] Fixed a bug that `ColorColorOn` was not set correctly in case of `SetColorMode`.
+
 ## [1.0.0] - 2020-08-07
 Initial release.
diff --git a/Runtime/UniShaderStandardParticleUtility/UtilsGetter.cs b/Runtime/UniShaderStandardParticleUtility/UtilsGetter.cs
@@ -142,7 +142,7 @@ private static Vector4 GetVector(Material material, string propertyName)
         /// </summary>
         /// <param name="material"></param>
         /// <returns></returns>
-        private static BlendMode GetBlendMode(Material material)
+        public static BlendMode GetBlendMode(Material material)
         {
             BlendMode blendMode = BlendMode.Opaque;
 
@@ -184,7 +184,7 @@ private static BlendMode GetBlendMode(Material material)
         /// </summary>
         /// <param name="material"></param>
         /// <returns></returns>
-        private static ColorMode GetColorMode(Material material)
+        public static ColorMode GetColorMode(Material material)
         {
             ColorMode colorMode = ColorMode.Multiply;
 

diff --git a/Runtime/UniShaderStandardParticleUtility/UtilsSetter.cs b/Runtime/UniShaderStandardParticleUtility/UtilsSetter.cs
@@ -186,24 +186,24 @@ public static void SetColorMode(Material material, ColorMode colorMode)
             {
                 case ColorMode.Multiply:
                     SetKeyword(material, Keyword.ColorOverlayOn, false);
-                    SetKeyword(material, Keyword.ColorAddSubDiffOn, false);
+                    SetKeyword(material, Keyword.ColorColorOn, false);
                     SetKeyword(material, Keyword.ColorAddSubDiffOn, false);
                     break;
                 case ColorMode.Overlay:
                     SetKeyword(material, Keyword.ColorOverlayOn, true);
-                    SetKeyword(material, Keyword.ColorAddSubDiffOn, false);
+                    SetKeyword(material, Keyword.ColorColorOn, false);
                     SetKeyword(material, Keyword.ColorAddSubDiffOn, false);
                     break;
                 case ColorMode.Color:
                     SetKeyword(material, Keyword.ColorOverlayOn, false);
-                    SetKeyword(material, Keyword.ColorAddSubDiffOn, true);
+                    SetKeyword(material, Keyword.ColorColorOn, true);
                     SetKeyword(material, Keyword.ColorAddSubDiffOn, false);
                     break;
                 case ColorMode.Additive:
                 case ColorMode.Subtractive:
                 case ColorMode.Difference:
                     SetKeyword(material, Keyword.ColorOverlayOn, false);
-                    SetKeyword(material, Keyword.ColorAddSubDiffOn, false);
+                    SetKeyword(material, Keyword.ColorColorOn, false);
                     SetKeyword(material, Keyword.ColorAddSubDiffOn, true);
                     break;
             }

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "izayoi.unishaders",
   "displayName": "UniShaders",
   "description": "UniShaders is utility scripts to get/set Unity shader parameters. (standard, particle, skybox)",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "tool",
   "category": "",
   "keywords": [