Refactor Worlds to contain a mutable list of Layers. #23

viking-sudo-rm · 2018-08-23T06:58:41Z

Worlds now contain a list of layers which are configurable via config.yml.
Layer interface standardizes implementation for BackgroundLayers, TileLayers, and EntityLayers. Level has been renamed TileLayer.
Reorganized interface hierarchy in snorri.world package. This affects Savable, Loadable, Renderable, etc.
Removed old spaghetti code for deprecated features (creating walls, 2D pathfinding).
Introduced new static factory pattern for creating worlds and some layers (did not take the time to adapt old stuff).
Changed LevelEditor to have a currently selected layer for editing. Currently, this layer is set to the standard tile layer, but we can introduce functionality to switch it to edit foreground layers in the future.
Other related cleaning up and refactoring.

Through manual testing, I have confirmed that old-formatted levels can be loaded in the LevelEditor. Additionally, new levels can be created, and levels that have been loaded can be saved correctly.

Fixes #14.

… YAML.

tojaroslaw · 2018-08-27T04:53:23Z

src/snorri/pathfinding/PathGraph.java

@@ -37,7 +37,7 @@
 	private final int width, height;

 	@SuppressWarnings("unchecked")
-	public PathGraph(List<Level> levels, int width, int height) {
+	public PathGraph(List<TileLayer> levels, int width, int height) {


you should rename these variables to something less confusing than levels

maybe we can do this whenever we make any manual changes to a file

tojaroslaw · 2018-08-27T04:54:07Z

src/snorri/pathfinding/PathGraph.java

@@ -37,7 +37,7 @@
 	private final int width, height;

 	@SuppressWarnings("unchecked")
-	public PathGraph(List<Level> levels, int width, int height) {
+	public PathGraph(List<TileLayer> levels, int width, int height) {


maybe we can do this whenever we make any manual changes to a file

tojaroslaw · 2018-08-27T05:09:01Z

src/snorri/world/Editable.java


-	public Level getLevel(int layer);
+	/** Rendering has the same signature as the one in Layer. */
+	public void render(FocusedWindow<?> levelEditor, Graphics2D gr, double deltaTime, boolean b);


We should make this extend Renderable and have this method be @OverRide

Added @Override annotation.

tojaroslaw · 2018-08-27T05:20:17Z

src/snorri/world/EntityLayer.java

-		// TODO Auto-generated method stub
-		return null;
+	public String getFilename() {
+		return "entity.level";


this should be entity.layer, entity.level is too confusing

Changed. Also changed default value when generating a config.

tojaroslaw · 2018-08-27T05:23:31Z

src/snorri/world/Layer.java

-	public int getWidth();
+	public boolean canShootOver(Vector position);	
+
+	// TODO(lambdaviking): Save this stuff.


find out what this means

Refactored this class to use a LayerType enum to create worlds. This allows some fancy :: stuff, and definitely cleans up the logic.

tojaroslaw · 2018-08-27T05:25:02Z

src/snorri/world/Layer.java

+	static Layer fromYAML(World world, Map<String, Object> params) throws IOException {
+		String type = (String) params.get("type");
+		switch (type) {
+		case "background":


maybe we should have an enum or constants, just something to think about, having strings seems bad for code maintainability

tojaroslaw · 2018-08-27T05:28:40Z

src/snorri/world/SavableLayer.java

+public interface SavableLayer extends Layer, Savable {
+
+	/** Get the filename for saving the Level in the World folder. */
+	public String getFilename();


should we have a way to change the filename?

Yup, good idea. Added enums LayerType here and PlayableType in Playable.

tojaroslaw · 2018-08-27T05:36:26Z

src/snorri/world/TileLayer.java

+
+	@Override
+	public String getFilename() {
+		return "tile.level";


this should be tile.layer

tojaroslaw · 2018-08-27T05:38:18Z

src/snorri/world/World.java

 		if (f.exists() && !f.isDirectory()) {
-			throw new IOException("tried to save world to non-directory");
+			throw new IOException("Tried to save world to non-directory.");


grammar????????????????????????????????

Null subject allowed in this pragmatic context, bitch.

tojaroslaw · 2018-08-27T05:40:59Z

src/snorri/world/World.java

+				Layer layer = Layer.fromYAML(this, params);
+				addLayer(layer);
+			} catch (Exception e) {
+				// FIXME(lambdaviking): Does getting rid of forEach allow us not to use this clause?


what is this for?

Elaborated in comment that is not a FIXME.

tojaroslaw · 2018-08-27T05:42:07Z

src/snorri/world/World.java

+	 * @param index Index of the layer in the layers array.
+	 * @return The layer whose index in layers is <code>index</code>.
+	 */
+	// TODO(lambdaviking): Figure this out.


What do you need to figure out?

Removed this code. We should probably eventually support an API for accessing different TileLayers, which is what was to be figured out. But, for now, I just deleted the unused method.

viking-sudo-rm added 8 commits August 22, 2018 15:20

Significantly refactored the World package to use Layers.

2891a3f

Added new files.

fcd9be1

No more compile-time errors after refactor.

c131bf0

Removed pathfinding stuff.

0334b2d

Can now load and save worlds in the level editor. Layers specified in…

79a09e2

… YAML.

Renamed Level to TileLayer.

3a33820

Renamed Level to TileLayer (added files).

9bd2926

Create default world config.

17a3ebe

viking-sudo-rm requested a review from tojaroslaw August 23, 2018 06:58

tojaroslaw reviewed Aug 27, 2018

View reviewed changes

Addressed refactoring comments in #23.

b2f0f01

viking-sudo-rm merged commit a913efa into master Aug 27, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor Worlds to contain a mutable list of Layers. #23

Refactor Worlds to contain a mutable list of Layers. #23

viking-sudo-rm commented Aug 23, 2018

tojaroslaw Aug 27, 2018

tojaroslaw Aug 27, 2018

viking-sudo-rm Aug 27, 2018

tojaroslaw Aug 27, 2018

tojaroslaw Aug 27, 2018

viking-sudo-rm Aug 27, 2018

tojaroslaw Aug 27, 2018

viking-sudo-rm Aug 27, 2018

tojaroslaw Aug 27, 2018

viking-sudo-rm Aug 27, 2018

tojaroslaw Aug 27, 2018

tojaroslaw Aug 27, 2018

viking-sudo-rm Aug 27, 2018

tojaroslaw Aug 27, 2018

viking-sudo-rm Aug 27, 2018

tojaroslaw Aug 27, 2018

viking-sudo-rm Aug 27, 2018

tojaroslaw Aug 27, 2018

viking-sudo-rm Aug 27, 2018

tojaroslaw Aug 27, 2018

viking-sudo-rm Aug 27, 2018

Refactor Worlds to contain a mutable list of Layers. #23

Refactor Worlds to contain a mutable list of Layers. #23

Conversation

viking-sudo-rm commented Aug 23, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment