Zangief idle wrap correction
This commit is contained in:
parent
3e12e98010
commit
ecbe08fdc3
@ -161,7 +161,7 @@ public class Engine {
|
|||||||
List<String> path2 = new ArrayList<>();
|
List<String> path2 = new ArrayList<>();
|
||||||
path2.add("textures/awesomeface.png");
|
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);
|
engine.add_objectGl(zangief);
|
||||||
// zangief.translate(new Vector3f(-600.0f,100,10.0f));
|
// zangief.translate(new Vector3f(-600.0f,100,10.0f));
|
||||||
|
|
||||||
@ -180,7 +180,7 @@ public class Engine {
|
|||||||
lastFrame = System.currentTimeMillis();
|
lastFrame = System.currentTimeMillis();
|
||||||
// Game logic should fit here
|
// Game logic should fit here
|
||||||
|
|
||||||
zangief.setTextureWrap(52,2,70,83);
|
zangief.setTextureWrap(58,0,62,84);
|
||||||
gamepadInput(zangief, speed);
|
gamepadInput(zangief, speed);
|
||||||
input(zangief, speed);
|
input(zangief, speed);
|
||||||
// input(smiley2, speed);
|
// input(smiley2, speed);
|
||||||
|
@ -19,8 +19,6 @@ public class ObjectGl {
|
|||||||
public static Matrix4f view;
|
public static Matrix4f view;
|
||||||
|
|
||||||
public float zPos;
|
public float zPos;
|
||||||
public float width;
|
|
||||||
public float height;
|
|
||||||
public float scalingFactor;
|
public float scalingFactor;
|
||||||
|
|
||||||
public ObjectGl(){
|
public ObjectGl(){
|
||||||
@ -29,13 +27,14 @@ public class ObjectGl {
|
|||||||
|
|
||||||
public ObjectGl(float x, float y, float z, float h, float w, float size){
|
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.vertexArray = new VertexArray(Primitive.createRectangle(x, y, z, h, w), Primitive.rectangle_indices, null, null);
|
||||||
|
|
||||||
this.transform = Matrix4f.identity();
|
this.transform = Matrix4f.identity();
|
||||||
this.scale(new Vector3f(size, size,1f));
|
this.scale(new Vector3f(size, size,1f));
|
||||||
this.scalingFactor = size;
|
|
||||||
this.shader = new Shader("shaders/ObjectGl/vert.glsl","shaders/ObjectGl/frag.glsl");
|
this.shader = new Shader("shaders/ObjectGl/vert.glsl","shaders/ObjectGl/frag.glsl");
|
||||||
|
|
||||||
|
this.scalingFactor = size;
|
||||||
this.zPos = z;
|
this.zPos = z;
|
||||||
this.width = w;
|
|
||||||
this.height = h;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void resetTransform(){
|
public void resetTransform(){
|
||||||
|
@ -15,7 +15,5 @@ public class ObjectGlColor extends ObjectGl{
|
|||||||
this.scalingFactor = size;
|
this.scalingFactor = size;
|
||||||
this.shader = new Shader("shaders/ObjectGlColor/vert.glsl","shaders/ObjectGlColor/frag.glsl");
|
this.shader = new Shader("shaders/ObjectGlColor/vert.glsl","shaders/ObjectGlColor/frag.glsl");
|
||||||
this.zPos = z;
|
this.zPos = z;
|
||||||
this.width = w;
|
|
||||||
this.height = h;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,8 +24,7 @@ public class ObjectGlTex extends ObjectGl{
|
|||||||
this.scalingFactor = size;
|
this.scalingFactor = size;
|
||||||
this.shader = new Shader("shaders/ObjectGlTex/vert.glsl","shaders/ObjectGlTex/frag.glsl");
|
this.shader = new Shader("shaders/ObjectGlTex/vert.glsl","shaders/ObjectGlTex/frag.glsl");
|
||||||
this.zPos = z;
|
this.zPos = z;
|
||||||
this.width = w;
|
|
||||||
this.height = h;
|
|
||||||
this.setTexture(texPath);
|
this.setTexture(texPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,8 +18,6 @@ public class ObjectGlTexColor extends ObjectGlTex{
|
|||||||
this.scalingFactor = size;
|
this.scalingFactor = size;
|
||||||
this.shader = new Shader("shaders/ObjectGlTexColor/vert.glsl","shaders/ObjectGlTexColor/frag.glsl");
|
this.shader = new Shader("shaders/ObjectGlTexColor/vert.glsl","shaders/ObjectGlTexColor/frag.glsl");
|
||||||
this.zPos = z;
|
this.zPos = z;
|
||||||
this.width = w;
|
|
||||||
this.height = h;
|
|
||||||
this.setTexture(texPath);
|
this.setTexture(texPath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user