PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-22 20:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix #2 skin manager rendering after loading a world

Browse source
This commit is contained in:
Matthew Messinger 2016-05-21 01:50:09 -04:00
parent 0ee3250930
commit 665984cfa1
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java
View file

@ -146,7 +146,7 @@ public class EntityPlayerModel extends EntityLivingBase {
@Override @Override
public int getBrightnessForRender(float partialTicks) { public int getBrightnessForRender(float partialTicks) {
return 1; return 15728880;
} }
@Override @Override

15
src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiMetaHandler.java
View file

@ -37,6 +37,7 @@ import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiSlider; import net.minecraft.client.gui.GuiSlider;
import net.minecraft.client.gui.GuiSlider.FormatHelper; import net.minecraft.client.gui.GuiSlider.FormatHelper;
import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
@ -139,13 +140,16 @@ public class GuiMetaHandler extends GuiScreen implements IMetaHandler {
int bottom = height - 40; int bottom = height - 40;
int mid = width / 2; int mid = width / 2;
float yPos = this.height;
float scale = this.height * 0.25F;
Gui.drawRect(mid + 10, top, width - 10, bottom, Integer.MIN_VALUE); Gui.drawRect(mid + 10, top, width - 10, bottom, Integer.MIN_VALUE);
((GuiSkins) parent).enableClipping(30, height - 40); ((GuiSkins) parent).enableClipping(30, height - 40);
enableBlend(); enableBlend();
enableDepth(); enableDepth();
mc.getTextureManager().bindTexture(EntityPlayerModel.NOSKIN); mc.getTextureManager().bindTexture(this.model.getSkinTexture());
renderPlayerModel(this.model, width * 0.75F, height * .75F, height * 0.25F, mouseX, mouseY, partialTick); renderPlayerModel(this.model, width * 0.75F, height * .75F, height * 0.25F, mouseX, yPos - scale * 1.8F - mouseY, partialTick);
disableDepth(); disableDepth();
disableBlend(); disableBlend();
((GuiSkins) parent).disableClipping(); ((GuiSkins) parent).disableClipping();
@ -160,8 +164,9 @@ public class GuiMetaHandler extends GuiScreen implements IMetaHandler {
public void renderPlayerModel(Entity thePlayer, float xPosition, float yPosition, float scale, float mouseX, float mouseY, float partialTick) { public void renderPlayerModel(Entity thePlayer, float xPosition, float yPosition, float scale, float mouseX, float mouseY, float partialTick) {
enableColorMaterial(); enableColorMaterial();
pushMatrix(); pushMatrix();
translate(xPosition, yPosition, 300.0F); translate(xPosition, yPosition, 200.0F);
GlStateManager.color(1, 1, 1, 1);
scale(-scale, scale, scale); scale(-scale, scale, scale);
rotate(180.0F, 0.0F, 0.0F, 1.0F); rotate(180.0F, 0.0F, 0.0F, 1.0F);
rotate(135.0F, 0.0F, 1.0F, 0.0F); rotate(135.0F, 0.0F, 1.0F, 0.0F);
@ -170,13 +175,13 @@ public class GuiMetaHandler extends GuiScreen implements IMetaHandler {
rotate(-135.0F, 0.0F, 1.0F, 0.0F); rotate(-135.0F, 0.0F, 1.0F, 0.0F);
rotate(15.0F, 1.0F, 0.0F, 0.0F); rotate(15.0F, 1.0F, 0.0F, 0.0F);
rotate((updateCounter + partialTick) * 2.5F, 0.0F, 1.0F, 0.0F); rotate((this.updateCounter + partialTick) * 2.5F, 0.0F, 1.0F, 0.0F);
thePlayer.rotationPitch = -((float) Math.atan(mouseY / 40.0F)) * 20.0F; thePlayer.rotationPitch = -((float) Math.atan(mouseY / 40.0F)) * 20.0F;
translate(0.0D, thePlayer.getYOffset(), 0.0D); translate(0.0D, thePlayer.getYOffset(), 0.0D);
RenderManager rm = Minecraft.getMinecraft().getRenderManager(); RenderManager rm = Minecraft.getMinecraft().getRenderManager();
rm.playerViewY = 180.0F; rm.playerViewY = 180.0F;
rm.renderEntityStatic(thePlayer, 0, false); rm.doRenderEntity(thePlayer, 0, 0, 0, 0, 1, false);
popMatrix(); popMatrix();
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();

7
src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
View file

@ -573,9 +573,10 @@ public class GuiSkins extends GuiScreen implements IUploadCompleteCallback, IOpe
float xPos2 = this.width * 0.75F; float xPos2 = this.width * 0.75F;
float scale = this.height * 0.25F; float scale = this.height * 0.25F;
mc.getTextureManager().bindTexture(EntityPlayerModel.NOSKIN); mc.getTextureManager().bindTexture(this.localPlayer.getSkinTexture());
this.renderPlayerModel(this.localPlayer, xPos1, yPos, scale, xPos1 - mouseX, yPos - scale * 1.8F - mouseY, partialTick); this.renderPlayerModel(this.localPlayer, xPos1, yPos, scale, xPos1 - mouseX, yPos - scale * 1.8F - mouseY, partialTick);
mc.getTextureManager().bindTexture(this.remotePlayer.getSkinTexture());
this.renderPlayerModel(this.remotePlayer, xPos2, yPos, scale, xPos2 - mouseX, yPos - scale * 1.8F - mouseY, partialTick); this.renderPlayerModel(this.remotePlayer, xPos2, yPos, scale, xPos2 - mouseX, yPos - scale * 1.8F - mouseY, partialTick);
this.disableClipping(); this.disableClipping();
@ -670,7 +671,7 @@ public class GuiSkins extends GuiScreen implements IUploadCompleteCallback, IOpe
RenderManager rm = Minecraft.getMinecraft().getRenderManager(); RenderManager rm = Minecraft.getMinecraft().getRenderManager();
rm.playerViewY = 180.0F; rm.playerViewY = 180.0F;
rm.renderEntityStatic(thePlayer, 0, false); rm.doRenderEntity(thePlayer, 0, 0, 0, 0, 1, false);
popMatrix(); popMatrix();
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();