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

Fixed Broken patch

Browse Source
This commit is contained in:
Speiger 2025-05-10 21:37:43 +02:00
parent 5a82dfcf2d
commit c7c7fd9856
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,79 +56,48 @@ public class SimpleUIRenderer implements IUIRenderer, AutoCloseable {
} }
@Override @Override
<<<<<<< HEAD
public void pushTransform() { transformCache.push(); }
=======
public void pushTransform() { public void pushTransform() {
transform.push(); transform.push();
invalidateMatrix(); invalidateMatrix();
} }
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override @Override
<<<<<<< HEAD
public void popTransform() { transformCache.pop(); }
=======
public void popTransform() { public void popTransform() {
transform.pop(); transform.pop();
invalidateMatrix(); invalidateMatrix();
} }
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override @Override
<<<<<<< HEAD
public void translate(float z) { transformCache.translateZ(z); }
=======
public void translate(float z) { public void translate(float z) {
transform.translate(0, 0, z); transform.translate(0, 0, z);
invalidateMatrix(); invalidateMatrix();
} }
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override @Override
<<<<<<< HEAD
public void translate(float x, float y) { transformCache.translate(x, y); }
=======
public void translate(float x, float y) { public void translate(float x, float y) {
transform.translate(x, y); transform.translate(x, y);
invalidateMatrix(); invalidateMatrix();
} }
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override @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) { public void translate(float x, float y, float z) {
transform.translate(x, y, z); transform.translate(x, y, z);
invalidateMatrix(); invalidateMatrix();
} }
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override @Override
<<<<<<< HEAD
public void scale(float scale) { transformCache.scale(scale); }
=======
public void scale(float scale) { public void scale(float scale) {
transform.scale(scale); transform.scale(scale);
invalidateMatrix(); invalidateMatrix();
} }
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override @Override
<<<<<<< HEAD
public void scale(float x, float y) { transformCache.scale(x, y, 1F); }
=======
public void scale(float x, float y) { public void scale(float x, float y) {
transform.scale(x, y, 1F); transform.scale(x, y, 1F);
invalidateMatrix(); invalidateMatrix();
} }
>>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
@Override @Override
<<<<<<< HEAD
public void rotate(Quaternion rotation) { transformCache.rotate(rotation); }
=======
public void rotate(Quaternion rotation) { public void rotate(Quaternion rotation) {
transform.rotate(rotation); transform.rotate(rotation);
invalidateMatrix(); invalidateMatrix();