soc-2008-mxcurioni: now supports current scene drawing (instead of fixed scene object), still with fixed style and fixed camera. Initialization is properly handled, which limits memory problems and speed-ups subsequent rendering. The viewing ratio should be correct now too. I also removed linking references to former lib3ds library path (caused some linking problems).

config/darwin-config.py

@@ -167,7 +167,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 # WITH_BF_OPENEXR = 'true'

config/linux2-config.py

@@ -93,7 +93,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'

config/linuxcross-config.py

@@ -13,7 +13,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 ###########################

config/openbsd3-config.py

@@ -87,7 +87,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'

config/sunos5-config.py

@@ -89,7 +89,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'

config/win32-mingw-config.py

@@ -104,7 +104,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'

config/win32-vc-config.py

@@ -115,7 +115,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'

source/blender/freestyle/SConscript

@@ -74,13 +74,21 @@ env.BlenderLib (libname="bf_freestyle",
 ########################################################
 #	swig
 #
-# 	1] Run the following two commands in the source/blender/freestyle/intern/swig directory.
+# 	1] Run the following three commands in the source/blender/freestyle/intern/swig directory.
 #
 #	2] Replace /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib to the path
 #	of your library directory (used to locate libbf_freestyle.a)
 #
 #   3] Replace the python directories to suit your config
 
+# export SWIG_LIB=/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/extern/freestyle/swig/Lib
+
+# cd /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/intern/swig
+
+# /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/bin/swig -c++ -python -o ModuleWrapper.cpp Freestyle.i
+
+# mv ./Freestyle.py ../../python/
+
 # g++ -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -I../../../blenlib -I../../../blenkernel -I../../../imbuf -I../../../makesdna -c ModuleWrapper.cpp -o ModuleWrapper.o
 
 ###########  Mac OS X ###########

source/blender/freestyle/intern/app_blender/api.cpp

@@ -11,10 +11,11 @@ extern "C" {
 #endif
 
 #include "render_types.h"
-//#include "renderdatabase.h"
-/* display_draw() needs render layer info */
 #include "renderpipeline.h"
 
+#include "BLI_blenlib.h"
+#include "BPY_extern.h"
+
 #ifdef __cplusplus
 }
 #endif
@@ -25,26 +26,50 @@ using namespace std;
 extern "C" {
 #endif
 
-	void FRS_execute(Render* re) {
+	static Controller *controller = NULL;
-		cout << "Freestyle start" << endl;
+	static AppGLWidget *view = NULL;
-	
+
+	void FRS_initialize(){
 		Config::Path pathconfig;
-		Controller *c = new Controller;
-		AppGLWidget *view = new AppGLWidget;
 		
-		c->SetView(view);
+		if( controller == NULL )
+			controller = new Controller;
+		
+		if( view == NULL )
+			view = new AppGLWidget;
+	}
+
+	void FRS_execute(Render* re) {
+			
+		FRS_initialize();
+		
+		controller->SetView(view);
 		unsigned int width = re->winx;
 		unsigned int height = re->winy;
 		view->setWidth(width);
 		view->setHeight(height);
+		view->_camera->setScreenWidthAndHeight(width, height);
+		//view->setCameraState(const float* position, const float* orientation) 
 		
-		c->Load3DSFile( TEST_3DS_FILE );
+		BPY_run_python_script( TEST_3DS_EXPORT );
 		
-		c->InsertStyleModule( 0, TEST_STYLE_MODULE_FILE );
+		char btempdir[255];
-		c->toggleLayer(0, true);
+		BLI_where_is_temp(btempdir,1);
-		c->ComputeViewMap();
+		string exported_3ds_file =  btempdir;
+		exported_3ds_file += "/tmp_scene_freestyle.3ds";
+		if( BLI_exists( const_cast<char *>(exported_3ds_file.c_str()) ) ) {
+			controller->Load3DSFile( exported_3ds_file.c_str() );
+		}
+		else {
+			cout << "Cannot find" << exported_3ds_file << endl;
+			return;
+		}
 		
-		c->DrawStrokes(); // build strokes
+		controller->InsertStyleModule( 0, TEST_STYLE_MODULE_FILE );
+		controller->toggleLayer(0, true);
+		controller->ComputeViewMap();
+		
+		controller->DrawStrokes(); // build strokes
 		view->draw(); // render final result
 		
 		RenderResult rres;
@@ -52,8 +77,6 @@ extern "C" {
 		view->readPixels(0,0,width,height,AppGLWidget::RGBA, rres.rectf );		
 		re->result->renlay = render_get_active_layer(re, re->result);
 		re->display_draw(re->result, NULL);
-		
-		cout << "Freestyle end" << endl;
 
 	}
 	

source/blender/freestyle/intern/app_blender/test_config.h

@@ -1,8 +1,10 @@
-
-#define TEST_3DS_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/models/teapot.3DS"
-
 #define TEST_STYLE_MODULE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/contour.py"
 
 #define TEST_ROOT_DIR "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle"
 
 #define TEST_TEXTURE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/textures/papers/whitepaper.jpg"
+
+
+
+
+#define TEST_3DS_EXPORT "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/python/3ds_export.py"

source/blender/freestyle/intern/swig/ModuleWrapper.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.35
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -73,7 +73,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVoid : public UnaryFunction0D<void >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVoid : public UnaryFunction0D< void >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVoid(PyObject *self);
@@ -119,7 +119,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DUnsigned : public UnaryFunction0D<unsigned int >, public Swig::Director {
+class SwigDirector_UnaryFunction0DUnsigned : public UnaryFunction0D< unsigned int >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DUnsigned(PyObject *self);
@@ -165,7 +165,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DFloat : public UnaryFunction0D<float >, public Swig::Director {
+class SwigDirector_UnaryFunction0DFloat : public UnaryFunction0D< float >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DFloat(PyObject *self);
@@ -211,7 +211,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DDouble : public UnaryFunction0D<double >, public Swig::Director {
+class SwigDirector_UnaryFunction0DDouble : public UnaryFunction0D< double >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DDouble(PyObject *self);
@@ -257,13 +257,13 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVec2f : public UnaryFunction0D<Geometry::Vec2f >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVec2f : public UnaryFunction0D< Geometry::Vec2f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVec2f(PyObject *self);
     virtual ~SwigDirector_UnaryFunction0DVec2f();
     virtual std::string getName() const;
-    virtual VecMat::Vec2<float > operator ()(Interface0DIterator &iter);
+    virtual VecMat::Vec2< float > operator ()(Interface0DIterator &iter);
 
 
 /* Internal Director utilities */
@@ -303,13 +303,13 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVec3f : public UnaryFunction0D<Geometry::Vec3f >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVec3f : public UnaryFunction0D< Geometry::Vec3f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVec3f(PyObject *self);
     virtual ~SwigDirector_UnaryFunction0DVec3f();
     virtual std::string getName() const;
-    virtual VecMat::Vec3<float > operator ()(Interface0DIterator &iter);
+    virtual VecMat::Vec3< float > operator ()(Interface0DIterator &iter);
 
 
 /* Internal Director utilities */
@@ -349,7 +349,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DId : public UnaryFunction0D<Id >, public Swig::Director {
+class SwigDirector_UnaryFunction0DId : public UnaryFunction0D< Id >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DId(PyObject *self);
@@ -395,7 +395,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVoid : public UnaryFunction1D<void >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVoid : public UnaryFunction1D< void >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVoid(PyObject *self);
@@ -442,7 +442,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DUnsigned : public UnaryFunction1D<unsigned int >, public Swig::Director {
+class SwigDirector_UnaryFunction1DUnsigned : public UnaryFunction1D< unsigned int >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DUnsigned(PyObject *self);
@@ -489,7 +489,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DFloat : public UnaryFunction1D<float >, public Swig::Director {
+class SwigDirector_UnaryFunction1DFloat : public UnaryFunction1D< float >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DFloat(PyObject *self);
@@ -536,7 +536,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DDouble : public UnaryFunction1D<double >, public Swig::Director {
+class SwigDirector_UnaryFunction1DDouble : public UnaryFunction1D< double >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DDouble(PyObject *self);
@@ -583,14 +583,14 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVec2f : public UnaryFunction1D<Geometry::Vec2f >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVec2f : public UnaryFunction1D< Geometry::Vec2f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVec2f(PyObject *self);
     SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType);
     virtual ~SwigDirector_UnaryFunction1DVec2f();
     virtual std::string getName() const;
-    virtual VecMat::Vec2<float > operator ()(Interface1D &inter);
+    virtual VecMat::Vec2< float > operator ()(Interface1D &inter);
 
 
 /* Internal Director utilities */
@@ -630,14 +630,14 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVec3f : public UnaryFunction1D<Geometry::Vec3f >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVec3f : public UnaryFunction1D< Geometry::Vec3f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVec3f(PyObject *self);
     SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType);
     virtual ~SwigDirector_UnaryFunction1DVec3f();
     virtual std::string getName() const;
-    virtual VecMat::Vec3<float > operator ()(Interface1D &inter);
+    virtual VecMat::Vec3< float > operator ()(Interface1D &inter);
 
 
 /* Internal Director utilities */

source/blender/freestyle/python/Freestyle.py

@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.33
+# Version 1.3.35
 #
 # Don't modify this file, modify the SWIG interface instead.
 # This file is compatible with both classic and new-style classes.
@@ -60,7 +60,7 @@ class PySwigIterator(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, PySwigIterator, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, PySwigIterator, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_destroy__ = _Freestyle.delete_PySwigIterator
     __del__ = lambda self : None;
@@ -674,6 +674,8 @@ class Interface0D(_object):
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Interface0D, name)
     __repr__ = _swig_repr
+    __swig_destroy__ = _Freestyle.delete_Interface0D
+    __del__ = lambda self : None;
     def getExactTypeName(*args): return _Freestyle.Interface0D_getExactTypeName(*args)
     def getX(*args): return _Freestyle.Interface0D_getX(*args)
     def getY(*args): return _Freestyle.Interface0D_getY(*args)
@@ -694,8 +696,6 @@ class Interface0D(_object):
         this = _Freestyle.new_Interface0D(*args)
         try: self.this.append(this)
         except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Interface0D
-    __del__ = lambda self : None;
 Interface0D_swigregister = _Freestyle.Interface0D_swigregister
 Interface0D_swigregister(Interface0D)
 cvar = _Freestyle.cvar
@@ -718,7 +718,7 @@ class Interface0DIteratorNested(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Interface0DIteratorNested, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Interface0DIteratorNested, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_destroy__ = _Freestyle.delete_Interface0DIteratorNested
     __del__ = lambda self : None;
@@ -803,8 +803,10 @@ class Interface1D(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Interface1D, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Interface1D, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
+    __swig_destroy__ = _Freestyle.delete_Interface1D
+    __del__ = lambda self : None;
     def getExactTypeName(*args): return _Freestyle.Interface1D_getExactTypeName(*args)
     def verticesBegin(*args): return _Freestyle.Interface1D_verticesBegin(*args)
     def verticesEnd(*args): return _Freestyle.Interface1D_verticesEnd(*args)
@@ -815,8 +817,6 @@ class Interface1D(_object):
     def getNature(*args): return _Freestyle.Interface1D_getNature(*args)
     def getTimeStamp(*args): return _Freestyle.Interface1D_getTimeStamp(*args)
     def setTimeStamp(*args): return _Freestyle.Interface1D_setTimeStamp(*args)
-    __swig_destroy__ = _Freestyle.delete_Interface1D
-    __del__ = lambda self : None;
 Interface1D_swigregister = _Freestyle.Interface1D_swigregister
 Interface1D_swigregister(Interface1D)
 
@@ -1434,7 +1434,7 @@ class ViewVertex(Interface0D):
     __swig_getmethods__ = {}
     for _s in [Interface0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, ViewVertex, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     def getExactTypeName(*args): return _Freestyle.ViewVertex_getExactTypeName(*args)
     __swig_setmethods__["userdata"] = _Freestyle.ViewVertex_userdata_set
@@ -4831,7 +4831,7 @@ class Operators(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Operators, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Operators, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_getmethods__["select"] = lambda x: _Freestyle.Operators_select
     if _newclass:select = staticmethod(_Freestyle.Operators_select)
@@ -4898,7 +4898,7 @@ class Canvas(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Canvas, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Canvas, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_getmethods__["getInstance"] = lambda x: _Freestyle.Canvas_getInstance
     if _newclass:getInstance = staticmethod(_Freestyle.Canvas_getInstance)

tools/Blender.py

@@ -121,9 +121,6 @@ def setup_staticlibs(lenv):
         ]
     libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
     libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
-	
-    if lenv['WITH_BF_FREESTYLE']:
-        libincs += Split(lenv['BF_LIB3DS_LIBPATH'])	
 
     if lenv['WITH_BF_INTERNATIONAL']:
         libincs += Split(lenv['BF_GETTEXT_LIBPATH'])

tools/btools.py

@@ -66,7 +66,7 @@ def validate_arguments(args, bc):
             'BF_FANCY', 'BF_QUIET',
             'BF_X264_CONFIG',
             'BF_XVIDCORE_CONFIG',
-			'BF_WITH_BF_FREESTYLE', 'BF_FREESTYLE', 'BF_FREESTYLE_SRC', 'BF_SWIG', 'BF_SWIG_LIB', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_LIBPATH', 'BF_LIB3DS_INC'
+			'BF_WITH_BF_FREESTYLE', 'BF_FREESTYLE', 'BF_FREESTYLE_SRC', 'BF_SWIG', 'BF_SWIG_LIB', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_INC'
             ]
 
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
@@ -245,8 +245,7 @@ def read_opts(cfg, args):
         ('BF_SWIG_LIB', 'SWIG library', ''),
         ('BF_LIB3DS', 'lib3ds base path', ''),
         ('BF_LIB3DS_LIB', 'lib3ds library', ''),
-        ('BF_LIB3DS_LIBPATH', 'lib3ds library path', ''),
+        ('BF_LIB3DS_INC', 'lib3ds include path', ''),
-		('BF_LIB3DS_INC', 'lib3ds include path', ''),
 
 ##
 ##WITH_BF_NSPR = 'true'