Enable DynamicBatching

0x7c13 · Aug 19, 2023 · 89aba47 · 89aba47
1 parent 94a3bc6
commit 89aba47
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 6 deletions.
diff --git a/Assets/Scripts/Pal3/Effect/FireEffect.cs b/Assets/Scripts/Pal3/Effect/FireEffect.cs
@@ -41,7 +41,8 @@ public void Init(GameResourceProvider resourceProvider, uint effectParameter)
                 _sceneObjectRenderer = gameObject.AddComponent<PolyModelRenderer>();
                 _sceneObjectRenderer.Render(polFile,
                     textureProvider,
-                    materialFactory);
+                    materialFactory,
+                    isStaticObject: false);
             }
 
             if (!string.IsNullOrEmpty(info.TexturePathFormat))

diff --git a/Assets/Scripts/Pal3/Rendering/Renderer/Mv3ModelRenderer.cs b/Assets/Scripts/Pal3/Rendering/Renderer/Mv3ModelRenderer.cs
@@ -127,6 +127,7 @@ public void Init(Mv3File mv3File,
                     tagNodeRenderer.Render(tagNodePolFile,
                         tagNodeTextureProvider,
                         _materialFactory,
+                        isStaticObject: false,
                         tagNodeTintColor);
 
                     _tagNodes[i].transform.SetParent(transform, true);

diff --git a/Assets/Scripts/Pal3/Rendering/Renderer/PolyModelRenderer.cs b/Assets/Scripts/Pal3/Rendering/Renderer/PolyModelRenderer.cs
@@ -33,6 +33,7 @@ public class PolyModelRenderer : MonoBehaviour, IDisposable
         private readonly List<Coroutine> _waterAnimations = new ();
         private Dictionary<string, Texture2D> _textureCache = new ();
 
+        private bool _isStaticObject;
         private Color _tintColor;
         private bool _isWaterSurfaceOpaque;
 
@@ -41,11 +42,13 @@ public class PolyModelRenderer : MonoBehaviour, IDisposable
         public void Render(PolFile polFile,
             ITextureResourceProvider textureProvider,
             IMaterialFactory materialFactory,
+            bool isStaticObject,
             Color? tintColor = default,
             bool isWaterSurfaceOpaque = default)
         {
             _textureProvider = textureProvider;
             _materialFactory = materialFactory;
+            _isStaticObject = isStaticObject;
             _tintColor = tintColor ?? Color.white;
             _isWaterSurfaceOpaque = isWaterSurfaceOpaque;
             _textureCache = BuildTextureCache(polFile, textureProvider);
@@ -149,7 +152,10 @@ private void RenderMeshInternal(PolGeometryNode meshNode, PolMesh mesh)
                     return;
                 }
 
-                var meshObject = new GameObject(meshNode.Name);
+                GameObject meshObject = new (meshNode.Name)
+                {
+                    isStatic = _isStaticObject
+                };
 
                 // Attach BlendFlag and GameBoxMaterial to the GameObject for better debuggability
                 #if UNITY_EDITOR

diff --git a/Assets/Scripts/Pal3/Scene/Scene.cs b/Assets/Scripts/Pal3/Scene/Scene.cs
@@ -243,13 +243,18 @@ public bool IsPositionInsideJumpableArea(int layerIndex, Vector2Int tilePosition
         private void RenderMesh()
         {
             // Render mesh
-            _mesh = new GameObject($"Mesh_{ScnFile.SceneInfo.CityName}_{ScnFile.SceneInfo.SceneName}");
+            _mesh = new GameObject($"Mesh_{ScnFile.SceneInfo.CityName}_{ScnFile.SceneInfo.SceneName}")
+            {
+                isStatic = true // Scene mesh is static
+            };
+
             var polyMeshRenderer = _mesh.AddComponent<PolyModelRenderer>();
             _mesh.transform.SetParent(_parent.transform, false);
 
             polyMeshRenderer.Render(ScenePolyMesh.PolFile,
                 ScenePolyMesh.TextureProvider,
                 _materialFactory,
+                isStaticObject: true, // Scene mesh is static
                 Color.white,
                 IsWaterSurfaceOpaque());
 

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/ImpulsiveObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/ImpulsiveObject.cs
@@ -68,6 +68,7 @@ public override GameObject Activate(GameResourceProvider resourceProvider, Color
             subObjectModelRenderer.Render(polFile,
                 textureProvider,
                 resourceProvider.GetMaterialFactory(),
+                isStaticObject: false,
                 subObjectTintColor);
 
             _subObjectController = _subObjectGameObject.AddComponent<ImpulsiveMechanismSubObjectController>();

diff --git a/Assets/Scripts/Pal3/Scene/SceneObjects/SceneObject.cs b/Assets/Scripts/Pal3/Scene/SceneObjects/SceneObject.cs
@@ -135,6 +135,7 @@ public virtual GameObject Activate(GameResourceProvider resourceProvider,
                 _polyModelRenderer.Render(polFile,
                     textureProvider,
                     materialFactory,
+                    isStaticObject: false,
                     tintColor);
             }
             else if (ModelType == SceneObjectModelType.CvdModel)

diff --git a/Assets/Scripts/ResourceViewer/GameResourceViewer.cs b/Assets/Scripts/ResourceViewer/GameResourceViewer.cs
@@ -257,6 +257,7 @@ private bool LoadPol(string filePath)
                 meshRenderer.Render(polyFile,
                     textureProvider,
                     _resourceProvider.GetMaterialFactory(),
+                    isStaticObject: true,
                     Color.white);
 
                 consoleTextUI.text = $"{filePath}";

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -576,16 +576,16 @@ PlayerSettings:
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone
     m_StaticBatching: 0
-    m_DynamicBatching: 0
+    m_DynamicBatching: 1
   - m_BuildTarget: tvOS
     m_StaticBatching: 0
     m_DynamicBatching: 0
   - m_BuildTarget: Android
     m_StaticBatching: 0
-    m_DynamicBatching: 0
+    m_DynamicBatching: 1
   - m_BuildTarget: iPhone
     m_StaticBatching: 0
-    m_DynamicBatching: 0
+    m_DynamicBatching: 1
   - m_BuildTarget: WebGL
     m_StaticBatching: 0
     m_DynamicBatching: 0