From: fredb <fredb>
Date: Sat, 16 Dec 2006 17:29:16 +0000 (+0000)
Subject: Port jpgfactory to OSG
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=49fcc799ca048bc85e75b05766dacfe3e948f8ed;p=simgear.git

Port jpgfactory to OSG
---

diff --git a/projects/VC7.1/SimGear.vcproj b/projects/VC7.1/SimGear.vcproj
index d87b8dc7..18e48cb3 100755
--- a/projects/VC7.1/SimGear.vcproj
+++ b/projects/VC7.1/SimGear.vcproj
@@ -432,6 +432,12 @@
 			<File
 				RelativePath="..\..\simgear\screen\GLBitmaps.h">
 			</File>
+			<File
+				RelativePath="..\..\simgear\screen\jpgfactory.cxx">
+			</File>
+			<File
+				RelativePath="..\..\simgear\screen\jpgfactory.hxx">
+			</File>
 			<File
 				RelativePath="..\..\simgear\screen\RenderTexture.cpp">
 			</File>
diff --git a/simgear/screen/jpgfactory.cxx b/simgear/screen/jpgfactory.cxx
index a5160cfc..5c260a3f 100644
--- a/simgear/screen/jpgfactory.cxx
+++ b/simgear/screen/jpgfactory.cxx
@@ -21,6 +21,10 @@
 // $Id$
 
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif
@@ -237,13 +241,6 @@ int trJpgFactory::render()
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
 
-    // OSGFIXME
-//     sgFrustum *frustum = ssgGetFrustum();
-    trFrustum(tr,
-              frustum->getLeft(), frustum->getRight(),
-              frustum->getBot(),  frustum->getTop(), 
-              frustum->getNear(), frustum->getFar());
-
     /* just to be safe... */
     glPixelStorei(GL_PACK_ALIGNMENT, 1);
 
diff --git a/simgear/screen/jpgfactory.hxx b/simgear/screen/jpgfactory.hxx
index abc03186..0e631bb9 100644
--- a/simgear/screen/jpgfactory.hxx
+++ b/simgear/screen/jpgfactory.hxx
@@ -27,6 +27,10 @@
 extern "C" {
 #endif
 
+#ifdef HAVE_WINDOWS_H
+#  define XMD_H // to avoid INT32 redefinition
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <jpeglib.h>
@@ -72,6 +76,10 @@ class trJpgFactory {
         void destroy(int error = 0);
 
         int render();
+        void setFrustum(GLdouble left, GLdouble right,
+               GLdouble bottom, GLdouble top,
+               GLdouble zNear, GLdouble zFar) { trFrustum(tr, left, right, bottom, top, zNear, zFar); }
+
         unsigned char *data() { return IMAGE ; }
 
         struct jpeg_compress_struct *JPGinfo() { return &cinfo ; }