Blender Git Commit Log

Git Commits -> Revision 272a91f

Revision 272a91f by Brecht Van Lommel (master)

June 17, 2008, 10:27 (GMT)

Merge of apricot branch game engine changes into trunk, excluding GLSL.

GLEW
====

Added the GLEW opengl extension library into extern/, always compiled
into Blender now. This is much nicer than doing this kind of extension
management manually, and will be used in the game engine, for GLSL, and
other opengl extensions.

* According to the GLEW website it works on Windows, Linux, Mac OS X,
FreeBSD, Irix, and Solaris. There might still be platform specific
issues due to this commit, so let me know and I'll look into it.
* This means also that all extensions will now always be compiled in,
regardless of the glext.h on the platform where compilation happens.

Game Engine
===========

Refactoring of the use of opengl extensions and other drawing code
in the game engine, and cleaning up some hacks related to GLSL
integration. These changes will be merged into trunk too after this.

The game engine graphics demos & apricot level survived my tests,
but this could use some good testing of course.

For users: please test with the options "Generate Display Lists" and
"Vertex Arrays" enabled, these should be the fastest and are supposed
to be "unreliable", but if that's the case that's probably due to bugs
that can be fixed.

* The game engine now also uses GLEW for extensions, replacing the
custom opengl extensions code that was there. Removes a lot of
#ifdef's, but the runtime checks stay of course.
* Removed the WITHOUT_GLEXT environment variable. This was added to
work around a specific bug and only disabled multitexturing anyway.
It might also have caused a slowdown since it was retrieving the
environment variable for every vertex in immediate mode (bug #13680).

* Refactored the code to allow drawing skinned meshes with vertex
arrays too, removing some specific immediate mode drawing functions
for this that only did extra normal calculation. Now it always splits
vertices of flat faces instead.
* Refactored normal recalculation with some minor optimizations,
required for the above change.
* Removed some outdated code behind the __NLA_OLDDEFORM #ifdef.
* Fixed various bugs in setting of multitexture coordinates and vertex
attributes for vertex arrays. These were not being enabled/disabled
correct according to the opengl spec, leading to crashes. Also tangent
attributes used an immediate mode call for vertex arrays, which can't
work.
* Fixed use of uninitialized variable in RAS_TexVert.
* Exporting skinned meshes was doing O(n^2) lookups for vertices and
deform weights, now uses same trick as regular meshes.

Commit Details:

Full Hash: 272a91f754fd215f2ad9b48ba80fe56ee0564d7a
SVN Revision: 15249
Parent Commit: c9d1924
Lines Changed: +23056, -3954

10 Added Paths:

/extern/glew/CMakeLists.txt (+33, -0) (View)
/extern/glew/include/GL/glew.h (+9797, -0) (View)
/extern/glew/include/GL/glxew.h (+1062, -0) (View)
/extern/glew/include/GL/wglew.h (+934, -0) (View)
/extern/glew/README.txt (+18, -0) (View)
/extern/glew/SConscript (+12, -0) (View)
/extern/glew/src/glew.c (+9756, -0) (View)
/extern/glew/src/Makefile (+56, -0)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+149, -0) (View)
/source/gameengine/Ketsji/BL_BlenderShader.h (+44, -0) (View)

4 Deleted Paths:

/source/gameengine/BlenderRoutines/mac_compat_glext.h (+0, -132)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h (+0, -150)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/EXT_separate_specular_color.h (+0, -12)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py (+0, -627)

73 Modified Paths:

/blenderplayer/CMakeLists.txt (+1, -0) (Diff)
/extern/CMakeLists.txt (+3, -0) (Diff)
/extern/Makefile (+1, -1) (Diff)
/extern/SConscript (+2, -0) (Diff)
/source/blender/src/CMakeLists.txt (+1, -1) (Diff)
/source/blender/src/Makefile (+1, -0) (Diff)
/source/blender/src/SConscript (+1, -1) (Diff)
/source/blender/src/usiblender.c (+1, -0) (Diff)
/source/creator/CMakeLists.txt (+1, -0) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+16, -28) (Diff)
/source/gameengine/BlenderRoutines/CMakeLists.txt (+1, -0) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h (+2, -6) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp (+12, -40) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp (+2, -11) (Diff)
/source/gameengine/BlenderRoutines/Makefile (+2, -1) (Diff)
/source/gameengine/BlenderRoutines/SConscript (+1, -0) (Diff)
/source/gameengine/Converter/BL_ArmatureObject.cpp (+1, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+21, -12) (Diff)
/source/gameengine/Converter/BL_MeshDeformer.cpp (+108, -52) (Diff)
/source/gameengine/Converter/BL_MeshDeformer.h (+3, -4) (Diff)
/source/gameengine/Converter/BL_SkinDeformer.cpp (+5, -38) (Diff)
/source/gameengine/Converter/BL_SkinDeformer.h (+2, -2) (Diff)
/source/gameengine/Converter/BL_SkinMeshObject.cpp (+12, -12) (Diff)
/source/gameengine/Converter/BL_SkinMeshObject.h (+13, -30) (Diff)
/source/gameengine/Converter/KX_BlenderSceneConverter.cpp (+13, -1) (Diff)
/source/gameengine/Converter/KX_BlenderSceneConverter.h (+5, -0) (Diff)
/source/gameengine/GamePlayer/common/CMakeLists.txt (+1, -0) (Diff)
/source/gameengine/GamePlayer/common/GPC_Canvas.h (+6, -12) (Diff)
/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp (+1, -18) (Diff)
/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp (+3, -11) (Diff)
/source/gameengine/GamePlayer/common/GPC_RenderTools.h (+4, -11) (Diff)
/source/gameengine/GamePlayer/common/Makefile (+1, -0) (Diff)
/source/gameengine/GamePlayer/common/SConscript (+2, -1) (Diff)
/source/gameengine/GamePlayer/ghost/CMakeLists.txt (+1, -0) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+10, -33) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.h (+1, -0) (Diff)
/source/gameengine/GamePlayer/ghost/Makefile (+1, -0) (Diff)
/source/gameengine/GamePlayer/ghost/SConscript (+2, -1) (Diff)
/source/gameengine/Ketsji/BL_Material.cpp (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_Material.h (+2, -1) (Diff)
/source/gameengine/Ketsji/BL_Shader.cpp (+119, -187) (Diff)
/source/gameengine/Ketsji/BL_Texture.cpp (+49, -112) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.cpp (+180, -109) (Diff)
/source/gameengine/Ketsji/KX_BlenderMaterial.h (+11, -2) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+2, -2) (Diff)
/source/gameengine/Ketsji/KX_ISceneConverter.h (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+20, -48) (Diff)
/source/gameengine/Ketsji/Makefile (+1, -0) (Diff)
/source/gameengine/Ketsji/SConscript (+1, -1) (Diff)
/source/gameengine/Rasterizer/CMakeLists.txt (+1, -0) (Diff)
/source/gameengine/Rasterizer/Makefile (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp (+26, -37) (Diff)
/source/gameengine/Rasterizer/RAS_CameraData.h (+2, -2) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp (+0, -6) (Diff)
/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h (+0, -2) (Diff)
/source/gameengine/Rasterizer/RAS_IRasterizer.h (+6, -23) (Diff)
/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp (+5, -34) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.cpp (+15, -12) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.h (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp (+27, -649) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h (+4, -503) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp (+7, -12) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+253, -802) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h (+12, -25) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp (+167, -131) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h (+6, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript (+3, -3) (Diff)
/source/gameengine/Rasterizer/SConscript (+1, -1) (Diff)
/source/Makefile (+1, -0) (Diff)
/source/nan_definitions.mk (+1, -0) (Diff)

Blender Git Commit Log

Git Commits -> Revision 272a91f

Commit Details:

10 Added Paths:

4 Deleted Paths:

73 Modified Paths:

Navigation

Stats

RSS Feeds

Blender Git Commit Log

Git Commits -> Revision 272a91f Go

Commit Details:

10 Added Paths:

4 Deleted Paths:

73 Modified Paths:

Navigation

Stats

RSS Feeds

Git Commits -> Revision 272a91f