Skip to content

Fixed hook rotation math using degrees instead of radians. #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
squeeglii wants to merge 1 commit into
base: 1.20.x
Choose a base branch
from
Open

Fixed hook rotation math using degrees instead of radians. #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/main/java/com/yyon/grapplinghook/entities/grapplehook/RenderGrapplehookEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.culling.Frustum;
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.EntityRendererProvider;
Expand All @@ -25,6 +24,7 @@
import org.joml.Matrix3f;
import org.joml.Matrix4f;
import org.joml.Quaternionf;
import org.joml.Vector3f;


/*
Expand Down Expand Up @@ -54,6 +54,12 @@ public class RenderGrapplehookEntity<T extends GrapplehookEntity> extends Entity
private static final RenderType ROPE_RENDER = RenderType.entitySolid(ROPE_TEXTURES);
EntityRendererProvider.Context context;


public static final Vector3f X_AXIS = new Vector3f(1, 0, 0);
public static final Vector3f Y_AXIS = new Vector3f(0, 1, 0);
public static final Vector3f Z_AXIS = new Vector3f(0, 0, 1);


public RenderGrapplehookEntity(EntityRendererProvider.Context context, Item itemIn) {
super(context);
this.item = itemIn;
Expand Down Expand Up @@ -157,10 +163,10 @@ public void render(T hookEntity, float p_225623_2_, float partialTicks, PoseStac
matrix.pushPose();
matrix.scale(0.5F, 0.5F, 0.5F);

matrix.mulPose(new Quaternionf().setAngleAxis((float) (-attach_dir.getYaw()),0, 1, 0 ));
matrix.mulPose(new Quaternionf().setAngleAxis((float) (attach_dir.getPitch() - 90), 1, 0, 0 ));
matrix.mulPose(new Quaternionf().setAngleAxis((float) (45 * hand_right), 0, 1, 0 ));
matrix.mulPose(new Quaternionf().setAngleAxis((float) (-45), 0, 0, 1 ));
matrix.mulPose(rotatedAxis(-attach_dir.getYaw(), Y_AXIS));
matrix.mulPose(rotatedAxis(attach_dir.getPitch() - 90, X_AXIS));
matrix.mulPose(rotatedAxis(45.0f * hand_right, Y_AXIS));
matrix.mulPose(rotatedAxis(-45.0f, Z_AXIS));

// draw hook
ItemStack stack = this.getStackToRender(hookEntity);
Expand Down Expand Up @@ -358,15 +364,18 @@ public boolean shouldRender(T p_225626_1_, Frustum p_225626_2_, double p_225626_
return true;
}

public ItemStack getStackToRender(T entityIn)
{
public ItemStack getStackToRender(T entityIn) {
ItemStack stack = new ItemStack(this.item);
CompoundTag tag = stack.getOrCreateTag();
tag.putBoolean("hook", true);
stack.setTag(tag);
return stack;
}

public static Quaternionf rotatedAxis(double angleDegrees, Vector3f axis) {
return new Quaternionf().rotateAxis((float) Math.toRadians(angleDegrees), axis);
}

/**
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
*/
Expand Down