Changeset 193 for trunk/VUT/work/ogre_changes/RenderSystems/GL/include

Timestamp:

08/03/05 14:12:41 (19 years ago)

Author:

mattausch

Message:

changed to ogre 103
added readme

Location:

trunk/VUT/work/ogre_changes/RenderSystems/GL/include

Files:

• OgreGLPrerequisites.h (modified) (3 diffs)
• OgreWin32Window.h (modified) (3 diffs)

trunk/VUT/work/ogre_changes/RenderSystems/GL/include/OgreGLPrerequisites.h

@@ -52 +52 @@
 #       define APIENTRY
 #   endif
+#   define GL_GLEXT_LEGACY 
 #   include <OpenGL/gl.h>
 #   include <OpenGL/glu.h>
@@ -270 +271 @@
     if (errCode != GL_NO_ERROR) {  \
     errString = gluErrorString (errCode);  \
-    LogManager::getSingleton().logMessage  ("[GL] :" + ERROR_MSG +  \
+    LogManager::getSingleton().logMessage  ("[GL] :" + Ogre::String(ERROR_MSG) +  \
     " : " + Ogre::String( (const char*) errString)); \
         } \
@@ -282 +283 @@
     errString = gluErrorString (errCode);  \
     OGRE_EXCEPT (Exception::ERR_INTERNAL_ERROR,  \
-    ERROR_MSG +  \
+    Ogre::String(ERROR_MSG) +  \
     " : " + Ogre::String( (const char*) errString), String("")); \
         } \

trunk/VUT/work/ogre_changes/RenderSystems/GL/include/OgreWin32Window.h

@@ -40 +40 @@
                     bool fullScreen, const NameValuePairList *miscParams);
         void destroy(void);
-        bool isActive(void) const;
+        bool isVisible() const;
         bool isClosed(void) const;
         void reposition(int left, int top);
@@ -61 +61 @@
                 // Method for dealing with resize / move & 3d library
                 virtual void windowMovedOrResized(void);
-                bool isReady() const { return mReady; }
-                void setReady(bool set) { mReady = set; }
-                void setActive(bool set) { mActive = set; }
                 
                 void getCustomAttribute( const String& name, void* pData );
@@ -72 +69 @@
                 HDC             mHDC;
                 HGLRC   mGlrc;
-                int             mOldSwapIntervall;
-                bool    mActive;                                // Is active i.e. visible
-                bool    mReady;                                 // Is ready i.e. available for update
+        bool    mIsExternal;
+        bool    mSizing;
                 bool    mClosed;
+        int     mDisplayFrequency;      // fullscreen only, to restore display
         Win32Context *mContext;