changed data for blue bas frames. Changed main function in that for better testing of correct hitboxes placement.

src/gameplay/Characters/Blue/BlueBaseFrames.java

@@ -7,6 +7,7 @@ import engine.object.ObjectGl;
 import gameplay.frames.Frame;
 import gameplay.hitboxes.*;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 
 public class BlueBaseFrames {
@@ -21,7 +22,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(0,0,102,120);
+                blueStandframe1.setSpriteWrap(0,0,138,138);
                 return blueStandframe1;
         }
 
@@ -35,12 +36,18 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(0,0,102,120);
+                blueStandframe1.setSpriteWrap(138,0,138,138);
                 return blueStandframe1;
         }
 
         protected static Frame[] blueStandFrames() {
-                Frame[] sf = {generateStandFrame1(),generateStandFrame2()};
+                Frame[] sf = new Frame[6];
+                sf[0] = generateStandFrame1();
+                sf[1] = generateStandFrame1();
+                sf[2] = generateStandFrame1();
+                sf[3] = generateStandFrame2();
+                sf[4] = generateStandFrame2();
+                sf[5] = generateStandFrame2();
                 return sf;
         }
 
@@ -54,7 +61,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(102,120,102,120);
+                blueStandframe1.setSpriteWrap(138,138*3,138,138);
                 return blueStandframe1;
         }
 
@@ -73,7 +80,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(18.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,false,false,false,false,false);
-                blueStandframe1.setSpriteWrap(816,0,102,120);
+                blueStandframe1.setSpriteWrap(138*7,0,138,138);
                 return blueStandframe1;
         }
 
@@ -87,7 +94,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(-18.0,0.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,false,false,false,false,false);
-                blueStandframe1.setSpriteWrap(816,0,102,120);
+                blueStandframe1.setSpriteWrap(138*7,0,138,138);
                 return blueStandframe1;
         }
 
@@ -112,11 +119,39 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(18.0,10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,false,false,false,false,false);
-                blueStandframe1.setSpriteWrap(816,0,102,120);
+                blueStandframe1.setSpriteWrap(138*6,0,138,138);
                 return blueStandframe1;
         }
 
         private static Frame GenerateForwardJumpFrame2(){
+                Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500);
+                Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100);
+                Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500);
+                ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
+                ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
+                phb.add(bStandPHB1);
+                pthb.add(bStandPTHB1);
+                Frame blueStandframe1 = new Frame(9.0,10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
+                        bStandPB1,false,false,false,false,false);
+                blueStandframe1.setSpriteWrap(138*7,0,138,138);
+                return blueStandframe1;
+        }
+
+        private static Frame GenerateForwardJumpFrame3(){
+                Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500);
+                Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100);
+                Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500);
+                ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
+                ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
+                phb.add(bStandPHB1);
+                pthb.add(bStandPTHB1);
+                Frame blueStandframe1 = new Frame(-9.0,10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
+                        bStandPB1,false,false,false,false,false);
+                blueStandframe1.setSpriteWrap(138*7,0,138,138);
+                return blueStandframe1;
+        }
+
+        private static Frame GenerateForwardJumpFrame4(){
                 Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500);
                 Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100);
                 Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500);
@@ -126,18 +161,24 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(-18.0,10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,false,false,false,false,false);
-                blueStandframe1.setSpriteWrap(816,0,102,120);
+                blueStandframe1.setSpriteWrap(138*6,0,138,138);
                 return blueStandframe1;
         }
 
         protected static Frame[] blueForwardJump() {
                 Frame[] jF = new Frame[40];
-                for(int i = 0; i < jF.length/2; i++) {
+                for(int i = 0; i < jF.length/4; i++) {
                         jF[i] = GenerateForwardJumpFrame1();
                 }
-                for(int i = jF.length/2; i < jF.length; i++) {
+                for(int i = jF.length/4; i < jF.length/2; i++) {
                         jF[i] = GenerateForwardJumpFrame2();
                 }
+                for(int i = jF.length/2; i < jF.length/(3/4); i++) {
+                        jF[i] = GenerateForwardJumpFrame3();
+                }
+                for(int i = jF.length/(3/4); i < jF.length; i++) {
+                        jF[i] = GenerateForwardJumpFrame4();
+                }
                 return jF;
         }
 
@@ -151,21 +192,10 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(18.0,-10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,false,false,false,false,false);
-                blueStandframe1.setSpriteWrap(816,0,102,120);
+                blueStandframe1.setSpriteWrap(138*6,0,138,138);
                 return blueStandframe1;
         }
 
-        protected static Frame[] blueBackJump() {
-                Frame[] jF = new Frame[40];
-                for(int i = 0; i < jF.length/2; i++) {
-                        jF[i] = BackJumpFrame1();
-                }
-                for(int i = jF.length/2; i < jF.length; i++) {
-                        jF[i] = BackJumpFrame2();
-                }
-                return jF;
-        }
-
         private static Frame BackJumpFrame2(){
                 Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500);
                 Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100);
@@ -174,12 +204,58 @@ public class BlueBaseFrames {
                 ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
                 phb.add(bStandPHB1);
                 pthb.add(bStandPTHB1);
-                Frame blueStandframe1 = new Frame(-18.0,-10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
+                Frame blueStandframe1 = new Frame(9.0,-10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,false,false,false,false,false);
-                blueStandframe1.setSpriteWrap(816,0,102,120);
+                blueStandframe1.setSpriteWrap(138*7,0,138,138);
                 return blueStandframe1;
         }
 
+        private static Frame BackJumpFrame3(){
+                Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500);
+                Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100);
+                Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500);
+                ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
+                ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
+                phb.add(bStandPHB1);
+                pthb.add(bStandPTHB1);
+                Frame blueStandframe1 = new Frame(-9.0,-10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
+                        bStandPB1,false,false,false,false,false);
+                blueStandframe1.setSpriteWrap(138*7,0,138,138);
+                return blueStandframe1;
+        }
+
+        private static Frame BackJumpFrame4(){
+                Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500);
+                Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100);
+                Push_HitBox bStandPB1 = new Push_HitBox(70,70,150,500);
+                ArrayList<Passive_HitBox> phb = new ArrayList<Passive_HitBox>();
+                ArrayList<Passive_throw_HitBox> pthb = new ArrayList<Passive_throw_HitBox>();
+                phb.add(bStandPHB1);
+                pthb.add(bStandPTHB1);
+                Frame blueStandframe1 = new Frame(-18.0,-10.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
+                        bStandPB1,false,false,false,false,false);
+                blueStandframe1.setSpriteWrap(138*6,0,138,138);
+                return blueStandframe1;
+        }
+
+        protected static Frame[] blueBackJump() {
+                Frame[] jF = new Frame[40];
+                for(int i = 0; i < jF.length/4; i++) {
+                        jF[i] = BackJumpFrame1();
+                }
+                for(int i = jF.length/4; i < jF.length/2; i++) {
+                        jF[i] = BackJumpFrame2();
+                }
+                for(int i = jF.length/2; i < jF.length/(3/4); i++) {
+                        jF[i] = BackJumpFrame3();
+                }
+                for(int i = jF.length/(3/4); i < jF.length; i++) {
+                        jF[i] = BackJumpFrame4();
+                }
+                return jF;
+        }
+
+
         private static Frame walkForwardFrame1(){
                 Passive_HitBox bStandPHB1 = new Passive_HitBox(70,70,150,500);
                 Passive_throw_HitBox bStandPTHB1 = new Passive_throw_HitBox(70,400,150,100);
@@ -190,7 +266,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(204,0,102,120);
+                blueStandframe1.setSpriteWrap(138*3,0,138,138);
                 return blueStandframe1;
         }
 
@@ -204,7 +280,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(306,0,102,120);
+                blueStandframe1.setSpriteWrap(138*3,0,138,138);
                 return blueStandframe1;
         }
 
@@ -218,7 +294,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(408,0,102,120);
+                blueStandframe1.setSpriteWrap(138*4,0,138,138);
                 return blueStandframe1;
         }
 
@@ -232,7 +308,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(510,0,102,120);
+                blueStandframe1.setSpriteWrap(138*5,0,138,138);
                 return blueStandframe1;
         }
 
@@ -265,7 +341,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(220,0,112,120);
+                blueStandframe1.setSpriteWrap(138*5,0,138,138);
                 return blueStandframe1;
         }
 
@@ -279,7 +355,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(330,0,112,120);
+                blueStandframe1.setSpriteWrap(138*4,0,138,138);
                 return blueStandframe1;
         }
 
@@ -293,7 +369,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(420,0,112,120);
+                blueStandframe1.setSpriteWrap(138*3,0,138,138);
                 return blueStandframe1;
         }
 
@@ -307,7 +383,7 @@ public class BlueBaseFrames {
                 pthb.add(bStandPTHB1);
                 Frame blueStandframe1 = new Frame(0.0,-8.0,phb,new ArrayList<Active_HitBox>(),pthb,new ArrayList<Active_throw_Hitbox>(),
                         bStandPB1,true,true,true,true,true);
-                blueStandframe1.setSpriteWrap(500,0,112,120);
+                blueStandframe1.setSpriteWrap(138*3,0,138,138);
                 return blueStandframe1;
         }
 
@@ -325,37 +401,69 @@ public class BlueBaseFrames {
                 Engine engine = new Engine(640, 480, new Vector3f(4.0f, 3.0f));
                 engine.init();
 
-                String path = "textures/Sprite.png";
+                Vector3f BLUE = new Vector3f(0f,0f,1f); //passive_hit
-                String pathToBG = "textures/background_beach.png";
+                Vector3f RED = new Vector3f(1f,0f,0f); //active_hit
+                Vector3f GREEN = new Vector3f(0f,1f,0f); //passive_throw
+                Vector3f YELLOW = new Vector3f(1f,1f,0f); //Active throw
+                Vector3f PURPLE = new Vector3f(1f,0f,1f); //pushbox
+
+
+                String path = "textures/Sprite_sans_grille_9comp.png";
+                String pathToBG = "textures/arena1.png";
 
                 Frame f = generateStandFrame1();
-                ObjectGl blue = new ObjectGl(0f, 60f, 80f, 5f, path, null);
+
+
+                ObjectGl blue = new ObjectGl(0f, 138f, 138f, 4f, path, null);
                 blue.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3]);
-                blue.translate(new Vector3f(-750,200,0));
+
                 int posX = -750;
                 int posY = 200;
-                engine.add_objectGl(blue);
-                int counter = 0;
-                long ts1, ts2;
-                float posZ = 11;
-                while(counter < 1000) {
-                        ts1 = System.currentTimeMillis();
-                        posZ = 11;
-                        engine.update();
-                        engine.render();
-                        counter++;
-                        for(Passive_HitBox h: f.getPassHitBox()){
-                                Hitbox hh = new Hitbox(posZ,h.getSize_x(),h.getSize_y(),5f,new Vector3f(1,0,0));
-                                engine.add_objectGl(hh);
-                                hh.translate(new Vector3f(-750+h.getPosY(),200+h.getPosY()));
-                        }
-                        blue.translate(new Vector3f(0,0,0));
-                        ts2 = System.currentTimeMillis();
-                        while(ts2-ts1 < 1000/20) {
-                                ts2 = System.currentTimeMillis();
-                        }
 
+                blue.translate(new Vector3f(posX,posY,0));
+
+                engine.add_objectGl(blue);
+                float posZ = 11f;
+
+                for(Passive_HitBox h: f.getPassHitBox()){
+                        Hitbox hh = new Hitbox(posZ,h.getSize_x(),h.getSize_y(),1f,BLUE);
+                        engine.add_objectGl(hh);
+                        hh.translate(new Vector3f(posX+h.getPosX(),posY+h.getPosY()));
+                        posZ++;
                 }
+                for(Active_HitBox h: f.getActHitBox()){
+                        Hitbox hh = new Hitbox(posZ,h.getSize_x(),h.getSize_y(),1f,RED);
+                        engine.add_objectGl(hh);
+                        hh.translate(new Vector3f(posX+h.getPosX(),posY+h.getPosY()));
+                        posZ++;
+                }
+                for(Passive_throw_HitBox h: f.getPassThrowHitBox()){
+                        Hitbox hh = new Hitbox(posZ,h.getSize_x(),h.getSize_y(),1f,GREEN);
+                        engine.add_objectGl(hh);
+                        hh.translate(new Vector3f(posX+h.getPosX(),posY+h.getPosY()));
+                        posZ++;
+                }
+                for(Active_throw_Hitbox h: f.getActThrowHitBox()){
+                        Hitbox hh = new Hitbox(posZ,h.getSize_x(),h.getSize_y(),1f,YELLOW);
+                        engine.add_objectGl(hh);
+                        hh.translate(new Vector3f(posX+h.getPosX(),posY+h.getPosY()));
+                        posZ++;
+                }
+
+                Push_HitBox phb = f.getPushHitBox();
+                Hitbox hh = new Hitbox(posZ,phb.getSize_x(),phb.getSize_y(),1f,PURPLE);
+                engine.add_objectGl(hh);
+                hh.translate(new Vector3f(posX+phb.getPosX(),posY+phb.getPosY()));
+
+                engine.update();
+                engine.render();
+
+                double ts1 = System.currentTimeMillis();
+                double ts2 = System.currentTimeMillis();
+                while(ts2 - ts1 < 60000) {
+                        ts2 = System.currentTimeMillis();
+                }
+
         }
 
 }

src/gameplay/input/InputBuffer.java

@@ -110,7 +110,7 @@ public class InputBuffer {
 		try {
 			ret = this.inputList[pos].containsButtonTab(command[command.length - 1]);
 		} catch (ArrayIndexOutOfBoundsException e ) {
-			return true;
+			return false;
 		}
 		for(int i = command.length - 2; i >= 0 && ret; i--) {
 			backCounter = 1;