MATH: improve type support for viewport argument

scummvm · Aug 15, 2014 · e539b27 · e539b27
1 parent 361eb89
commit e539b27
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
@@ -388,7 +388,7 @@ void GfxOpenGL::getScreenBoundingBox(const Mesh *model, int *x1, int *y1, int *x
 			obj.set(*(pVertices), *(pVertices + 1), *(pVertices + 2));
 
 			Math::Vector3d win;
-			Math::gluMathProject<GLdouble>(obj, modelView, projection, viewPort, win);
+			Math::gluMathProject<GLdouble, GLint>(obj, modelView, projection, viewPort, win);
 
 			if (win.x() > right)
 				right = win.x();
@@ -456,7 +456,7 @@ void GfxOpenGL::getScreenBoundingBox(const EMIModel *model, int *x1, int *y1, in
 			int index = indices[j];
 			Math::Vector3d obj = model->_drawVertices[index];
 			Math::Vector3d win;
-			Math::gluMathProject<GLdouble>(obj, modelView, projection, viewPort, win);
+			Math::gluMathProject<GLdouble, GLint>(obj, modelView, projection, viewPort, win);
 
 			if (win.x() > right)
 				right = win.x();
@@ -533,7 +533,7 @@ void GfxOpenGL::getActorScreenBBox(const Actor *actor, Common::Point &p1, Common
 				Math::Vector3d added(bboxSize.x() * 0.5f * (x * 2 - 1), bboxSize.y() * 0.5f * (y * 2 - 1), bboxSize.z() * 0.5f * (z * 2 - 1));
 				m.transform(&added, false);
 				p = bboxPos + added;
-				Math::gluMathProject<GLdouble>(p, modelView, projection, viewPort, projected);
+				Math::gluMathProject<GLdouble, GLint>(p, modelView, projection, viewPort, projected);
 
 				// Find the points
 				if (projected.x() < p1.x)

diff --git a/engines/grim/gfx_tinygl.cpp b/engines/grim/gfx_tinygl.cpp
@@ -401,7 +401,7 @@ void GfxTinyGL::getScreenBoundingBox(const Mesh *model, int *x1, int *y1, int *x
 			obj.set(*(pVertices), *(pVertices + 1), *(pVertices + 2));
 
 			Math::Vector3d win;
-			Math::gluMathProject<TGLfloat>(obj, modelView, projection, viewPort, win);
+			Math::gluMathProject<TGLfloat, TGLint>(obj, modelView, projection, viewPort, win);
 
 			if (win.x() > right)
 				right = win.x();
@@ -470,7 +470,7 @@ void GfxTinyGL::getScreenBoundingBox(const EMIModel *model, int *x1, int *y1, in
 
 			Math::Vector3d obj = model->_drawVertices[index];
 			Math::Vector3d win;
-			Math::gluMathProject<TGLfloat>(obj, modelView, projection, viewPort, win);
+			Math::gluMathProject<TGLfloat, TGLint>(obj, modelView, projection, viewPort, win);
 
 			if (win.x() > right)
 				right = win.x();
@@ -549,7 +549,7 @@ void GfxTinyGL::getActorScreenBBox(const Actor *actor, Common::Point &p1, Common
 				Math::Vector3d added(bboxSize.x() * 0.5f * (x * 2 - 1), bboxSize.y() * 0.5f * (y * 2 - 1), bboxSize.z() * 0.5f * (z * 2 - 1));
 				m.transform(&added, false);
 				p = bboxPos + added;
-				Math::gluMathProject<TGLfloat>(p, modelView, projection, viewPort, projected);
+				Math::gluMathProject<TGLfloat, TGLint>(p, modelView, projection, viewPort, projected);
 
 				// Find the points
 				if (projected.x() < p1.x)

diff --git a/engines/myst3/gfx_opengl.cpp b/engines/myst3/gfx_opengl.cpp
@@ -357,7 +357,7 @@ Graphics::Surface *OpenGLRenderer::getScreenshot() {
 void OpenGLRenderer::screenPosToDirection(const Common::Point screen, float &pitch, float &heading) {
 	// Screen coords to 3D coords
 	Math::Vector3d obj;
-	Math::gluMathUnProject<double>(Math::Vector3d(screen.x, kOriginalHeight - screen.y, 0.9),
+	Math::gluMathUnProject<double, int>(Math::Vector3d(screen.x, kOriginalHeight - screen.y, 0.9),
 		_cubeModelViewMatrix, _cubeProjectionMatrix, _cubeViewport, obj);
 
 	// 3D coords to polar coords

diff --git a/engines/myst3/gfx_tinygl.cpp b/engines/myst3/gfx_tinygl.cpp
@@ -326,7 +326,7 @@ Graphics::Surface *TinyGLRenderer::getScreenshot() {
 void TinyGLRenderer::screenPosToDirection(const Common::Point screen, float &pitch, float &heading) {
 	// Screen coords to 3D coords
 	Math::Vector3d obj;
-	Math::gluMathUnProject<float>(Math::Vector3d(screen.x, kOriginalHeight - screen.y, 0.9),
+	Math::gluMathUnProject<float, int>(Math::Vector3d(screen.x, kOriginalHeight - screen.y, 0.9),
 		_cubeModelViewMatrix, _cubeProjectionMatrix, _cubeViewport, obj);
 
 	// 3D coords to polar coords

diff --git a/math/glmath.h b/math/glmath.h
@@ -29,8 +29,8 @@
 namespace Math {
 
 // function based on gluProject from Mesa 5.0 glu GPLv2+ licensed sources
-template<typename T>
-bool gluMathProject(Vector3d obj, const T model[16], const T proj[16], const int viewport[4], Vector3d &win) {
+template<typename T, typename S>
+bool gluMathProject(Vector3d obj, const T model[16], const T proj[16], const S viewport[4], Vector3d &win) {
 	Vector4d in, out;
 	Matrix4 modelMatrix, projMatrix;
 
@@ -64,8 +64,8 @@ bool gluMathProject(Vector3d obj, const T model[16], const T proj[16], const int
 }
 
 // function based on gluUnProject from Mesa 5.0 glu GPLv2+ licensed sources
-template<typename T>
-bool gluMathUnProject(Vector3d win, const T model[16], const T proj[16], const int viewport[4], Vector3d &obj) {
+template<typename T, typename S>
+bool gluMathUnProject(Vector3d win, const T model[16], const T proj[16], const S viewport[4], Vector3d &obj) {
 	Matrix4 A;
 	Matrix4 modelMatrix, projMatrix;
 	Vector4d in, out;