Skip to content

Commit

Permalink
v32
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrbudda
jrbudda committed Nov 30, 2016
1 parent 218eb3c commit dda5cfa
Show file tree
Hide file tree
Showing 13 changed files with 118 additions and 116 deletions.
4 changes: 2 additions & 2 deletions installer/Installer.java
View file
Expand Up @@ -36,8 +36,8 @@ public class Installer extends JPanel implements PropertyChangeListener
private static final boolean ALLOW_HYDRA_INSTALL = false; // TODO: Change to true once Hydra is fixed up
private static final boolean ALLOW_SHADERSMOD_INSTALL = true;

private static final boolean NEEDS_2010_REDIST = true;
private static final boolean NEEDS_2012_REDIST = true;
private static final boolean NEEDS_2010_REDIST = false;
private static final boolean NEEDS_2012_REDIST = false;

// Currently needed for Win boxes - C++ redists

Expand Down
31 changes: 14 additions & 17 deletions patches/net/minecraft/client/entity/EntityPlayerSP.java.patch
View file
Expand Up @@ -41,7 +41,7 @@
import net.minecraft.world.World;

public class EntityPlayerSP extends AbstractClientPlayer
@@ -61,6 +77,20 @@
@@ -61,6 +77,19 @@
*/
protected int sprintToggleTimer;

Expand All @@ -56,13 +56,12 @@
+ public double additionZ = 0;
+ public double additionY = 0;
+ public final float PIOVER180 = (float)Math.PI / 180.0F;
+ public Vec3 directionVec = Vec3.createVectorHelper(0, 0, 0);
+ /** END MINECRIFT **/
+
/** Ticks left before sprinting is disabled. */
public int sprintingTicksLeft;
public float renderArmYaw;
@@ -80,13 +110,46 @@
@@ -80,13 +109,46 @@
public float prevTimeInPortal;
private static final String __OBFID = "CL_00000938";

Expand Down Expand Up @@ -109,15 +108,15 @@
public void updateEntityActionState()
{
super.updateEntityActionState();
@@ -99,6 +162,7 @@
@@ -99,6 +161,7 @@
this.renderArmYaw = (float)((double)this.renderArmYaw + (double)(this.rotationYaw - this.renderArmYaw) * 0.5D);
}

+
/**
* Called frequently so the entity can update its state every tick as required. For example, zombies and skeletons
* use this to react to sunlight and start to burn.
@@ -182,7 +246,9 @@
@@ -182,7 +245,9 @@
}

boolean var1 = this.movementInput.jump;
Expand All @@ -128,7 +127,7 @@
boolean var3 = this.movementInput.moveForward >= var2;
this.movementInput.updatePlayerMoveState();

@@ -195,20 +261,28 @@
@@ -195,20 +260,28 @@

if (this.movementInput.sneak && this.yOffset2 < 0.2F)
{
Expand Down Expand Up @@ -163,7 +162,7 @@
}
else
{
@@ -252,7 +326,7 @@
@@ -252,7 +325,7 @@
this.motionY += 0.15D;
}
}
Expand All @@ -172,7 +171,7 @@
if (this.isRidingHorse())
{
if (this.horseJumpPowerCounter < 0)
@@ -296,6 +370,10 @@
@@ -296,6 +369,10 @@

super.onLivingUpdate();

Expand All @@ -183,7 +182,7 @@
if (this.onGround && this.capabilities.isFlying)
{
this.capabilities.isFlying = false;
@@ -341,7 +419,14 @@
@@ -341,7 +418,14 @@
var1 *= 1.0F - var4 * 0.15F;
}

Expand All @@ -199,7 +198,7 @@
}

/**
@@ -524,70 +609,168 @@
@@ -524,70 +608,168 @@
{
return this.worldObj.getBlock(p_71153_1_, p_71153_2_, p_71153_3_).isNormalCube();
}
Expand Down Expand Up @@ -414,7 +413,7 @@

return false;
}
@@ -640,6 +823,15 @@
@@ -640,6 +822,15 @@

public void playSound(String name, float volume, float pitch)
{
Expand All @@ -430,7 +429,7 @@
this.worldObj.playSound(this.posX, this.posY - (double)this.yOffset, this.posZ, name, volume, pitch, false);
}

@@ -662,4 +854,285 @@
@@ -662,4 +853,283 @@
}

protected void sendHorseJump() {}
Expand Down Expand Up @@ -520,9 +519,7 @@
+ strafe *= speed;
+ forward *= speed;
+
+ directionVec.xCoord = strafe;
+ directionVec.yCoord = 0;
+ directionVec.zCoord = forward;
+ Vec3 directionVec = Vec3.createVectorHelper(strafe, 0, forward);
+
+ //VIVE DO PITCH FLYING
+
Expand Down Expand Up @@ -555,8 +552,8 @@
+ directionVec.rotateAroundY(-con.getHMDYaw_World() * PIOVER180);
+ break;
+ case VRSettings.FREEMOVE_RUNINPLACE:
+ directionVec.rotateAroundY((float) (-mc.runTracker.getYaw() * PIOVER180));
+ directionVec = OpenVRPlayer.vecMult(directionVec, (float)mc.runTracker.getSpeed());
+ directionVec=directionVec.rotateYaw((float) (-mc.runTracker.getYaw() * PIOVER180));
+ directionVec=directionVec.scale(mc.runTracker.getSpeed());
+ break;
+ }
+ }
Expand Down
43 changes: 22 additions & 21 deletions patches/net/minecraft/client/gui/GuiIngame.java.patch
View file
Expand Up @@ -365,7 +365,7 @@
int var25 = MathHelper.floor_double((double)(this.mc.thePlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
this.drawString(var8, "f: " + var25 + " (" + Direction.directions[var25] + ") / " + MathHelper.wrapAngleTo180_float(this.mc.thePlayer.rotationYaw), 2, 88, 14737632);

@@ -347,11 +421,28 @@
@@ -347,11 +421,29 @@
{
this.drawString(var8, String.format("shader: %s", new Object[] {this.mc.entityRenderer.getShaderGroup().getShaderGroupName()}), 2, 112, 14737632);
}
Expand All @@ -381,9 +381,10 @@
+ this.drawString(var8,"Offhand Look: " + v3Format(mc.roomScale.getControllerOffhandDir_World()) , 2, 188 , 14737632);
+ this.drawString(var8,"World Scale: " + mc.vrSettings.vrWorldScale + " World Rotation " + mc.vrSettings.vrWorldRotation , 2, 196 , 14737632);
+ // this.drawString(var8,"Gui " + MCOpenVR.guiPos_World.x + " " + MCOpenVR.guiPos_World.y + " " + MCOpenVR.guiPos_World.z, 2, 204 , 14737632);
+ this.drawString(var8,"R Touchpad x " + String.format("%.2f",MCOpenVR.rtbX) + " y " + String.format("%.2f",MCOpenVR.rtbY), 2, 212 , 14737632);
+ this.drawString(var8,"3rd Person Camera: " + v3Format(mc.entityRenderer.getEyeRenderPos(renderPass.Third)), 2, 220 , 14737632);
+// this.drawString(var8,"R Touchpad x " + String.format("%.2f",MCOpenVR.rtbX) + " y " + String.format("%.2f",MCOpenVR.rtbY), 2, 212 , 14737632);
+ //this.drawString(var8,"3rd Person Camera: " + v3Format(mc.entityRenderer.getEyeRenderPos(renderPass.Third)), 2, 220 , 14737632);
+ //this.drawString(var8,"Depth: " + mc.getDepthOfPosition(mc.roomScale.getHMDPos_World()), 2, 228 , 14737632);
+ this.drawString(var8,"RunDir: " + mc.runTracker.getYaw() , 2, 212 , 14737632);
+
+ }

Expand All @@ -395,7 +396,7 @@
if (this.recordPlayingUpFor > 0)
{
this.mc.mcProfiler.startSection("overlayMessage");
@@ -366,7 +457,7 @@
@@ -366,7 +458,7 @@
if (var13 > 8)
{
GL11.glPushMatrix();
Expand All @@ -404,7 +405,7 @@
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
var14 = 16777215;
@@ -388,14 +479,14 @@
@@ -388,14 +480,14 @@

if (var37 != null)
{
Expand All @@ -421,7 +422,7 @@
this.mc.mcProfiler.startSection("chat");
this.persistantChatGUI.drawChat(this.updateCounter);
this.mc.mcProfiler.endSection();
@@ -422,7 +513,7 @@
@@ -422,7 +514,7 @@
var46 = 150;
}

Expand All @@ -430,7 +431,7 @@
byte var47 = 10;
drawRect(var19 - 1, var47 - 1, var19 + var46 * var17, var47 + 9 * var16, Integer.MIN_VALUE);

@@ -501,9 +592,10 @@
@@ -501,9 +593,10 @@
{
this.streamIndicator.render((int)(p_152126_1_ - 10.0F), 10);
}
Expand All @@ -444,7 +445,7 @@
Scoreboard var5 = p_96136_1_.getScoreboard();
Collection var6 = var5.getSortedScores(p_96136_1_);

@@ -549,9 +641,10 @@
@@ -549,9 +642,10 @@
}
}
}
Expand All @@ -458,7 +459,7 @@
boolean var3 = this.mc.thePlayer.hurtResistantTime / 3 % 2 == 1;

if (this.mc.thePlayer.hurtResistantTime < 10)
@@ -559,52 +652,52 @@
@@ -559,52 +653,52 @@
var3 = false;
}

Expand Down Expand Up @@ -535,7 +536,7 @@
{
this.drawTexturedModalRect(var23, var18, 16, 9, 9, 9);
}
@@ -616,7 +709,7 @@
@@ -616,7 +710,7 @@
int var26;
int var27;

Expand All @@ -544,7 +545,7 @@
{
var23 = 16;

@@ -636,16 +729,16 @@
@@ -636,16 +730,16 @@
var24 = 1;
}

Expand All @@ -565,7 +566,7 @@
{
var27 -= 2;
}
@@ -661,12 +754,12 @@
@@ -661,12 +755,12 @@

if (var3)
{
Expand All @@ -580,7 +581,7 @@
{
this.drawTexturedModalRect(var26, var27, var23 + 63, 9 * var28, 9, 9);
}
@@ -674,7 +767,7 @@
@@ -674,7 +768,7 @@

if (var19 > 0.0F)
{
Expand All @@ -589,7 +590,7 @@
{
this.drawTexturedModalRect(var26, var27, var23 + 153, 9 * var28, 9, 9);
}
@@ -687,22 +780,22 @@
@@ -687,22 +781,22 @@
}
else
{
Expand All @@ -616,7 +617,7 @@
{
this.mc.mcProfiler.endStartSection("food");

@@ -718,7 +811,7 @@
@@ -718,7 +812,7 @@
var38 = 13;
}

Expand All @@ -625,7 +626,7 @@
{
var36 = var13 + (this.rand.nextInt(3) - 1);
}
@@ -733,32 +826,32 @@
@@ -733,32 +827,32 @@

if (var6)
{
Expand Down Expand Up @@ -664,7 +665,7 @@
var36 = (int)Math.ceil((double)var35.getHealth());
float var37 = var35.getMaxHealth();
var26 = (int)(var37 + 0.5F) / 2;
@@ -830,7 +923,9 @@
@@ -830,7 +924,9 @@
/**
* Renders dragon's (boss) health on the HUD
*/
Expand All @@ -675,7 +676,7 @@
{
if (BossStatus.bossName != null && BossStatus.statusBarTime > 0)
{
@@ -856,9 +951,15 @@
@@ -856,9 +952,15 @@
this.mc.getTextureManager().bindTexture(icons);
}
}
Expand All @@ -693,7 +694,7 @@
GL11.glDisable(GL11.GL_DEPTH_TEST);
GL11.glDepthMask(false);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
@@ -881,8 +982,15 @@
@@ -881,8 +983,15 @@
/**
* Renders the vignette. Args: vignetteBrightness, width, height
*/
Expand All @@ -710,7 +711,7 @@
p_73829_1_ = 1.0F - p_73829_1_;

if (p_73829_1_ < 0.0F)
@@ -913,44 +1021,22 @@
@@ -913,44 +1022,22 @@
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
}
Expand Down Expand Up @@ -765,7 +766,7 @@
{
ItemStack var5 = this.mc.thePlayer.inventory.mainInventory[p_73832_1_];

@@ -1039,4 +1125,23 @@
@@ -1039,4 +1126,23 @@
{
return this.updateCounter;
}
Expand Down
12 changes: 7 additions & 5 deletions patches/net/minecraft/client/renderer/EntityRenderer.java.patch
View file
Expand Up @@ -86,7 +86,7 @@
import net.minecraft.potion.Potion;
import net.minecraft.server.integrated.IntegratedServer;
import net.minecraft.src.Config;
@@ -61,2593 +99,4840 @@
@@ -61,2593 +99,4842 @@
import net.minecraft.world.World;
import net.minecraft.world.WorldProvider;
import net.minecraft.world.biome.BiomeGenBase;
Expand Down Expand Up @@ -4326,7 +4326,7 @@
+ if(mc.theWorld == null) mc.vrPlayer.worldRotationRadians = 0;
+
+ Vec3 eye =mc.entityRenderer.getEyeRenderPos(currentPass);
+ if (mc.theWorld==null || mc.currentScreen instanceof GuiWinGame ) {
+ if (mc.theWorld==null) {
+ eye = mc.roomScale.getEyePos_Room(currentPass);
+ }
+ Vector3f guipos = MCOpenVR.guiPos_World;
Expand Down Expand Up @@ -4448,10 +4448,12 @@
+ }
+ }
+ } else {
+
+ guipos = guipos.add(new Vector3f((float)interPolatedRoomOrigin.xCoord,
+ if (mc.theWorld==null || mc.currentScreen instanceof GuiWinGame){
+ }
+ else {
+ guipos = guipos.add(new Vector3f((float)interPolatedRoomOrigin.xCoord,
+ (float) interPolatedRoomOrigin.yCoord, (float) interPolatedRoomOrigin.zCoord));
+
+ }
+ }
+ // otherwise, looking at inventory screen. use pose calculated when screen was opened
+ //where is this set up... should be here....
Expand Down

0 comments on commit dda5cfa

Please sign in to comment.