Zangief idle wrap correction

This commit is contained in:
Antoine
2021-05-21 18:20:49 +02:00
parent 3e12e98010
commit ecbe08fdc3
5 changed files with 7 additions and 13 deletions

View File

@ -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(){

View File

@ -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;
}
}

View File

@ -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);
}

View File

@ -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);
}
}