[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14691] branches/soc-2008-mxcurioni: merge to 14689, Freestyle library changes, SConscript start

Maxime Curioni maxime.curioni at gmail.com
Mon May 5 18:56:45 CEST 2008 

Revision: 14691
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14691
Author:   mxcurioni
Date:     2008-05-05 18:56:44 +0200 (Mon, 05 May 2008)

Log Message:
-----------
merge to 14689, Freestyle library changes, SConscript start

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/config/darwin-config.py
    branches/soc-2008-mxcurioni/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/extern/verse/dist/v_bignum.c
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
    branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/soc-2008-mxcurioni/release/scripts/console.py
    branches/soc-2008-mxcurioni/release/scripts/wizard_curve2tree.py
    branches/soc-2008-mxcurioni/release/scripts/x3d_export.py
    branches/soc-2008-mxcurioni/source/blender/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeavi.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_blenlib.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/util.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/genfile.c
    branches/soc-2008-mxcurioni/source/blender/include/BIF_screen.h
    branches/soc-2008-mxcurioni/source/blender/include/butspace.h
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
    branches/soc-2008-mxcurioni/source/blender/python/BPY_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/BPY_menus.c
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Blender.c
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Library.c
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Library.h
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Node.c
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Sys.c
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/LibData.py
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/sceneRender.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/src/buttons_editing.c
    branches/soc-2008-mxcurioni/source/blender/src/buttons_object.c
    branches/soc-2008-mxcurioni/source/blender/src/buttons_scene.c
    branches/soc-2008-mxcurioni/source/blender/src/buttons_shading.c
    branches/soc-2008-mxcurioni/source/blender/src/drawimage.c
    branches/soc-2008-mxcurioni/source/blender/src/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/src/drawview.c
    branches/soc-2008-mxcurioni/source/blender/src/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/src/editdeform.c
    branches/soc-2008-mxcurioni/source/blender/src/editimasel.c
    branches/soc-2008-mxcurioni/source/blender/src/editipo.c
    branches/soc-2008-mxcurioni/source/blender/src/editobject.c
    branches/soc-2008-mxcurioni/source/blender/src/editscreen.c
    branches/soc-2008-mxcurioni/source/blender/src/editsima.c
    branches/soc-2008-mxcurioni/source/blender/src/editsound.c
    branches/soc-2008-mxcurioni/source/blender/src/filesel.c
    branches/soc-2008-mxcurioni/source/blender/src/fluidsim.c
    branches/soc-2008-mxcurioni/source/blender/src/ghostwinlay.c
    branches/soc-2008-mxcurioni/source/blender/src/header_action.c
    branches/soc-2008-mxcurioni/source/blender/src/header_ipo.c
    branches/soc-2008-mxcurioni/source/blender/src/header_nla.c
    branches/soc-2008-mxcurioni/source/blender/src/interface_draw.c
    branches/soc-2008-mxcurioni/source/blender/src/outliner.c
    branches/soc-2008-mxcurioni/source/blender/src/screendump.c
    branches/soc-2008-mxcurioni/source/blender/src/seqaudio.c
    branches/soc-2008-mxcurioni/source/blender/src/sequence.c
    branches/soc-2008-mxcurioni/source/blender/src/space.c
    branches/soc-2008-mxcurioni/source/blender/src/view.c
    branches/soc-2008-mxcurioni/source/blender/src/writeimage.c
    branches/soc-2008-mxcurioni/source/blender/src/writemovie.c
    branches/soc-2008-mxcurioni/source/blender/yafray/intern/export_File.cpp
    branches/soc-2008-mxcurioni/source/blender/yafray/intern/export_Plugin.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/soc-2008-mxcurioni/tools/Blender.py
    branches/soc-2008-mxcurioni/tools/btools.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/source/blender/freestyle/
    branches/soc-2008-mxcurioni/source/blender/freestyle/AUTHORS.TXT
    branches/soc-2008-mxcurioni/source/blender/freestyle/BUGS.TXT
    branches/soc-2008-mxcurioni/source/blender/freestyle/CHANGELOG.TXT
    branches/soc-2008-mxcurioni/source/blender/freestyle/COPYRIGHT.TXT
    branches/soc-2008-mxcurioni/source/blender/freestyle/INSTALL.TXT
    branches/soc-2008-mxcurioni/source/blender/freestyle/LICENSE.TXT
    branches/soc-2008-mxcurioni/source/blender/freestyle/README.TXT
    branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
    branches/soc-2008-mxcurioni/source/blender/freestyle/THANKS.TXT
    branches/soc-2008-mxcurioni/source/blender/freestyle/TODO.TXT
    branches/soc-2008-mxcurioni/source/blender/freestyle/data/
    branches/soc-2008-mxcurioni/source/blender/freestyle/src/
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/extern/freestyle/AUTHORS.TXT
    branches/soc-2008-mxcurioni/extern/freestyle/BUGS.TXT
    branches/soc-2008-mxcurioni/extern/freestyle/CHANGELOG.TXT
    branches/soc-2008-mxcurioni/extern/freestyle/COPYRIGHT.TXT
    branches/soc-2008-mxcurioni/extern/freestyle/INSTALL.TXT
    branches/soc-2008-mxcurioni/extern/freestyle/LICENSE.TXT
    branches/soc-2008-mxcurioni/extern/freestyle/README.TXT
    branches/soc-2008-mxcurioni/extern/freestyle/THANKS.TXT
    branches/soc-2008-mxcurioni/extern/freestyle/TODO.TXT
    branches/soc-2008-mxcurioni/extern/freestyle/data/
    branches/soc-2008-mxcurioni/extern/freestyle/src/
    branches/soc-2008-mxcurioni/extern/freestyle/style_modules/

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2008-05-05 15:40:16 UTC (rev 14690)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2008-05-05 16:56:44 UTC (rev 14691)
@@ -250,6 +250,10 @@
   ELSE (MSVC80)
   SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
   ENDIF(MSVC80)
+  IF (MSVC90)
+  SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
+  ENDIF(MSVC90)
+
   
   SET(QUICKTIME ${LIBDIR}/QTDevWin)
   SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct	2008-05-05 15:40:16 UTC (rev 14690)
+++ branches/soc-2008-mxcurioni/SConstruct	2008-05-05 16:56:44 UTC (rev 14691)
@@ -403,9 +403,26 @@
     if '.svn' in tn:
         tn.remove('.svn')
     for f in tf:
+        print ">>>", env['BF_INSTALLDIR'], tp, f
         pluglist.append(tp+os.sep+f)
         plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f)
 
+# header files for plugins
+pluglist.append('source/blender/blenpluginapi/documentation.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'documentation.h')
+pluglist.append('source/blender/blenpluginapi/externdef.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'externdef.h')
+pluglist.append('source/blender/blenpluginapi/floatpatch.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'floatpatch.h')
+pluglist.append('source/blender/blenpluginapi/iff.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'iff.h')
+pluglist.append('source/blender/blenpluginapi/plugin.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'plugin.h')
+pluglist.append('source/blender/blenpluginapi/util.h')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'util.h')
+pluglist.append('source/blender/blenpluginapi/plugin.DEF')
+plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep + 'plugin.def')
+
 plugininstall = []
 for targetdir,srcfile in zip(plugtargetlist, pluglist):
     td, tf = os.path.split(targetdir)

Modified: branches/soc-2008-mxcurioni/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/darwin-config.py	2008-05-05 15:40:16 UTC (rev 14690)
+++ branches/soc-2008-mxcurioni/config/darwin-config.py	2008-05-05 16:56:44 UTC (rev 14691)
@@ -160,6 +160,21 @@
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '${BF_FREESTYLE}/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+
+# WITH_BF_OPENEXR = 'true'
+# BF_OPENEXR = '${LCGDIR}/openexr'
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
+# BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
@@ -220,9 +235,10 @@
 	CCFLAGS=SDK_FLAGS+CCFLAGS
 	CXXFLAGS=SDK_FLAGS+CXXFLAGS
 	
+# you can add -mssse3 if gcc >= 4.2
 if MAC_PROC == 'i386':
-	REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mssse3']
-	REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mssse3']
+	REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
+	REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
 else:
 	CFLAGS = CFLAGS+['-fno-strict-aliasing']
 	CCFLAGS =  CCFLAGS+['-fno-strict-aliasing']

Modified: branches/soc-2008-mxcurioni/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/win32-vc-config.py	2008-05-05 15:40:16 UTC (rev 14690)
+++ branches/soc-2008-mxcurioni/config/win32-vc-config.py	2008-05-05 16:56:44 UTC (rev 14691)
@@ -170,7 +170,6 @@
                         /NODEFAULTLIB:"libcd.lib"
                         /NODEFAULTLIB:"libcpd.lib" 
                         /NODEFAULTLIB:"libcp.lib" 
-                        /NODEFAULTLIB:"libcmtd.lib"
                     '''
                         
 BF_BUILDDIR = '..\\build\\win32-vc'

Deleted: branches/soc-2008-mxcurioni/extern/freestyle/AUTHORS.TXT
===================================================================
--- branches/soc-2008-mxcurioni/extern/freestyle/AUTHORS.TXT	2008-05-05 15:40:16 UTC (rev 14690)
+++ branches/soc-2008-mxcurioni/extern/freestyle/AUTHORS.TXT	2008-05-05 16:56:44 UTC (rev 14691)
@@ -1,6 +0,0 @@
-Authors
--------
-Fr\xE9do Durand		<fredo at mit.edu>
-St\xE9phane Grabli		<stephane.grabli at imag.fr>
-Fran\xE7ois Sillion	<francois.sillion at imag.fr>
-Emmanuel Turquin	<emmanuel.turquin at imag.fr>

Deleted: branches/soc-2008-mxcurioni/extern/freestyle/BUGS.TXT
===================================================================
--- branches/soc-2008-mxcurioni/extern/freestyle/BUGS.TXT	2008-05-05 15:40:16 UTC (rev 14690)
+++ branches/soc-2008-mxcurioni/extern/freestyle/BUGS.TXT	2008-05-05 16:56:44 UTC (rev 14691)
@@ -1,11 +0,0 @@
-* Application doesn't exit properly (eg style window still hangs out)
-* macosx: Window bar is unaccessible.
-* macosx: Build leds to an application that is half-bundle (for the executable) half UNIX-style (for libraries).
-* Strokes Strips are sometimes incorrect
-* TVertex sometimes points towards NULL ViewEdges
-* Some points are found to be outside of the grid. (for big models and mostly in release mode). Probably due to precision problems.
-* Operators::recursiveChains() and ViewEdgeIterator change ViewEdgeIterator so that it supports the copy of specialized types in a transparent way. It works here only because we're never copying it and because it is passed as a reference.
-* Functions0D takes a Interface0DIterator& insted of a const Interface0DIterator& as argument. dangerous.
-* crashes on big models
-
- 

Deleted: branches/soc-2008-mxcurioni/extern/freestyle/CHANGELOG.TXT
===================================================================
--- branches/soc-2008-mxcurioni/extern/freestyle/CHANGELOG.TXT	2008-05-05 15:40:16 UTC (rev 14690)
+++ branches/soc-2008-mxcurioni/extern/freestyle/CHANGELOG.TXT	2008-05-05 16:56:44 UTC (rev 14691)
@@ -1,47 +0,0 @@
-2008-03-06 - freestyle-2.2.0
-	* Fixed a bug related to the ViewShape IDs that caused the ray casting to crash.
-	* Fixed a bug in the style module insertion.
-                
-2008-03-02 - freestyle-2.1.1
-	* Added the management of texture coordinates in the scene graph and the rendering.
-	* The reps in the scene graph are now assigned ids based on the lib3ds nodes ids. These ids are transmitted to the WingedEdge Shapes.
-2007-10-05 - freestyle-2.0.1
-
-	* Enforced node construction from lib3ds (thanks to Thomas Netter)
-        * Reverted to not using bundles by default on MacOSX. Activating bundles can be made by uncommenting the lib_bundle line of the CONFIG variable in Config.pri
-        * Added a NodeCamera to the scene graph.
-        * Made sure the display lists were compiled AND executed (GL_COMPILE -> GL_COMPILE_AND_EXECUTE) for IndexedFaceSet.
-        * Added a visitor to deallocate memory on the graphics card (display lists right now).
-        * Modified the grid to use a visitor pattern for ray casting and grid traversal.
-        
-
-
-2007-05-06 - freestyle-2.0.0
-
-	* Switched to Qt 4.2.3, swig 1.3.31, visual c++ 2005, gcc 4.0.1, qglviewer 2.2.5-1
-	* Added texture coordinates to scene graph
-	* Made the grid more robust
-        * Now compiles on MacOSX
-        * Fixed the brush texture problem: the full path to the texture was used instead of the base name and that was breaking the search path algorithm
-
-
-2006-06-18 - freestyle-1.0.2
-
-	* Fixed a bug related to the loading of OpenGL extensions.
-
-
-2005-07-25 - freestyle-1.0.1
-
-	* Upgrade to QGLViewer 2.0.4
-	* Added the FREESTYLE_DIR environment variable.
-	  It must be set to the freestyle directory for
-	  all releases except the pre-compiled windows version.
-	* Fixed the unix path separator.
-	* Added the "Help>Control bindings" menu action.
-	* Fixed the style modules according to Python 2.4 standards.
-
-
-2005-04-05 - freestyle-1.0.0  
-
-	* Initial release
-

Deleted: branches/soc-2008-mxcurioni/extern/freestyle/COPYRIGHT.TXT
===================================================================
--- branches/soc-2008-mxcurioni/extern/freestyle/COPYRIGHT.TXT	2008-05-05 15:40:16 UTC (rev 14690)
+++ branches/soc-2008-mxcurioni/extern/freestyle/COPYRIGHT.TXT	2008-05-05 16:56:44 UTC (rev 14691)
@@ -1,9 +0,0 @@
-Freestyle
-
-Copyright (c) 2001-2007 by the following:
-
-
-Fr\xE9do Durand		<fredo at mit.edu>
-St\xE9phane Grabli		<stephane.grabli at gmail.com>
-Fran\xE7ois Sillion	<francois.sillion at imag.fr>
-Emmanuel Turquin	<emmanuel.turquin at imag.fr>

Deleted: branches/soc-2008-mxcurioni/extern/freestyle/INSTALL.TXT
===================================================================
--- branches/soc-2008-mxcurioni/extern/freestyle/INSTALL.TXT	2008-05-05 15:40:16 UTC (rev 14690)
+++ branches/soc-2008-mxcurioni/extern/freestyle/INSTALL.TXT	2008-05-05 16:56:44 UTC (rev 14691)
@@ -1,79 +0,0 @@
-Install
--------
-
-* UNIX/LINUX
-
-(for a more detailed description, see doc/linuxinstall.html)
-
-  This is quite straightforward, provided that you have all the
-needed libraries properly installed (see Requirements section in
-the README.TXT file). 
-First, set the FREESTYLE-DIR environment variable to your 
-freestyle directory and then, simply type:
-
-$> cd "$FREESTYLE_DIR"/src
-$> qmake
-$> make
-
-Note: The SWIG wrapper hasn't been included in the qmake build
-cycle yet and thus has to be compiled separately, by hand:
-
-$> cd "$FREESTYLE_DIR"/src/swig
-$> make
-
-And to run the app:
-
-$> export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./lib"
-$> cd "$FREESTYLE_DIR"/build/linux-g++/release/
-$> ./Freestyle
-
-
-* WINDOWS
-
- - If you downloaded the binary version:
-
-1) unzip the package
-2) run vcredist_x86.exe
-3) run Freestyle.exe
-
-- Compilation Instructions:
-

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list