From ce0bbf20b46ce3a868ec36958006948183320977 Mon Sep 17 00:00:00 2001 From: Antoine Date: Thu, 10 Jun 2021 15:16:56 +0200 Subject: [PATCH] Premier fix il faut encore corriger le clignotement --- src/gameplay/match/match.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/gameplay/match/match.java b/src/gameplay/match/match.java index c39516c..77b9f62 100644 --- a/src/gameplay/match/match.java +++ b/src/gameplay/match/match.java @@ -70,9 +70,9 @@ public class match { inputsP1 = new InputBuffer(inputBufferSize); inputsP2 = new InputBuffer(inputBufferSize); p1.setPos(-750, groundLevel); //TODO : change to better values if needed - p2.setPos(-750, groundLevel); //TODO : change to better values if needed + p2.setPos((int) (750 - objP2.getWidth() * objP2.getScalingFactor()), groundLevel); //TODO : change to better values if needed objP1.translate(new Vector3f(p1.getPosX(),p1.getPosY(),0)); - objP1.translate(new Vector3f(p2.getPosX(),p2.getPosY(),0)); + objP2.translate(new Vector3f(p2.getPosX(),p2.getPosY(),0)); } /** @@ -178,10 +178,10 @@ public class match { engine.add_objectGl(objP2); f = p1.getCurrentframe(); - objP1.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3], ObjectGl.STICK_TOP); + objP1.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3], ObjectGl.DEFAULT); f = p2.getCurrentframe(); - objP2.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3], ObjectGl.STICK_TOP); + objP2.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3], ObjectGl.DEFAULT); objP2.flipTextureWrapH(); if (Joystick1Present) { @@ -197,7 +197,7 @@ public class match { } private static void ac(int i) { - System.out.println(i); +// System.out.println(i); switch (i) { //initiate a round @@ -278,11 +278,12 @@ public class match { updatePos(p1); updatePos(p2); f = p1.getCurrentframe(); - objP1.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3], ObjectGl.STICK_TOP); - objP1.translate(new Vector3f(p1.getPosX()-oldPosXp1,p1.getPosY()-oldPosYp1,0)); + objP1.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3], ObjectGl.DEFAULT); + objP1.translate(new Vector3f(p1.getPosX() - oldPosXp1,p1.getPosY() - oldPosYp1,0)); f = p2.getCurrentframe(); - objP2.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3], ObjectGl.STICK_TOP); - objP2.translate(new Vector3f(p2.getPosX()-oldPosXp2,p2.getPosY()-oldPosYp2,0)); + objP2.setTextureWrap(f.getSprite()[0], f.getSprite()[1], f.getSprite()[2], f.getSprite()[3], ObjectGl.DEFAULT); + objP2.translate(new Vector3f(p2.getPosX() - oldPosXp2,p2.getPosY() - oldPosYp2,0)); + System.out.println(p1.getPosX()); boolean p1LooksRight = p1.getPosX() < p2.getPosX(); if(p1LooksRight) {