Revision: 15249 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15249 Author: blendix Date: 2008-06-17 12:27:34 +0200 (Tue, 17 Jun 2008)
Log Message: ----------- 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. Modified Paths: -------------- trunk/blender/blenderplayer/CMakeLists.txt trunk/blender/extern/CMakeLists.txt trunk/blender/extern/Makefile trunk/blender/extern/SConscript trunk/blender/source/Makefile trunk/blender/source/blender/src/CMakeLists.txt trunk/blender/source/blender/src/Makefile trunk/blender/source/blender/src/SConscript trunk/blender/source/blender/src/usiblender.c trunk/blender/source/creator/CMakeLists.txt trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp trunk/blender/source/gameengine/BlenderRoutines/Makefile trunk/blender/source/gameengine/BlenderRoutines/SConscript trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp trunk/blender/source/gameengine/Converter/BL_MeshDeformer.cpp trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp trunk/blender/source/gameengine/Converter/BL_SkinDeformer.h trunk/blender/source/gameengine/Converter/BL_SkinMeshObject.cpp trunk/blender/source/gameengine/Converter/BL_SkinMeshObject.h trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.h trunk/blender/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp trunk/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp trunk/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.h trunk/blender/source/gameengine/GamePlayer/common/Makefile trunk/blender/source/gameengine/GamePlayer/common/SConscript trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.h trunk/blender/source/gameengine/GamePlayer/ghost/Makefile trunk/blender/source/gameengine/GamePlayer/ghost/SConscript trunk/blender/source/gameengine/Ketsji/BL_Material.cpp trunk/blender/source/gameengine/Ketsji/BL_Material.h trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp trunk/blender/source/gameengine/Ketsji/CMakeLists.txt trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp trunk/blender/source/gameengine/Ketsji/KX_ISceneConverter.h trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp trunk/blender/source/gameengine/Ketsji/Makefile trunk/blender/source/gameengine/Ketsji/SConscript trunk/blender/source/gameengine/Rasterizer/CMakeLists.txt trunk/blender/source/gameengine/Rasterizer/Makefile trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp trunk/blender/source/gameengine/Rasterizer/RAS_CameraData.h trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h trunk/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript trunk/blender/source/gameengine/Rasterizer/SConscript trunk/blender/source/nan_definitions.mk Added Paths: ----------- trunk/blender/extern/glew/ trunk/blender/extern/glew/CMakeLists.txt trunk/blender/extern/glew/ChangeLog trunk/blender/extern/glew/README.txt trunk/blender/extern/glew/SConscript trunk/blender/extern/glew/doc/ trunk/blender/extern/glew/doc/advanced.html trunk/blender/extern/glew/doc/basic.html trunk/blender/extern/glew/doc/credits.html trunk/blender/extern/glew/doc/glew.css trunk/blender/extern/glew/doc/glew.html trunk/blender/extern/glew/doc/glx.txt trunk/blender/extern/glew/doc/glxew.html trunk/blender/extern/glew/doc/gpl.txt trunk/blender/extern/glew/doc/index.html trunk/blender/extern/glew/doc/install.html trunk/blender/extern/glew/doc/log.html trunk/blender/extern/glew/doc/sgi.txt trunk/blender/extern/glew/doc/wglew.html trunk/blender/extern/glew/include/ trunk/blender/extern/glew/include/GL/ trunk/blender/extern/glew/include/GL/glew.h trunk/blender/extern/glew/include/GL/glxew.h trunk/blender/extern/glew/include/GL/wglew.h trunk/blender/extern/glew/src/ trunk/blender/extern/glew/src/Makefile trunk/blender/extern/glew/src/glew.c trunk/blender/source/gameengine/Ketsji/BL_BlenderShader.cpp trunk/blender/source/gameengine/Ketsji/BL_BlenderShader.h Removed Paths: ------------- trunk/blender/source/gameengine/BlenderRoutines/mac_compat_glext.h trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/EXT_separate_specular_color.h trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py Modified: trunk/blender/blenderplayer/CMakeLists.txt =================================================================== --- trunk/blender/blenderplayer/CMakeLists.txt 2008-06-17 10:16:52 UTC (rev 15248) +++ trunk/blender/blenderplayer/CMakeLists.txt 2008-06-17 10:27:34 UTC (rev 15249) @@ -108,6 +108,7 @@ blenkernel_blc bf_quicktime extern_binreloc + extern_glew ) FOREACH(SORTLIB ${BLENDER_SORTED_LIBS}) Modified: trunk/blender/extern/CMakeLists.txt =================================================================== --- trunk/blender/extern/CMakeLists.txt 2008-06-17 10:16:52 UTC (rev 15248) +++ trunk/blender/extern/CMakeLists.txt 2008-06-17 10:27:34 UTC (rev 15249) @@ -43,3 +43,6 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") SUBDIRS(binreloc) ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") + +SUBDIRS(glew) + Modified: trunk/blender/extern/Makefile =================================================================== --- trunk/blender/extern/Makefile 2008-06-17 10:16:52 UTC (rev 15248) +++ trunk/blender/extern/Makefile 2008-06-17 10:27:34 UTC (rev 15249) @@ -30,7 +30,7 @@ SOURCEDIR = extern DIR = $(OCGDIR)/extern -DIRS = qhull/src solid +DIRS = qhull/src solid glew/src ifeq ($(WITH_FREETYPE2), true) DIRS += bFTGL/src Modified: trunk/blender/extern/SConscript =================================================================== --- trunk/blender/extern/SConscript 2008-06-17 10:16:52 UTC (rev 15248) +++ trunk/blender/extern/SConscript 2008-06-17 10:27:34 UTC (rev 15249) @@ -2,6 +2,8 @@ Import('env') +SConscript(['glew/SConscript']) + if env['WITH_BF_GAMEENGINE']: SConscript(['qhull/SConscript', 'solid/SConscript']) Added: trunk/blender/extern/glew/CMakeLists.txt =================================================================== --- trunk/blender/extern/glew/CMakeLists.txt (rev 0) +++ trunk/blender/extern/glew/CMakeLists.txt 2008-06-17 10:27:34 UTC (rev 15249) @@ -0,0 +1,33 @@ +# $Id$ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2006, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): Jacques Beaurain. +# +# ***** END GPL LICENSE BLOCK ***** + +SET(INC include src) + +SET(SRC + src/glew.c +) + +BLENDERLIB(extern_glew "${SRC}" "${INC}") Added: trunk/blender/extern/glew/ChangeLog =================================================================== --- trunk/blender/extern/glew/ChangeLog (rev 0) +++ trunk/blender/extern/glew/ChangeLog 2008-06-17 10:27:34 UTC (rev 15249) @@ -0,0 +1,1703 @@ +2005-05-16 00:35 ikits + + * auto/src/template.html, doc/advanced.html, doc/basic.html, + doc/credits.html, doc/index.html, doc/install.html, doc/log.html: + getting ready for the release + +2005-05-16 00:14 ikits + + * auto/Makefile: Added option for splitting the source into + multiple files + +2005-05-16 00:13 ikits + + * auto/bin/update_ext.sh: Fixed GL_ARB_transpose_matrix bug + +2005-04-22 18:47 ikits + + * auto/: bin/update_ext.sh, core/GL_VERSION_2_0: fixed bugs 1185517 + and 1182116 + +2005-04-04 23:49 ikits + + * auto/src/: glew_head.c, glew_init_gl.c: fix for OGL 2.0 problem + +2005-03-16 21:49 ikits + + * config/version: bump version number + +2005-03-16 21:48 ikits + + * auto/src/glew_init_gl.c: minor issue + +2005-03-16 21:04 ikits + + * doc/advanced.html, doc/basic.html, doc/credits.html, + doc/index.html, doc/install.html, doc/log.html, + auto/src/template.html: getting ready for the release + +2005-03-16 20:49 ikits + + * ChangeLog: it's that time again + +2005-03-16 20:48 ikits + + * TODO.txt: fix it when there is time + +2005-03-16 20:45 ikits + + * auto/src/glew_init_gl.c: added check for crippled hardware + +2005-03-14 23:50 ikits + + * auto/src/template.html: documentation update + +2005-03-14 23:38 ikits + + * doc/log.html: update log + +2005-03-14 23:24 ikits + + * TODO.txt: done + +2005-03-14 23:21 ikits + + * doc/: advanced.html, basic.html, credits.html, index.html, + install.html, log.html, glew.css: changes for html 4.01 + compliance + +2005-03-14 00:13 ikits + + * TODO.txt: oops + +2005-03-14 00:10 ikits + + * TODO.txt: some more + +2005-03-14 00:08 ikits + + * TODO.txt: the road ahead + +2005-03-14 00:00 ikits + + * config/: Makefile.mingw, Makefile.mingw32: fixed bug #1161790 + +2005-03-13 23:09 ikits + + * auto/core/: GL_APPLE_pixel_buffer, GL_EXT_framebuffer_object, + GL_SGIX_shadow: cleanup and bug fixes; thanks to Stephane for + these + +2005-02-05 02:17 ikits + + * auto/core/GL_VERSION_2_0: fixed bug 1116569 + +2005-02-03 00:25 ikits + + * ChangeLog: version bump + +2005-02-03 00:21 ikits + + * config/version: version bump + +2005-02-03 00:13 ikits + + * doc/log.html: oops + +2005-02-02 23:28 ikits + + * doc/index.html: added reference + +2005-02-02 22:49 ikits + + * doc/install.html: ready for release + +2005-02-02 22:34 ikits + + * auto/Makefile, auto/src/template.html, doc/advanced.html, + doc/basic.html, doc/credits.html, doc/glew.css, doc/index.html, + doc/install.html, doc/log.html: prepare for release + +2005-01-30 17:26 ikits + + * doc/advanced.html, doc/basic.html, doc/credits.html, + doc/index.html, doc/install.html, doc/log.html, + auto/src/template.html: , + +2005-01-30 17:12 ikits + + * doc/install.html: corrected VS.NET install location + +2005-01-30 01:46 ikits + + * auto/src/: glew.rc, glewinfo.rc, visualinfo.rc: added description + fields + +2005-01-30 01:35 ikits + + * ChangeLog, doc/log.html: update logs + +2005-01-29 20:48 ikits + + * auto/Makefile, auto/src/glew.rc, auto/src/glewinfo.rc, + auto/src/visualinfo.rc, build/vc6/glew_shared.dsp, + build/vc6/glew_static.dsp, build/vc6/glewinfo.dsp, + build/vc6/visualinfo.dsp: added resource files for win32 + versioning + +2005-01-29 18:39 ikits + + * config/version: changed versioning to make it easier to follow + +2005-01-29 11:59 ikits + + * auto/src/glew_head.h: fix borland compilation problem + +2005-01-28 23:36 ikits + + * auto/bin/parse_spec.pl: fixed GLhalf bug + +2005-01-21 09:04 ikits + + * auto/core/GL_EXT_framebuffer_object: ubercomplete + +2005-01-20 19:53 ikits + + * auto/core/GL_VERSION_2_0: fixed bugs + +2005-01-11 18:03 mem + + * auto/lib/OpenGL/Spec.pm: Clean up a little + +2005-01-11 15:40 mem + + * auto/lib/OpenGL/Spec.pm: Modularized parser + +2005-01-06 01:53 ikits + + * doc/: advanced.html, basic.html, credits.html, index.html, + install.html, log.html, ogl_sm.jpg, new.png: sync up webpage and + docs + +2005-01-06 01:26 ikits + + * TODO.txt: one more item + +2005-01-06 01:25 ikits + + * auto/bin/update_ext.sh: fixed GLhandleARB + +2005-01-05 15:37 mem + + * config/version: Forgot to bump GLEW version + +2005-01-05 15:35 mem + + * TODO.txt: Expanded TODO item about autoinitialization + +2005-01-05 15:27 mem + + * ChangeLog: Added ChangeLog. The file is generated with cvs2cl. + +2005-01-05 15:19 mem + + * Makefile, auto/Makefile, config/Makefile.darwin, + config/Makefile.freebsd, config/Makefile.irix, + config/Makefile.linux, config/Makefile.solaris, config/version: + Fix soname, ABI broke + +2005-01-04 20:55 ikits + + * doc/gpl.txt: documentation update + +2005-01-04 20:32 ikits + + * doc/index.html: documentation update + +2005-01-04 20:17 ikits + + * doc/glew.css: documentation update + +2005-01-04 20:10 ikits + + * auto/src/template.html, doc/README.html, doc/advanced.html, + doc/basic.html, doc/credits.html, doc/index.html, + doc/install.html, doc/log.html: documentation update + +2005-01-04 20:01 ikits + + * README.txt, auto/src/template.html, doc/glew.css: documentation + update + +2005-01-04 10:02 ikits + + * auto/src/glew_head.c: bug fixes + +2005-01-04 01:00 ikits + + * auto/src/template.html: web crap + +2005-01-04 00:30 ikits + + * auto/: bin/make_str.pl, src/glew_head.c, src/glew_str_glx.c, + src/glew_str_head.c, src/glew_str_tail.c, src/glew_str_wgl.c, + src/glew_utils.c, src/glew_utils.h: extended glewIsSupported + +2005-01-03 23:17 ikits + + * config/: Makefile.solaris, Makefile.sunos: makefile fixes + +2005-01-03 23:11 ikits + + * Makefile, config/Makefile.cygwin, config/Makefile.mingw32: + makefile fixes + +2005-01-03 22:57 ikits + + * Makefile, config/Makefile.darwin: added darwin makefile + +2005-01-03 22:29 ikits + + * auto/: Makefile, bin/make_info.pl, bin/make_list.pl, + bin/make_str.pl: bug fixes + +2005-01-03 22:05 ikits + + * auto/: Makefile, bin/make_init.pl, src/glew_head.c, + src/glew_utils.c, src/glew_utils.h: bug fixes + +2005-01-03 02:32 ikits + + * Makefile, TODO.txt, auto/Makefile, + auto/bin/fix_OML_sync_control.sh, auto/bin/make.pl, + auto/bin/make_def_fun.pl, auto/bin/make_def_var.pl, + auto/bin/make_header.pl, auto/bin/make_html.pl, + auto/bin/make_info.pl, auto/bin/make_info_list.pl, + auto/bin/make_init.pl, auto/bin/make_list.pl, + auto/bin/make_str.pl, auto/bin/make_struct_fun.pl, + auto/bin/make_struct_var.pl, auto/bin/parse_spec.pl, + auto/bin/update_ext.sh, auto/bin/update_registry.sh, + auto/src/glew_head.html, auto/src/glew_tail.html, + auto/src/glxew_head.html, auto/src/wglew_head.html, + auto/src/wglew_tail.html, src/visualinfo.c: Year bump in + copyright message. Removed obsolete files from auto/src. + +2005-01-03 02:09 ikits + + * build/vc6/: glew_shared.dsp, glew_static.dsp: Single file now + compiles with VC71. Kept multi-file split for future use. + +2005-01-03 02:05 ikits + + * auto/Makefile, auto/bin/make_header.pl, auto/bin/make_html.pl, + auto/src/glew_gl_fun.c, auto/src/glew_gl_head.c, + auto/src/glew_gl_init.c, auto/src/glew_gl_tail.c, + auto/src/glew_gl_var.c, auto/src/glew_glx_fun.c, + auto/src/glew_glx_head.c, auto/src/glew_glx_init.c, + auto/src/glew_glx_tail.c, auto/src/glew_glx_var.c, @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs