Improved #59
This commit is contained in:
+1
-1
Submodule common updated: c72af1300a...fc1500abbd
@@ -1,13 +1,21 @@
|
|||||||
package org.saturnclient.impl.mixins;
|
package org.saturnclient.impl.mixins;
|
||||||
|
|
||||||
|
import org.joml.Quaternionf;
|
||||||
import org.saturnclient.common.ref.render.MatrixStackRef;
|
import org.saturnclient.common.ref.render.MatrixStackRef;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
|
import net.minecraft.util.math.RotationAxis;
|
||||||
|
|
||||||
@Mixin(MatrixStack.class)
|
@Mixin(MatrixStack.class)
|
||||||
public abstract class MatrixStackMixin implements MatrixStackRef {
|
public abstract class MatrixStackMixin implements MatrixStackRef {
|
||||||
|
@Shadow
|
||||||
|
public abstract void push();
|
||||||
|
|
||||||
|
@Shadow
|
||||||
|
public abstract void pop();
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
public abstract void translate(float x, float y, float z);
|
public abstract void translate(float x, float y, float z);
|
||||||
|
|
||||||
@@ -15,10 +23,10 @@ public abstract class MatrixStackMixin implements MatrixStackRef {
|
|||||||
public abstract void scale(float x, float y, float z);
|
public abstract void scale(float x, float y, float z);
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
public abstract void push();
|
public abstract void multiply(Quaternionf quaternion);
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
public abstract void pop();
|
public abstract void multiply(Quaternionf quaternion, float originX, float originY, float originZ);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void translate(float x, float y) {
|
public void translate(float x, float y) {
|
||||||
@@ -29,4 +37,14 @@ public abstract class MatrixStackMixin implements MatrixStackRef {
|
|||||||
public void scale(float x, float y) {
|
public void scale(float x, float y) {
|
||||||
scale(x, y, 1.0f);
|
scale(x, y, 1.0f);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
@Override
|
||||||
|
public void rotate(float angle, float originX, float originY, float originZ) {
|
||||||
|
multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(angle), originX, originY, originZ);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void rotate(float angle) {
|
||||||
|
multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(angle));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user