[Bf-blender-cvs] CVS commit: blender/intern/elbeem SConscript blender/intern/elbeem/intern cfgparser.h attributes.cpp attributes.h blendercall.cpp cfglexer.cpp cfgparser.cpp isosurface.cpp isosurface.h lbmdimensions.h lbmfsgrsolver.h lbmfunctions.h lbminterface.cpp ...

[Nils Thuerey]

n_t (Nils Thuerey) 2005/09/23 16:42:14 CEST

  Modified files:
    blender/intern/elbeem SConscript 
    blender/intern/elbeem/intern attributes.cpp attributes.h 
                                 blendercall.cpp cfglexer.cpp 
                                 cfgparser.cpp isosurface.cpp 
                                 isosurface.h lbmdimensions.h 
                                 lbmfsgrsolver.h lbmfunctions.h 
                                 lbminterface.cpp lbminterface.h 
                                 ntl_blenderdumper.cpp 
                                 ntl_bsptree.cpp ntl_bsptree.h 
                                 ntl_geometrymodel.cpp 
                                 ntl_geometryobject.cpp 
                                 ntl_geometryshader.h ntl_image.h 
                                 ntl_lightobject.cpp ntl_ray.cpp 
                                 ntl_ray.h ntl_raytracer.cpp 
                                 ntl_renderglobals.h ntl_scene.cpp 
                                 ntl_scene.h ntl_vector3dim.h 
                                 parametrizer.cpp parametrizer.h 
                                 particletracer.cpp 
                                 simulation_object.cpp 
                                 utilities.cpp utilities.h 
    blender/source/blender/blenkernel/intern DerivedMesh.c 
    blender/source/blender/src fluidsim.c 
  Added files:
    blender/intern/elbeem/intern cfgparser.h 
  Removed files:
    blender/intern/elbeem/intern cfgparser.hpp 
  
  Log:
  - 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?
  
  Revision  Changes    Path
  1.3       +1 -0      blender/intern/elbeem/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/SConscript.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.2       +9 -11     blender/intern/elbeem/intern/attributes.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/attributes.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +4 -2      blender/intern/elbeem/intern/attributes.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/attributes.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +19 -5     blender/intern/elbeem/intern/blendercall.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/blendercall.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +109 -106  blender/intern/elbeem/intern/cfglexer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/cfglexer.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +12 -12    blender/intern/elbeem/intern/cfgparser.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/cfgparser.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +17 -21    blender/intern/elbeem/intern/isosurface.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/isosurface.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +2 -0      blender/intern/elbeem/intern/isosurface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/isosurface.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +4 -4      blender/intern/elbeem/intern/lbmdimensions.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/lbmdimensions.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +2044 -1952blender/intern/elbeem/intern/lbmfsgrsolver.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/lbmfsgrsolver.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +33 -64    blender/intern/elbeem/intern/lbmfunctions.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/lbmfunctions.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +45 -87    blender/intern/elbeem/intern/lbminterface.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/lbminterface.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.3       +34 -85    blender/intern/elbeem/intern/lbminterface.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/lbminterface.h.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.2       +3 -12     blender/intern/elbeem/intern/ntl_blenderdumper.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_blenderdumper.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +312 -10   blender/intern/elbeem/intern/ntl_bsptree.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_bsptree.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +2 -0      blender/intern/elbeem/intern/ntl_bsptree.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_bsptree.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +2 -10     blender/intern/elbeem/intern/ntl_geometrymodel.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_geometrymodel.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +31 -35    blender/intern/elbeem/intern/ntl_geometryobject.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_geometryobject.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +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.1&r2=1.2&cvsroot=bf-blender>
  1.2       +1 -1      blender/intern/elbeem/intern/ntl_image.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_image.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +1 -0      blender/intern/elbeem/intern/ntl_lightobject.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_lightobject.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +19 -3     blender/intern/elbeem/intern/ntl_ray.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_ray.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +6 -97     blender/intern/elbeem/intern/ntl_ray.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_ray.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +9 -5      blender/intern/elbeem/intern/ntl_raytracer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_raytracer.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +1 -7      blender/intern/elbeem/intern/ntl_renderglobals.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_renderglobals.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +6 -6      blender/intern/elbeem/intern/ntl_scene.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_scene.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +16 -22    blender/intern/elbeem/intern/ntl_scene.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_scene.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +34 -24    blender/intern/elbeem/intern/ntl_vector3dim.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/ntl_vector3dim.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +12 -20    blender/intern/elbeem/intern/parametrizer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/parametrizer.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +0 -22     blender/intern/elbeem/intern/parametrizer.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/parametrizer.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +3 -3      blender/intern/elbeem/intern/particletracer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/particletracer.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +10 -7     blender/intern/elbeem/intern/simulation_object.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/simulation_object.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +30 -4     blender/intern/elbeem/intern/utilities.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/utilities.cpp.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.2       +51 -30    blender/intern/elbeem/intern/utilities.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/intern/elbeem/intern/utilities.h.diff?r1=1.1&r2=1.2&cvsroot=bf-blender>
  1.88      +64 -75    blender/source/blender/blenkernel/intern/DerivedMesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/DerivedMesh.c.diff?r1=1.87&r2=1.88&cvsroot=bf-blender>
  1.4       +33 -13    blender/source/blender/src/fluidsim.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/fluidsim.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>