fix first person render rotations
This commit is contained in:
parent
b09f8e422b
commit
c6ba1703a2
3 changed files with 8 additions and 4 deletions
|
@ -109,9 +109,9 @@ public class RenderHumanoid extends RenderNpc
|
||||||
ItemStack itemstack = npc.getHeldItem();
|
ItemStack itemstack = npc.getHeldItem();
|
||||||
modelplayer.setSlim(npc.hasSlimArms()); // .hasSlimSkin());
|
modelplayer.setSlim(npc.hasSlimArms()); // .hasSlimSkin());
|
||||||
modelplayer.setVisible(true);
|
modelplayer.setVisible(true);
|
||||||
boolean third = this.manager.gm == null || npc != this.manager.gm.getRenderViewEntity() || this.manager.gm.thirdPersonView != 0 || !this.manager.gm.showPlayerFirstPerson || this.manager.gm.charEditor;
|
boolean third = this.manager.gm != null && npc == this.manager.gm.getRenderViewEntity() && this.manager.gm.thirdPersonView == 0 && this.manager.gm.showPlayerFirstPerson && !this.manager.gm.charEditor;
|
||||||
modelplayer.bipedHead.showModel &= third;
|
modelplayer.bipedHead.skipRender = third;
|
||||||
modelplayer.bipedHeadwear.showModel &= third;
|
modelplayer.bipedHeadwear.skipRender = third;
|
||||||
// if(npc.isPlayer()) {
|
// if(npc.isPlayer()) {
|
||||||
// modelplayer.bipedHeadwear.showModel &= npc.isWearing(ModelPart.HEAD);
|
// modelplayer.bipedHeadwear.showModel &= npc.isWearing(ModelPart.HEAD);
|
||||||
// modelplayer.bipedBodyWear.showModel &= npc.isWearing(ModelPart.JACKET);
|
// modelplayer.bipedBodyWear.showModel &= npc.isWearing(ModelPart.JACKET);
|
||||||
|
|
|
@ -43,7 +43,7 @@ public class RenderSpaceMarine extends RenderNpc
|
||||||
ModelSpaceMarine modelplayer = this.getMainModel();
|
ModelSpaceMarine modelplayer = this.getMainModel();
|
||||||
ItemStack itemstack = npc.getHeldItem();
|
ItemStack itemstack = npc.getHeldItem();
|
||||||
modelplayer.setVisible(true);
|
modelplayer.setVisible(true);
|
||||||
modelplayer.bipedHead.showModel &= this.manager.gm == null || npc != this.manager.gm.getRenderViewEntity() || this.manager.gm.thirdPersonView != 0 || !this.manager.gm.showPlayerFirstPerson || this.manager.gm.charEditor;
|
modelplayer.bipedHead.skipRender = this.manager.gm != null && npc == this.manager.gm.getRenderViewEntity() && this.manager.gm.thirdPersonView == 0 && this.manager.gm.showPlayerFirstPerson && !this.manager.gm.charEditor;
|
||||||
modelplayer.heldItemLeft = 0;
|
modelplayer.heldItemLeft = 0;
|
||||||
modelplayer.aimedBow = false;
|
modelplayer.aimedBow = false;
|
||||||
modelplayer.isSneak = false;
|
modelplayer.isSneak = false;
|
||||||
|
|
|
@ -33,6 +33,7 @@ public class ModelRenderer
|
||||||
private int displayList;
|
private int displayList;
|
||||||
public boolean mirror;
|
public boolean mirror;
|
||||||
public boolean showModel;
|
public boolean showModel;
|
||||||
|
public boolean skipRender;
|
||||||
|
|
||||||
/** Hides the model. */
|
/** Hides the model. */
|
||||||
public boolean isHidden;
|
public boolean isHidden;
|
||||||
|
@ -172,6 +173,9 @@ public class ModelRenderer
|
||||||
{
|
{
|
||||||
this.compileDisplayList(p_78785_1_);
|
this.compileDisplayList(p_78785_1_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(this.skipRender)
|
||||||
|
return;
|
||||||
|
|
||||||
GL15.glTranslatef(this.offsetX, this.offsetY, this.offsetZ);
|
GL15.glTranslatef(this.offsetX, this.offsetY, this.offsetZ);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue