28

jrbudda · Jul 12, 2016 · 3afa4e4 · 3afa4e4
1 parent a7dc04b
commit 3afa4e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/com/mtbs3d/minecrift/provider/MCOpenVR.java b/src/com/mtbs3d/minecrift/provider/MCOpenVR.java
@@ -561,6 +561,7 @@ private static void processHotbar() {
 
 	public static boolean setKeyboardOverlayShowing(boolean showingState, GuiTextField gui) {
 		try {
+			if(mc.vrSettings.seated) showingState = false;
 			keyboardGui = gui;
 			int ret = 1;
 			if (showingState) {
@@ -1978,12 +1979,12 @@ private static void updateAim() {
 			double v = Mouse.getY() / (double) mc.displayHeight * 180 - 90;
 
 			if(Display.isActive()){
-			if(h < -54){
+			if(h < -30){
 				mc.vrSettings.vrWorldRotation +=1;
 				hmdForwardYaw = (float)Math.toDegrees(Math.atan2(headDirection.x, headDirection.z));    
 				mc.vrPlayer.checkandUpdateRotateScale(true);
 			}
-			if(h > 54){
+			if(h > 30){
 				mc.vrSettings.vrWorldRotation -=1;
 				hmdForwardYaw = (float)Math.toDegrees(Math.atan2(headDirection.x, headDirection.z));    
 				mc.vrPlayer.checkandUpdateRotateScale(true);

diff --git a/src/com/mtbs3d/minecrift/provider/OpenVRPlayer.java b/src/com/mtbs3d/minecrift/provider/OpenVRPlayer.java
@@ -163,6 +163,8 @@ public void onLivingUpdate(EntityPlayerSP player, Minecraft mc, Random rand)
     	if(!player.initFromServer) return;
         updateSwingAttack();
 
+        if(mc.vrSettings.seated) freeMoveMode = true;
+
         this.checkandUpdateRotateScale(false);
 
 		/** MINECRIFT */
@@ -181,8 +183,7 @@ public void onLivingUpdate(EntityPlayerSP player, Minecraft mc, Random rand)
        } else {
     	  // player.height = 1.8f;
        }
-
-
+
         if (getFreeMoveMode()) {
         		if(player.movementInput.moveForward ==0) doPlayerMoveInRoom(player);
         	      NetworkHelper.sendVRPlayerPositions(this);