Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: merge spawn preview screen into world pre generation screen #5118

Merged
merged 3 commits into from
Jul 20, 2023
Merged

refactor: merge spawn preview screen into world pre generation screen #5118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcf8723
refactor: merge StartPlaying screen into WorldPreGeneration screen
jdrueckert Jul 13, 2023
b02c473
remove unused code
skaldarnar Jul 18, 2023
f99acfe
chore: remove unused imports
jdrueckert Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 0 additions & 111 deletions ...src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/StartPlayingScreen.java
View file
Open in desktop

This file was deleted.

64 changes: 41 additions & 23 deletions ...in/java/org/terasology/engine/rendering/nui/layers/mainMenu/WorldPreGenerationScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,41 @@
package org.terasology.engine.rendering.nui.layers.mainMenu;

import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.engine.core.module.ModuleManager;
import org.terasology.gestalt.assets.ResourceUrn;
import org.joml.Vector2i;
import org.terasology.engine.config.Config;
import org.terasology.engine.context.Context;
import org.terasology.engine.core.GameEngine;
import org.terasology.engine.core.modes.StateLoading;
import org.terasology.engine.core.module.ModuleManager;
import org.terasology.engine.game.GameManifest;
import org.terasology.engine.network.NetworkMode;
import org.terasology.engine.registry.In;
import org.terasology.engine.rendering.assets.texture.Texture;
import org.terasology.engine.rendering.assets.texture.TextureData;
import org.terasology.engine.rendering.nui.CoreScreenLayer;
import org.terasology.engine.rendering.nui.NUIManager;
import org.terasology.engine.rendering.nui.animation.MenuAnimationSystems;
import org.terasology.engine.rendering.nui.layers.mainMenu.preview.FacetLayerPreview;
import org.terasology.engine.rendering.nui.layers.mainMenu.preview.PreviewGenerator;
import org.terasology.engine.rendering.world.WorldSetupWrapper;
import org.terasology.math.TeraMath;
import org.terasology.engine.utilities.Assets;
import org.terasology.engine.world.generator.UnresolvedWorldGeneratorException;
import org.terasology.engine.world.generator.WorldGenerator;
import org.terasology.engine.world.generator.internal.WorldGeneratorManager;
import org.terasology.engine.world.generator.plugin.TempWorldGeneratorPluginLibrary;
import org.terasology.engine.world.generator.plugin.WorldGeneratorPluginLibrary;
import org.terasology.engine.world.zones.Zone;
import org.terasology.gestalt.assets.ResourceUrn;
import org.terasology.gestalt.module.ModuleEnvironment;
import org.terasology.gestalt.naming.Name;
import org.terasology.math.TeraMath;
import org.terasology.nui.Canvas;
import org.terasology.nui.WidgetUtil;
import org.terasology.nui.databinding.Binding;
import org.terasology.nui.widgets.UIImage;
import org.terasology.nui.widgets.UISlider;
import org.terasology.nui.widgets.UISliderOnChangeTriggeredListener;
import org.terasology.nui.widgets.UIText;
import org.terasology.engine.registry.In;
import org.terasology.engine.rendering.nui.CoreScreenLayer;
import org.terasology.engine.rendering.nui.NUIManager;
import org.terasology.engine.utilities.Assets;
import org.terasology.engine.world.generator.UnresolvedWorldGeneratorException;
import org.terasology.engine.world.generator.WorldGenerator;
import org.terasology.engine.world.generator.internal.WorldGeneratorManager;
import org.terasology.engine.world.generator.plugin.TempWorldGeneratorPluginLibrary;
import org.terasology.engine.world.generator.plugin.WorldGeneratorPluginLibrary;
import org.terasology.engine.world.zones.Zone;

import java.nio.ByteBuffer;
import java.util.List;
Expand All @@ -49,20 +53,22 @@ public class WorldPreGenerationScreen extends CoreScreenLayer implements UISlide

public static final ResourceUrn ASSET_URI = new ResourceUrn("engine:worldPreGenerationScreen");

private static final Logger logger = LoggerFactory.getLogger(WorldPreGenerationScreen.class);

@In
private ModuleManager moduleManager;

@In
private Config config;

@In
private GameEngine gameEngine;

private ModuleEnvironment environment;
private WorldGenerator worldGenerator;
private Texture texture;
private UIImage previewImage;
private Context context;
private PreviewGenerator previewGen;
private UniverseWrapper universeWrapper;
private WorldSetupWrapper selectedWorld;
private int seedNumber;
private UISlider zoomSlider;
Expand All @@ -80,6 +86,7 @@ public void setEnvironment(Context subContext) throws UnresolvedWorldGeneratorEx
environment = context.get(ModuleEnvironment.class);
context.put(WorldGeneratorPluginLibrary.class, new TempWorldGeneratorPluginLibrary(environment, context));
selectedWorld = context.get(UniverseSetupScreen.class).getSelectedWorld();
universeWrapper = context.get(UniverseWrapper.class);

ensureWorldGeneratorIsSet();
selectedWorld.getWorldGenerator().setWorldSeed(createSeed(selectedWorld.getWorldName().toString()));
Expand Down Expand Up @@ -125,12 +132,6 @@ public void set(String value) {
updatePreview();
});

StartPlayingScreen startPlayingScreen = getManager().createScreen(StartPlayingScreen.ASSET_URI, StartPlayingScreen.class);
WidgetUtil.trySubscribe(this, "continue", button -> {
startPlayingScreen.setTargetWorld(selectedWorld, texture, context);
triggerForwardAnimation(startPlayingScreen);
});

WorldSetupScreen worldSetupScreen = getManager().createScreen(WorldSetupScreen.ASSET_URI, WorldSetupScreen.class);
WidgetUtil.trySubscribe(this, "config", button -> {
try {
Expand All @@ -150,6 +151,18 @@ public void set(String value) {
triggerBackAnimation();
});

WidgetUtil.trySubscribe(this, "play", button -> {
universeWrapper.setTargetWorld(selectedWorld);
final GameManifest gameManifest = GameManifestProvider.createGameManifest(universeWrapper, moduleManager, config);
if (gameManifest != null) {
gameEngine.changeState(new StateLoading(gameManifest, (universeWrapper.getLoadingAsServer())
? NetworkMode.DEDICATED_SERVER
: NetworkMode.NONE));
} else {
getManager().createScreen(MessagePopup.ASSET_URI, MessagePopup.class).setMessage("Error", "Can't create new game!");
}
});

WidgetUtil.trySubscribe(this, "mainMenu", button -> {
getManager().pushScreen("engine:mainMenuScreen");
});
Expand Down Expand Up @@ -260,4 +273,9 @@ public void onSliderValueChanged(float val) {
public boolean isLowerLayerVisible() {
return false;
}

@Override
public Vector2i getPreferredContentSize(Canvas canvas, Vector2i vector2i) {
return vector2i;
}
}
153 changes: 0 additions & 153 deletions engine/src/main/resources/org/terasology/engine/assets/ui/menu/startPlayingScreen.ui
View file
Open in desktop

This file was deleted.

Loading
Loading