Move model batch from sceneGraph to scene

commons/src/main/com/mbrlabs/mundus/commons/Scene.java

@@ -18,6 +18,7 @@
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.PerspectiveCamera;
+import com.badlogic.gdx.graphics.g3d.ModelBatch;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.Disposable;
 import com.mbrlabs.mundus.commons.assets.TerrainAsset;
@@ -46,6 +47,7 @@ public class Scene implements Disposable {
     public GameObject currentSelection;
 
     public PerspectiveCamera cam;
+    public ModelBatch batch;
 
     public Scene() {
         environment = new MundusEnvironment();
@@ -69,6 +71,16 @@ public Scene() {
         sceneGraph = new SceneGraph(this);
     }
 
+    public void render() {
+        render(Gdx.graphics.getDeltaTime());
+    }
+
+    public void render(float delta) {
+        batch.begin(cam);
+        sceneGraph.render(delta);
+        batch.end();
+    }
+
     public String getName() {
         return name;
     }

commons/src/main/com/mbrlabs/mundus/commons/scene3d/SceneGraph.java

@@ -17,7 +17,6 @@
 package com.mbrlabs.mundus.commons.scene3d;
 
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.g3d.ModelBatch;
 import com.badlogic.gdx.utils.Array;
 import com.mbrlabs.mundus.commons.Scene;
 
@@ -30,7 +29,6 @@ public class SceneGraph {
     protected GameObject root;
 
     public Scene scene;
-    public ModelBatch batch;
 
     private GameObject selected;
 
@@ -41,16 +39,10 @@ public SceneGraph(Scene scene) {
         this.scene = scene;
     }
 
-    public void render() {
-        render(Gdx.graphics.getDeltaTime());
-    }
-
     public void render(float delta) {
-        batch.begin(scene.cam);
         for (GameObject go : root.getChildren()) {
             go.render(delta);
         }
-        batch.end();
     }
 
     public void update() {

commons/src/main/com/mbrlabs/mundus/commons/scene3d/components/ModelComponent.java

@@ -89,7 +89,7 @@ public ModelInstance getModelInstance() {
     @Override
     public void render(float delta) {
         modelInstance.transform.set(gameObject.getTransform());
-        gameObject.sceneGraph.batch.render(modelInstance, gameObject.sceneGraph.scene.environment, shader);
+        gameObject.sceneGraph.scene.batch.render(modelInstance, gameObject.sceneGraph.scene.environment, shader);
     }
 
     @Override

commons/src/main/com/mbrlabs/mundus/commons/scene3d/components/TerrainComponent.java

@@ -55,7 +55,7 @@ public void setShader(Shader shader) {
 
     @Override
     public void render(float delta) {
-        gameObject.sceneGraph.batch.render(terrain.getTerrain(), gameObject.sceneGraph.scene.environment, shader);
+        gameObject.sceneGraph.scene.batch.render(terrain.getTerrain(), gameObject.sceneGraph.scene.environment, shader);
     }
 
     @Override

editor/src/main/com/mbrlabs/mundus/editor/Editor.kt

@@ -17,6 +17,7 @@
 package com.mbrlabs.mundus.editor
 
 import com.badlogic.gdx.ApplicationListener
+import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.InputAdapter
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3WindowAdapter
 import com.badlogic.gdx.graphics.Color
@@ -121,7 +122,7 @@ class Editor : Lwjgl3WindowAdapter(), ApplicationListener,
             }
 
             sg.update()
-            sg.render()
+            sg.render(Gdx.graphics.deltaTime)
 
             toolManager.render()
             compass.render(batch)

editor/src/main/com/mbrlabs/mundus/editor/core/project/ProjectManager.java

@@ -133,7 +133,7 @@ public ProjectContext createProject(String name, String folder) {
         scene.environment.setFog(new Fog());
         scene.setId(newProjectContext.obtainID());
         SceneManager.saveScene(newProjectContext, scene);
-        scene.sceneGraph.batch = modelBatch;
+        scene.sceneGraph.scene.batch = modelBatch;
 
         // save .pro file
         newProjectContext.scenes.add(scene.getName());
@@ -334,9 +334,9 @@ public EditorScene loadScene(ProjectContext context, String sceneName) throws Fi
 
         EditorScene scene = SceneConverter.convert(sceneDTO, context.assetManager.getAssetMap());
         scene.skybox = SkyboxBuilder.createDefaultSkybox();
+        scene.batch = modelBatch;
 
         SceneGraph sceneGraph = scene.sceneGraph;
-        sceneGraph.batch = modelBatch;
         for (GameObject go : sceneGraph.getGameObjects()) {
             initGameObject(context, go);
         }

editor/src/main/com/mbrlabs/mundus/editor/scene3d/components/PickableModelComponent.java

@@ -43,7 +43,7 @@ public void encodeRaypickColorId() {
 
     @Override
     public void renderPick() {
-        gameObject.sceneGraph.batch.render(modelInstance, Shaders.INSTANCE.getPickerShader());
+        gameObject.sceneGraph.scene.batch.render(modelInstance, Shaders.INSTANCE.getPickerShader());
     }
 
     @Override

editor/src/main/com/mbrlabs/mundus/editor/scene3d/components/PickableTerrainComponent.java

@@ -41,7 +41,7 @@ public void encodeRaypickColorId() {
 
     @Override
     public void renderPick() {
-        gameObject.sceneGraph.batch.render(terrain.getTerrain(), Shaders.INSTANCE.getPickerShader());
+        gameObject.sceneGraph.scene.batch.render(terrain.getTerrain(), Shaders.INSTANCE.getPickerShader());
     }
 
 }

editor/src/main/com/mbrlabs/mundus/editor/tools/picker/GameObjectPicker.java

@@ -62,11 +62,11 @@ public GameObject pick(EditorScene scene, int screenX, int screenY) {
     }
 
     private void renderPickableScene(SceneGraph sceneGraph) {
-        sceneGraph.batch.begin(sceneGraph.scene.cam);
+        sceneGraph.scene.batch.begin(sceneGraph.scene.cam);
         for (GameObject go : sceneGraph.getGameObjects()) {
             renderPickableGameObject(go);
         }
-        sceneGraph.batch.end();
+        sceneGraph.scene.batch.end();
     }
 
     private void renderPickableGameObject(GameObject go) {

editor/src/main/com/mbrlabs/mundus/editor/tools/picker/ToolHandlePicker.java

@@ -36,7 +36,7 @@ public ToolHandlePicker() {
 
     public ToolHandle pick(ToolHandle[] handles, EditorScene scene, int screenX, int screenY) {
         begin(scene.viewport);
-        renderPickableScene(handles, scene.sceneGraph.batch, scene.cam);
+        renderPickableScene(handles, scene.batch, scene.cam);
         end();
         Pixmap pm = getFrameBufferPixmap(scene.viewport);