Commit Graph

331 Commits

Author SHA1 Message Date
Brecht Van Lommel
24446906bc Use ALsizei/GLsizei to fix compile errors on mac / gcc 4.x. 2006-01-29 21:29:14 +00:00
Kent Mein
e544723e63 Fix some of Stealth Apprent's warnings/errors and some extra little stuff.
here is a quick summary...

Kent

intern/bsp/intern/BSP_CSGMesh_CFIterator.h
removed tri_index (unused variable)

intern/bsp/intern/CSG_BooleanOps.cpp
removed extra ;

intern/string/intern/STR_String.cpp
added <ctype.h>

source/blender/blenkernel/BKE_writeavi.h
moved things around so not doing forward declarations

source/blender/renderconverter/intern/convertBlenderScene.c
changed render.h to render_types.h

source/blender/src/blenderbuttons.c
source/blender/src/editgroup.c
source/blender/src/meshtools.c
added newline

source/gameengine/Ketsji/KX_KetsjiEngine.cpp
commented out include "PIL_time.h" code that requires it is commented out

reading blender/src/writeavicodec.c
(struct keyword to a couple of lines that needed it)
and added:
extern struct Render R;

blender/renderconverter/intern/convertBlenderScene.c
added extern Render R;
added #include "rendercore.h" to get rid of undeclared shade_material_loop
        (Not sure if this is right but it fixes it.
Did not fix this problem, is it alright to just pass NULL here or should we chan
ge it to something else:
        init_render_materials' : too few

gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
removed argument to dHashSpaceCreate
commented out dWorldQuickStep since it does not exist
2006-01-29 15:15:34 +00:00
Tom Musgrove
2fbef6f9c9 ==compiling==
need this version to compile with cygwin...
2006-01-28 19:57:09 +00:00
Jens Ole Wund
1ae7fb0c99 doing MSCV6 project woodoo ( preparing orange --> bf migration )
NOTE to Ton and Hos
PLEASE do not try to merge any ot the MSVC6 project files (*.dsw ,*dsp)
I have a plan to get it done with a minimum of pain
thanks
ole
2006-01-26 22:05:39 +00:00
Kent Mein
c693e01b8d Ton forgot a few modifications to the Scons and Makefile build systems.
These should make it so that other people can compile with OpenEXR support.

(I also added the OPENAL fix erwin commited to bf-blender since I
need it for my machine, and this syncs up the file)

Kent
2006-01-09 02:18:11 +00:00
Brecht Van Lommel
c2cff1cbcf More work on the new unwrapper code (orange branch):
- There is now a (temporary) dropdown box in the image window header for
  switching between the old an new unwrapper code. So to test the changes
  described below you need to enable the new unwrapper code.
- Pinning is now more predictable, if one uv is pinned, the others belonging
  to the same vertex are pinned also.
- Live LSCM is much faster, since the LU factorization, the most expensive
  part of the computation, is now stored and reused (was Jens' idea).
- Packing multiple uv charts is slightly improved, by doing a binary search
  over the texture width. This fixes the case where all the charts are
  packed at the bottom of the image.
- LSCM now uses an angle based formulation, and the results seem somewhat
  different (maybe slightly better?), didn't find out why yet.
2005-12-03 23:22:31 +00:00
Brecht Van Lommel
d6feeb6b22 Orange branch commit.
This commit adds new underlying uv unwrapper code, intended to be
more extensible. At the moment this has a re-implementation of LSCM.
This has not been activated yet, since it doesn't add anything new.

What's new is the stretch minimize tool from tuhopuu. It works by
selecting some some uv's in the uv editor window, and then pressing
ctrl+V. The uv's on the boundary stay fixed.

More stuff will follow as I port it over & fix it.
2005-12-01 02:09:21 +00:00
Nils Thuerey
006e9547a9 - 'extern "C"' fix for MSVC as suggested by Stephane 2005-11-24 12:42:33 +00:00
Nils Thuerey
1b6482771e - solver now supports animated time steps, gravity
and viscosity, an example can be found here:
  http://www10.informatik.uni-erlangen.de/~sinithue/temp/fluid_timeanim.mpg
- for simulation time animation the time IPO of the object is currently used,
  for all three there should probably be new ipos in the fluidsim struct
- started the API in elbeem.cpp, to get rid of parser & export
  via HD (it's not yet used)
2005-11-23 12:51:07 +00:00
Kent Mein
46875a6400 Changed powf to pow. (For Solaris)
Kent
2005-11-21 18:03:42 +00:00
Chris Want
b44ba190d2 Fix for bug #3414 provided by Lewis Saunders.
It appears that removing the 'int level' field from the
MemHead struct caused alignment issues for gcc builds of blender
on Irix (zr, who removed this field, commented that this problem
might occur, and sure enough it did happen). I've renamed the
field from 'level' to 'pad' to reflect that it has no meaning
beyond addressing alignment issues.
2005-11-17 14:48:11 +00:00
Jens Ole Wund
40237b6e57 some more msvc6 magic 2005-11-16 23:39:49 +00:00
Alexander Ewering
6b8007a8a3 Bjornmose's fixes for making booleans compile on MSVC 6.
Thanks!
2005-11-11 23:10:10 +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
Ton Roosendaal
6a2413cbb4 Removal of ugly_nvidia_hack for OSX Nvidia systems. Apple has fixed this
bug in 10.4.3 now.
2005-11-11 11:42:54 +00:00
Jens Ole Wund
0093857b4f fixing msvc6 projects to compile again 2005-11-09 19:29:04 +00:00
Jens Ole Wund
e52c277423 adding msvc6 project to boolops 2005-11-09 19:27:25 +00:00
Nils Thuerey
35c605d299 - replaced values.h by float.h/limits.h as suggested by Hos,GSR,UnNamed 2005-11-09 16:47:49 +00:00
Nils Thuerey
8a13f43416 - forgot to enable mac compile fix 2005-11-09 16:30:05 +00:00
Nils Thuerey
e3f681da67 - popup menu now aborts by default
- changed directory/prefix input (only 1 string instead of two, more similar to render output settings now)
- changed reading/writing of surface files
- slightly enhanced surface smoothness
2005-11-09 07:56:26 +00:00
Chris Want
0fbd27fd9b I seem to have problems with the distinction between else and #else today.
My apologies!
2005-11-05 22:20:40 +00:00
Chris Want
165ed1b116 Use limits.h and float.h on *bsd instead of values.h.
On this subject (and thanks to GSR for research) on debian the
values.h has the following warning:

/* This interface is obsolete.  New programs should use
   <limits.h> and/or <float.h> instead of <values.h>.  */

Should values.h be used at all?
2005-11-05 21:09:47 +00:00
Joseph Gilbert
beece21d1f project file update
*Added the boolop project
2005-11-03 20:07:55 +00:00
Ken Hughes
881f3419c6 -- avoid some divide-by-zero errors/assertions in boolean modifiers which
caused "Trace/BPT trap" errors (don't normalize zero-length vectors)
2005-11-01 19:42:55 +00:00
Brecht Van Lommel
9cce3710ae Support for adding elements in random positions in an opennl matrix.
Also some code formatting.
2005-10-30 18:38:35 +00:00
Johnny Matthews
e6f5f9bf85 fixing case issue for blender_BOP.lib to blender_bop.lib 2005-10-29 13:47:41 +00:00
Johnny Matthews
1d366b3fe9 Scons files for Boolop
also a fix in BOP_Material so that MSVC won't complain about template issues
2005-10-29 13:26:31 +00:00
Alexander Ewering
767bae35f2 (Hopefully) last part of Booleans commit.
Please update, compile (make) and test.
2005-10-28 20:18:56 +00:00
Alexander Ewering
d243bfb61e New files from new booleans 2005-10-28 20:17:27 +00:00
Alexander Ewering
d3dd5c5b7a Somehow, most files are missing from this commit, and I have no idea why,
so there will be more files following.

Anyway: NEW BOOLEANS from Google Summer of Code (Courtesy of Marc Freixas)

Known problems:

 - Random freezes while using them as a modifier. This may not be directly
   related to modifiers though - it's maybe just the huge number of
   operations that leads to a higher probability of triggering a bug

 - Static booleans (the first 3 entries in the WKEY menu) are borked
   anyway, this is not due to this commit.

 - Errors when exiting Blender (dupli_alloc stuff), is not related to this
   commit, either.

Please test if everything works, and check the other build systems, I only
know that make works.

Also, compare the results of, say, cube-cylinder, in old and new booleans
:)
2005-10-28 19:54:16 +00:00
Nils Thuerey
d348027499 - hopefully fixed osx compilation by forcing compilation
with a single file again (intern/elbeem/intern/solver_main.cpp
	includes intern/elbeem/intern/solver_init.cpp and
	intern/elbeem/intern/solver_util.cpp when __APPLE_CC__ is defined)
- minor cleanup of inlined functions
2005-10-26 12:07:51 +00:00
Jens Ole Wund
dd38751a84 updated elbeem project for new / removed files 2005-10-25 18:18:43 +00:00
Nils Thuerey
a7e9a9d9c0 Only restructured code:
- added Hos fixes
- split up solver into 3 cpp files (as suggested by jonathan)
- de-inlined function that caused gcc33 to use >1GB of memory
2005-10-25 08:07:52 +00:00
Jean-Luc Peurière
acf2fda50e fix for Game engine bug #1961 furnished by Josh Nimoy.
Thanks.

Although the fix is not perfect (lacks screen requisition safeguards),
it does indeed allow to run game engine fullscreen
2005-10-20 18:05:06 +00:00
Kent Mein
85939c5839 looks like the warning fix caused problems so reverting it.
Kent
2005-10-11 19:21:31 +00:00
Kent Mein
c6524703d3 A couple of small fixes to get things working on solaris.
added #include <ieeefp.h>  similar to where its included in
other files.  (made an ifdef that matches other includes of the same
file)

solaris does a lot of type overloading so there is no expf  its just exp
so I added a #define expf exp wrapped in an ifndef

Finally, I fixed a warning in cfglexer.cpp about multiply defined
yy_wrap functions.

Kent
2005-10-11 18:07:37 +00:00
Jens Ole Wund
ad915277a0 msvc6 project file suite complete again 2005-10-10 17:27:17 +00:00
Joseph Gilbert
ee77c42f01 Projectfile update
* added new file to elbeem project
2005-10-10 15:34:56 +00:00
Nils Thuerey
7095d8a11f - minor solver fix for msvc compilation
- added pop up menues for fluid sim bake with no
  fluid objects or without valid output dir settings
- fixed 3d view redraw for fluidsim buttons
2005-10-10 11:31:06 +00:00
Nils Thuerey
d3d8441f67 - fixed fluidsim inflow speed init
- fixed intersecting fluid objects init
- added MSVC6 fixes from bjornmose (thanks!)
2005-10-10 08:52:42 +00:00
Nils Thuerey
328eeaf10b - added option to switch off compiling elbeem to scons files (set USE_FLUIDSIM=true)
in this case only the new blenderdummy.cpp and utilities.cpp have to be compiled
- restructured gui:
   * domain options split up into 2 sections
	 * added compressibility and refinement settings
	 * added inflow/outflow object types
- increased progress bar by 1
2005-10-10 06:59:47 +00:00
Jens Ole Wund
42bd456060 added elbeem though it won't compile without modifications
thus i did not add to dependencies but still a nice reminder to build it at times
2005-10-04 20:39:31 +00:00
Jens Ole Wund
f342f06920 again an intermediate solution for the msvc6 builders
added msvc6 project file for builing elbeem

NOTE: it won't build unless some spots in elbeem code are cangend

see -->
fixing elbeem to build on msvc6
http://projects.blender.org/pipermail/bf-committers/2005-September/011952.html


[quote]
And no.. i won't set up a msvc6 project for building blender_elbeem.lib
until things calmed down a bit.
[/quote]

well i did for me to continue work, why not share.

if you do *rebuild all* in this project (release mode) on success will do a
post build step which will copy blender_elbeem.lib to the lib/windows..blah folder
such that the msvc6 (blender) project will find it for happy linking.

it even #defines MSVC6 so all the above changes could be nicly hidden behind that
( my local tree does so ) but it is on Nils to decide if he wants his code to be *pested*.
2005-10-02 20:57:53 +00:00
Joseph Gilbert
f6c7cf7c13 projectfile update to elbeem
* fixed lib paths
* removed files
* fix preprocessor define
2005-09-29 02:22:56 +00:00
Nils Thuerey
227c88c293 - corrected MSVC6 fix in ntl_vector3dim.h (caused problems with SDL includes)
- removed print from SConscript
2005-09-28 17:52:06 +00:00
Nils Thuerey
d7b441473a - removed some unecessary files & code
- debug output now controlled globally by elbeem debug level
  (BLENDER_ELBEEMDEBUG environment var), also for fluidsimBake
	and read/writeBobj
- debug output is written to file for WIN32
- added "for" and "vector" etc. defines for MSVC6
  (I couldnt get hold of the compiler itself, so not tested yet)
2005-09-28 16:20:57 +00:00
Joseph Gilbert
b6ecdb8c35 Project file update for elbeem
Warning clean up of python project
2005-09-26 14:46:14 +00:00
Nils Thuerey
4fb0cccc68 - merged latest version of fluid solver
(fixed shadowed variables warnings, removed cfgparser.hpp,
	added cfgparser.h, removed debugging output)
- added support for env. var BLENDER_ELBEEMDEBUG to enable
  debugging output again
- fixed missing triangle display (marching cubes produced v3=0 triangles)
- fixed geometry init bug (nearest intersection check
  for intersecting objects was messed up)
- changed position of derived mesh creation in DerivedMesh.c
  (for some reason the useDeform code is necessary, without it or
	 with useDeform=0 nothing is displayed)
- 3dviews now update every 2 seconds to show simulation progress
- note: mesh_strip_loose_faces(me); in ./source/blender/blenkernel/intern/mesh.c:937
  not necessary anymore?
2005-09-23 14:42:14 +00:00
Joseph Gilbert
38922c74c0 update to .NET project files
*Added elbeem project to /intern
(please rebuild intern)
2005-09-22 19:45:00 +00:00
Joseph Gilbert
f29f335ad5 Before including <GL/gl.h> on windows you have to include <windows.h> 2005-09-22 18:03:58 +00:00