Waves via displacement (#111)

* introduce displacement * fix missing animations * fix displacement
srcimon · Sep 27, 2023 · 5b44d1b · 5b44d1b
1 parent 2d64c06
commit 5b44d1b
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 25 deletions.
diff --git a/...re/src/main/java/io/github/srcimon/screwbox/core/entities/components/RenderComponent.java b/...re/src/main/java/io/github/srcimon/screwbox/core/entities/components/RenderComponent.java
@@ -2,6 +2,7 @@
 
 import io.github.srcimon.screwbox.core.Angle;
 import io.github.srcimon.screwbox.core.Percent;
+import io.github.srcimon.screwbox.core.Vector;
 import io.github.srcimon.screwbox.core.entities.Component;
 import io.github.srcimon.screwbox.core.graphics.Flip;
 import io.github.srcimon.screwbox.core.graphics.Sprite;
@@ -16,6 +17,7 @@ public class RenderComponent implements Component {
     public double scale = 1;
     public Angle rotation = Angle.none();
     public Flip flip = Flip.NONE;
+    public Vector displacement = Vector.zero();
 
     public RenderComponent() {
         this(0);

diff --git a/...box-core/src/main/java/io/github/srcimon/screwbox/core/entities/systems/RenderSystem.java b/...box-core/src/main/java/io/github/srcimon/screwbox/core/entities/systems/RenderSystem.java
@@ -23,15 +23,15 @@ public void update(final Engine engine) {
             final var sprite = render.sprite;
             final var spriteDimension = sprite.size();
             final var spriteBounds = Bounds.atOrigin(
-                    entityPosition.x() - spriteDimension.width() / 2.0,
-                    entityPosition.y() - spriteDimension.height() / 2.0,
+                    entityPosition.x() - spriteDimension.width() / 2.0 + render.displacement.x(),
+                    entityPosition.y() - spriteDimension.height() / 2.0 + render.displacement.y(),
                     spriteDimension.width() * render.scale,
                     spriteDimension.height() * render.scale);
 
             if (spriteBounds.intersects(visibleArea)) {
                 spriteBatch.addEntry(
                         render.sprite,
-                        spriteBounds.origin(),
+                        spriteBounds.origin().add(render.displacement),
                         render.scale,
                         render.opacity,
                         render.rotation,

diff --git a/...e/src/main/java/io/github/srcimon/screwbox/examples/platformer/collectables/Cherries.java b/...e/src/main/java/io/github/srcimon/screwbox/examples/platformer/collectables/Cherries.java
@@ -17,7 +17,7 @@
 
 public class Cherries implements Converter<GameObject> {
 
-    private static final Asset<Sprite> SPRITE = spriteAssetFromJson("tilesets/collectables/cherries.json");
+    private static final Asset<Sprite> SPRITE = spriteAssetFromJson("tilesets/collectables/cherries.json", "animation");
 
     @Override
     public Entity convert(final GameObject object) {

diff --git a/...mple/src/main/java/io/github/srcimon/screwbox/examples/platformer/collectables/DeboB.java b/...mple/src/main/java/io/github/srcimon/screwbox/examples/platformer/collectables/DeboB.java
@@ -14,7 +14,7 @@
 
 public class DeboB implements Converter<GameObject> {
 
-    private static final Asset<Sprite> SPRITE = spriteAssetFromJson("tilesets/collectables/debo-b.json");
+    private static final Asset<Sprite> SPRITE = spriteAssetFromJson("tilesets/collectables/debo-b.json", "animation");
 
     @Override
     public Entity convert(final GameObject object) {

diff --git a/...mple/src/main/java/io/github/srcimon/screwbox/examples/platformer/collectables/DeboD.java b/...mple/src/main/java/io/github/srcimon/screwbox/examples/platformer/collectables/DeboD.java
@@ -14,7 +14,7 @@
 
 public class DeboD implements Converter<GameObject> {
 
-    private static final Asset<Sprite> SPRITE = spriteAssetFromJson("tilesets/collectables/debo-d.json");
+    private static final Asset<Sprite> SPRITE = spriteAssetFromJson("tilesets/collectables/debo-d.json", "animation");
 
     @Override
     public Entity convert(final GameObject object) {

diff --git a/...mple/src/main/java/io/github/srcimon/screwbox/examples/platformer/collectables/DeboE.java b/...mple/src/main/java/io/github/srcimon/screwbox/examples/platformer/collectables/DeboE.java
@@ -14,7 +14,7 @@
 
 public class DeboE implements Converter<GameObject> {
 
-    private static final Asset<Sprite> SPRITE = spriteAssetFromJson("tilesets/collectables/debo-e.json");
+    private static final Asset<Sprite> SPRITE = spriteAssetFromJson("tilesets/collectables/debo-e.json", "animation");
 
     @Override
     public Entity convert(GameObject object) {

diff --git a/...mple/src/main/java/io/github/srcimon/screwbox/examples/platformer/collectables/DeboO.java b/...mple/src/main/java/io/github/srcimon/screwbox/examples/platformer/collectables/DeboO.java
@@ -14,7 +14,7 @@
 
 public class DeboO implements Converter<GameObject> {
 
-    private static final Asset<Sprite> SPRITE = spriteAssetFromJson("tilesets/collectables/debo-o.json");
+    private static final Asset<Sprite> SPRITE = spriteAssetFromJson("tilesets/collectables/debo-o.json", "animation");
 
     @Override
     public Entity convert(GameObject object) {

diff --git a/screwbox-examples/platformer-example/src/main/resources/maps/1-1_teufelsinsel.json b/screwbox-examples/platformer-example/src/main/resources/maps/1-1_teufelsinsel.json
@@ -964,7 +964,7 @@
          "value":true
         }],
  "renderorder":"right-down",
- "tiledversion":"1.8.4",
+ "tiledversion":"1.10.1",
  "tileheight":16,
  "tilesets":[
         {
@@ -981,6 +981,6 @@
         }],
  "tilewidth":16,
  "type":"map",
- "version":"1.8",
+ "version":"1.10",
  "width":256
 }
diff --git a/screwbox-examples/platformer-example/src/main/resources/tilesets/collectables/cherries.json b/screwbox-examples/platformer-example/src/main/resources/tilesets/collectables/cherries.json
@@ -6,7 +6,7 @@
  "name":"cherries",
  "spacing":0,
  "tilecount":4,
- "tiledversion":"1.5.0",
+ "tiledversion":"1.10.1",
  "tileheight":16,
  "tiles":[
         {
@@ -27,9 +27,15 @@
                  "duration":200,
                  "tileid":3
                 }],
-         "id":0
+         "id":0,
+         "properties":[
+                {
+                 "name":"name",
+                 "type":"string",
+                 "value":"animation"
+                }]
         }],
  "tilewidth":10,
  "type":"tileset",
- "version":1.5
+ "version":"1.10"
 }
diff --git a/screwbox-examples/platformer-example/src/main/resources/tilesets/collectables/debo-b.json b/screwbox-examples/platformer-example/src/main/resources/tilesets/collectables/debo-b.json
@@ -6,7 +6,7 @@
  "name":"debo-b",
  "spacing":0,
  "tilecount":3,
- "tiledversion":"1.5.0",
+ "tiledversion":"1.10.1",
  "tileheight":16,
  "tiles":[
         {
@@ -27,9 +27,15 @@
                  "duration":200,
                  "tileid":1
                 }],
-         "id":0
+         "id":0,
+         "properties":[
+                {
+                 "name":"name",
+                 "type":"string",
+                 "value":"animation"
+                }]
         }],
  "tilewidth":16,
  "type":"tileset",
- "version":1.5
+ "version":"1.10"
 }
diff --git a/screwbox-examples/platformer-example/src/main/resources/tilesets/collectables/debo-d.json b/screwbox-examples/platformer-example/src/main/resources/tilesets/collectables/debo-d.json
@@ -6,7 +6,7 @@
  "name":"debo-d",
  "spacing":0,
  "tilecount":3,
- "tiledversion":"1.5.0",
+ "tiledversion":"1.10.1",
  "tileheight":16,
  "tiles":[
         {
@@ -27,9 +27,15 @@
                  "duration":200,
                  "tileid":1
                 }],
-         "id":0
+         "id":0,
+         "properties":[
+                {
+                 "name":"name",
+                 "type":"string",
+                 "value":"animation"
+                }]
         }],
  "tilewidth":16,
  "type":"tileset",
- "version":1.5
+ "version":"1.10"
 }
diff --git a/screwbox-examples/platformer-example/src/main/resources/tilesets/collectables/debo-e.json b/screwbox-examples/platformer-example/src/main/resources/tilesets/collectables/debo-e.json
@@ -6,7 +6,7 @@
  "name":"debo-e",
  "spacing":0,
  "tilecount":3,
- "tiledversion":"1.5.0",
+ "tiledversion":"1.10.1",
  "tileheight":16,
  "tiles":[
         {
@@ -27,9 +27,15 @@
                  "duration":200,
                  "tileid":1
                 }],
-         "id":0
+         "id":0,
+         "properties":[
+                {
+                 "name":"name",
+                 "type":"string",
+                 "value":"animation"
+                }]
         }],
  "tilewidth":16,
  "type":"tileset",
- "version":1.5
+ "version":"1.10"
 }
diff --git a/screwbox-examples/platformer-example/src/main/resources/tilesets/collectables/debo-o.json b/screwbox-examples/platformer-example/src/main/resources/tilesets/collectables/debo-o.json
@@ -6,7 +6,7 @@
  "name":"debo-o",
  "spacing":0,
  "tilecount":3,
- "tiledversion":"1.5.0",
+ "tiledversion":"1.10.1",
  "tileheight":16,
  "tiles":[
         {
@@ -27,9 +27,15 @@
                  "duration":200,
                  "tileid":1
                 }],
-         "id":0
+         "id":0,
+         "properties":[
+                {
+                 "name":"name",
+                 "type":"string",
+                 "value":"animation"
+                }]
         }],
  "tilewidth":16,
  "type":"tileset",
- "version":1.5
+ "version":"1.10"
 }