diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/java/kz/ilotterytea/frogartha/assets/Assets.java | 4 | ||||
| -rw-r--r-- | core/src/main/java/kz/ilotterytea/frogartha/screens/GameScreen.java | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/core/src/main/java/kz/ilotterytea/frogartha/assets/Assets.java b/core/src/main/java/kz/ilotterytea/frogartha/assets/Assets.java index 0ad53f2..0284a8c 100644 --- a/core/src/main/java/kz/ilotterytea/frogartha/assets/Assets.java +++ b/core/src/main/java/kz/ilotterytea/frogartha/assets/Assets.java @@ -10,4 +10,8 @@ public class Assets { public static final String SPRITE_LOGO = "sprites/gui/logo.png"; public static final String SPRITE_ILOTTERYTEA = "sprites/gui/ilotterytea.png"; } + + public static class Maps { + public static final String MAP_BETA = "maps/map_beta/map_beta.gltf"; + } } diff --git a/core/src/main/java/kz/ilotterytea/frogartha/screens/GameScreen.java b/core/src/main/java/kz/ilotterytea/frogartha/screens/GameScreen.java index 73e8f49..801f8dd 100644 --- a/core/src/main/java/kz/ilotterytea/frogartha/screens/GameScreen.java +++ b/core/src/main/java/kz/ilotterytea/frogartha/screens/GameScreen.java @@ -4,13 +4,8 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.Screen; import com.badlogic.gdx.graphics.*; -import com.badlogic.gdx.graphics.g3d.Material; -import com.badlogic.gdx.graphics.g3d.Model; -import com.badlogic.gdx.graphics.g3d.ModelInstance; -import com.badlogic.gdx.graphics.g3d.attributes.ColorAttribute; import com.badlogic.gdx.graphics.g3d.decals.CameraGroupStrategy; import com.badlogic.gdx.graphics.g3d.decals.DecalBatch; -import com.badlogic.gdx.graphics.g3d.utils.ModelBuilder; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.scenes.scene2d.Stage; import com.badlogic.gdx.scenes.scene2d.ui.Skin; @@ -28,6 +23,7 @@ import net.mgsx.gltf.scene3d.attributes.PBRTextureAttribute; import net.mgsx.gltf.scene3d.lights.DirectionalShadowLight; import net.mgsx.gltf.scene3d.lights.PointLightEx; import net.mgsx.gltf.scene3d.scene.Scene; +import net.mgsx.gltf.scene3d.scene.SceneAsset; import net.mgsx.gltf.scene3d.scene.SceneManager; import net.mgsx.gltf.scene3d.scene.SceneSkybox; import net.mgsx.gltf.scene3d.utils.IBLBuilder; @@ -135,13 +131,8 @@ public class GameScreen implements Screen { private void create3D() { sceneManager = new SceneManager(); - // Building a dummy scene - ModelBuilder modelBuilder = new ModelBuilder(); - Model plane = modelBuilder.createBox(20f, 1f, 20f, new Material(ColorAttribute.createDiffuse(Color.LIME)), - VertexAttributes.Usage.Position | VertexAttributes.Usage.Normal); - Scene planeScene = new Scene(new ModelInstance(plane)); - planeScene.modelInstance.transform.translate(0f, -1f, 0f); - sceneManager.addScene(planeScene); + SceneAsset asset = game.getAssetManager().get(Assets.Maps.MAP_BETA); + sceneManager.addScene(new Scene(asset.scene)); camera = new PerspectiveCamera(60f, Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); camera.near = 1f; |
