Commit Graph

25 Commits

Author SHA1 Message Date
Brecht Van Lommel
ec00764dd2 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD 2008-12-14 17:32:24 +00:00
Brecht Van Lommel
272a91f754 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.
2008-06-17 10:27:34 +00:00
Chris Want
5d0a207ecb Patch from GSR that a) fixes a whole bunch of GPL/BL license
blocks that were previously missed; and b) greatly increase my
ohloh stats!
2008-04-16 22:40:48 +00:00
Kent Mein
320ac3f0e2 Fixing makefiles for binreloc I made it use flags like other
things default on for linux.  ideasman helped me get scons working.
Cmake still needs some love...

Kent
2008-01-18 21:39:47 +00:00
Chris Want
341f50c4f7 Makefile support for bullet2 ... please test 2006-11-22 19:05:35 +00:00
Jiri Hnidek
2ee42ac01e Huge commit: VERSE
- All code is in #ifdef ... #endif
 - Only make build system is supported and you have to add:
    export WITH_VERSE=true
   to user-def.mk file
 - Blender can share only mesh objects and bitmaps now
 - More informations can be found at wiki:
    http://mediawiki.blender.org/index.php/BlenderDev/VerseIntegrationToBlender
    http://mediawiki.blender.org/index.php/BlenderDev/VerseIntegrationToBlenderUserDoc

  I hope, that I didn't forget at anything
2006-08-20 15:22:56 +00:00
Peter Schlaile
9be8517ca3 == FFMPEG ==
Merge conflict indicators left... arghh.
2006-06-25 19:16:45 +00:00
Peter Schlaile
347df56270 == FFMPEG ==
Added Cygwin / mingw default location also
2006-06-25 19:15:50 +00:00
Peter Schlaile
3f34e2a180 == FFMPEG ==
Added extern/ffmpeg.
Gets only build on WITH_FFMPEG=true and NAN_FFMPEG = LCGDIR/ffmpeg.
2006-06-25 18:25:36 +00:00
Kent Mein
43b0fb0b09 When I made solid and qhull not build when not needed I switched their
order around.  solid depends on qhull headers so this fixes it.
(you would only notice if you did not have the qhull headers in blender/../lib)

Kent
2006-06-23 16:35:44 +00:00
Kent Mein
ad388f6a39 small fix to make it so solid and qhull are not build if not needed.
Got the go ahead on #blendercoders, Erwin if you need my address to
hunt me down I'll email it to you. ;)

Kent
2006-06-21 15:27:49 +00:00
Erwin Coumans
745fc2f9d0 updated SConstruct and Makefile so that if you compile the gameengine, is always enables bullet, independent of sumo/ode.
So for the 2.4 release, both bullet AND sumo will be enabled. You can choose in the world buttons which physics engine is active for a scene.

sorry if this breaks your builds!
2005-10-23 17:55:19 +00:00
Chris Want
4a50f5b593 Support for 'Bullet' in the Makefiles. Enable with:
export NAN_USE_BULLET=true

in environment, or in user-def.mk
2005-08-18 06:07:02 +00:00
Kent Mein
8c4608bbf4 I updated the FREETYPE2 checks so it didn't build freetype stuff
if WITH_FREETYPE2 was set to false.

Also added/cleaned up source/nan_compile.mk NAN_NOKETSJI stuff a hair.

Kent
2005-02-18 16:52:03 +00:00
Kent Mein
26f63bfa19 Added bFTGL to extern and updated the Makefiles. I'm guessing there will
need to be tweaks but it seems to work on my linux box.  I haven't
touched any of the other build systems so those will need to be done.

We probably don't need all of this stuff but I figured better to add a little
too much then to little.

Kent
2005-01-21 05:15:33 +00:00
Chris Want
83222e376e Make sure directory $(OCGDIR)/extern is created before building extern
stuff.
2004-08-21 19:12:59 +00:00
Kester Maddock
5ff83fa2b8 One more cleanup for MSVC - need separation for debug/release because MSVC can't handle debug and optimisation flags at the same time. 2004-07-17 04:59:25 +00:00
Kester Maddock
a57cd82e9f Remove all the autoconf stuff for QHull & SOLID and use the Makefiles.
This should make building Solid & Qhull much more reliable.
2004-07-17 02:44:24 +00:00
Hans Lambermont
dd2a4a0249 extend clean target for qhull and solid 2004-05-14 20:40:56 +00:00
Kester Maddock
762b07f13d Enable doubles internally in Solid for the Makefile build system. 2004-05-05 04:12:53 +00:00
Chris Want
79f3e88021 Build blender with solid-based gameengine on irix using pre-compiled
libs. I turned off the automatic building of solid in extern/ for
irix since the vendor supplied build system does not work well.

Note to JW: this can be built with either mipspro 7.3 or 7.4
(I needed to archive solid with "CC -ar ..." for this to work
with 7.3).
2004-05-04 04:55:24 +00:00
Hans Lambermont
fb72b8d937 - build qhull and solid (next to ode) 2004-05-03 17:58:36 +00:00
Hans Lambermont
016cca242f reshuffle the 'install' target :
- 'all' in extern/ first builds every subdir, then also 'install's the
  header files and the library. This way a top-level Makefile only needs
  to call 'all' for extern/ and have it build and install.
- 'clean' still works as it should
2003-01-19 21:17:45 +00:00
Hans Lambermont
80acb04124 Enable automated build and install runs on FreeBSD for ODE.
ODE does not build on FreeBSD out of the box, so an automated patchfile
is included as well.
The 'clean' target reverses the patches that were done by 'all'.
2003-01-11 23:20:10 +00:00
Hans Lambermont
97fece8cde Build and install ode in lib/<platform>
Only enabled for Linux now, and not even tested yet :-P (what do you
mean 'in a hurry' ;-)
2003-01-11 19:14:34 +00:00