From b0be36329373c4a411080f6446d7609d32a0d653 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Tue, 31 May 2022 23:22:06 -0500
Subject: [PATCH] Make simulation calculations run at a minimum rate of 60 FPS.
 Include extra data for maps

Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
---
 maps/world1.map             | Bin 294912 -> 295488 bytes
 src/sig/RabiClone.java      |   2 +-
 src/sig/map/Background.java |   5 +++
 src/sig/map/Map.java        |  68 ++++++++++++++++++++++++++++++++----
 src/sig/map/View.java       |  13 +++++++
 5 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 src/sig/map/Background.java
 create mode 100644 src/sig/map/View.java

diff --git a/maps/world1.map b/maps/world1.map
index e9e0aeb5dde0fb0363697499d9c92ebc27b11162..88ae8c9a60f337b882300529256f3fec6b8f7973 100644
GIT binary patch
delta 20
bcmZo@5IWEz)X>7%!qmdNgr#Alf&&u(P22{y

delta 16
XcmX@mBGk|z)X>7%!qmdNgrxxhG<F4}

diff --git a/src/sig/RabiClone.java b/src/sig/RabiClone.java
index adbcac6..81c8335 100644
--- a/src/sig/RabiClone.java
+++ b/src/sig/RabiClone.java
@@ -60,7 +60,7 @@ public class RabiClone{
 		while (true) {
 			long timePassed = System.nanoTime()-lastGameTime;
 			lastGameTime=System.nanoTime();
-			double updateMult = timePassed/1000000000d;
+			double updateMult = Math.min(1/60d,timePassed/1000000000d);
 
 			for (int i=0;i<OBJ.size();i++) {
 				OBJ.get(i).update(updateMult);
diff --git a/src/sig/map/Background.java b/src/sig/map/Background.java
new file mode 100644
index 0000000..2dca341
--- /dev/null
+++ b/src/sig/map/Background.java
@@ -0,0 +1,5 @@
+package sig.map;
+
+public enum Background {
+    DEFAULT
+}
diff --git a/src/sig/map/Map.java b/src/sig/map/Map.java
index 3be2cfb..cd9eb75 100644
--- a/src/sig/map/Map.java
+++ b/src/sig/map/Map.java
@@ -8,21 +8,62 @@ import java.io.IOException;
 
 public class Map {
     //Maps contain 512x288 tiles, allowing for 16384x9216 pixels of action per map.
-    //294912 bytes = 294KB of memory storage per map.
     //Since a screen normally fits 16x9 tiles, you get 32x32 (1024) screens of gameplay per world.
+    //
+    //After the map data, the next 1024 bytes will indicate the map view information.
+    //After that, the next 1024 bytes will indicate the background information.
+    //After that, the next 1024 bytes will indicate the map color information.
+    //After that, the next 1024 bytes will indicate the map room type. (Might show checkpoints, warp points, POI, etc)
+    //
+    //299008 bytes = 299KB of memory storage per map.
+    //
 
     final public static int MAP_WIDTH=512;
     final public static int MAP_HEIGHT=288;
 
     char[] tiles = new char[MAP_WIDTH*MAP_HEIGHT];
+    byte[] views = new byte[(MAP_WIDTH/Tile.TILE_WIDTH)*(MAP_HEIGHT/Tile.TILE_HEIGHT)];
+    byte[] backgrounds = new byte[(MAP_WIDTH/Tile.TILE_WIDTH)*(MAP_HEIGHT/Tile.TILE_HEIGHT)];
+    byte[] colors = new byte[(MAP_WIDTH/Tile.TILE_WIDTH)*(MAP_HEIGHT/Tile.TILE_HEIGHT)];
+    byte[] types = new byte[(MAP_WIDTH/Tile.TILE_WIDTH)*(MAP_HEIGHT/Tile.TILE_HEIGHT)];
+
+    final static byte MAP_DATA = 0;
+    final static byte VIEW_DATA = 1;
+    final static byte BACKGROUND_DATA = 2;
+    final static byte COLOR_DATA = 3;
+    final static byte TYPE_DATA = 4;
 
     public static Map LoadMap(Maps map) {
         try {
             Map newMap = new Map();
             DataInputStream stream = new DataInputStream(new FileInputStream(map.getFile()));
             int marker=0;
+            int iterationCount=MAP_WIDTH*MAP_HEIGHT;
+            int readingData = MAP_DATA;
             while (stream.available()!=0) {
-                newMap.tiles[marker++]=stream.readChar();
+                switch (readingData) {
+                    case MAP_DATA:
+                        newMap.tiles[marker++]=stream.readChar();
+                    break;
+                    case VIEW_DATA:
+                        newMap.views[marker++]=stream.readByte();
+                    break;
+                    case BACKGROUND_DATA:
+                        newMap.backgrounds[marker++]=stream.readByte();
+                    break;
+                    case COLOR_DATA:
+                        newMap.colors[marker++]=stream.readByte();
+                    break;
+                    case TYPE_DATA:
+                        newMap.types[marker++]=stream.readByte();
+                    break;
+                }
+                iterationCount--;
+                if (iterationCount<=0) {
+                    readingData++;
+                    marker=0;
+                    iterationCount=(MAP_WIDTH/Tile.TILE_WIDTH)*(MAP_HEIGHT/Tile.TILE_HEIGHT);
+                }
             }
             stream.close();
             return newMap;
@@ -34,17 +75,32 @@ public class Map {
 
     public static void SaveMap(Maps map) {
         try {
-            int marker=0;
             DataOutputStream stream = new DataOutputStream(new FileOutputStream(map.getFile()));
-            while (marker<map.map.tiles.length) {
-                stream.writeChar(map.map.tiles[marker++]);
-            }
+            saveCharData(stream,map.map.tiles);
+            saveByteData(stream,map.map.views);
+            saveByteData(stream,map.map.backgrounds);
+            saveByteData(stream,map.map.colors);
+            saveByteData(stream,map.map.types);
             stream.close();
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
+    private static void saveCharData(DataOutputStream stream, char[] a) throws IOException {
+        int marker = 0;
+        while (marker<a.length) {
+            stream.writeChar(a[marker++]);
+        }
+    }
+
+    private static void saveByteData(DataOutputStream stream, byte[] a) throws IOException {
+        int marker = 0;
+        while (marker<a.length) {
+            stream.writeByte(a[marker++]);
+        }
+    }
+
     public void ModifyTile(int x,int y,Tile t) {
         tiles[y*Map.MAP_WIDTH+x]=(char)(t.ordinal());
         //System.out.println("Tile "+(y*MAP_WIDTH+x)+" is now "+tiles[y*MAP_WIDTH+x]+".");
diff --git a/src/sig/map/View.java b/src/sig/map/View.java
new file mode 100644
index 0000000..1b9842a
--- /dev/null
+++ b/src/sig/map/View.java
@@ -0,0 +1,13 @@
+package sig.map;
+
+public enum View {
+    DIRECT_FOLLOW, //Follows the player directly.
+    LIGHT_FOLLOW, 
+        //  Follows the player loosely, but makes sure there's 
+        //  still a border between the edge of the screen and the player.
+    FIXED, //Does not follow the player.
+    LIGHT_HORIZONTAL_FOLLOW,
+        //  Used for rooms that are wide, but only 1 screen tall.
+    LIGHT_VERTICAL_FOLLOW,
+        //  Used for rooms that are tall, but only 1 screen wide.
+}