From 7a7f9359fdbc3813fa14f420a2f1394493b9e092 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Thu, 2 Jun 2022 22:30:07 -0500
Subject: [PATCH] Implement three camera views

Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
---
 maps/world1.map                    | Bin 295488 -> 295488 bytes
 src/sig/objects/LevelRenderer.java |   2 +-
 src/sig/objects/Player.java        |  16 ++++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/maps/world1.map b/maps/world1.map
index 67eddc0b43e2dd3609eff4611cf7f4b250fd8b2d..fc71cb1d795009c100240156f6689704ea286cd5 100644
GIT binary patch
delta 73
zcmX@mB6OfdXoF(LWPKN*i3)t1<qPgHH_PX=%jYlxF%u9oZ<o(uc_b{r#DD@Ar*CXz
L>EEaz2w?yKH^mea

delta 69
zcmX@mB6OfdXoF(LWL+DPi3&WM<qPgHH_PX=%jYlxF%u9oZ<o(uc_b{z%zy$InKuf~
LXPhqBz|s!@-@_4*

diff --git a/src/sig/objects/LevelRenderer.java b/src/sig/objects/LevelRenderer.java
index 49986cd..ce6cc05 100644
--- a/src/sig/objects/LevelRenderer.java
+++ b/src/sig/objects/LevelRenderer.java
@@ -46,7 +46,7 @@ public class LevelRenderer extends Object{
      * @param object
      */
     protected void Draw_Object(Object object) {
-        super.Draw_Sprite(Math.round(object.getX()-this.getX()-object.getSprite().getWidth()/2), Math.round(object.getY()-this.getY()-object.getSprite().getHeight()/2), object.getSprite());
+        super.Draw_Sprite(object.getX()-this.getX()-object.getSprite().getWidth()/2, Math.round(object.getY()-this.getY()-object.getSprite().getHeight()/2), object.getSprite());
     }
 
     private void DrawTile(double x, double y, Tile tile) {
diff --git a/src/sig/objects/Player.java b/src/sig/objects/Player.java
index 6f648d2..9346058 100644
--- a/src/sig/objects/Player.java
+++ b/src/sig/objects/Player.java
@@ -5,6 +5,7 @@ import sig.engine.Object;
 import sig.engine.Panel;
 import sig.engine.Sprite;
 import sig.map.CollisionType;
+import sig.map.Map;
 import sig.map.Tile;
 import sig.map.View;
 
@@ -33,6 +34,9 @@ public class Player extends Object{
     int maxJumpCount=1;
     int jumpCount=maxJumpCount;
 
+    final double viewBoundaryX=RabiClone.BASE_WIDTH/3;
+    final double viewBoundaryY=RabiClone.BASE_HEIGHT/3;
+
     public Player(Panel panel) {
         super(panel);
         this.setSprite(Sprite.NANA_SMALL);
@@ -55,8 +59,20 @@ public class Player extends Object{
                 RabiClone.level_renderer.setY(getY()-RabiClone.BASE_HEIGHT/2);
                 break;
             case FIXED:
+                RabiClone.level_renderer.setX((tileX/Tile.TILE_SCREEN_COUNT_X)*Map.MAP_WIDTH);
+                RabiClone.level_renderer.setY((tileY/Tile.TILE_SCREEN_COUNT_Y)*Map.MAP_HEIGHT);
                 break;
             case LIGHT_FOLLOW:
+                if (getX()-RabiClone.level_renderer.getX()<viewBoundaryX) {
+                    RabiClone.level_renderer.setX(getX()-viewBoundaryX);
+                } else if (getX()-RabiClone.level_renderer.getX()>RabiClone.BASE_WIDTH-viewBoundaryX) {
+                    RabiClone.level_renderer.setX(getX()-(RabiClone.BASE_WIDTH-viewBoundaryX));
+                }
+                if (getY()-RabiClone.level_renderer.getY()<viewBoundaryY) {
+                    RabiClone.level_renderer.setY(getY()-viewBoundaryY);
+                } else if (getY()-RabiClone.level_renderer.getY()>RabiClone.BASE_HEIGHT-viewBoundaryY) {
+                    RabiClone.level_renderer.setY(getY()-(RabiClone.BASE_HEIGHT-viewBoundaryY));
+                }
                 break;
             case LIGHT_HORIZONTAL_FOLLOW:
                 break;