diff --git a/src/engine/Engine.java b/src/engine/Engine.java index 839c9c5..5ec76a5 100644 --- a/src/engine/Engine.java +++ b/src/engine/Engine.java @@ -161,7 +161,7 @@ public class Engine { List path2 = new ArrayList<>(); path2.add("textures/awesomeface.png"); - ObjectGlTex zangief = new ObjectGlTex(0f,0f,0f,60f,80f,5f, path, Primitive.stdTexWrap); + ObjectGlTex zangief = new ObjectGlTex(0f,0f,0f,60f,80f,10f, path, Primitive.stdTexWrap); engine.add_objectGl(zangief); // zangief.translate(new Vector3f(-600.0f,100,10.0f)); @@ -180,7 +180,7 @@ public class Engine { lastFrame = System.currentTimeMillis(); // Game logic should fit here - zangief.setTextureWrap(52,2,70,83); + zangief.setTextureWrap(58,0,62,84); gamepadInput(zangief, speed); input(zangief, speed); // input(smiley2, speed); diff --git a/src/engine/object/ObjectGl.java b/src/engine/object/ObjectGl.java index ea9c8c6..f302cec 100644 --- a/src/engine/object/ObjectGl.java +++ b/src/engine/object/ObjectGl.java @@ -19,8 +19,6 @@ public class ObjectGl { public static Matrix4f view; public float zPos; - public float width; - public float height; public float scalingFactor; public ObjectGl(){ @@ -29,13 +27,14 @@ public class ObjectGl { public ObjectGl(float x, float y, float z, float h, float w, float size){ this.vertexArray = new VertexArray(Primitive.createRectangle(x, y, z, h, w), Primitive.rectangle_indices, null, null); + this.transform = Matrix4f.identity(); this.scale(new Vector3f(size, size,1f)); - this.scalingFactor = size; + this.shader = new Shader("shaders/ObjectGl/vert.glsl","shaders/ObjectGl/frag.glsl"); + + this.scalingFactor = size; this.zPos = z; - this.width = w; - this.height = h; } public void resetTransform(){ diff --git a/src/engine/object/ObjectGlColor.java b/src/engine/object/ObjectGlColor.java index 809689d..c7fc3ee 100644 --- a/src/engine/object/ObjectGlColor.java +++ b/src/engine/object/ObjectGlColor.java @@ -15,7 +15,5 @@ public class ObjectGlColor extends ObjectGl{ this.scalingFactor = size; this.shader = new Shader("shaders/ObjectGlColor/vert.glsl","shaders/ObjectGlColor/frag.glsl"); this.zPos = z; - this.width = w; - this.height = h; } } diff --git a/src/engine/object/ObjectGlTex.java b/src/engine/object/ObjectGlTex.java index a5b0e72..a4f9d9a 100644 --- a/src/engine/object/ObjectGlTex.java +++ b/src/engine/object/ObjectGlTex.java @@ -24,8 +24,7 @@ public class ObjectGlTex extends ObjectGl{ this.scalingFactor = size; this.shader = new Shader("shaders/ObjectGlTex/vert.glsl","shaders/ObjectGlTex/frag.glsl"); this.zPos = z; - this.width = w; - this.height = h; + this.setTexture(texPath); } diff --git a/src/engine/object/ObjectGlTexColor.java b/src/engine/object/ObjectGlTexColor.java index 88f8dc6..e1f8444 100644 --- a/src/engine/object/ObjectGlTexColor.java +++ b/src/engine/object/ObjectGlTexColor.java @@ -18,8 +18,6 @@ public class ObjectGlTexColor extends ObjectGlTex{ this.scalingFactor = size; this.shader = new Shader("shaders/ObjectGlTexColor/vert.glsl","shaders/ObjectGlTexColor/frag.glsl"); this.zPos = z; - this.width = w; - this.height = h; this.setTexture(texPath); } }