fix: do not render invisible Scene and their root Table

This commit is contained in:
2025-09-30 11:36:42 +07:00
parent 9163a0aebb
commit e19259c2c4
5 changed files with 42 additions and 11 deletions

View File

@ -7,6 +7,8 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.ui.Table;
import com.badlogic.gdx.utils.viewport.ScreenViewport; import com.badlogic.gdx.utils.viewport.ScreenViewport;
import java.util.ArrayList;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.vibecoders.moongazer.managers.Assets; import org.vibecoders.moongazer.managers.Assets;
@ -14,8 +16,8 @@ import org.vibecoders.moongazer.scenes.*;
public class Game extends ApplicationAdapter { public class Game extends ApplicationAdapter {
private static final Logger log = LoggerFactory.getLogger(Game.class); private static final Logger log = LoggerFactory.getLogger(Game.class);
public static State state = State.INTRO; public State state = State.INTRO;
public static Transition transition = null; public Transition transition = null;
SpriteBatch batch; SpriteBatch batch;
// UI stage // UI stage
public Stage stage; public Stage stage;
@ -23,7 +25,8 @@ public class Game extends ApplicationAdapter {
// Scenes // Scenes
Scene currentScene; Scene currentScene;
Scene introScene; Scene introScene;
public static Scene mainMenuScene; public Scene mainMenuScene;
public ArrayList<Scene> gameScenes;
@Override @Override
public void create() { public void create() {
@ -38,7 +41,9 @@ public class Game extends ApplicationAdapter {
root.setFillParent(true); root.setFillParent(true);
stage.addActor(root); stage.addActor(root);
// Scene initialization // Scene initialization
gameScenes = new ArrayList<>();
currentScene = introScene = new Intro(this); currentScene = introScene = new Intro(this);
gameScenes.add(introScene);
// By the end of the intro, the main menu scene will be created and assigned to Game.mainMenuScene // By the end of the intro, the main menu scene will be created and assigned to Game.mainMenuScene
} }
@ -54,7 +59,7 @@ public class Game extends ApplicationAdapter {
stage.draw(); stage.draw();
return; return;
} }
switch (Game.state) { switch (this.state) {
case INTRO: case INTRO:
currentScene = introScene; currentScene = introScene;
break; break;
@ -67,6 +72,20 @@ public class Game extends ApplicationAdapter {
default: default:
log.warn("Unknown state: {}", state); log.warn("Unknown state: {}", state);
} }
for (var scene : gameScenes) {
// log.trace("Checking scene visibility: {}", scene.getClass().getSimpleName());
if (scene != currentScene && scene.root.isVisible()) {
log.trace("Hiding scene: {}", scene.getClass().getSimpleName());
scene.root.setVisible(false);
}
}
if (!currentScene.root.isVisible()) {
log.trace("Showing current scene: {}", currentScene.getClass().getSimpleName());
currentScene.root.setVisible(true);
}
batch.begin(); batch.begin();
currentScene.render(batch); currentScene.render(batch);
batch.end(); batch.end();

View File

@ -29,6 +29,8 @@ public class Intro extends Scene {
startTime = System.currentTimeMillis() + 500; startTime = System.currentTimeMillis() + 500;
log.info("Starting to load all remaining assets..."); log.info("Starting to load all remaining assets...");
Assets.loadAll(); Assets.loadAll();
game.mainMenuScene = new MainMenu(game);
game.gameScenes.add(game.mainMenuScene);
} }
/** /**
@ -38,10 +40,10 @@ public class Intro extends Scene {
@Override @Override
public void render(SpriteBatch batch) { public void render(SpriteBatch batch) {
if (System.currentTimeMillis() > endTime + 2000 && endTime != 0) { if (System.currentTimeMillis() > endTime + 2000 && endTime != 0) {
if (Game.transition == null) { if (game.transition == null) {
Assets.waitUntilLoaded(); Assets.waitUntilLoaded();
Game.mainMenuScene = new MainMenu(game); log.info("All assets loaded successfully.");
Game.transition = new Transition(this, Game.mainMenuScene, State.MAIN_MENU, 1000); game.transition = new Transition(game, this, game.mainMenuScene, State.MAIN_MENU, 1000);
} }
batch.draw(TEXTURE_BLACK, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT); batch.draw(TEXTURE_BLACK, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
return; return;

View File

@ -21,7 +21,8 @@ public class MainMenu extends Scene {
var font = Assets.getFont("ui", 24); var font = Assets.getFont("ui", 24);
textLabel = new Label("Moongazer", new LabelStyle(font, Color.BLACK)); textLabel = new Label("Moongazer", new LabelStyle(font, Color.BLACK));
textLabel.setPosition(WINDOW_WIDTH / 2f - textLabel.getWidth() / 2f, WINDOW_HEIGHT / 2f - textLabel.getHeight() / 2f); textLabel.setPosition(WINDOW_WIDTH / 2f - textLabel.getWidth() / 2f, WINDOW_HEIGHT / 2f - textLabel.getHeight() / 2f);
game.root.addActor(textLabel); root.addActor(textLabel);
game.stage.addActor(root);
} }
/** /**
* Renders the main menu scene. * Renders the main menu scene.

View File

@ -5,13 +5,16 @@ import org.vibecoders.moongazer.Game;
import org.vibecoders.moongazer.managers.Assets; import org.vibecoders.moongazer.managers.Assets;
import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.scenes.scene2d.ui.Table;
public abstract class Scene { public abstract class Scene {
protected final Logger log = org.slf4j.LoggerFactory.getLogger(getClass()); protected final Logger log = org.slf4j.LoggerFactory.getLogger(getClass());
public Table root;
public Scene(Game game) { public Scene(Game game) {
this(); this();
} }
public Scene() { public Scene() {
root = new Table();
if (!Assets.isLoadedAll() && Assets.isStartLoadAll()) { if (!Assets.isLoadedAll() && Assets.isStartLoadAll()) {
Assets.waitUntilLoaded(); Assets.waitUntilLoaded();
} }

View File

@ -9,6 +9,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
* Handles transitions between scenes with a linear transition effect. * Handles transitions between scenes with a linear transition effect.
*/ */
public class Transition extends Scene { public class Transition extends Scene {
private Game game;
private Scene from; private Scene from;
private Scene to; private Scene to;
private State targetState; private State targetState;
@ -22,7 +23,10 @@ public class Transition extends Scene {
* @param targetState The target state of the game after the transition. * @param targetState The target state of the game after the transition.
* @param duration The duration of the transition in milliseconds. * @param duration The duration of the transition in milliseconds.
*/ */
public Transition(Scene from, Scene to, State targetState, long duration) { public Transition(Game game, Scene from, Scene to, State targetState, long duration) {
// Transition does not need to render UI elements
this.root = null;
this.game = game;
this.from = from; this.from = from;
this.to = to; this.to = to;
this.targetState = targetState; this.targetState = targetState;
@ -39,15 +43,17 @@ public class Transition extends Scene {
var toOpacity = ((float) (System.currentTimeMillis() - startTime)) / duration; var toOpacity = ((float) (System.currentTimeMillis() - startTime)) / duration;
if (toOpacity >= 0.99) { if (toOpacity >= 0.99) {
log.trace("Transition complete to state: {}", targetState); log.trace("Transition complete to state: {}", targetState);
Game.state = targetState; game.state = targetState;
Game.transition = null; game.transition = null;
return; return;
} }
var fromOpacity = 1 - toOpacity; var fromOpacity = 1 - toOpacity;
log.trace("Transition opacities - from: {}, to: {}", fromOpacity, toOpacity); log.trace("Transition opacities - from: {}, to: {}", fromOpacity, toOpacity);
batch.setColor(1, 1, 1, fromOpacity); batch.setColor(1, 1, 1, fromOpacity);
from.root.setVisible(true);
from.render(batch); from.render(batch);
batch.setColor(1, 1, 1, toOpacity); batch.setColor(1, 1, 1, toOpacity);
to.root.setVisible(true);
to.render(batch); to.render(batch);
} }
} }