Commit Graph

236 Commits

Author SHA1 Message Date
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
Nathan Letwory
bcd5d1c9ed * integrate bFTGL with Scons
* add some ENV = os.environ's here and there (help those who have msvc toolkit installed)

Note for OSX users: check from your config.opts the correct info for the precompiled ftgl lib is used.
2005-05-06 13:37:18 +00:00
Chris Want
6275dd5b14 Clean up for Makefiles: some of the directories were being printed
wrong (e.g., "/Fuzzics" and "/Joystick", and some of  the solid stuff).
This was particularly noticable during "make clean".
2005-04-09 22:40:34 +00:00
Joseph Gilbert
f49224137f - update to msvc7 projectfiles to accomodate recent file additions
- fixed bad path in extern project file
2005-03-30 05:19:33 +00:00
Joseph Gilbert
f33b71bcbd Removed freetype project from extern solution 2005-02-25 21:24:50 +00:00
Joseph Gilbert
61767b4f48 MSVC7 update and freetype2 source
- Added correct .libs to be linked to GP_Ghost
- Fixed incorrect library extensions for the linker (*.lib and not unix *.a)
- Projects have been set to be multi-threaded - projects were being linked to different versions of the CRT
- All projects are now linking to python 2.3 (this fixes an error regarding struct sizes in python)
- Removed invalid source paths from inclusion for the compiler
- Fix dependency issues with the GP_Ghost module
- Proper .dll's are now being copied to their respective locations for debug and release version of blender/blenderplayer
- Warnings have been set to level 2
- Import paths have been updated and organized for the compiler
- Duplicate import paths for the compiler have been removed
- Removed silly silly silly silly unix path-separators from window paths
- Post-Build scripts have been updated where neccessary (XCOPY is retatined)
- Fixed the output of various .lib files (PHY_Sumo and Yafray)
- PHY_Sumo now uses a .pch
- Removed #undef _DEBUG from debug builds :p
- FTF_Font is now contains a debug build and is being set to it's correct output path
- Blender/Blenderplayer/3DPlugin all linkto Debug libs where appropriate (instead of static release libs to avoid conflicts with the CRT)
- Python23_d.dll is now loaded into a true debug output of both blenderplayer and blender debug builds
- msvcrtd.dll is now loaded into a true debug output of both blenderplayer and blender debug builds
- Post-builds now clean up their mess
- ActiveX controller now builds
- BlenderPlayer now builds
- Internal libs now using .pch
- Moved the build directory from /blender/obj to ../build/msvc_7/  to follow precedence with scons builds
- Builds are now organized to follow precedence with scons builds with a /libs and a /intern /extern /source obj folders
- Set the proper build path for opennl
- Forcing BLO_loader source files to follow project defaults
- Added an 'extern' project that mimics the /make build of the 'intern' project
- Extern build includes solid and it's associated builds, ftgl, and freetype
- Added .vcproj files to /extern directory
- Added new extern.sln file to /extern directory
- All project now link to the built solid.lib from the extern project instead of lib/windows
- Removed uneeded XCOPYs commands from post-builds
- Added conditional Directory building to post-builds
- Freetype2 source commit (this is need for the building of a correct MFC linked version of the activeX controller as well as a correct release and debug build of the blender project)
- Ftgl is built and linked by the 'extern' project
- Intern/Extern project are now exporting their proper header files
- PHY_Physics is now linking to the correct set of header files (in build path not source)
- Makesdna builds object files into build directory now
- Projects are now ignoring the CORRECT versions of the CRT's  :)
- Renderconverter is now outputting it's obj file to it's own directory instead of /render
- Gen_system is now being built to ../kernel
- BL_src_cre is now being built to /creator
- *.exp and *.ilk are now being cleaned up from linkers
- Libpng.dll and zlib.dll are now being copied to the /bin
- MTDLL build are now available for the correct projects
- ActiveX 3D Plugin now links correctly to solid and freetype2
- Corrected the Preprocessor #define that was labeled incorrectly in FTF_Font and Blender that was causing the FTGL libs to export dll calling conventions.
- Changed the solution configurations to 3D Plugin Release, Debug and Blender Release, Debug for internal and external librarys
- Changed the solution configurations to 3D Plugin Release, Debug and Blender Release, Debug for blender and added 2 new solutions configurations BlenderPlayer Release, Debug
-
2005-02-20 21:33:11 +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
Rob Haarsma
465b15eb69 Modified FTGL for proper texturefont support.
Also fixed msvc6 (release only) projectfile to build and output correctly.
2005-01-21 14:43:21 +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
Ton Roosendaal
65d5d124d0 Makefile didnt copy files correctly, obviously because the nan_definitions
were not there...
2004-12-14 13:08:17 +00:00
Chris Want
12307b358d Making the C++ stuff work for the MipsPro 7.3 compiler.
Kester might want to check this for correctness
Kent might want to test if this breaks the Sun compile.
2004-11-23 23:04:30 +00:00
Jean-Luc Peurière
cd7b789907 more conservative default build options for OS X
O3 works thought on my system, but should not be set on reference releases
2004-11-14 14:38:03 +00:00
Kester Maddock
b3395edd2a Add new broad phase collision response to Solid: this will let us hook (and potentially reject) the detail phase. 2004-11-06 04:56:05 +00:00
Kent Mein
a731d22c3d Needed to include <math.h> on solaris for some odd reason for their
c++....   so I ifdefed it.

Kent
2004-11-01 14:25:34 +00:00
Kent Mein
4894785ed7 Cast 0 as unsigned int for sun's CC to get rid of this:
"BP_ProxyList.h", line 60: Error: Cannot use std::pair<BP_Proxy*, int> to initialize std::pair<BP_Proxy*, unsigned>.

Kent
2004-11-01 14:06:13 +00:00
Chris Want
83222e376e Make sure directory $(OCGDIR)/extern is created before building extern
stuff.
2004-08-21 19:12:59 +00:00
Hans Lambermont
0ce1304e1b Theodore Schundler's patches to add FreeBSD support to the scons build
system.
2004-08-15 18:09:37 +00:00
Jean-Luc Peurière
0b9cf9006a compile options for macos X builds 2004-07-27 20:31:03 +00:00
Ton Roosendaal
c1bb49ab16 Fixed OSX ranlib line, to match commented out part in make libs 2004-07-17 11:23:57 +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
e70045b548 Missed these two... 2004-07-17 02:50:15 +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
Simon Clitherow
21520c6c14 - updated VC6 project files for SOLID - blender now links with the
static solid lib.

- also cleaned up solid.dsw workspace (removed unused projects).
2004-07-13 21:52:23 +00:00
Kester Maddock
72493e41bd Compile fixes for gcc 3.4 2004-06-04 03:04:56 +00:00
Kester Maddock
15849ce3d2 Port closest points fix from tuhopuu - should return positive distance. 2004-05-16 13:13:41 +00:00
Kester Maddock
d5fde6c48b Added #!/usr/bin/python standard script identifier to the start of SConscript files.
Makes text editors identify SConscripts as Python, and syntax highlight properly.
2004-05-16 13:07:20 +00:00
Hans Lambermont
dd2a4a0249 extend clean target for qhull and solid 2004-05-14 20:40:56 +00:00
Jean-Luc Peurière
ac47d081c4 post 2.33 release commit of the modified SCons files for Os X.
Sconstruct modified so that Blender build on 10.3 without any additionnal
download than source + darwin libs.
defaults settings correct for 10.3.

fixed bug # 1260 : added MT_NDEBUG flag at top-level.
2004-05-08 01:34:39 +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
Nathan Letwory
892720ffad [SCONS] Optimisation flags for msvc 2004-04-22 04:50:41 +00:00
Kester Maddock
aa5500680d Fix segfault on collisions between dynamic complex (polyheder) and dynamic convex (box/sphere/cone/cylinder) objects. 2004-04-17 00:56:54 +00:00
Nathan Letwory
b3a45ffbe5 correct path to qhull in extern. 2004-04-16 22:07:18 +00:00
Kent Mein
d204f77251 Added #if defined (__sparc) || (__APPLE__)
bits around sqrtf and friends.  ON these two platforms
they are overloaded so its just sqrt not sqrtf.

Kent
2004-03-31 17:01:45 +00:00
Nathan Letwory
00291b5cf4 [GameEngine] Commit all Kester's changes made to the gameengine to restore 2.25 like physics.
[SCons] Build with Solid as default when enabling the gameengine in the build process
[SCons] Build solid and qhull from the extern directory and link statically against them

That was about it.

There are a few things that needs double checking:

* Makefiles
* Projectfiles
* All the other systems than Linux and Windows on which the build (with scons) has been successfully tested.
2004-03-22 22:02:18 +00:00
Nathan Letwory
3081f4a635 - [SCONS] Added building of qhull and Solid from extern when selecting the Solid gameengine. The gameengine has not been updated with the Tuhopuu2 one, so it is not wise to do that yet. This is in preparation for that and won't effect the current build process. 2004-03-09 21:14:03 +00:00
Wouter van Heyst
f56eb94bab Work done to build blender on Linux [sparc64].
extern/ode/dist/ode/test/test_ode.cpp:
- Don't include <ieeefp.h> on sparc linux, it doesn't exist.

extern/ode/Makefile:
- While hacking on ode, get rid of that annoying infinite rebuild

source/Makefile:
- Define a default BINTARGETS (just blenderdynamic) for linux, individual archs
  can override/add to that if they so please

source/nan_link.nmk:
- Add a sparc64 arch target to the linux section of nan_link.mk, using the same
  options as powerpc

After the first ode problem, the build completed all but the linking of a
blender binary, because there wasn't any target defined!

On the rebuilding: The usersettings would have a newer date than targets
depending on it, so it would rebuild entirely. I haven't really fixed this, but
isolated it to the platforms where usersettings need to be moved around (darwin
and windows). FBSD patches the usersettings, so it might still happen there.  I
didn't bother with a proper fix, as it looks like we're moving to scons soon.
I'm amazed no one got annoyed enough before to take care of this.
2004-01-01 23:19:08 +00:00
Michel Selten
95732797bf Added the qhull sources to the repository.
These files are needed by Solid.
I left out the generated Windows .exe files. If needed later on, I'll add
them.
2003-12-06 19:17:13 +00:00
Michel Selten
581c0f232c Added the Solid 3.5 sources to the blender source tree.
This is a direct copy from the CD-ROM contents except for the generated
libraries for the Windows platform. If needed, I can add those later on.
(Those take up over 800 kb).
All files, including license files, documentation, examples and sources are
committed.
2003-12-06 19:02:42 +00:00
Wouter van Heyst
d81fcf73ff Multiline string literals are deprecated in gcc3.3, fixes build error 2003-07-05 11:27:50 +00:00
Wouter van Heyst
a6acb198a8 Sigh, OSX and ranlib again 2003-03-27 19:35:47 +00:00
Wouter van Heyst
6d5f1939a1 Ahum, ode does needs it's usersettings. (non-patching platforms didn't have it,
tried to be to smart)
2003-03-25 19:16:22 +00:00
Wouter van Heyst
dbb49fd378 - Build ode on OSX
- shuffle patching around
2003-03-25 14:39:19 +00:00
Hans Lambermont
ad625dd508 - fix 'debug' target
- add ID and copyrights to top level makefile
2003-02-17 16:51:16 +00:00
Frank van Beek
4eead02134 - create lib dir when compiling blender for windows 2003-01-26 10:19:06 +00:00
Wouter van Heyst
558b75b9d3 Create dist/lib so the build can create it's library as expected 2003-01-20 00:01:05 +00:00
Wouter van Heyst
7401ed64a9 Reenable the ode build on Linux 2003-01-19 22:30:56 +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
Frank van Beek
040797ba3d - ode now compiles and installs under MSVC / cygwin 2003-01-12 10:52: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
Hans Lambermont
080dd299d6 - use ODE in lib/ for FreeBSD
- use default python library path
- remove obsolete SSR comments
2003-01-04 20:20:54 +00:00
Maarten Gribnau
c2d3cb6af0 Another small fix to ode:
Added a debug target to the Makefile to get a debug Blender to build
Maarten (mail@maartengribnau.com)
2002-11-04 21:55:48 +00:00
Maarten Gribnau
c21d639735 Changed the OSX config file so that it compiles on OSX 10.2
Checked against a fresh version from the ODE CVS and found that the problem was
not fixed there as well so I felt free to commit it here.
Maarten (mail@maartengribnau.com)
2002-11-04 20:32:30 +00:00
Kent Mein
01bff70383 fixed spacing in the headers to get rid of some warnings and some other
little minor spacing issues.
2002-10-30 02:07:20 +00:00
Norman Lin
bdad961ce3 checkin of ODE library. Do not modify the ODE source code; instead, follow the
development of ode at http://q12.org and periodically copy the q12.org ODE
sourcecode into this tree to update the Blender ODE.

This ODE has not been changed from q12.org and is provided here merely as a
convenience to Blender developers.
2002-10-18 15:02:02 +00:00