Bug Fixes
This commit is contained in:
@@ -23,6 +23,7 @@ import org.lwjgl.glfw.GLFW;
|
|||||||
import org.lwjgl.glfw.GLFWVidMode;
|
import org.lwjgl.glfw.GLFWVidMode;
|
||||||
import org.lwjgl.system.MemoryStack;
|
import org.lwjgl.system.MemoryStack;
|
||||||
import com.jme3.system.lwjgl.LwjglWindow;
|
import com.jme3.system.lwjgl.LwjglWindow;
|
||||||
|
import de.blight.game.state.DrownState;
|
||||||
import de.blight.game.state.HotbarState;
|
import de.blight.game.state.HotbarState;
|
||||||
import de.blight.game.state.HudState;
|
import de.blight.game.state.HudState;
|
||||||
import de.blight.game.state.LoadingScreenState;
|
import de.blight.game.state.LoadingScreenState;
|
||||||
@@ -63,6 +64,7 @@ public class BlightGame extends SimpleApplication {
|
|||||||
private long pendingFullscreenFixAt = Long.MAX_VALUE;
|
private long pendingFullscreenFixAt = Long.MAX_VALUE;
|
||||||
private boolean firstLaunch = true; // false nach dem ersten simpleInitApp()
|
private boolean firstLaunch = true; // false nach dem ersten simpleInitApp()
|
||||||
private boolean initialFixDone = false; // Initial-Fix bei 0.5s bereits gelaufen
|
private boolean initialFixDone = false; // Initial-Fix bei 0.5s bereits gelaufen
|
||||||
|
private boolean pendingMenuRebuild = false; // nur true nach explizitem app.restart()
|
||||||
|
|
||||||
private JWindow splashWindow;
|
private JWindow splashWindow;
|
||||||
|
|
||||||
@@ -427,6 +429,12 @@ public class BlightGame extends SimpleApplication {
|
|||||||
pendingFullscreenFixAt = System.currentTimeMillis() + 1000;
|
pendingFullscreenFixAt = System.currentTimeMillis() + 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Wird von GraphicsScreen vor app.restart() aufgerufen – erlaubt beim nächsten
|
||||||
|
* reshape() die Menü-States neu aufzubauen. Darf NICHT beim Startup-Fix feuern. */
|
||||||
|
public void scheduleMenuRebuild() {
|
||||||
|
pendingMenuRebuild = true;
|
||||||
|
}
|
||||||
|
|
||||||
// ── Render-Loop ──────────────────────────────────────────────────────────
|
// ── Render-Loop ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -479,6 +487,16 @@ public class BlightGame extends SimpleApplication {
|
|||||||
rebuildState(HudState.class);
|
rebuildState(HudState.class);
|
||||||
rebuildState(HotbarState.class);
|
rebuildState(HotbarState.class);
|
||||||
rebuildState(LoadingScreenState.class);
|
rebuildState(LoadingScreenState.class);
|
||||||
|
if (pendingMenuRebuild) {
|
||||||
|
pendingMenuRebuild = false;
|
||||||
|
rebuildEnabled(mainMenuState);
|
||||||
|
rebuildEnabled(pauseMenu);
|
||||||
|
rebuildEnabled(configScreen);
|
||||||
|
rebuildEnabled(audioScreen);
|
||||||
|
rebuildEnabled(graphicsScreen);
|
||||||
|
}
|
||||||
|
DrownState drown = stateManager.getState(DrownState.class);
|
||||||
|
if (drown != null) drown.rebuild();
|
||||||
JmeConsole console = stateManager.getState(JmeConsole.class);
|
JmeConsole console = stateManager.getState(JmeConsole.class);
|
||||||
if (console != null) console.rebuild();
|
if (console != null) console.rebuild();
|
||||||
}
|
}
|
||||||
@@ -491,6 +509,13 @@ public class BlightGame extends SimpleApplication {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void rebuildEnabled(com.jme3.app.state.BaseAppState state) {
|
||||||
|
if (state != null && state.isEnabled()) {
|
||||||
|
state.setEnabled(false);
|
||||||
|
state.setEnabled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ── Konsolen-Befehle ─────────────────────────────────────────────────────
|
// ── Konsolen-Befehle ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
private void registerGameCommands(JmeConsole console) {
|
private void registerGameCommands(JmeConsole console) {
|
||||||
|
|||||||
@@ -219,6 +219,7 @@ public class GraphicsScreen extends MenuScreen {
|
|||||||
s.setVSync(live.vsync);
|
s.setVSync(live.vsync);
|
||||||
s.setSamples(live.samples);
|
s.setSamples(live.samples);
|
||||||
app.setSettings(s);
|
app.setSettings(s);
|
||||||
|
((BlightGame) getApplication()).scheduleMenuRebuild();
|
||||||
if (live.fullscreen) {
|
if (live.fullscreen) {
|
||||||
((BlightGame) getApplication()).scheduleFullscreenFix();
|
((BlightGame) getApplication()).scheduleFullscreenFix();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -736,6 +736,7 @@ public class WorldScene extends BaseAppState {
|
|||||||
// Schatten als Filter – vermeidet das Setzen von ShadowMap-Texturen in Scene-Materialien
|
// Schatten als Filter – vermeidet das Setzen von ShadowMap-Texturen in Scene-Materialien
|
||||||
fpp.addFilter(shadowFilter);
|
fpp.addFilter(shadowFilter);
|
||||||
|
|
||||||
|
|
||||||
// Globales Wasser bei Y=0 (bedeckt die gesamte Karte unterhalb der Wasserlinie)
|
// Globales Wasser bei Y=0 (bedeckt die gesamte Karte unterhalb der Wasserlinie)
|
||||||
try {
|
try {
|
||||||
DynamicWaterFilter waterFilter = new DynamicWaterFilter(rootNode, sunDir);
|
DynamicWaterFilter waterFilter = new DynamicWaterFilter(rootNode, sunDir);
|
||||||
|
|||||||
@@ -80,12 +80,25 @@ public class DrownState extends BaseAppState {
|
|||||||
@Override
|
@Override
|
||||||
protected void initialize(Application application) {
|
protected void initialize(Application application) {
|
||||||
app = (SimpleApplication) application;
|
app = (SimpleApplication) application;
|
||||||
float w = app.getCamera().getWidth();
|
|
||||||
float h = app.getCamera().getHeight();
|
|
||||||
overlay = new Geometry("drown_overlay", new Quad(w, h));
|
|
||||||
overlayMat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
|
overlayMat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
|
||||||
overlayMat.setColor("Color", new ColorRGBA(0f, 0f, 0f, 0f));
|
overlayMat.setColor("Color", new ColorRGBA(0f, 0f, 0f, 0f));
|
||||||
overlayMat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
|
overlayMat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
|
||||||
|
buildOverlay();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Neu aufrufen wenn sich die Auflösung ändert. */
|
||||||
|
public void rebuild() {
|
||||||
|
if (app == null) return;
|
||||||
|
boolean wasAttached = overlay != null && overlay.getParent() != null;
|
||||||
|
detachOverlay();
|
||||||
|
buildOverlay();
|
||||||
|
if (wasAttached) attachOverlay();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void buildOverlay() {
|
||||||
|
float w = app.getCamera().getWidth();
|
||||||
|
float h = app.getCamera().getHeight();
|
||||||
|
overlay = new Geometry("drown_overlay", new Quad(w, h));
|
||||||
overlay.setMaterial(overlayMat);
|
overlay.setMaterial(overlayMat);
|
||||||
overlay.setQueueBucket(RenderQueue.Bucket.Gui);
|
overlay.setQueueBucket(RenderQueue.Bucket.Gui);
|
||||||
overlay.setLocalTranslation(0f, 0f, 50f);
|
overlay.setLocalTranslation(0f, 0f, 50f);
|
||||||
|
|||||||
Reference in New Issue
Block a user