update reach water

TheGuardians · May 2, 2024 · 1f2df17 · 1f2df17
1 parent 8c36a07
commit 1f2df17
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/ShaderGenerator b/ShaderGenerator
diff --git a/TagTool/Shaders/ShaderMatching/ShaderMatcherNew.cs b/TagTool/Shaders/ShaderMatching/ShaderMatcherNew.cs
@@ -405,9 +405,17 @@ private Rmt2Descriptor RebuildRmt2Options(Rmt2Descriptor srcRmt2Descriptor, Stre
 
                     string methodName = BaseCache.StringTable.GetString(baseRmdfDefinition.Categories[i].Name);
 
-                    if (methodName == "reach_compatibility")
+                    if (PortingCache.Version >= CacheVersion.HaloReach && methodName == "reach_compatibility")
                     {
-                        newOptions.Add(PortingCache.Version >= CacheVersion.HaloReach ? (byte)1 : (byte)0);
+                        if (portingRmdfDefinition.GetCategoryOption(PortingCache, "detail", srcRmt2Descriptor.Options) == "repeat")
+                        {
+                            int potentialIndex = baseRmdfDefinition.GetCategoryOptionIndex(BaseCache, "reach_compatibility", "enabled_detail_repeat");
+                            newOptions.Add(potentialIndex != -1 ? (byte)potentialIndex : (byte)1);
+                        }
+                        else
+                        {
+                            newOptions.Add(1);
+                        }
                         continue;
                     }
 

diff --git a/TagTool/Tags/Definitions/RenderMethodDefinition.cs b/TagTool/Tags/Definitions/RenderMethodDefinition.cs
@@ -3,6 +3,7 @@
 using TagTool.Shaders;
 using System.Collections.Generic;
 using System;
+using System.IO;
 
 namespace TagTool.Tags.Definitions
 {
@@ -153,5 +154,32 @@ public bool ContainsCategory(GameCache cache, string categoryName)
             }
             return false;
         }
+
+        public string GetCategoryOption(GameCache cache, string categoryName, byte[] options)
+        {
+            for (int i = 0; i < Categories.Count; i++)
+            {
+                if (cache.StringTable.GetString(Categories[i].Name) == categoryName)
+                    return cache.StringTable.GetString(Categories[i].ShaderOptions[options[i]].Name);
+            }
+            return "INVALID_CATEGORY";
+        }
+
+        public int GetCategoryOptionIndex(GameCache cache, string categoryName, string optionName)
+        {
+            for (int i = 0; i < Categories.Count; i++)
+            {
+                if (cache.StringTable.GetString(Categories[i].Name) == categoryName)
+                {
+                    for (int j = 0; j < Categories[i].ShaderOptions.Count; j++)
+                    {
+                        if (cache.StringTable.GetString(Categories[i].ShaderOptions[j].Name) == optionName)
+                            return j;
+                    }
+                    break;
+                }
+            }
+            return -1;
+        }
     }
 }
+10 −0		halo_online_shaders/water.fx
+94 −38		halo_online_shaders/water_shading.fx
+513 −0		halo_online_shaders/water_shading_reach.fx