From a464da424a7dc425bb1970e60f4ee505cd7d64b6 Mon Sep 17 00:00:00 2001
From: s-prechtl <stefan@tague.at>
Date: Tue, 13 Dec 2022 10:35:00 +0100
Subject: [PATCH] collision workey

---
 frontend/game.ts             | 13 +++++++++++--
 frontend/models/Entity.ts    | 13 ++++++++++++-
 frontend/models/Obstacle.ts  |  4 ++--
 frontend/models/Pipe.ts      |  8 ++++----
 frontend/models/Raspberry.ts |  5 ++++-
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/frontend/game.ts b/frontend/game.ts
index 01c2ffc..4eb9194 100644
--- a/frontend/game.ts
+++ b/frontend/game.ts
@@ -11,11 +11,12 @@ let raspberry: Raspberry;
 function setup() {
     backgroundImage = loadImage(backgroundImagePath);
 
-    createCanvas(1000, 1000);
+    createCanvas(2000, 1000);
     obstacleOffset = width / 3;
 
     raspberry = new Raspberry();
     raspberry.image = raspberryImagePath;
+    raspberry.showHitbox = true;
 
     obstacles.push(new Obstacle(
         new Position(width, 0),
@@ -43,18 +44,26 @@ function draw() {
     background(backgroundImage)
     raspberry.draw();
     raspberry.update();
-    
+
     obstacles.forEach((obstacle) => {
+
         obstacle.draw();
         obstacle.update();
 
         checkObstacleReset(obstacle);
     });
+
+    if (obstacles[0].collides(raspberry)) {
+        obstacles[0].draw();
+        console.log("SAMC")
+    }
 }
 
 function checkObstacleReset(obstacle: Obstacle){
     if(obstacle.position.x < -obstacleWidth) {
         obstacle.resetPosition(true);
+        obstacles.shift();
+        obstacles.push(obstacle);
     }
 }
 
diff --git a/frontend/models/Entity.ts b/frontend/models/Entity.ts
index 1424271..d7b416b 100644
--- a/frontend/models/Entity.ts
+++ b/frontend/models/Entity.ts
@@ -3,6 +3,7 @@ abstract class Entity {
     private _width: number;
     private _height: number;
     private fill: number;
+    private _showHitbox: boolean;
 
     //region Getter & Setter
     get position(): Position {
@@ -28,13 +29,23 @@ abstract class Entity {
     set height(value: number) {
         this._height = value;
     }
-    //endregion
+
+    get showHitbox(): boolean {
+        return this._showHitbox;
+    }
+
+    set showHitbox(value: boolean) {
+        this._showHitbox = value;
+    }
+
+//endregion
 
     protected constructor(position: Position, width: number, height: number, fill: number) {
         this.position = position;
         this.width = width;
         this.height = height;
         this.fill = fill;
+        this._showHitbox = false;
     }
 
     public abstract update(): void;
diff --git a/frontend/models/Obstacle.ts b/frontend/models/Obstacle.ts
index 1c2e6ef..cb79236 100644
--- a/frontend/models/Obstacle.ts
+++ b/frontend/models/Obstacle.ts
@@ -18,7 +18,7 @@ class Obstacle extends Entity implements Collidable{
         this.pipeTop.image = pipeImagePath;
         this.pipeBottom.image = pipeImagePath;
 
-        this.distanceBetweenPipes = height / 4;
+        this.distanceBetweenPipes = height / 2.5;
         Obstacle.startX = width;
     }
 
@@ -51,7 +51,7 @@ class Obstacle extends Entity implements Collidable{
         this.pipeBottom.draw();
     }
 
-    collides(o: Entity): boolean {
+    public collides(o: Entity): boolean {
         return this.pipeTop.collides(o) || this.pipeBottom.collides(o);
     }
 }
\ No newline at end of file
diff --git a/frontend/models/Pipe.ts b/frontend/models/Pipe.ts
index 42a9ce1..caeac69 100644
--- a/frontend/models/Pipe.ts
+++ b/frontend/models/Pipe.ts
@@ -31,9 +31,9 @@ class Pipe extends Entity implements Collidable {
     }
 
     collides(o: Entity): boolean {
-        return this.position.x < o.position.x + o.width && //inside left border
-            this.position.x + this.width > o.position.x && //but not outside right border
-            this.position.y < o.position.y + o.height && //inside top border
-            this.position.y + this.height > o.position.y; //but not outside bottom border
+        return this.position.x < (o.position.x + o.width) && //inside left border
+            (this.position.x + this.width) > o.position.x && //but not outside right border
+            this.position.y < (o.position.y + o.height) && //inside top border
+            (this.position.y + this.height) > o.position.y; //but not outside bottom border
     }
 }
\ No newline at end of file
diff --git a/frontend/models/Raspberry.ts b/frontend/models/Raspberry.ts
index 2d6b8a3..581c0f6 100644
--- a/frontend/models/Raspberry.ts
+++ b/frontend/models/Raspberry.ts
@@ -59,7 +59,10 @@ class Raspberry extends Entity {
     public draw(): void {
         image(this.image, this.position.x, this.position.y, this.width, this.height);
         noFill();
-        noStroke();
+        strokeWeight(50);
+        if (!this.showHitbox) {
+            noStroke();
+        }
         rect(
             this.position.x,
             this.position.y,