diff --git a/build.bat b/build.bat index 127c71c5..56944eea 100644 --- a/build.bat +++ b/build.bat @@ -1,4 +1,5 @@ @echo off +python getchanges.py %* REM.\mcp\runtime\bin\python\python_mcp build.py python build.py diff --git a/patches/net/minecraft/client/Minecraft.java.patch b/patches/net/minecraft/client/Minecraft.java.patch index 5a1379af..12590d07 100644 --- a/patches/net/minecraft/client/Minecraft.java.patch +++ b/patches/net/minecraft/client/Minecraft.java.patch @@ -147,7 +147,7 @@ import net.minecraft.world.EnumDifficulty; import net.minecraft.world.WorldProviderEnd; import net.minecraft.world.WorldProviderHell; -@@ -150,2988 +218,4797 @@ +@@ -150,2988 +218,4796 @@ import net.minecraft.world.storage.ISaveFormat; import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.WorldInfo; @@ -6814,8 +6814,7 @@ + + Vector3f CameraLook = new Vector3f(-(f1 * f2), f3, -f * f2); + -+ Vec3 camplayer = entityRenderer.getEyeRenderPos(renderPass.Third).subtract(entityRenderer.getEyeRenderPos(renderPass.Center)); -+ ++ Vec3 camplayer = entityRenderer.getEyeRenderPos(renderPass.Center).subtract(entityRenderer.getEyeRenderPos(renderPass.Third)); + + GL30.glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, 0); + GL30.glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, framebuffer.framebufferObject); diff --git a/src/com/mtbs3d/minecrift/provider/MCOpenVR.java b/src/com/mtbs3d/minecrift/provider/MCOpenVR.java index 2be2c496..95c42f05 100644 --- a/src/com/mtbs3d/minecrift/provider/MCOpenVR.java +++ b/src/com/mtbs3d/minecrift/provider/MCOpenVR.java @@ -1735,6 +1735,10 @@ static void onGuiScreenChanged(GuiScreen previousScreen, GuiScreen newScreen) guiRotationPose = new Matrix4f(orientationQuat); guiRotationPose.M[3][3] = 1.0f; + + guiPos_World = guiPos_World.subtract(new Vector3f((float)mc.entityRenderer.interPolatedRoomOrigin.xCoord, + (float) mc.entityRenderer.interPolatedRoomOrigin.yCoord, (float) mc.entityRenderer.interPolatedRoomOrigin.zCoord)); + } else if ( previousScreen==null && newScreen != null || newScreen instanceof GuiContainerCreative || newScreen instanceof GuiChat) { @@ -1768,7 +1772,11 @@ static void onGuiScreenChanged(GuiScreen previousScreen, GuiScreen newScreen) float yaw = (float) ((float) Math.PI + Math.atan2(look.x, look.z)); guiRotationPose = Matrix4f.rotationY((float) yaw); Matrix4f tilt = OpenVRUtil.rotationXMatrix(pitch); - guiRotationPose = Matrix4f.multiply(guiRotationPose,tilt); + guiRotationPose = Matrix4f.multiply(guiRotationPose,tilt); + + guiPos_World = guiPos_World.subtract(new Vector3f((float)mc.entityRenderer.interPolatedRoomOrigin.xCoord, + (float) mc.entityRenderer.interPolatedRoomOrigin.yCoord, (float) mc.entityRenderer.interPolatedRoomOrigin.zCoord)); + } else{ Vec3 adj = Vec3.createVectorHelper(0,0,-2); @@ -1798,13 +1806,15 @@ static void onGuiScreenChanged(GuiScreen previousScreen, GuiScreen newScreen) Matrix4f tilt = OpenVRUtil.rotationXMatrix((float)Math.toRadians(mc.roomScale.getHMDPitch_World())); guiRotationPose = Matrix4f.multiply(guiRotationPose,tilt); - if(guiPos_World!=null) - guiPos_World = guiPos_World.subtract(new Vector3f((float)mc.entityRenderer.interPolatedRoomOrigin.xCoord, - (float) mc.entityRenderer.interPolatedRoomOrigin.yCoord, (float) mc.entityRenderer.interPolatedRoomOrigin.zCoord)); - - + guiPos_World = guiPos_World.subtract(new Vector3f((float)mc.entityRenderer.interPolatedRoomOrigin.xCoord, + (float) mc.entityRenderer.interPolatedRoomOrigin.yCoord, (float) mc.entityRenderer.interPolatedRoomOrigin.zCoord)); + } } + + + + } //-------------------------------------------------------