eliminated or renamed last of the glvr variables

Author: tomkidd

Quake-iOS/GameViewController.swift

@@ -194,8 +194,8 @@ class GameViewController: GLKViewController, GLKViewControllerDelegate
                 return
             }
 
-            glvr_eyetranslation = (1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0)
-            glvr_projection = (0.839099705, 0.0, 0.0, 0.0, 0.0, 1.49173284, 0.0, 0.0, 0.0, 0.0, -1.00195503, -1.0, 0.0, 0.0, -8.00782013, 0.0)
+            gl_translation = (1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0)
+            gl_projection = (0.839099705, 0.0, 0.0, 0.0, 0.0, 1.49173284, 0.0, 0.0, 0.0, 0.0, -1.00195503, -1.0, 0.0, 0.0, -8.00782013, 0.0)
 
             frame_lapse = Float(controller.timeSinceLastUpdate)
 

Quake-iOS/gl_vidios.c

@@ -143,10 +143,8 @@ GLfloat gl_projection_matrix[16];
 
 qboolean tiltaim_enabled;
 
-qboolean glvr_enabled;
-
-GLfloat glvr_eyetranslation[16];
-GLfloat glvr_projection[16];
+GLfloat gl_translation[16];
+GLfloat gl_projection[16];
 
 unsigned short	d_8to16table[256];
 unsigned*	d_8to24table;
@@ -436,8 +434,6 @@ void GL_Init (void)
 
     GL_Use (0);
 
-    glvr_enabled = true;
-    
     glClearColor (1,0,0,0);
     glEnable(GL_DEPTH_TEST);
 //    glEnable(GL_SCISSOR_TEST);

Quake.xcodeproj/project.xcworkspace/xcuserdata/tomkidd.xcuserdatad/UserInterfaceState.xcuserstate

@@ -250,11 +250,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Quake/menu.c"
-            timestampString = "552704958.513726"
+            timestampString = "553494955.131204"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1124"
-            endingLineNumber = "1124"
+            startingLineNumber = "1116"
+            endingLineNumber = "1116"
             landmarkName = "M_AdjustSliders"
             landmarkType = "9">
          </BreakpointContent>
@@ -266,7 +266,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Quake-iOS/GameControllerSetup.swift"
-            timestampString = "553494562.996824"
+            timestampString = "553494955.131265"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "29"
@@ -282,7 +282,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Quake/keys.c"
-            timestampString = "553494562.996895"
+            timestampString = "553494955.131322"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "637"
@@ -330,7 +330,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Quake-iOS/sys_ios.c"
-            timestampString = "553494562.996994"
+            timestampString = "553494955.131415"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "302"
@@ -346,7 +346,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Quake-iOS/GameControllerSetup.swift"
-            timestampString = "553494562.997043"
+            timestampString = "553494955.131461"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "62"
@@ -362,7 +362,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Quake-iOS/GameViewController.swift"
-            timestampString = "553494562.9970959"
+            timestampString = "553494955.131514"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "423"
@@ -378,7 +378,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Quake-iOS/GameControllerSetup.swift"
-            timestampString = "553494562.9971499"
+            timestampString = "553494955.131568"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "86"

Quake.xcodeproj/xcuserdata/tomkidd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1394,10 +1394,7 @@ Draw_FadeScreen
 */
 void Draw_FadeScreen (void)
 {
-    if (glvr_enabled)
-    {
-        return;
-    }
+    // note: glvr_enabled exited this function immediately. Don't know why. -tkidd
 
     glEnable(GL_BLEND);
 
@@ -1476,23 +1473,14 @@ Setup as if the screen was 320*200
 */
 void GL_Set2D (void)
 {
-    if (glvr_enabled)
-    {
-        GL_Identity (gl_textandfill_matrix);
-        
-        GL_Translate (gl_textandfill_matrix, -2.0, 1.2, 0.0);
-        GL_Scale (gl_textandfill_matrix, 4.0 / vid.width, -4.0 / vid.height, 1.0);
-        
-        GL_MultiplyLeft (gl_textandfill_matrix, glvr_eyetranslation);
-        
-        GL_MultiplyRight (glvr_projection, gl_textandfill_matrix);
-    }
-    else
-    {
-        glViewport (glx, gly, glwidth, glheight);
-        
-        GL_Ortho(gl_textandfill_matrix, 0.0, vid.width, vid.height, 0.0, -99999.0, 99999.0);
-    }
+    GL_Identity (gl_textandfill_matrix);
+    
+    GL_Translate (gl_textandfill_matrix, -2.0, 1.2, 0.0);
+    GL_Scale (gl_textandfill_matrix, 4.0 / vid.width, -4.0 / vid.height, 1.0);
+    
+    GL_MultiplyLeft (gl_textandfill_matrix, gl_translation);
+    
+    GL_MultiplyRight (gl_projection, gl_textandfill_matrix);
 
     glDisable (GL_DEPTH_TEST);
     glDisable (GL_CULL_FACE);

Quake/gl_draw.c

@@ -128,10 +128,7 @@ void R_ApplyWorld (void)
 
     GL_MultiplyLeft (gl_polygon_matrix, r_world_translate_matrix);
 
-    if (glvr_enabled)
-    {
-        GL_MultiplyLeft (gl_polygon_matrix, glvr_eyetranslation);
-    }
+    GL_MultiplyLeft (gl_polygon_matrix, gl_translation);
 }
 
 void R_RotateForEntity (entity_t *e)
@@ -147,15 +144,7 @@ void R_RotateForEntity (entity_t *e)
 
 void R_ApplyProjection (void)
 {
-    // *** THIS ONE BREAKS SHIT
-    if (glvr_enabled)
-    {
-        GL_MultiplyRight (glvr_projection, gl_polygon_matrix);
-    }
-    else
-    {
-        GL_MultiplyRight (gl_projection_matrix, gl_polygon_matrix);
-    }
+    GL_MultiplyRight (gl_projection, gl_polygon_matrix);
 }
 
 /*
@@ -1001,14 +990,7 @@ void R_PolyBlend (void)
     GL_Rotate (transform, -90.0,  1.0, 0.0, 0.0);	    // put Z going up
     GL_Rotate (transform, 90.0,  0.0, 0.0, 1.0);	    // put Z going up
 
-    if (glvr_enabled)
-    {
-        GL_MultiplyRight (glvr_projection, transform);
-    }
-    else
-    {
-        GL_MultiplyRight (gl_projection_matrix, transform);
-    }
+    GL_MultiplyRight (gl_projection, transform);
 
     glUniformMatrix4fv(gl_polygonnotextureprogram_transform, 1, 0, transform);
 
@@ -1221,11 +1203,6 @@ void R_SetupGL (void)
 		w = h = 256;
 	}
 
-    if (!glvr_enabled)
-    {
-        glViewport (glx + x, gly + y2, w, h);
-    }
-
     screenaspect = (float)r_refdef.vrect.width/r_refdef.vrect.height;
 //	yfov = 2*atan((float)r_refdef.vrect.height/r_refdef.vrect.width)*180/M_PI;
     MYgluPerspective (r_refdef.fov_y,  screenaspect,  4,  4096);

Quake/gl_rmain.c

@@ -370,10 +370,8 @@ extern GLfloat gl_projection_matrix[16];
 
 extern qboolean tiltaim_enabled;
 
-extern qboolean glvr_enabled;
-
-extern GLfloat glvr_eyetranslation[16];
-extern GLfloat glvr_projection[16];
+extern GLfloat gl_translation[16];
+extern GLfloat gl_projection[16];
 
 void GL_Use (GLuint program);
 

Quake/glquake.h

@@ -360,16 +360,8 @@ void M_Main_Key (int key)
             Host_Quit_f();
 #else
 #ifdef GLQUAKE
-            // In VR mode, just plainly exit the game.
-            if (glvr_enabled)
-            {
-                key_dest = key_console;
-                Host_Quit_f();
-            }
-            else
-            {
-                M_Menu_Quit_f ();
-            }
+            key_dest = key_console;
+            Host_Quit_f();
 #else
             M_Menu_Quit_f ();
 #endif