From bdc21441451ac6c941c321e7e1a6a411c7595f97 Mon Sep 17 00:00:00 2001
From: Antoine <antoine.dupuis@etudiant.univ-rennes1.fr>
Date: Thu, 20 May 2021 20:55:51 +0200
Subject: [PATCH] test with Zangief

---
 src/engine/Engine.java                  | 22 ++++++++++++++++++++--
 src/engine/object/ObjectGl.java         |  2 --
 src/engine/object/ObjectGlTex.java      |  5 +----
 src/engine/object/ObjectGlTexColor.java |  4 +---
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/engine/Engine.java b/src/engine/Engine.java
index 81d10de..1e5c5c6 100644
--- a/src/engine/Engine.java
+++ b/src/engine/Engine.java
@@ -178,7 +178,8 @@ public class Engine {
             double time = glfwGetTime();
             lastFrame = System.currentTimeMillis();
             // Game logic should fit here
-            
+
+            zangief.setTextureWrap(52,2,70,83);
             input(zangief, speed);
 //            input(smiley2, speed);
 
@@ -207,11 +208,28 @@ public class Engine {
         }
     }
     
-    public static void  input(ObjectGl token, int speed) {
+    public static void input(ObjectGl token, int speed) {
     	if (Input.isKeyDown(GLFW.GLFW_KEY_W))token.translate(new Vector3f ( 0.0f, speed * 5.0f, 0.0f));
         if (Input.isKeyDown(GLFW.GLFW_KEY_A))token.translate(new Vector3f (speed *-5.0f,  0.0f, 0.0f));
         if (Input.isKeyDown(GLFW.GLFW_KEY_S))token.translate(new Vector3f ( 0.0f,speed * -5.0f, 0.0f));
         if (Input.isKeyDown(GLFW.GLFW_KEY_D))token.translate(new Vector3f (speed * 5.0f,  0.0f, 0.0f));
     }
 
+    public static void input(ObjectGlTex token, int speed) {
+        if (Input.isKeyDown(GLFW.GLFW_KEY_W)) {
+            token.translate(new Vector3f ( 0.0f, speed * 5.0f, 0.0f));
+        }
+        if (Input.isKeyDown(GLFW.GLFW_KEY_A)) {
+            token.translate(new Vector3f (speed *-5.0f,  0.0f, 0.0f));
+            token.setTextureWrap(121,0,57,80);
+        }
+        if (Input.isKeyDown(GLFW.GLFW_KEY_S)) {
+            token.setTextureWrap(161,260,56,59);
+        }
+        if (Input.isKeyDown(GLFW.GLFW_KEY_D)) {
+            token.translate(new Vector3f (speed * 5.0f,  0.0f, 0.0f));
+            token.setTextureWrap(178,0,62,82);
+        }
+    }
+
 }
diff --git a/src/engine/object/ObjectGl.java b/src/engine/object/ObjectGl.java
index 513c13d..3a101b1 100644
--- a/src/engine/object/ObjectGl.java
+++ b/src/engine/object/ObjectGl.java
@@ -6,8 +6,6 @@ import engine.graphics.Shader;
 import engine.math.Matrix4f;
 import engine.math.Vector3f;
 
-import java.util.Comparator;
-
 /**
  *
  */
diff --git a/src/engine/object/ObjectGlTex.java b/src/engine/object/ObjectGlTex.java
index 5423658..1f04e99 100644
--- a/src/engine/object/ObjectGlTex.java
+++ b/src/engine/object/ObjectGlTex.java
@@ -1,11 +1,8 @@
 package engine.object;
 
 import engine.math.Primitive;
-import engine.graphics.Shader;
-import engine.graphics.Texture;
-import engine.graphics.VertexArray;
+import engine.graphics.*;
 import engine.math.Matrix4f;
-import engine.math.Vector3f;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/engine/object/ObjectGlTexColor.java b/src/engine/object/ObjectGlTexColor.java
index ec5090e..7d8aa7d 100644
--- a/src/engine/object/ObjectGlTexColor.java
+++ b/src/engine/object/ObjectGlTexColor.java
@@ -1,12 +1,10 @@
 package engine.object;
 
-import engine.graphics.Texture;
-import engine.math.Primitive;
 import engine.graphics.Shader;
 import engine.graphics.VertexArray;
+import engine.math.Primitive;
 import engine.math.Matrix4f;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class ObjectGlTexColor extends ObjectGlTex{