Commit Graph

106 Commits

Author SHA1 Message Date
Nathan Letwory
d7e5f37172 ==SCons==
* Fix typo in bullet SConscript
* win32-vc now copies all necessary files to BF_INSTALLDIR, including dlls
2006-02-05 18:48:01 +00:00
Nathan Letwory
631a8d85d4 * WITH_BF_GETTEXT and WITH_BF_FREETYPE are merged into WITH_BF_INTERNATIONAL
* typo in adding BF_OPENAL_LIBPATH, resulting in it not being added at all
2006-02-05 12:24:52 +00:00
Nathan Letwory
3bb82a27fc == SCons ==
* This commit is all of the rewrite work done on the SCons system. For
  documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt.
  Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring
  contains valuable information, along with what still needs to be done.

    - linux, os x and windows compile now.
    - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py)
        - NOTE: Jean-Luc P will commit sometime during the weekend proper
          appit() for OS X. For now, copy the resulting binary to an
          existing .app bundle.
    - features:
        - cleaner structure for better maintenance
        - cleaner output during compile
        - better handling of build options
        - general overall speed increase
        - see the wiki for more info

  Cygwin, FreeBSD and Solaris systems still need work. For these systems:
    1) copy a config/(platform)-config.py to ie. config/cygwin-config.py
    2) set the proper defaults for your platform
    3) mail me at jesterking at letwory dot net with you configuration. if
       you need any modifications to the system, do send a patch, too.

  I'll be giving first-aid today and tomorrow, after that it'll be all
  regular development work :)

  /Nathan
2006-02-04 14:15:10 +00:00
Kent Mein
8e9222ec21 More simple fixes to cleanup warnings and what not:
extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.h
        added newline at end of file.
 intern/boolop/intern/BOP_Face2Face.cpp
        fixed indentation and had nested declarations of a varible i used
                for multiple for loops, changed it to just one declaration.
 source/blender/blenkernel/bad_level_call_stubs/stubs.c
        added prototypes and a couple other fixes.
 source/blender/include/BDR_drawobject.h
 source/blender/include/BSE_node.h
 source/blender/include/butspace.h
 source/blender/render/extern/include/RE_shader_ext.h
        added struct definitions
 source/blender/src/editmesh_mods.c
 source/gameengine/Ketsji/KX_BlenderMaterial.cpp
 source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
 source/gameengine/Ketsji/KX_RaySensor.cpp
        removed unused variables;
 source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
        changed format of case statements to avoid warnings in gcc.

Kent
2006-01-30 19:59:33 +00:00
Tom Musgrove
5953857f92 ==warnings cleanup==
killed off some newline warnings in bullet
2006-01-29 06:04:13 +00:00
Chris Want
635224802e The extern/bullet from HEAD is needed to compile the gameengine in
orange
2006-01-28 17:25:03 +00:00
Erwin Coumans
1332091dc2 bullet in the orange branch seems to be merged incorrectly. updated to the latest version 2006-01-11 06:24:18 +00:00
Ton Roosendaal
e7285229b8 Tuesday merger of bf-blender into orange branch. 2006-01-10 22:10:14 +00:00
Kent Mein
39fcd3586f Lots of stupid warning fixes:
Added newlines at end of a bunch of files that didn't have them.
removed a couple of unused variables and an extra ';'
(Also removed config.h crap from these files)

Kent
2006-01-05 23:10:54 +00:00
Joseph Gilbert
700ff0193b *msvc7 update
- added bullet files to project
- fixed compiler path on bBullet project
2006-01-03 16:19:36 +00:00
Erwin Coumans
bab1b90edc more game engine bug-fixes, hooked up 'formfactor' as inertia tensor tweaker, friction/restitution, more scaling related fixes. 2005-12-31 21:59:56 +00:00
Erwin Coumans
9119b6e8a5 Fixed several bugs: python refcounting related and Bullet related (basic add/remove object support, bounding volume hierarchy). Added a few files, updated the Bullet scons. Vc6/7 Bullet projectfiles need to add a couple of files: 'Bullet/CollisionShapes/BvhTriangleMeshShape.cpp',
'Bullet/CollisionShapes/ConvexTriangleCallback.cpp',
'Bullet/CollisionShapes/EmptyShape.cpp',
'Bullet/CollisionShapes/OptimizedBvh.cpp',
'Bullet/CollisionShapes/TriangleCallback.cpp',
'Bullet/CollisionShapes/TriangleIndexVertexArray.cpp',
'Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp'.
Sorry, no armatures fix yet.
2005-12-31 07:20:08 +00:00
Hans Lambermont
f0e7d21793 - include path and file changes for FreeBSD 2005-12-27 20:37:15 +00:00
Jens Ole Wund
66a0ebcbe0 adding some msvc6 magic to bullet part 1 2005-11-16 23:37:02 +00:00
Jens Ole Wund
e25b7c519e special service for msvc6 projects
post build step for booleans --> copy boolop.lib to lib folder _foo_/lib/windows..

enabeling bullet for GE
wants to link with _foo_/lib/windows/bullet/lib/bullet3.lib
you have to build it with continuous.dsw in exten/bullet and copy it manually there
since bullet is exten i think no automagic in place here
2005-11-11 20:15:16 +00:00
Erwin Coumans
281f236e6e Minor changes in Bullet:
- on Ton's request use double versions of cos,sin,tan, sqrt etc.
just like Solid in MT_Scalar #if defined (__sun) || defined (__sun__) || defined (__sparc) || defined (__APPLE__)
- updated an url in the header of files
2005-10-30 06:44:42 +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
Ton Roosendaal
d8fe530797 Ftgl patch for texture fonts got lost... somehow. That made them much
slower than pixmap fonts. Test on buttons window CTRL+ALT+T timer shows it
goes down from 2500 to 100 on this commit. :)
2005-09-26 18:47:50 +00:00
Erwin Coumans
bbffe9b5b2 added some get methods and stuff 2005-09-06 16:45:48 +00:00
Erwin Coumans
92731af84f support for __MINGW32__ compiler, it doesn't have __forceinline 2005-08-18 17:32:25 +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
Erwin Coumans
c99c7fbcb3 some more fixes in the raycast/mouse over 2005-08-17 19:52:56 +00:00
Erwin Coumans
5ebc7c8bda added more debug text, enabled the bullet penalty solver, instead of ode solver by default, added a better demo. 2005-08-12 13:42:00 +00:00
Erwin Coumans
29f06ad76e some more work on bullet raycast 2005-08-08 17:08:42 +00:00
Erwin Coumans
66dc186fb6 fixed sphere shape, added non-uniform scaling (making it an ellipsoid)
removed bug-fixing comments
2005-08-05 22:10:27 +00:00
Erwin Coumans
b6d9fbf0db fixed the mouse-over sensor,
added raycast support for bullet (no triangle-mesh support, soon)
added python methods for 'getHitObject', getRayDirection, getHitPosition and getHitNormal for mouse over sensor,
which makes it easy for a shootout.blend demo :)
2005-08-05 17:00:32 +00:00
Erwin Coumans
210ab537ce improved deactivation, exposed more tweakable parameters to python,
fixed some copy/paste bug in inertia/inverse inertia.
colors in deactivation debug
2005-08-04 19:07:39 +00:00
Erwin Coumans
2cc6d565cb moved some hardcoded constants into tweaking tresholds
exposed those tresholds to python (more 'expert' settings)
2005-08-03 18:22:30 +00:00
Simon Clitherow
671235b69b Finalised support for compiling BULLET on linux.
Bullet is now off by default on all platforms until we get an OK
from Erwin. To enable it, change USE_PHYSICS to 'bullet' in your
config.opts.
2005-08-02 18:54:11 +00:00
Erwin Coumans
558b8daf67 added python binding for debugdraw,
tweaked friction, some more preparations but no real functionality added yet
2005-08-02 14:59:49 +00:00
Joseph Gilbert
292c03ab8e _.NET projectfiles update_
* converted files to .NET 2002
* removed unneeded projectfiles from bullet
* PHY_Bullet outputs to correct directories
* Bullet linked to activex and blenderplayer
* misc updates
2005-08-02 13:44:49 +00:00
Simon Clitherow
208da2a5d0 Added support for compiling BULLET with scons on windows
using bandoler's patch as a basis (thanks!).

A couple of notes:

-  This is for windows only, I did not have a chance to try linux yet.

-  SConscript for PHY_Bullet may need tweaking (plus support
 for other platforms), but at least it's in there :)

Any problems, shout :)
2005-08-01 21:19:41 +00:00
Erwin Coumans
49499c49be updated vc7 projectfiles so they work with bullet 2005-07-31 14:40:51 +00:00
Erwin Coumans
697b22cc41 updated testbed demo 2005-07-30 18:58:21 +00:00
Erwin Coumans
ed997ca8d2 more physics work, tuning parameters, hooking up friction etc. 2005-07-30 18:10:53 +00:00
Erwin Coumans
dad6ef9045 added physics-debugging
didn't check every single file, so might have broken some gameengine stuff, will fix it this weekend!
2005-07-29 18:14:41 +00:00
Joseph Gilbert
66c7f07280 _build environment for bullet physics_
- adds bullet projectfiles to the extern.sln build
(please rebuild extern.sln)
2005-07-28 18:29:18 +00:00
Erwin Coumans
b5ec3efeaf removed duplicate testing files 2005-07-28 12:21:55 +00:00
Erwin Coumans
411123b250 - added debug line drawing in gameengine (handy for debugging physics problems)
- added #ifdef for a visual studio 8 crashing problems
- added scaling and tolerances to triangle meshes
2005-07-27 09:30:53 +00:00
Erwin Coumans
16b76eb0ec added bandoler's SConscript file for Bullet 2005-07-23 15:06:45 +00:00
Erwin Coumans
f6024cfdac aCVS: ----------------------------------------------------------------------
added minkowskisum in the raytrace demo
update vc8 projectfiles
2005-07-22 16:46:15 +00:00
Erwin Coumans
e34b1b3276 added the Elsevier CDROM license to one file. This still allows to use the software for any purpose, commercial or non-commercial. 2005-07-20 10:19:43 +00:00
Erwin Coumans
2dbb9409df initialize simd quad in default constructor
this should not be necessary, its for testing
2005-07-19 04:11:47 +00:00
Erwin Coumans
701b9c21fd more preparations for bullet physics, and some eol issues with SCA_Joystick* 2005-07-18 05:41:00 +00:00
Erwin Coumans
9a26c98605 provided proper license for lcp solver 2005-07-17 10:07:46 +00:00
Erwin Coumans
feb4f51103 Added Bullet library.
Only windows projectfiles for now.
Will ask Hans to get unix makefiles done.
2005-07-16 09:58:01 +00:00
Rob Haarsma
9abdd362b7 Bugfix #2704
Modified bFTGL so the bitmaps supplied by the font itself aren't used.
Patch originally supplied by Shizu, somehow this was never added to
FTGL.

Be sure to build binaries with bFTGL, not the provided ftgl.lib from the
lib dir. (this one can be deleted afaic)
2005-06-06 14:42:50 +00:00
Jean-Luc Peurière
38202abff8 ccommented stuff in qhull geom.c with standard C comments not C++ ones 2005-06-05 13:46:28 +00:00
Jean-Luc Peurière
f38e0686d9 new round of warning fixes. we are now down to 24 with Xcode on blender
alone with the following flags :
-Wall -Wno-char-subscripts -Wno-missing-braces.

the only one still worrying me is in rand.c line 57 :

rand.c:57: integer constant is too large for "long" type

but i have no clue about how correct cross-compiler and 32/64 bits friendly

see also my mail to commiter list for signed/unsigned issues
2005-06-04 16:22:50 +00:00
Ton Roosendaal
884c94500b Another update on FTGL texture fonts drawing. Added the same floor() trick
to precisely align the glyphs to pixel coordinates as used in the Pixmap
version. It now looks fully identical here.
2005-05-11 21:09:13 +00:00