Speiger/SimpleJavaEngine
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Speiger:cdc5eb3b96f748aab82b4ea745c3b432fe27bc81
Branches Tags
Speiger:master
..
compare: Speiger:a1b37c6b1cd4eafecc9dfc63aae190fda10b9343
Branches Tags
Speiger:master

No commits in common. "cdc5eb3b96f748aab82b4ea745c3b432fe27bc81" and "a1b37c6b1cd4eafecc9dfc63aae190fda10b9343" have entirely different histories.
cdc5eb3b96 ... a1b37c6b1c

2 changed files with 3 additions and 44 deletions
Show Stats Expand all files Collapse all files

13
src/main/java/speiger/src/coreengine/math/vector/matrix/Matrix4f.java
View File

@ -364,19 +364,6 @@ public class Matrix4f {
return this;
}
public Matrix4f translateZ(float z) {
if(z == 0F) return this;
if((properties & (PROPERTY_ROTATION | PROPERTY_SCALE)) == 0) {
data[M32] += z;
return evaluateProps();
}
data[M30] += data[M20] * z;
data[M31] += data[M21] * z;
data[M32] += data[M22] * z;
data[M33] += data[M23] * z;
return evaluateProps();
}
public Matrix4f translate(float x, float y) {
if(x == 0F && y == 0F) return this;
if((properties & (PROPERTY_ROTATION | PROPERTY_SCALE)) == 0) {

34
src/main/java/speiger/src/coreengine/rendering/gui/renderer/SimpleUIRenderer.java
View File

@ -56,79 +56,48 @@ public class SimpleUIRenderer implements IUIRenderer, AutoCloseable {
}
@Override
<<<<<<< HEAD
public void pushTransform() { transformCache.push(); }
=======
public void pushTransform() {
transform.push();
invalidateMatrix();
}
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override
<<<<<<< HEAD
public void popTransform() { transformCache.pop(); }
=======
public void popTransform() {
transform.pop();
invalidateMatrix();
}
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override
<<<<<<< HEAD
public void translate(float z) { transformCache.translateZ(z); }
=======
public void translate(float z) {
transform.translate(0, 0, z);
invalidateMatrix();
}
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override
<<<<<<< HEAD
public void translate(float x, float y) { transformCache.translate(x, y); }
=======
public void translate(float x, float y) {
transform.translate(x, y);
invalidateMatrix();
}
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override
<<<<<<< HEAD
public void translate(float x, float y, float z) { transformCache.translate(x, y, z); }
=======
public void translate(float x, float y, float z) {
transform.translate(x, y, z);
invalidateMatrix();
}
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override
<<<<<<< HEAD
public void scale(float scale) { transformCache.scale(scale); }
=======
public void scale(float scale) {
transform.scale(scale);
invalidateMatrix();
}
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override
<<<<<<< HEAD
public void scale(float x, float y) { transformCache.scale(x, y, 1F); }
=======
public void scale(float x, float y) {
transform.scale(x, y, 1F);
invalidateMatrix();
}
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override
<<<<<<< HEAD
public void rotate(Quaternion rotation) { transformCache.rotate(rotation); }
=======
public void rotate(Quaternion rotation) {
transform.rotate(rotation);
invalidateMatrix();
@ -170,6 +139,7 @@ public class SimpleUIRenderer implements IUIRenderer, AutoCloseable {
@Override
public void drawCustom(Consumer<Matrix4f> matrix) {
validateMatrix();
}
@Override
@ -183,6 +153,8 @@ public class SimpleUIRenderer implements IUIRenderer, AutoCloseable {
public void drawLine(float minX, float minY, float maxX, float maxY, float zLevel, int color) {
validateMatrix();
ensureDrawCall(GLMode.TRIANGLES, VertexTypes.POS_RGBA, 0);
}
@Override