upstream/Angelica
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Angelica.git synced 2026-10-26 14:24:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix glMultMatrix using the wrong variable for multiplication (#444)

Browse Source 
* Fix glMultMatrix using the wrong variable for multiplication

* Fix "conersion" typo
This commit is contained in:
Raven Szewczyk authored and GitHub committed 2024-04-27 18:46:35 +00:00
1 parent f01cdfda4b
commit 9a73dc9bfd
1 file changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java
+8 -8
View File
@@ -1112,8 +1112,8 @@ public class GLStateManager {
}
public static void glLoadMatrix(DoubleBuffer m) {
conersionMatrix4d.set(m);
getMatrixStack().set(conersionMatrix4d);
conversionMatrix4d.set(m);
getMatrixStack().set(conversionMatrix4d);
GL11.glLoadMatrix(m);
}
@@ -1160,16 +1160,16 @@ public class GLStateManager {
public static void glMultMatrix(FloatBuffer floatBuffer) {
GL11.glMultMatrix(floatBuffer);
tempMatrix4f.set(floatBuffer);
getMatrixStack().mul(conersionMatrix4f);
getMatrixStack().mul(tempMatrix4f);
}
public static final Matrix4d conersionMatrix4d = new Matrix4d();
public static final Matrix4f conersionMatrix4f = new Matrix4f();
public static final Matrix4d conversionMatrix4d = new Matrix4d();
public static final Matrix4f conversionMatrix4f = new Matrix4f();
public static void glMultMatrix(DoubleBuffer matrix) {
GL11.glMultMatrix(matrix);
conersionMatrix4d.set(matrix);
conersionMatrix4f.set(conersionMatrix4d);
getMatrixStack().mul(conersionMatrix4f);
conversionMatrix4d.set(matrix);
conversionMatrix4f.set(conversionMatrix4d);
getMatrixStack().mul(conversionMatrix4f);
}
private static final Vector3f rotation = new Vector3f();