diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-06-26 13:15:41 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-06-26 13:15:41 +0400 |
| commit | 4c53f38756976704bab11a3dd8c33c71d926e6b8 (patch) | |
| tree | 5db17347afbc71062a77f01f1197a9bfe7f0c20d /source/gameengine/GamePlayer | |
| parent | f69cc652e283bfa1958ae6945b0a014eb7d50906 (diff) | |
Minor Fixes:
Better use of booleans for python
#include fixes for Windows
Python Doc fixes
Use the farthest vertex as the face position when z sorting faces. (Camera is on -z axis!)
Diffstat (limited to 'source/gameengine/GamePlayer')
| -rw-r--r-- | source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp | 24 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 9 |
2 files changed, 22 insertions, 11 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp index 472d921dbe9..c4715c5f060 100644 --- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp +++ b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp @@ -34,6 +34,19 @@ #include <config.h> #endif +#ifdef WIN32 +#include <windows.h> +#endif // WIN32 +#ifdef __APPLE__ +#include <OpenGL/gl.h> +#include <OpenGL/glu.h> +#else +#include <GL/gl.h> +#include <GL/glu.h> +#endif + + + #include "GPC_PolygonMaterial.h" #include "MT_Vector3.h" #include "RAS_IRasterizer.h" @@ -66,17 +79,6 @@ #include "IMB_imbuf_types.h" /* end of blender include block */ -#ifdef WIN32 -#include <windows.h> -#endif // WIN32 -#ifdef __APPLE__ -#include <OpenGL/gl.h> -#include <OpenGL/glu.h> -#else -#include <GL/gl.h> -#include <GL/glu.h> -#endif - static Image *fCurpage=0; static int fCurtile=0, fCurmode=0, fCurTileXRep=0, fCurTileYRep=0; static short fTexWindx, fTexWindy, fTexWinsx, fTexWinsy; diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 868f9f1ea40..48859392b54 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -37,6 +37,15 @@ #ifdef WIN32 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning + #include <windows.h> +#endif + +#ifdef __APPLE__ +#include <OpenGL/gl.h> +#include <OpenGL/glu.h> +#else +#include <GL/gl.h> +#include <GL/glu.h> #endif #include "GPG_Application.h" |