summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets/models/scenes/living_room.glbbin0 -> 22180 bytes
-rw-r--r--core/src/com/ilotterytea/maxoning/utils/AssetLoading.java9
2 files changed, 9 insertions, 0 deletions
diff --git a/assets/models/scenes/living_room.glb b/assets/models/scenes/living_room.glb
new file mode 100644
index 0000000..9d572f7
--- /dev/null
+++ b/assets/models/scenes/living_room.glb
Binary files differ
diff --git a/core/src/com/ilotterytea/maxoning/utils/AssetLoading.java b/core/src/com/ilotterytea/maxoning/utils/AssetLoading.java
index aa5e62d..250fbab 100644
--- a/core/src/com/ilotterytea/maxoning/utils/AssetLoading.java
+++ b/core/src/com/ilotterytea/maxoning/utils/AssetLoading.java
@@ -10,8 +10,14 @@ import com.ilotterytea.maxoning.anim.SpriteUtils;
import com.ilotterytea.maxoning.player.MaxonItemEnum;
import com.ilotterytea.maxoning.player.MaxonItemRegister;
import com.ilotterytea.maxoning.ui.AnimatedImage;
+import net.mgsx.gltf.loaders.glb.GLBAssetLoader;
+import net.mgsx.gltf.scene3d.scene.SceneAsset;
public class AssetLoading {
+ public static void setup(AssetManager am) {
+ am.setLoader(SceneAsset.class, ".glb", new GLBAssetLoader());
+ }
+
public static void queue(AssetManager am) {
// Texture atlases:
am.load("sprites/env/environment.atlas", TextureAtlas.class);
@@ -24,6 +30,9 @@ public class AssetLoading {
am.load("MainSpritesheet.atlas", TextureAtlas.class);
am.load("MainSpritesheet.skin", Skin.class, new SkinLoader.SkinParameter("MainSpritesheet.atlas"));
+ // Models:
+ am.load("models/scenes/living_room.glb", SceneAsset.class);
+
// Cat item textures:
am.load("sprites/sheet/loadingCircle.png", Texture.class);
am.load("sprites/sheet/bror.png", Texture.class);