[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11109] branches/soc-2007-maike/source/ gameengine: include change for GLEW integration
Miguel Torres Lima
torreslima at gmail.com
Thu Jun 28 19:29:16 CEST 2007
Revision: 11109
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11109
Author: maike
Date: 2007-06-28 19:29:15 +0200 (Thu, 28 Jun 2007)
Log Message:
-----------
include change for GLEW integration
Modified Paths:
--------------
branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2007-maike/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/src/blender_plugin_types.h
branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/colorcycle/TST_colorcycle.c
branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/gears/TST_gears.c
branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/threaded_gears/TST_threaded_gears.c
branches/soc-2007-maike/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2007-maike/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2007-maike/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2007-maike/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2007-maike/source/gameengine/Physics/Sumo/Fuzzics/sample/particle.cpp
branches/soc-2007-maike/source/gameengine/Physics/Sumo/Fuzzics/sample/particle0.cpp
branches/soc-2007-maike/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
branches/soc-2007-maike/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
branches/soc-2007-maike/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/soc-2007-maike/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2007-maike/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
Modified: branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
===================================================================
--- branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h 2007-06-28 17:29:15 UTC (rev 11109)
@@ -32,13 +32,12 @@
#ifndef __KX_BLENDERCANVAS
#define __KX_BLENDERCANVAS
+#include <GL/glew.h>
+
#ifdef WIN32
#include <windows.h>
#endif
#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
#endif
#include "RAS_ICanvas.h"
Modified: branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
===================================================================
--- branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp 2007-06-28 17:29:15 UTC (rev 11109)
@@ -46,15 +46,10 @@
#include <string.h>
#include "BMF_Api.h"
+#include <GL/glew.h>
-
#ifdef __APPLE__
#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
#endif
#include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
#include "RAS_OpenGLRasterizer/ARB_multitexture.h"
Modified: branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
===================================================================
--- branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp 2007-06-28 17:29:15 UTC (rev 11109)
@@ -31,15 +31,14 @@
#include "KX_BlenderRenderTools.h"
+#include <GL/glew.h>
+
#ifdef WIN32
// OpenGL gl.h needs 'windows.h' on windows platforms
#include <windows.h>
#endif //WIN32
#ifdef __APPLE__
#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
#endif
#include "RAS_IRenderTools.h"
Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_Canvas.h
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_Canvas.h 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_Canvas.h 2007-06-28 17:29:15 UTC (rev 11109)
@@ -40,13 +40,13 @@
#ifdef WIN32
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#include <windows.h>
- #include <GL/gl.h>
+ #include <GL/glew.h>
#else // WIN32
// __APPLE__ is defined
- #include <AGL/gl.h>
+ #include <GL/glew.h>
#endif // WIN32
#else //defined(WIN32) || defined(__APPLE__)
- #include <GL/gl.h>
+ #include <GL/glew.h>
#endif //defined(WIN32) || defined(__APPLE__)
#include <map>
Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp 2007-06-28 17:29:15 UTC (rev 11109)
@@ -34,16 +34,13 @@
#include <config.h>
#endif
+#include <GL/glew.h>
+
#ifdef WIN32
#include <windows.h>
#endif // WIN32
#ifdef __APPLE__
#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
#endif
Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp 2007-06-28 17:29:15 UTC (rev 11109)
@@ -31,6 +31,7 @@
*/
#include <assert.h>
+#include <GL/glew.h>
#ifdef WIN32
#pragma warning (disable : 4786)
@@ -39,9 +40,6 @@
#ifdef __APPLE__
#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
#endif
#include <iostream>
Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_RenderTools.h
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_RenderTools.h 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/common/GPC_RenderTools.h 2007-06-28 17:29:15 UTC (rev 11109)
@@ -36,13 +36,13 @@
#if defined(WIN32) || defined(__APPLE__)
#ifdef WIN32
#include <windows.h>
- #include <GL/gl.h>
+ #include <GL/glew.h>
#else // WIN32
// __APPLE__ is defined
- #include <AGL/gl.h>
+ #include <GL/glew.h>
#endif // WIN32
#else //defined(WIN32) || defined(__APPLE__)
- #include <GL/gl.h>
+ #include <GL/glew.h>
#endif //defined(WIN32) || defined(__APPLE__)
Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/ghost/GPG_Application.cpp 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/ghost/GPG_Application.cpp 2007-06-28 17:29:15 UTC (rev 11109)
@@ -35,6 +35,8 @@
#include <config.h>
#endif
+#include <GL/glew.h>
+
#ifdef WIN32
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#include <windows.h>
@@ -42,11 +44,6 @@
#ifdef __APPLE__
#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
#endif
#include "GPG_Application.h"
Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/src/blender_plugin_types.h
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/src/blender_plugin_types.h 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/src/blender_plugin_types.h 2007-06-28 17:29:15 UTC (rev 11109)
@@ -35,6 +35,7 @@
#define BLENDER_PLUGIN_TYPES_H
#include <stdio.h>
+#include <GL/glew.h>
#ifdef _WIN32
/* Windows stuff goes here: */
Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/colorcycle/TST_colorcycle.c
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/colorcycle/TST_colorcycle.c 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/colorcycle/TST_colorcycle.c 2007-06-28 17:29:15 UTC (rev 11109)
@@ -35,7 +35,7 @@
#include <X11/Intrinsic.h>
#include <stdio.h>
#include "npapi.h"
-#include <GL/gl.h>
+#include <GL/glew.h>
#include <GL/glx.h>
#include "NZC_application_hooks.h"
Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/gears/TST_gears.c
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/gears/TST_gears.c 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/gears/TST_gears.c 2007-06-28 17:29:15 UTC (rev 11109)
@@ -159,6 +159,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <GL/glew.h>
#include <GL/glut.h>
#include <X11/keysym.h>
#include <X11/Intrinsic.h>
Modified: branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/threaded_gears/TST_threaded_gears.c
===================================================================
--- branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/threaded_gears/TST_threaded_gears.c 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/GamePlayer/netscape/test/threaded_gears/TST_threaded_gears.c 2007-06-28 17:29:15 UTC (rev 11109)
@@ -177,6 +177,7 @@
#include <unistd.h>
#include <stdio.h>
#include <string.h>
+#include <GL/glew.h>
#include <GL/glut.h>
#include <X11/keysym.h>
#include <X11/Intrinsic.h>
Modified: branches/soc-2007-maike/source/gameengine/Ketsji/BL_Shader.cpp
===================================================================
--- branches/soc-2007-maike/source/gameengine/Ketsji/BL_Shader.cpp 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/Ketsji/BL_Shader.cpp 2007-06-28 17:29:15 UTC (rev 11109)
@@ -1,14 +1,11 @@
// ------------------------------------
+#include <GL/glew.h>
+
#ifdef WIN32
#include <windows.h>
#endif // WIN32
#ifdef __APPLE__
#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
#endif
#include <iostream>
Modified: branches/soc-2007-maike/source/gameengine/Ketsji/BL_Texture.cpp
===================================================================
--- branches/soc-2007-maike/source/gameengine/Ketsji/BL_Texture.cpp 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/Ketsji/BL_Texture.cpp 2007-06-28 17:29:15 UTC (rev 11109)
@@ -1,14 +1,12 @@
// ------------------------------------
+
+#include <GL/glew.h>
+
#ifdef WIN32
#include <windows.h>
#endif // WIN32
#ifdef __APPLE__
#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
#endif
#include <iostream>
Modified: branches/soc-2007-maike/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
===================================================================
--- branches/soc-2007-maike/source/gameengine/Ketsji/KX_BlenderMaterial.cpp 2007-06-28 17:27:48 UTC (rev 11108)
+++ branches/soc-2007-maike/source/gameengine/Ketsji/KX_BlenderMaterial.cpp 2007-06-28 17:29:15 UTC (rev 11109)
@@ -6,16 +6,13 @@
#include <config.h>
#endif
+#include <GL/glew.h>
+
#ifdef WIN32
#include <windows.h>
#endif // WIN32
#ifdef __APPLE__
#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
#endif
#include "KX_BlenderMaterial.h"
Modified: branches/soc-2007-maike/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list