update shadergen

TheGuardians · May 16, 2024 · 67637ce · 67637ce
1 parent 6105d55
commit 67637ce
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/ShaderGenerator b/ShaderGenerator
diff --git a/TagTool/Shaders/ShaderMatching/ShaderMatcherNew.cs b/TagTool/Shaders/ShaderMatching/ShaderMatcherNew.cs
@@ -442,8 +442,23 @@ private Rmt2Descriptor RebuildRmt2Options(Rmt2Descriptor srcRmt2Descriptor, Stre
                         //    optionName = "cook_torrance_odst";
                         //if (methodName == "material_model" && optionName == "cook_torrance_rim_fresnel")
                         //    optionName = "cook_torrance";
-                        if (PortingCache.Version == CacheVersion.HaloReach && methodName == "environment_mapping" && optionName == "dynamic")
-                            optionName = "dynamic_reach";
+
+                        if (PortingCache.Version == CacheVersion.HaloReach)
+                        {
+                            if (methodName == "environment_mapping" && optionName == "dynamic")
+                            {
+                                optionName = "dynamic_reach";
+                            }
+                            else if (methodName == "material_model")
+                            {
+                                if (optionName == "cook_torrance")
+                                    optionName = "cook_torrance_reach";
+                                else if (optionName == "two_lobe_phong")
+                                    optionName = "two_lobe_phong_reach";
+                                //else if (optionName == "organism")
+                                //    optionName = "organism_reach";
+                            }
+                        }
 
                         // TODO: fill this switch, Reach shadergen might take some time...
                         // fixup names (remove when full rmdf + shader generation for each gen3 game)