program.pde

@@ -2,8 +2,6 @@
 //- Start Screen
 //- Level Editor (click with mouse spawns or deletes tiles)
 //  - Hotkey to slide the window right and left
-//- Movement berechnen mit move = gravitation - speed
-//  - Jump als Zahl, die langsam kleiner wird
 
 // jumping related
 float speed = 20;
@@ -13,13 +11,13 @@ float jumpcooldown = 12;
 
 // for moving x-axis (mostly depracted)
 // But dont delete yet!!
+PVector movement = new PVector(0,0);
 PVector direction = new PVector(0,0);
 PVector pos = new PVector(220, 50);
 int playerRadius = 25;
 
 float actualPos;
 
-PVector tilesize = new PVector(50, 50);
 
 void setup() {
   size(800,800);
@@ -38,8 +36,8 @@ void draw() {
   // noFill();
 
 
-  // menu();
-  play();
+  menu();
+  // play();
   helper();
 }
 
@@ -80,9 +78,9 @@ void play() {
   rect(pos.x, pos.y, playerRadius, playerRadius);
 
   baseline();
-  // jumpToJumpheight();
-  newJump();
   collisionTest();
+  cooldown();
+  jumpToJumpheight();
 
   generate_tiles();
 
@@ -92,12 +90,12 @@ void play() {
 // This is basically the Level file:
 // It consists out of an array, that spawns tiles
 // It is also checked in collisionTest()
-int[] tiles_x = { 300, 50, 600, 50};
-int[] tiles_y = { 500, 50, 600, 200 };
+int[] tiles_x = { 300, 50, 600 };
+int[] tiles_y = { 500, 50, 600 };
 
 void generate_tiles() {
   for (int i = 0; i < tiles_x.length; i++ ) {
-    rect(tiles_x[i], tiles_y[i], tilesize.x, tilesize.y);
+    rect(tiles_x[i], tiles_y[i], 50, 50);
   }
 }
 // TODO Collision erweitern wie in https://happycoding.io/tutorials/processing/collision-detection
@@ -106,13 +104,10 @@ void collisionTest() {
   if ( pos.y > baseline_y - playerRadius ) {
     pos.set(pos.x, baseline_y - playerRadius);
   }
-  // Collision with all the tiles bottom site
+  // Collision with all the tiles top site
   for (int i = 0; i < tiles_x.length; i++) {
-    if ((pos.x > tiles_x[i] - tilesize.x/2 && pos.x < tiles_x[i]+tilesize.x/2) && (pos.y < tiles_y[i] + tilesize.y/2 && pos.y > tiles_y[i] - tilesize.y/2)) {
-      pos.set(pos.x, tiles_y[i] + tilesize.y/2);
-    }
-    if ((pos.x > tiles_x[i] - tilesize.x/2 && pos.x < tiles_x[i]+tilesize.x/2) && (pos.y < tiles_y[i] + tilesize.y/2 && pos.y > tiles_y[i] -tilesize.y/2 - playerRadius)) {
-      pos.set(pos.x, tiles_y[i] - tilesize.y/2 - 20);
+    if ((pos.x > tiles_x[i]-25 && pos.x < tiles_x[i]+25) && pos.y < tiles_y[i] - playerRadius) {
+      pos.set(pos.x, tiles_y[i] - playerRadius);
     }
   }
 }
@@ -143,17 +138,12 @@ void jumpToJumpheight() {
     jumpheight = 0;
   }
 }
-
-float movement;
-float jumpspeed;
-void newJump() {
-  movement = gravitation - jumpspeed;
-  pos.set(pos.x, pos.y + movement);
-  if (jumpspeed > 0) {
-    jumpspeed--;
+// count down jumping cooldown
+void cooldown() {
+  if (jumpcooldown > 0) {
+    jumpcooldown = jumpcooldown-1;
   }
 }
-
 // actions for moving
 void keyPressed() {
   if (key == CODED)
@@ -170,10 +160,10 @@ void keyPressed() {
       pos.x = pos.x + direction.x * speed;
       //}
     }
-    if (keyCode == UP)
+    if (keyCode == UP && jumpcooldown == 0)
     {
       //if (directionY<0) {
-      jumpspeed =+ 25;
+      jumpheight += 400;
     //}
     }
     // else if (keyCode == DOWN)