Revert "Merge commit 'refs/pull/338/head' of https://github.com/coelc…

…kers/gzdoom"

This reverts commit 65bb8a5, reversing
changes made to 619281d.

CMakeLists.txt

@@ -300,8 +300,6 @@ endif()
 
 set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" )
 
-option( GZDOOM_USE_OPENVR "Support OpenVR API for virtual reality head mounted displays" OFF )
-
 if( NOT CMAKE_CROSSCOMPILING )
 	if( NOT CROSS_EXPORTS )
 		set( CROSS_EXPORTS "" )

src/CMakeLists.txt

@@ -461,31 +461,6 @@ if( NOT DYN_FLUIDSYNTH )
 	endif()
 endif()
 
-if (GZDOOM_USE_OPENVR)
-	find_path(OPENVR_SDK_PATH
-		NAMES
-			headers/openvr.h
-		HINTS
-			ENV OPENVR_DIR ENV PROGRAMFILES ENV HOME ENV USERPROFILE
-		PATH_SUFFIXES
-			openvr git/openvr
-	)
-	find_path(OPENVR_INCLUDE_DIRECTORY
-		NAMES
-			openvr.h
-		HINTS
-			${OPENVR_SDK_PATH}/headers
-	)
-	include_directories("${OPENVR_INCLUDE_DIRECTORY}")
-	find_library(OPENVR_LIBRARY
-		NAMES openvr_api
-		# TODO: Generalize for Mac and Linux and 64-bit Windows
-		HINTS "${OPENVR_SDK_PATH}/lib/win32/"
-	)
-	list(APPEND ZDOOM_LIBS ${OPENVR_LIBRARY})
-	add_definitions("-DUSE_OPENVR")
-endif()
-
 # Start defining source files for ZDoom
 set( PLAT_WIN32_SOURCES
 	sound/mididevices/music_win_mididevice.cpp
@@ -1020,7 +995,6 @@ set (PCH_SOURCES
 	gl/stereo3d/gl_stereo_leftright.cpp
 	gl/stereo3d/scoped_view_shifter.cpp
 	gl/stereo3d/gl_anaglyph.cpp
-	gl/stereo3d/gl_openvr.cpp
 	gl/stereo3d/gl_quadstereo.cpp
 	gl/stereo3d/gl_sidebyside3d.cpp
 	gl/stereo3d/gl_interleaved3d.cpp

src/gl/data/gl_matrix.h

@@ -62,7 +62,7 @@ class VSMatrix {
 		void perspective(FLOATTYPE fov, FLOATTYPE ratio, FLOATTYPE nearp, FLOATTYPE farp);
 		void ortho(FLOATTYPE left, FLOATTYPE right, FLOATTYPE bottom, FLOATTYPE top, FLOATTYPE nearp=-1.0f, FLOATTYPE farp=1.0f);
 		void frustum(FLOATTYPE left, FLOATTYPE right, FLOATTYPE bottom, FLOATTYPE top, FLOATTYPE nearp, FLOATTYPE farp);
-		void copy(FLOATTYPE * pDest) const
+		void copy(FLOATTYPE * pDest)
 		{
 			memcpy(pDest, mMatrix, 16 * sizeof(FLOATTYPE));
 		}