upd: removed welcome screen

2 files changed, 1 insertions, 249 deletions

diff --git a/core/src/kz/ilotterytea/maxon/screens/WelcomeScreen.java b/core/src/kz/ilotterytea/maxon/screens/WelcomeScreen.java
deleted file mode 100644
index d173d46..0000000
--- a/core/src/kz/ilotterytea/maxon/screens/WelcomeScreen.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package kz.ilotterytea.maxon.screens;
-
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Screen;
-import com.badlogic.gdx.graphics.*;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.graphics.g3d.ModelInstance;
-import com.badlogic.gdx.math.Intersector;
-import com.badlogic.gdx.math.Vector3;
-import com.badlogic.gdx.math.collision.BoundingBox;
-import com.badlogic.gdx.math.collision.Ray;
-import com.badlogic.gdx.scenes.scene2d.Action;
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.actions.Actions;
-import com.badlogic.gdx.scenes.scene2d.actions.RepeatAction;
-import com.badlogic.gdx.scenes.scene2d.ui.Image;
-import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.utils.Align;
-import com.badlogic.gdx.utils.viewport.ScreenViewport;
-import kz.ilotterytea.maxon.MaxonGame;
-import kz.ilotterytea.maxon.screens.game.GameScreen;
-import kz.ilotterytea.maxon.ui.DebugWidget;
-import net.mgsx.gltf.scene3d.attributes.PBRCubemapAttribute;
-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.utils.IBLBuilder;
-
-public class WelcomeScreen implements Screen {
-    private final MaxonGame game = MaxonGame.getInstance();
-
-    private Stage stage;
-    private Skin skin;
-    private Table table;
-
-    private PerspectiveCamera camera;
-    private SceneManager sceneManager;
-
-    private Image tintImage;
-
-    private BoundingBox collisionBox;
-    private Scene box;
-
-    private boolean boxOpened = false, boxCollision = false;
-    private double velocity = 0.0f;
-
-    @Override
-    public void show() {
-        // Setting up the scene
-        sceneManager = new SceneManager();
-
-        SceneAsset sceneAsset = game.assetManager.get("models/scenes/living_room.glb", SceneAsset.class);
-        Scene scene = new Scene(sceneAsset.scene);
-        sceneManager.addScene(scene);
-
-        SceneAsset boxAsset = game.assetManager.get("models/props/box.glb", SceneAsset.class);
-        box = new Scene(boxAsset.scene);
-        box.modelInstance.transform.setTranslation(new Vector3(2.0f, 10f, 1.0f));
-        box.modelInstance.transform.rotate(Vector3.Y, 45);
-        box.modelInstance.transform.scale(2.0f, 2.0f, 2.0f);
-        sceneManager.addScene(box);
-
-        collisionBox = new BoundingBox(
-                new Vector3(-1f, 0.25f, -0.35f),
-                new Vector3(1f, 2.08f, 0.8f)
-        );
-
-        // Setting up 3D view
-        this.camera = new PerspectiveCamera(60f, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
-        camera.near = 1f;
-        camera.far = 300f;
-        camera.position.set(-3f, 2f, -0.3f);
-        camera.rotate(256f, 0f, 1f, 0f);
-
-        camera.update();
-
-        sceneManager.setCamera(camera);
-
-        // Setting up the lights
-        DirectionalShadowLight light = new DirectionalShadowLight(1024, 1024, 60f, 60f, 1f, 300f);
-        light.set(new Color(0xdcccffff), -1f, -0.8f, -0.2f);
-        light.intensity = 5f;
-        sceneManager.environment.add(light);
-        sceneManager.environment.shadowMap = light;
-
-        PointLightEx windowLight = new PointLightEx();
-        windowLight.set(Color.BLUE, new Vector3(-1.1f, 7.3f, 0.5f), 80f, 100f);
-
-        PointLightEx boxLight = new PointLightEx();
-        boxLight.set(Color.WHITE, new Vector3(-3f, 4f, -0.3f), 50f, 50f);
-
-        sceneManager.environment.add(windowLight, boxLight);
-
-        IBLBuilder iblBuilder = IBLBuilder.createOutdoor(light);
-        Cubemap diffuseCubemap = iblBuilder.buildIrradianceMap(256);
-        Cubemap specularCubemap = iblBuilder.buildRadianceMap(10);
-        iblBuilder.dispose();
-
-        Texture brdfLUT = new Texture(Gdx.files.classpath("net/mgsx/gltf/shaders/brdfLUT.png"));
-
-        sceneManager.setAmbientLight(1f);
-        sceneManager.environment.set(new PBRTextureAttribute(PBRTextureAttribute.BRDFLUTTexture, brdfLUT));
-        sceneManager.environment.set(PBRCubemapAttribute.createSpecularEnv(specularCubemap));
-        sceneManager.environment.set(PBRCubemapAttribute.createDiffuseEnv(diffuseCubemap));
-
-        // Setting up 2D UI
-        stage = new Stage(new ScreenViewport());
-        skin = game.assetManager.get("sprites/gui/ui.skin", Skin.class);
-
-        table = new Table();
-        table.setFillParent(true);
-        table.align(Align.center | Align.bottom);
-
-        stage.addActor(table);
-
-        // Tint
-        TextureAtlas atlas = game.assetManager.get("sprites/gui/ui.atlas", TextureAtlas.class);
-        tintImage = new Image(atlas.findRegion("tile"));
-        tintImage.setFillParent(true);
-
-        tintImage.addAction(Actions.alpha(0.0f, 1.0f));
-
-        stage.addActor(tintImage);
-
-        DebugWidget debugWidget = new DebugWidget(skin);
-        this.stage.addActor(debugWidget);
-    }
-
-    @Override
-    public void render(float delta) {
-        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT | GL20.GL_DEPTH_BUFFER_BIT);
-
-        sceneManager.update(delta);
-        sceneManager.render();
-
-        stage.act(delta);
-        stage.draw();
-
-        final float delta2 = Math.min(1f/30f, Gdx.graphics.getDeltaTime());
-        velocity += 0.1f;
-
-        if (!boxCollision) {
-            box.modelInstance.transform.translate(0f, (float) (-delta2 * velocity), 0f);
-            boxCollision = checkCollision();
-
-            if (boxCollision) {
-                Table labelTable = new Table(skin);
-                labelTable.setBackground("bg");
-
-                Label label = new Label("Press the box to unpack...", skin);
-                labelTable.add(label).pad(25f, 35f, 25f, 35f);
-
-                labelTable.addAction(Actions.alpha(0.5f));
-                label.addAction(
-                        Actions.repeat(
-                                RepeatAction.FOREVER,
-                                Actions.sequence(
-                                        Actions.alpha(0.0f, 0.5f),
-                                        Actions.delay(0.2f),
-                                        Actions.alpha(1.0f, 0.5f),
-                                        Actions.delay(0.2f)
-                                )
-                        )
-                );
-
-                table.add(labelTable).padBottom(25f);
-            }
-        }
-
-        Ray ray = null;
-
-        if (Gdx.input.justTouched()) {
-            ray = camera.getPickRay(Gdx.input.getX(), Gdx.input.getY());
-        }
-
-        if (ray == null) {
-            return;
-        }
-
-        Vector3 intersection = new Vector3();
-
-        if (Intersector.intersectRayBounds(ray, collisionBox, intersection) && !boxOpened && boxCollision) {
-            boxOpened = true;
-            tintImage.addAction(
-                    Actions.sequence(
-                            Actions.alpha(1.0f, 0.5f),
-                            Actions.delay(1.0f),
-                            new Action() {
-                                @Override
-                                public boolean act(float delta) {
-                                    game.setScreen(new GameScreen());
-                                    return true;
-                                }
-                            }
-                    )
-            );
-        }
-    }
-
-    @Override
-    public void resize(int width, int height) {
-        stage.getViewport().update(width, height, true);
-        sceneManager.updateViewport(width, height);
-    }
-
-    @Override
-    public void pause() {
-
-    }
-
-    @Override
-    public void resume() {
-
-    }
-
-    @Override
-    public void hide() {
-        dispose();
-    }
-
-    @Override
-    public void dispose() {
-        sceneManager.dispose();
-        stage.dispose();
-    }
-
-    private boolean checkCollision() {
-        ModelInstance instance = box.modelInstance;
-        Vector3 position = instance.transform.getTranslation(new Vector3());
-
-        return position.y < 0.4f;
-    }
-}
diff --git a/core/src/kz/ilotterytea/maxon/ui/SavegameWidget.java b/core/src/kz/ilotterytea/maxon/ui/SavegameWidget.java
index 245e11f..2d12f86 100644
--- a/core/src/kz/ilotterytea/maxon/ui/SavegameWidget.java
+++ b/core/src/kz/ilotterytea/maxon/ui/SavegameWidget.java
@@ -1,6 +1,5 @@
 package kz.ilotterytea.maxon.ui;
 
-import com.badlogic.gdx.Screen;
 import com.badlogic.gdx.audio.Sound;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.scenes.scene2d.Action;
@@ -15,7 +14,6 @@ import kz.ilotterytea.maxon.MaxonGame;
 import kz.ilotterytea.maxon.localization.LineId;
 import kz.ilotterytea.maxon.player.Savegame;
 import kz.ilotterytea.maxon.screens.game.GameScreen;
-import kz.ilotterytea.maxon.screens.WelcomeScreen;
 import kz.ilotterytea.maxon.utils.OsUtils;
 import kz.ilotterytea.maxon.utils.formatters.NumberFormatter;
 
@@ -178,15 +176,7 @@ public class SavegameWidget extends Table implements Disposable {
                         new Action() {
                             @Override
                             public boolean act(float delta) {
-                                Screen screen;
-
-                                if (savegame.isNewlyCreated()) {
-                                    screen = new WelcomeScreen();
-                                } else {
-                                    screen = new GameScreen();
-                                }
-
-                                game.setScreen(screen);
+                                game.setScreen(new GameScreen());
                                 return true;
                             }
                         }