[Bf-blender-cvs] CVS commit: blender/intern/elbeem COPYING blender/intern/elbeem/extern elbeem.h blender/intern/elbeem/intern attributes.cpp attributes.h elbeem.cpp elbeem.h isosurface.cpp isosurface.h loop_tools.h ntl_blenderdumper.cpp ntl_blenderdumper.h ntl_bsptree.cpp ...

Sun Nov 5 17:30:29 CET 2006

n_t (Nils Thuerey) 2006/11/05 17:30:29 CET

  Modified files:
    blender/intern/elbeem COPYING 
    blender/intern/elbeem/extern elbeem.h 
    blender/intern/elbeem/intern attributes.cpp attributes.h 
                                 elbeem.cpp elbeem.h 
                                 isosurface.cpp isosurface.h 
                                 loop_tools.h 
                                 ntl_blenderdumper.cpp 
                                 ntl_blenderdumper.h 
                                 ntl_bsptree.cpp ntl_bsptree.h 
                                 ntl_geometryclass.h 
                                 ntl_geometrymodel.cpp 
                                 ntl_geometrymodel.h 
                                 ntl_geometryobject.cpp 
                                 ntl_geometryobject.h 
                                 ntl_geometryshader.h 
                                 ntl_lighting.cpp ntl_lighting.h 
                                 ntl_matrices.h ntl_ray.cpp 
                                 ntl_ray.h ntl_vector3dim.h 
                                 ntl_world.cpp ntl_world.h 
                                 parametrizer.cpp parametrizer.h 
                                 particletracer.cpp 
                                 particletracer.h 
                                 simulation_object.cpp 
                                 simulation_object.h 
                                 solver_adap.cpp solver_class.h 
                                 solver_init.cpp 
                                 solver_interface.cpp 
                                 solver_interface.h 
                                 solver_main.cpp solver_relax.h 
                                 solver_util.cpp utilities.cpp 
                                 utilities.h 
    blender/source/blender/blenkernel/intern DerivedMesh.c 
                                             effect.c 
    blender/source/blender/makesdna DNA_object_fluidsim.h 
    blender/source/blender/src buttons_object.c fluidsim.c 

  Log:
  - bugfixes
    #4742 exported normals are now correct
    #4821 & 4956 for complex movements in/outflows can now also
    use the animated mesh option
  - new features
    * isosurface subdivision: directly
      creates a finer surface mesh from the simulation data.
      this increases simulation time and harddisk usage, though, so
      be careful - usually values of 2-4 should be enough.
    * fluidsim particles: extended model for particle
      simulation and generation. When isosurface subdivision is enabled,
      the particles are now included in the surface generation,
      giving a better impression of a single connected surface.
      Note - the particles are only included in the final surface
      mesh, so the preview surface shows none of the particle
      effects.
    * particle loading: different types of particles can now be selected for
      display: drops, floats and tracers. This is a bit obsolete
      due to the extensions mentioned above, but might still be useful.
      Floats are just particles floating on the fluid surface, could
      be used for e.g. foam.
    * moving objects impact factor: this is another tweaking option,
      as the handling of moving objects is still not conserving
      mass. setting this to zero simply deletes the fluid, 1 is
      the default, while larger values cause a stronger
      impact. For tweaking the simulation: if fluid disappears, try
      increasing this value, and if too much is appearing reduce it.
      You can even use negative values for some strange results :)
  - more code cleanup, e.g. removed config file writing in fluidsim.c,
    added additional safety checks for particles & fluidsim domains (these
    currently dont work together). I also removed the "build particles"
    debug message in effects.c (seemed to be unnecessary?).

  Some more info on the new features:
  Here are two test animations showing the difference between
  using the particle generation with isosurface subdivision.
  This is how it would look with the old solver version:
  http://www10.informatik.uni-erlangen.de/~sinithue/blender/fluid6_fl6manc4_1noparts.mpg
  and this with the new one:
  http://www10.informatik.uni-erlangen.de/~sinithue/blender/fluid6_fl6manc4_2wparts.mpg
  Both simulations use a resolution of 64, however, the version with particles
  takes significantly longer (almost twice as long).
  The .blend file for a similar setup can be found here:
  http://www10.informatik.uni-erlangen.de/~sinithue/blender/fluid6_testmanc4.blend
  (Minor Tips for this file: dont enable subdivions of characters until rendering,
  thus leave off for simulation, as it uses the rendering settings! For making
  nice pictures switch on subdivion, and OSA.)

  And here's a picture of old vs. new (for webpage or so):
  http://www10.informatik.uni-erlangen.de/~sinithue/blender/fluid6_manc4compare.png

  Revision  Changes    Path
  1.2       +2 -4      blender/intern/elbeem/COPYING
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/COPYING.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.5       +10 -4     blender/intern/elbeem/extern/elbeem.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/extern/elbeem.h.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.7       +38 -518   blender/intern/elbeem/intern/attributes.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/attributes.cpp.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
  1.6       +44 -130   blender/intern/elbeem/intern/attributes.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/attributes.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.10      +7 -3      blender/intern/elbeem/intern/elbeem.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/elbeem.cpp.diff?r1=1.9&r2=1.10&cvsroot=bf-blender>
  1.6       +10 -4     blender/intern/elbeem/intern/elbeem.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/elbeem.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.12      +533 -193  blender/intern/elbeem/intern/isosurface.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/isosurface.cpp.diff?r1=1.11&r2=1.12&cvsroot=bf-blender>
  1.9       +26 -1     blender/intern/elbeem/intern/isosurface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/isosurface.h.diff?r1=1.8&r2=1.9&cvsroot=bf-blender>
  1.2       +4 -0      blender/intern/elbeem/intern/loop_tools.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/loop_tools.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.9       +46 -23    blender/intern/elbeem/intern/ntl_blenderdumper.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_blenderdumper.cpp.diff?r1=1.8&r2=1.9&cvsroot=bf-blender>
  1.5       +1 -1      blender/intern/elbeem/intern/ntl_blenderdumper.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_blenderdumper.h.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.7       +1 -1      blender/intern/elbeem/intern/ntl_bsptree.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_bsptree.cpp.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
  1.5       +1 -1      blender/intern/elbeem/intern/ntl_bsptree.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_bsptree.h.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.4       +8 -1      blender/intern/elbeem/intern/ntl_geometryclass.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_geometryclass.h.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.8       +1 -1      blender/intern/elbeem/intern/ntl_geometrymodel.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_geometrymodel.cpp.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.5       +1 -1      blender/intern/elbeem/intern/ntl_geometrymodel.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_geometrymodel.h.diff?r1=1.4&r2=1.5&cvsroot=bf-blender>
  1.9       +31 -20    blender/intern/elbeem/intern/ntl_geometryobject.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_geometryobject.cpp.diff?r1=1.8&r2=1.9&cvsroot=bf-blender>
  1.8       +8 -2      blender/intern/elbeem/intern/ntl_geometryobject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_geometryobject.h.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.8       +1 -1      blender/intern/elbeem/intern/ntl_geometryshader.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_geometryshader.h.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.2       +1 -1      blender/intern/elbeem/intern/ntl_lighting.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_lighting.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +1 -1      blender/intern/elbeem/intern/ntl_lighting.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_lighting.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.3       +80 -1     blender/intern/elbeem/intern/ntl_matrices.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_matrices.h.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.7       +1 -1      blender/intern/elbeem/intern/ntl_ray.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_ray.cpp.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
  1.6       +1 -1      blender/intern/elbeem/intern/ntl_ray.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_ray.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.13      +1 -1      blender/intern/elbeem/intern/ntl_vector3dim.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_vector3dim.h.diff?r1=1.12&r2=1.13&cvsroot=bf-blender>
  1.7       +18 -8     blender/intern/elbeem/intern/ntl_world.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_world.cpp.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
  1.6       +1 -1      blender/intern/elbeem/intern/ntl_world.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_world.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.8       +9 -7      blender/intern/elbeem/intern/parametrizer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/parametrizer.cpp.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.6       +3 -3      blender/intern/elbeem/intern/parametrizer.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/parametrizer.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.8       +17 -5     blender/intern/elbeem/intern/particletracer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/particletracer.cpp.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.6       +18 -3     blender/intern/elbeem/intern/particletracer.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/particletracer.h.diff?r1=1.5&r2=1.6&cvsroot=bf-blender>
  1.10      +61 -52    blender/intern/elbeem/intern/simulation_object.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/simulation_object.cpp.diff?r1=1.9&r2=1.10&cvsroot=bf-blender>
  1.8       +1 -1      blender/intern/elbeem/intern/simulation_object.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/simulation_object.h.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.3       +81 -65    blender/intern/elbeem/intern/solver_adap.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/solver_adap.cpp.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.10      +68 -10    blender/intern/elbeem/intern/solver_class.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/solver_class.h.diff?r1=1.9&r2=1.10&cvsroot=bf-blender>
  1.13      +308 -253  blender/intern/elbeem/intern/solver_init.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/solver_init.cpp.diff?r1=1.12&r2=1.13&cvsroot=bf-blender>
  1.10      +76 -35    blender/intern/elbeem/intern/solver_interface.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/solver_interface.cpp.diff?r1=1.9&r2=1.10&cvsroot=bf-blender>
  1.7       +43 -18    blender/intern/elbeem/intern/solver_interface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/solver_interface.h.diff?r1=1.6&r2=1.7&cvsroot=bf-blender>
  1.12      +363 -289  blender/intern/elbeem/intern/solver_main.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/solver_main.cpp.diff?r1=1.11&r2=1.12&cvsroot=bf-blender>
  1.12      +12 -1     blender/intern/elbeem/intern/solver_relax.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/solver_relax.h.diff?r1=1.11&r2=1.12&cvsroot=bf-blender>
  1.12      +438 -338  blender/intern/elbeem/intern/solver_util.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/solver_util.cpp.diff?r1=1.11&r2=1.12&cvsroot=bf-blender>
  1.9       +134 -20   blender/intern/elbeem/intern/utilities.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/utilities.cpp.diff?r1=1.8&r2=1.9&cvsroot=bf-blender>
  1.8       +3 -3      blender/intern/elbeem/intern/utilities.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/utilities.h.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.133     +4 -2      blender/source/blender/blenkernel/intern/DerivedMesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/DerivedMesh.c.diff?r1=1.132&r2=1.133&cvsroot=bf-blender>
  1.102     +9 -7      blender/source/blender/blenkernel/intern/effect.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/effect.c.diff?r1=1.101&r2=1.102&cvsroot=bf-blender>
  1.8       +3 -0      blender/source/blender/makesdna/DNA_object_fluidsim.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_object_fluidsim.h.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.188     +62 -22    blender/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_object.c.diff?r1=1.187&r2=1.188&cvsroot=bf-blender>
  1.29      +11 -287   blender/source/blender/src/fluidsim.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/fluidsim.c.diff?r1=1.28&r2=1.29&cvsroot=bf-blender>