griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
40e3dfd3bd1ff22d293df1d9d7b1b9b90d9bd708
test/source/blender/freestyle/SConscript

83 lines
2.1 KiB
Python
Raw Normal View History

merge to 14689, Freestyle library changes, SConscript start
2008-05-05 16:56:44 +00:00
#!/usr/bin/python
soc-2008-mxcurioni: swig compiles as independent library
2008-05-06 17:23:27 +00:00
import sys
Import ('env')
sources = []
defs = []
soc-2008-mxcurioni: towards Freestyle compilation, removing Qt's QString and QImage dependencies. Up to this commit, the following directories compile well (and without any warning): system, image, geometry, graph, winged_edge, view_map, stroke. Modified code is commented by //soc and unused variables by //soc unused
2008-05-09 23:06:28 +00:00
incs = ''
soc-2008-mxcurioni: swig compiles as independent library
2008-05-06 17:23:27 +00:00
Added Freestyle.getCurrentScene() to give access to the current scene from within style modules. Calling this function is only valid within style modules. Calling it from the Python Interactive Console results in an error as follows: >>> import Freestyle >>> Freestyle.getCurrentScene() Traceback (most recent call last): File "<console>", line 1, in <module> TypeError: current scene not available >>>
2009-12-06 22:01:04 +00:00
incs += '../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna'
Fixed compile errors due to an incomplete list of header directories.
2009-12-13 21:28:31 +00:00
incs += ' ../python ../python/intern'
incs += ' ../render/extern/include ../render/intern/include ../include ../src'
incs += ' #/extern/glew/include #/intern/guardedalloc ../freestyle'
soc-2008-mxcurioni: finished porting the Freestyle API. All of the original classes, except EdgeModifier and TimestampModifier (which aren't even ported via SWIG), are available under the Blender.Freestyle module. Testing of the porting will now begin to make sure the SWIG-less system works as the original. Quite a few modifications were made to finish the API: - Freestyle's SConscript was modified to catch all files within the intern/python directory, allowing integration of future shaders implemented in C++. - the Operators class was ported, with a special care of making its methods static (using the METH_STATIC flag in the tp_methods method definitions) - all of the type-checking functions [ BPy_[class name]_Check(obj) ] were changed to allow subclasses to be seen as that type too: instead on looking at the ob_type value, the PyObject_IsInstance function is used. - all of the iterators can now retrieve the object pointed to by the operator, using the getObject() method. A directedViewEdge pair is returned as a list of the two elements in the pair. - all of the style modules were copied to a style_modules_blender/ folder and were modified to use Freestyle as a Blender's submodule. IntegrationType and MediumType was also integrated (for example, changing MEAN to IntegrationType.MEAN). Testing now begins. If everything works correctly, I'll move on to lib3ds removal right away.
2008-07-29 05:45:16 +00:00
incs += ' ' + env['BF_PYTHON_INC']
soc-2008-mxcurioni: towards Freestyle compilation, removing Qt's QString and QImage dependencies. Up to this commit, the following directories compile well (and without any warning): system, image, geometry, graph, winged_edge, view_map, stroke. Modified code is commented by //soc and unused variables by //soc unused
2008-05-09 23:06:28 +00:00
incs += ' ' + env['BF_PNG_INC']
soc-2008-mxcurioni: swig compiles as independent library
2008-05-06 17:23:27 +00:00
jmsoler's SConscript patch for phtreads
2009-10-08 06:32:07 +00:00
if env['OURPLATFORM'] == 'linux2':
cflags='-pthread'
incs += ' ../../../extern/binreloc/include'
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
soc-2008-mxcurioni: towards Freestyle compilation, removing Qt's QString and QImage dependencies. Up to this commit, the following directories compile well (and without any warning): system, image, geometry, graph, winged_edge, view_map, stroke. Modified code is commented by //soc and unused variables by //soc unused
2008-05-09 23:06:28 +00:00
########################################################
# folders sources
########################################################
# system
prefix = 'intern/system'
system_sources = env.Glob(prefix + '/*.cpp')
# image
prefix = 'intern/image'
image_sources = env.Glob(prefix + '/*.cpp')
# geometry
prefix = 'intern/geometry'
geometry_sources = env.Glob(prefix + '/*.cpp')
# scene_graph
prefix = 'intern/scene_graph'
scene_graph_sources = env.Glob(prefix + '/*.cpp')
# winged_edge
prefix = 'intern/winged_edge'
winged_edge_sources = env.Glob(prefix + '/*.cpp')
# view_map
prefix = 'intern/view_map'
view_map_sources = env.Glob(prefix + '/*.cpp')
# stroke
prefix = 'intern/stroke'
stroke_sources = env.Glob(prefix + '/*.cpp')
fixed headers and SConscript to have successful build
2009-10-05 01:27:35 +00:00
# application
prefix = 'intern/application'
application_sources = env.Glob(prefix + '/*.cpp')
# blender_interface
prefix = 'intern/blender_interface'
interface_sources = env.Glob(prefix + '/*.cpp')
soc-2008-mxcurioni: towards Freestyle compilation, removing Qt's QString and QImage dependencies. Up to this commit, the following directories compile well (and without any warning): system, image, geometry, graph, winged_edge, view_map, stroke. Modified code is commented by //soc and unused variables by //soc unused
2008-05-09 23:06:28 +00:00
soc-2008-mxcurioni: first part of the Freestyle Python implementation. A new Freestyle module is added. The following modules are implemented: BinaryPredicate0D, BinaryPredicate1D, Id, Interface0D, Interface1D. I added a Convert module to help in the creation of Python objects for Freestyle's data structures. I also added a missing file for guarded_alloc needed for compilation on Windows.
2008-07-12 04:02:08 +00:00
# Python
prefix = 'intern/python'
soc-2008-mxcurioni: finished porting the Freestyle API. All of the original classes, except EdgeModifier and TimestampModifier (which aren't even ported via SWIG), are available under the Blender.Freestyle module. Testing of the porting will now begin to make sure the SWIG-less system works as the original. Quite a few modifications were made to finish the API: - Freestyle's SConscript was modified to catch all files within the intern/python directory, allowing integration of future shaders implemented in C++. - the Operators class was ported, with a special care of making its methods static (using the METH_STATIC flag in the tp_methods method definitions) - all of the type-checking functions [ BPy_[class name]_Check(obj) ] were changed to allow subclasses to be seen as that type too: instead on looking at the ob_type value, the PyObject_IsInstance function is used. - all of the iterators can now retrieve the object pointed to by the operator, using the getObject() method. A directedViewEdge pair is returned as a list of the two elements in the pair. - all of the style modules were copied to a style_modules_blender/ folder and were modified to use Freestyle as a Blender's submodule. IntegrationType and MediumType was also integrated (for example, changing MEAN to IntegrationType.MEAN). Testing now begins. If everything works correctly, I'll move on to lib3ds removal right away.
2008-07-29 05:45:16 +00:00
python_sources = env.Glob(prefix + '/*.cpp') \
+ env.Glob(prefix + '/*/*.cpp') \
+ env.Glob(prefix + '/*/*/*.cpp') \
+ env.Glob(prefix + '/*/*/*/*.cpp')
soc-2008-mxcurioni: Big update. Finally works (links and compiles). So far, the following steps work: 1. instantiates the config path, the controller and the view 2. sets the controller’s view 3. loads a 3ds file (right now a fixed file) 4. inserts a style module (right now, also fixed) 5. computes the view map The next and final step is running the Python script. A lot of information are fixed and should be changed to test the following code: see source/blender/freestyle/app_blender/*.cpp and search for fixed paths (starting in /Users/). I am currently evaluating whether it's worth making Python run on its own environment (right now, the program crashes because of PyImport_AddModule) or whether it should use Blender's Python capabilities. Also, I need to figure out how to integrate the SWIG wrapper dynamic library into the current scheme.
2008-05-25 17:34:21 +00:00
soc-2008-mxcurioni: towards Freestyle's first render: controller, config, appglwidget corrected. Freestyle is called but cannot be linked (ImBuf issues). This is an unstable commit.
2008-05-18 13:01:52 +00:00
sources = system_sources + image_sources + geometry_sources + scene_graph_sources \
Removed the OpenGL-based stroke renderer that was no longer used.
2010-07-10 00:09:05 +00:00
+ winged_edge_sources + view_map_sources + stroke_sources \
fixed headers and SConscript to have successful build
2009-10-05 01:27:35 +00:00
+ application_sources + interface_sources + python_sources
soc-2008-mxcurioni: towards Freestyle compilation, removing Qt's QString and QImage dependencies. Up to this commit, the following directories compile well (and without any warning): system, image, geometry, graph, winged_edge, view_map, stroke. Modified code is commented by //soc and unused variables by //soc unused
2008-05-09 23:06:28 +00:00
env.BlenderLib (libname="bf_freestyle",
sources=sources,
includes=Split(incs),
defines=defs,
Migration of Freestyle to Blender 2.5 codebase (continued): - proper Freestyle initialization, with support for undo/redo - re-added FreestyleStyleConfig data structure - Freestyle Python interpreter updated This commit should compile without errors. More work is necessary to complete the migration: - add Freestyle in the UI - set up RNA support
2009-09-28 03:56:31 +00:00
libtype=['core'],
Fixed a linker issue resulting in undefined reference to Freestyle_Init. The issue was caused by the order of libraries given to the linker. More specifically, libbf_python.a should precede libbf_freestyle.a, which is assured by choosing an appropriate 'priority' value of a BlenderLib.
2009-10-15 19:23:11 +00:00
priority = [370] # bf_python is 361
soc-2008-mxcurioni: uploaded missing files. Still NOT linking so do not use this version yet :(
2008-05-19 05:34:31 +00:00
)
soc-2008-mxcurioni: towards Freestyle compilation, removing Qt's QString and QImage dependencies. Up to this commit, the following directories compile well (and without any warning): system, image, geometry, graph, winged_edge, view_map, stroke. Modified code is commented by //soc and unused variables by //soc unused
2008-05-09 23:06:28 +00:00
Reference in New Issue Copy Permalink