Commit Graph

225 Commits

Author SHA1 Message Date
Erwin Coumans
52ccf71309 fixed in Bullet 2.x, should make msvc 6 compile, and reverted to 'old' style solver by default. 2006-11-23 02:42:53 +00:00
Erwin Coumans
083c310d1f fixed some code that causes problems with msvc 6 (need to verify) 2006-11-23 00:23:07 +00:00
Chris Want
341f50c4f7 Makefile support for bullet2 ... please test 2006-11-22 19:05:35 +00:00
Nathan Letwory
84a85f2b7e * tweak priority of bullet libs for blenderplayer 2006-11-21 13:19:39 +00:00
Erwin Coumans
318b98fc9a some fixes, related to object activation in game blender 2006-11-21 11:56:02 +00:00
Nathan Letwory
057a6e3360 * small priority fix. Hopefully helps on more platforms 2006-11-21 10:58:07 +00:00
Erwin Coumans
dba9042bb5 added ConeZ/ConeX 2006-11-21 08:22:01 +00:00
Erwin Coumans
98525b0210 added CMake file for new Bullet 2.x 2006-11-21 06:36:09 +00:00
Nathan Letwory
eb73025c63 ==SCons==
Enable Bullet2 for Scons. This should work for all platforms, but please, test, test,
 test, test, test (ad infinitum)
2006-11-21 06:11:41 +00:00
Erwin Coumans
3026843f23 angular-only hinge updated 2006-11-21 01:09:37 +00:00
Erwin Coumans
eec5ae7d50 angular-only hinge updated 2006-11-21 01:06:23 +00:00
Erwin Coumans
46234f90ce Removed old Blender/extern/bullet, and upgraded game engine to use Bullet 2.x
All platforms/build systems: either upgrade to use extern/bullet2, or disable the game engine until the build is fixed.
2006-11-21 00:53:40 +00:00
Erwin Coumans
d58670ddd2 catch up with latest Bullet 2.x (not in use yet) 2006-11-21 00:03:56 +00:00
Jacques Beuarain
41cb8f15ea CMake: Remove mkprot directory. Accidentally left this in from earlier development. 2006-11-17 23:25:15 +00:00
Kent Mein
7fc699eea3 This updates the Makefiles for verse so they use the blender compiler
settings, and build system.  Now it builds the library in obj just like
other stuff instead of the source tree directly.
Its not doing the dynamic building of specific c files but JesterKing said
this should be ok.  So whine at him if its not.... ;)

Kent
2006-11-17 18:12:12 +00:00
Jacques Beuarain
24f4440d05 CMake lists initial submission. Documentationand further verification for different platforms will follow soon. This was just tested against current CVS on MSVC 2005 with Verse, QuickTime, OpenEXR, Player all on. 2006-11-17 02:27:12 +00:00
Nathan Letwory
5a609daa75 * undo commit from 27th of October. Fixing the long-paths issue worked only on a number of boxes, so from now on the BF_BUILDDIR=c:\b -way is the only way to properly get Blender built with scons/mingw. 2006-11-14 05:47:52 +00:00
Erwin Coumans
3a1b7ece40 updating Bullet 2.x with latest changes. The integration + C-API will follow at some stage. 2006-11-12 21:05:10 +00:00
Nathan Letwory
e71fc134fe * have blenderplayer compile with Verse support enabled. 2006-11-01 05:43:05 +00:00
Erwin Coumans
92fd043346 update Bullet 2.x with latest changes, notice that the integration is not finished yet, and GameBlender is still using extern/bullet. 2006-10-31 18:19:57 +00:00
Nathan Letwory
45c1f23f19 Apply patch #5127 by Joseph Eagar (joeedh)
* This addresses the long command-line problem when building with SCons/MingW on windows through a dosbox (cmd.exe).

My test buildpath was: C:\Documents and Settings\nathan\My Documents\blender\build\win32-mingw
Should be rather long enough, don't you think?

/Nathan
2006-10-27 09:01:42 +00:00
Erwin Coumans
44d16f0562 Added refactored Bullet 2.x library. Important: these files are not part of the Blender build yet. First, the integration will be updated to make use of the new Bullet version. Then all build systems needs to be updated.
The refactoring didn't leave a single file the same, all filenames and classes have bt prefix, methodnames start with lowercase, a single headerfile can be included, and also a single include path.
Plan is to make use of this Bullet 2.x version in extern/bullet2 within the coming weeks, then extern/bullet can be discarded/ignored/content removed.
2006-10-23 02:54:30 +00:00
Nathan Letwory
980608af53 * remove -Wextra from makefile to make older compilers happy
* updated v_connection with version from Verse CVS for better unhandled unhandled-packet printing
2006-10-16 10:54:51 +00:00
Nathan Letwory
b2a8417fce Add Verse master-server functionality
* added two files from verse-master
* server list is available in outliner (new mode "Verse Servers")
* verse sessions are now also in new mode "Verse Sessions" in outliner
* fixed drawing of verse sessions and their nodes
* in user preferences System & OpenGL master-server ip setting (default master.uni-verse.org)
* in File>Verse entry "Get Servers" to get server list or
* RMB on "Available Verse Servers" in outliner to "Refresh" server list

Enjoy :)
2006-10-12 11:53:50 +00:00
Nathan Letwory
1266234202 * remove the .Append(LIBS = ['libverse']), since it confused the build system.
* removed unused options BF_VERSE_LIBPATH, BF_VERSE, BF_VERSE_LIBS, since they are not used at all.
* some whitespace mods

There should be no more issues with "libverse.lib" not being found (or anything like
 that).
2006-10-11 07:28:37 +00:00
Andrea Weikert
0f497dea2b ==== MSVC 7 project files ====
- added vs_master.c to verse_server project
- added dependency on verse to verse_server project
- cleanup of object file name in verse_server project
2006-10-03 21:44:18 +00:00
Nathan Letwory
1c1283198b * fix small bug in creation of verse server executable (path)
* remove debug printouts
2006-10-03 12:22:56 +00:00
Nathan Letwory
859ea2fc01 * make verse compile with new verse release
* added -src/-dst patch from Emil (on my request - is already in verse CVS)
2006-10-03 11:33:41 +00:00
Jiri Hnidek
9726cdc493 - I forgot to add new file to cvs repo during my last commit, I'm sorry 2006-10-03 11:09:58 +00:00
Jiri Hnidek
b62927b85c updated verse to version r6p1 2006-10-02 13:29:17 +00:00
Andrea Weikert
230b1a85d7 === MSVC 7 project files ===
- small fix of a few output paths
2006-10-01 14:30:14 +00:00
Andrea Weikert
0b7e25d3bd === MSVC 7 project files ===
- added verse support
- verse library and server are compiled with the extern solution
- note: verse server still misses icon, VS2003 refuses to add the currently provided icon
2006-09-30 14:31:27 +00:00
Andrea Weikert
857f7a66fa ==== MSVC 7 project files ===
maintenance work:
- added missing files in blenkernel
- updated Bullet in extern
- Python: SurfNurb.c
- removed compile and dependency of PHY_Ode
- made blenderplayer compile again (had to add pthreads lib)
2006-09-17 17:55:57 +00:00
Erwin Coumans
ed064df60b fixed bug in contact manifold generation, concave and compound objects require point with deepest penetration. 2006-09-05 04:16:35 +00:00
Chris Want
7970da34ed 'Better' cleaning for bullet (trickier to clean than most, since it is two
libraries split among many subdirectories).
2006-09-01 22:00:29 +00:00
Erwin Coumans
5c24f4a989 updated aabb calculation 2006-08-30 22:35:03 +00:00
Jens Ole Wund
653a35b267 msvc6 still builds :) 2006-08-30 07:43:54 +00:00
Erwin Coumans
bf49ff5050 Got a license from Intel for VTune, thanks! First performance analysis showed unexpected slowdown due to island management. Added path-compression to UnionFind, and iterate just over island-id's, rather then all objects, when filling islands. 2006-08-29 23:27:27 +00:00
Nathan Letwory
9123507c2e Patch #4043 Bullet scons fix (Joseph Eagar, aka joeedh)
* This is a simplified SConscript for Bullet building. It should keep itself better
 up-to-date since it uses env.Glob(). Tested to work on Linux and Windows (both mingw and vc)

/Nathan
2006-08-28 08:52:39 +00:00
Erwin Coumans
6ce5d97c56 upgraded Bullet rigidbody physics to latest version 1.9 2006-08-28 06:44:29 +00:00
Nathan Letwory
7fd8ce8156 * Patch #4909 by Joseph Eagar (joeedh)
- this patch adds verse support for SCons, which can be enabled by
    giving WITH_BF_VERSE=1, ie. on command-line
  - this patch also adds a custom lib dir possibility. From the patch description:


 "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py."

* Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
Jiri Hnidek
91c9917bc0 - bug fix of verse server and verse library backported from verse cvs 2006-08-22 11:10:31 +00:00
Jiri Hnidek
92077aa9dc added verse library (release r6) to extern directory 2006-08-20 16:09:03 +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
Kent Mein
6c89868386 Adds scons support for SunOS...
(I have one small problem with linking python's static library but
other than that this should work)

Kent
2006-08-03 02:46:37 +00:00
Erwin Coumans
3b1a592fb7 debug lines / register the applied impulse for constraint (for breaking) 2006-07-03 05:58:23 +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