update accessoryhelper to use matrixstack

This commit is contained in:
Vincent Lee committed 2020-01-21 10:21:43 -06:00
1 parent 0e73e16e10
commit e78a1f21f3
16 files changed
+51 -52

No files matched your search

@@ -1,6 +1,7 @@
package vazkii.botania.api.item;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.entity.LivingEntity;
/**
@@ -11,63 +12,63 @@ public final class AccessoryRenderHelper {
/**
* Rotates the render for a bauble correctly if the player is sneaking.
*/
public static void rotateIfSneaking(LivingEntity player) {
public static void rotateIfSneaking(MatrixStack ms, LivingEntity player) {
if(player.isCrouching())
applySneakingRotation();
applySneakingRotation(ms);
}
/**
* Rotates the render for a bauble correctly for a sneaking player.
*/
public static void applySneakingRotation() {
GlStateManager.translatef(0F, 0.2F, 0F);
GlStateManager.rotatef(90F / (float) Math.PI, 1.0F, 0.0F, 0.0F);
public static void applySneakingRotation(MatrixStack ms) {
ms.translate(0F, 0.2F, 0F);
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F / (float) Math.PI));
}
/**
* Shifts the render for a bauble correctly to the head, including sneaking rotation.
*/
public static void translateToHeadLevel(LivingEntity player, float partialTicks) {
public static void translateToHeadLevel(MatrixStack ms, LivingEntity player, float partialTicks) {
float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * partialTicks;
float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * partialTicks;
float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * partialTicks;
GlStateManager.rotatef(yawOffset, 0, -1, 0);
GlStateManager.rotatef(yaw - 270, 0, 1, 0);
GlStateManager.rotatef(pitch, 0, 0, 1);
GlStateManager.translatef(0, -player.getEyeHeight(), 0);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-yawOffset));
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(yaw - 270));
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(pitch));
ms.translate(0, -player.getEyeHeight(), 0);
// if (player.shouldRenderSneaking()) TODO Sneaking needs a different adjustment now
// GlStateManager.translatef(0.25F * MathHelper.sin(player.rotationPitch * (float) Math.PI / 180), 0.25F * MathHelper.cos(player.rotationPitch * (float) Math.PI / 180), 0F);
}
/**
* Shifts the render for a bauble correctly to the face.
* Use for renders after calling {@link AccessoryRenderHelper#translateToHeadLevel(LivingEntity, float)}.
* Use for renders after calling {@link AccessoryRenderHelper#translateToHeadLevel}.
*/
public static void translateToFace() {
GlStateManager.rotatef(90F, 0F, 1F, 0F);
GlStateManager.rotatef(180F, 1F, 0F, 0F);
GlStateManager.translatef(0f, -4.35f, -1.27f);
public static void translateToFace(MatrixStack ms) {
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90));
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180));
ms.translate(0f, -4.35f, -1.27f);
}
/**
* Scales down the render to a correct size.
* Use for any render.
*/
public static void defaultTransforms() {
GlStateManager.translated(0.0, 3.0, 1.0);
GlStateManager.scaled(0.55, 0.55, 0.55);
public static void defaultTransforms(MatrixStack ms) {
ms.translate(0.0, 3.0, 1.0);
ms.scale(0.55F, 0.55F, 0.55F);
}
/**
* Shifts the render for a bauble correctly to the chest.
* Use for renders after calling {@link AccessoryRenderHelper#rotateIfSneaking(LivingEntity)}.
* Use for renders after calling {@link AccessoryRenderHelper#rotateIfSneaking}.
*/
public static void translateToChest() {
GlStateManager.rotatef(180F, 1F, 0F, 0F);
GlStateManager.translatef(0F, -3.2F, -0.85F);
public static void translateToChest(MatrixStack ms) {
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180));
ms.translate(0F, -3.2F, -0.85F);
}
}
@@ -97,7 +97,7 @@ public final class BaubleRenderHandler extends LayerRenderer<AbstractClientPlaye
ItemStack stack = player.inventory.getStackInSlot(i);
if(!stack.isEmpty() && stack.getItem() == ModItems.manaTablet) {
ms.push();
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.rotateIfSneaking(ms, player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.LEGS).isEmpty();
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90));
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180));
@@ -77,8 +77,7 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
String name = player.getDisplayName().getString();
RenderSystem.pushMatrix();
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks);
if(name.equals("haighyorkie"))
renderGoldfish(ms, buffers, light, player);
@@ -89,7 +88,6 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
if(player.isWearing(PlayerModelPart.CAPE) && flowerMap.containsKey(name))
renderFlower(ms, buffers, player, flowerMap.get(name));
RenderSystem.popMatrix();
}
public static void firstStart() {
@@ -124,7 +122,7 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
private static void renderGoldfish(MatrixStack ms, IRenderTypeBuffer buffers, int light, PlayerEntity player) {
ms.push();
ms.translate(0, player.getEyeHeight(), 0);
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.rotateIfSneaking(ms, player);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180));
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90));
ms.scale(0.4F, 0.4F, 0.4F);
@@ -108,7 +108,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc
public static void renderOnPlayer(MatrixStack ms, IRenderTypeBuffer buffers, int light, ItemStack stack, PlayerEntity player, float partialTicks) {
if(hasAnyWill(stack) && !((ItemTerrasteelArmor) stack.getItem()).hasPhantomInk(stack)) {
ms.push();
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F));
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F));
ms.translate(-0.26F, -1.45F, -0.39F);
@@ -99,9 +99,9 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
Variant variant = ((ItemBaubleCosmetic) stack.getItem()).variant;
if(variant.isHead) {
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToFace();
AccessoryRenderHelper.defaultTransforms();
AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks);
AccessoryRenderHelper.translateToFace(ms);
AccessoryRenderHelper.defaultTransforms(ms);
switch (variant) {
case RED_GLASSES:
case ENGINEER_GOGGLES:
@@ -243,9 +243,9 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
break;
}
} else { // body cosmetics
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.translateToChest();
AccessoryRenderHelper.defaultTransforms();
AccessoryRenderHelper.rotateIfSneaking(ms, player);
AccessoryRenderHelper.translateToChest(ms);
AccessoryRenderHelper.defaultTransforms(ms);
switch (variant) {
case BLACK_BOWTIE:
ms.translate(0F, 0.15F, 0F);
@@ -121,7 +121,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.rotateIfSneaking(ms, player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F));
ms.translate(-0.26F, -0.4F, armor ? 0.2F : 0.15F);
@@ -70,7 +70,7 @@ public class ItemCloudPendant extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.rotateIfSneaking(ms, player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F));
ms.translate(-0.2F, -0.3F, armor ? 0.2F : 0.15F);
@@ -102,7 +102,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks);
ms.scale(0.8F, 0.8F, 0.8F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180));
@@ -386,7 +386,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
float mul = 32F / 20F;
s *= mul;
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.rotateIfSneaking(ms, player);
ms.translate(0F, h, i);
@@ -424,7 +424,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
@OnlyIn(Dist.CLIENT)
public static void renderHalo(@Nullable LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, float partialTicks) {
if(player != null)
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks);
ms.translate(0, 1.5F, 0);
ms.multiply(new Vector3f(1, 0, -1).getDegreesQuaternion(30));
ms.translate(-0.1F, -0.5F, -0.1F);
@@ -64,9 +64,9 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToFace();
AccessoryRenderHelper.defaultTransforms();
AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks);
AccessoryRenderHelper.translateToFace(ms);
AccessoryRenderHelper.defaultTransforms(ms);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F));
ms.translate(0.5F, 0.2F, 0.45F);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.DEFAULT_UV, ms, buffers);
@@ -80,7 +80,7 @@ public class ItemHolyCloak extends ItemBauble {
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
ItemHolyCloak item = ((ItemHolyCloak) stack.getItem());
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.rotateIfSneaking(ms, player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
ms.translate(0F, armor ? -0.07F : -0.01F, 0F);
@@ -79,7 +79,7 @@ public class ItemItemFinder extends ItemBauble {
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty();
AccessoryRenderHelper.translateToHeadLevel(living, partialTicks);
AccessoryRenderHelper.translateToHeadLevel(ms, living, partialTicks);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F));
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F));
ms.translate(-0.4F, -1.4F, armor ? -0.3F : -0.25F);
@@ -46,7 +46,7 @@ public class ItemLavaPendant extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.rotateIfSneaking(ms, player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
ms.scale(0.5F, 0.5F, 0.5F);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180));
@@ -54,9 +54,9 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty();
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToFace();
AccessoryRenderHelper.defaultTransforms();
AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks);
AccessoryRenderHelper.translateToFace(ms);
AccessoryRenderHelper.defaultTransforms(ms);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F));
ms.scale(0.5F, 0.5F, 0.5F);
ms.translate(0.5F, -0.2F, armor ? 0.12F : 0F);
@@ -57,7 +57,7 @@ public class ItemSuperLavaPendant extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.rotateIfSneaking(ms, player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
ms.scale(0.5F, 0.5F, 0.5F);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180));
@@ -146,7 +146,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.rotateIfSneaking(ms, player);
ms.translate(0F, 0.2F, 0F);