Merge pull request #42 from jpooleycodes/runtime-mundus-refactor

Refactored runtime's Mundus
JamesTKhan · May 20, 2022 · e28535e · e28535e
2 parents 285da7b + f4a4f8d
commit e28535e
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/gdx-runtime/src/com/mbrlabs/mundus/runtime/Mundus.java b/gdx-runtime/src/com/mbrlabs/mundus/runtime/Mundus.java
@@ -18,9 +18,11 @@
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.g3d.ModelBatch;
 import com.badlogic.gdx.utils.Disposable;
 import com.mbrlabs.mundus.commons.Scene;
 import com.mbrlabs.mundus.commons.assets.AssetManager;
+import com.mbrlabs.mundus.commons.shaders.ModelShader;
 
 /**
  * @author Marcus Brummer
@@ -42,15 +44,8 @@ public Mundus(final FileHandle mundusRoot) {
         this.root = mundusRoot;
         this.assetManager = new AssetManager(root.child(PROJECT_ASSETS_DIR));
         this.sceneLoader = new SceneLoader(this, root.child(PROJECT_SCENES_DIR));
-    }
 
-    public void init() {
-        try {
-            assetManager.loadAssets(null, true);
-            shaders = new Shaders();
-        } catch (Exception e) {
-            Gdx.app.log(TAG, e.getMessage());
-        }
+        init();
     }
 
     public AssetManager getAssetManager() {
@@ -61,13 +56,25 @@ public Shaders getShaders() {
         return shaders;
     }
 
-    public Scene loadScene(final String name) {
-        return sceneLoader.load(name);
+    public Scene loadScene(final String name, final ModelBatch batch) {
+        final Scene scene = sceneLoader.load(name);
+        scene.batch = batch;
+
+        return scene;
     }
 
     @Override
     public void dispose() {
         assetManager.dispose();
     }
 
+    private void init() {
+        try {
+            assetManager.loadAssets(null, true);
+            shaders = new Shaders();
+        } catch (Exception e) {
+            Gdx.app.log(TAG, e.getMessage());
+        }
+    }
+
 }