[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14882] branches/soc-2008-mxcurioni: soc-2008-mxcurioni: towards Freestyle's first render: controller, config, appglwidget corrected.
Maxime Curioni
maxime.curioni at gmail.com
Sun May 18 15:02:03 CEST 2008
Revision: 14882
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14882
Author: mxcurioni
Date: 2008-05-18 15:01:52 +0200 (Sun, 18 May 2008)
Log Message:
-----------
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.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript
branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/sceneRender.c
branches/soc-2008-mxcurioni/source/blender/render/SConscript
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_scene.c
branches/soc-2008-mxcurioni/source/blender/src/renderwin.c
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppCanvas.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/AppGLWidget.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.h
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/AUTHORS.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/BUGS.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/CHANGELOG.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/COPYRIGHT.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Config.pri
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc7-debug.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc7-release.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc8-debug.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Freestyle-vc8-release.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/INSTALL.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/LICENSE.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/Makefile.pro
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/README.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/THANKS.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/TODO.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/build_bundle.macosx.py
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/libconfig.pri
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/makedsp.vcnet.debug.bat
branches/soc-2008-mxcurioni/source/blender/freestyle/misc/makedsp.vcnet.release.bat
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/AUTHORS.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/BUGS.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/CHANGELOG.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/COPYRIGHT.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/Config.pri
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/Freestyle-vc7-debug.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/Freestyle-vc7-release.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/Freestyle-vc8-debug.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/Freestyle-vc8-release.sln
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/INSTALL.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/LICENSE.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/Makefile.pro
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/README.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/THANKS.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/TODO.TXT
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/build_bundle.macosx.py
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/libconfig.pri
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/makedsp.vcnet.debug.bat
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/makedsp.vcnet.release.bat
Modified: branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript 2008-05-18 10:41:42 UTC (rev 14881)
+++ branches/soc-2008-mxcurioni/extern/freestyle/swig/SConscript 2008-05-18 13:01:52 UTC (rev 14882)
@@ -16,12 +16,11 @@
swig_env = env.Copy()
-
if env['OURPLATFORM'] in ['win32-vc','win32-mingw']:
win_build_dir = root_build_dir + os.sep + "bin\\"
print "Under Windows, swig.exe is directly copied to build (binary) directory: " + win_build_dir
shutil.copy ( root + "/swig.exe", win_build_dir )
-else:
+else:
# Configure
print "Configuring swig..."
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript 2008-05-18 10:41:42 UTC (rev 14881)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript 2008-05-18 13:01:52 UTC (rev 14882)
@@ -46,23 +46,25 @@
# rendering
prefix = 'intern/rendering'
-stroke_sources = env.Glob(prefix + '/GL*.cpp')
+rendering_sources = env.Glob(prefix + '/GL*.cpp')
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
- stroke_sources = env.Glob(prefix + '/extgl.cpp')
+ rendering_sources = env.Glob(prefix + '/extgl.cpp')
-# app
+# app / app_blender
+prefix = 'intern/app_blender'
+app_sources = env.Glob(prefix + '/*.cpp')
-sources = system_sources + image_sources + geometry_sources + scene_graph_sources + \
- winged_edge_sources + view_map_sources + stroke_sources
-#print sources
+sources = system_sources + image_sources + geometry_sources + scene_graph_sources \
+ + winged_edge_sources + view_map_sources + stroke_sources + rendering_sources \
+ + app_sources
env.BlenderLib (libname="bf_freestyle",
sources=sources,
includes=Split(incs),
defines=defs,
- libtype=['blender'],
- priority = [15] )
+ libtype=['blender'],
+ priority = [20] )
########################################################
# SWIG
Deleted: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/AUTHORS.TXT
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/AUTHORS.TXT 2008-05-18 10:41:42 UTC (rev 14881)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/AUTHORS.TXT 2008-05-18 13:01:52 UTC (rev 14882)
@@ -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/source/blender/freestyle/intern/BUGS.TXT
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/BUGS.TXT 2008-05-18 10:41:42 UTC (rev 14881)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/BUGS.TXT 2008-05-18 13:01:52 UTC (rev 14882)
@@ -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/source/blender/freestyle/intern/CHANGELOG.TXT
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/CHANGELOG.TXT 2008-05-18 10:41:42 UTC (rev 14881)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/CHANGELOG.TXT 2008-05-18 13:01:52 UTC (rev 14882)
@@ -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/source/blender/freestyle/intern/COPYRIGHT.TXT
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/COPYRIGHT.TXT 2008-05-18 10:41:42 UTC (rev 14881)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/COPYRIGHT.TXT 2008-05-18 13:01:52 UTC (rev 14882)
@@ -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/source/blender/freestyle/intern/Config.pri
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/Config.pri 2008-05-18 10:41:42 UTC (rev 14881)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/Config.pri 2008-05-18 13:01:52 UTC (rev 14882)
@@ -1,176 +0,0 @@
-# This file should be viewed as a -*- mode: Makefile -*-
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# A p p l i c a t i o n & L i b r a r i e s #
-# b u i l d c o n f i g u r a t i o n #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-#
-# APPLICATION
-#
-#######################################
-
-APPNAME = Freestyle
-APPVERSION_MAJ = 2
-APPVERSION_MID = 2
-APPVERSION_MIN = 0
-APPVERSION = $${APPVERSION_MAJ}.$${APPVERSION_MID}.$${APPVERSION_MIN}
-
-PYTHON_VERSION_MAJ = 2
-PYTHON_VERSION_MIN = 5
-
-LIB3DS_VERSION_MAJ = 1
-LIB3DS_VERSION_MIN = 30
-
-#
-# CONFIG
-#
-#######################################
-
-CONFIG -= debug release ReleaseBuild Release build_pass precompile_header debug_and_release debug_and_release_target
-CONFIG *= qt shared stl exceptions rtti thread
-CONFIG *= release # debug or release
-CONFIG *= warn_off # warn_off or warn_on
-mac:CONFIG += x86
-#mac:CONFIG += ppc
-#mac:CONFIG *= lib_bundle
-
-#mac:QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
-#message($$CONFIG)
-#CONFIG *= static
-#CONFIG *= profiling
-
-
-
-QT += opengl
-
-#
-# LIBRARIES
-#
-#######################################
-
-debug{
- LIB_GEOMETRY = $${APPNAME}Geometry_d
- LIB_IMAGE = $${APPNAME}Image_d
- LIB_RENDERING = $${APPNAME}Rendering_d
- LIB_SCENE_GRAPH = $${APPNAME}SceneGraph_d
- LIB_SYSTEM = $${APPNAME}System_d
- LIB_VIEW_MAP = $${APPNAME}ViewMap_d
- LIB_STROKE = $${APPNAME}Stroke_d
- LIB_WINGED_EDGE = $${APPNAME}WingedEdge_d
-}else{
- LIB_GEOMETRY = $${APPNAME}Geometry
- LIB_IMAGE = $${APPNAME}Image
- LIB_RENDERING = $${APPNAME}Rendering
- LIB_SCENE_GRAPH = $${APPNAME}SceneGraph
- LIB_SYSTEM = $${APPNAME}System
- LIB_VIEW_MAP = $${APPNAME}ViewMap
- LIB_STROKE = $${APPNAME}Stroke
- LIB_WINGED_EDGE = $${APPNAME}WingedEdge
-}
-
-LIBVERSION = $${APPVERSION_MAJ}.$${APPVERSION_MID}
-
-
-#
-# FLAGS
-#
-#######################################
-
-win32:QMAKE_CXXFLAGS *= /GR /GX
-win32:QMAKE_CFLAGS *= /GR /GX
-irix-n32:QMAKE_CFLAGS *= -LANG:std
-irix-n32:QMAKE_CXXFLAGS *= -LANG:std
-linux-g++:QMAKE_CFLAGS *= -Wno-deprecated
-linux-g++:QMAKE_CXXFLAGS *= -Wno-deprecated
-cygwin-g++:QMAKE_CFLAGS *= -Wno-deprecated
-cygwin-g++:QMAKE_CXXFLAGS *= -Wno-deprecated -mno-win32
-mac:QMAKE_CFLAGS *= -Wno-deprecated
-mac:QMAKE_CXXFLAGS *= -Wno-deprecated
-
-linux-g++:QMAKE_CFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
-linux-g++:QMAKE_CXXFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
-cygwin-g++:QMAKE_CFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
-cygwin-g++:QMAKE_CXXFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list