[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15495] branches/soc-2008-mxcurioni/source /blender/freestyle: soc-2008-mxcurioni: first (blank) file upload for SWIG removal, in source/blender/freestyle/intern/python.
Maxime Curioni
maxime.curioni at gmail.com
Wed Jul 9 00:55:01 CEST 2008
Revision: 15495
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15495
Author: mxcurioni
Date: 2008-07-09 00:55:00 +0200 (Wed, 09 Jul 2008)
Log Message:
-----------
soc-2008-mxcurioni: first (blank) file upload for SWIG removal, in source/blender/freestyle/intern/python. The migration will be based on source/blender/freestyle/intern/swig/ModuleWrapper.{cpp,h}
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/CurvePointIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/EdgeModifier/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/EdgeModifier/TimestampModifier.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/EdgeModifier.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Id.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0DIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Curve/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Curve/Chain.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Material.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Noise.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Operators.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/SShape.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeAttribute.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate0D/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/ViewEdgeIterator/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/ViewEdgeIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/ViewMap.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/ViewShape.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/orientedViewEdgeIterator.cpp
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript 2008-07-08 22:43:44 UTC (rev 15494)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript 2008-07-08 22:55:00 UTC (rev 15495)
@@ -7,7 +7,7 @@
incs = ''
incs += '../blenkernel ../blenlib ../imbuf ../makesdna ../python '
-incs += '../render/extern/include ../render/intern/include'
+incs += '../render/extern/include ../render/intern/include ../include ../src'
incs += ' #/extern/freestyle/lib3ds'
incs += ' ' + env['BF_PYTHON_INC']
incs += ' ' + env['BF_LIB3DS_INC']
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp 2008-07-08 22:43:44 UTC (rev 15494)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp 2008-07-08 22:55:00 UTC (rev 15495)
@@ -106,11 +106,12 @@
void FRS_render(Render* re, int render_in_layer) {
- if(render_in_layer) {
- view->workingBuffer = GL_COLOR_ATTACHMENT0_EXT;
- } else {
- view->workingBuffer = GL_BACK;
- }
+ // if(render_in_layer) {
+ // view->workingBuffer = GL_COLOR_ATTACHMENT0_EXT;
+ // } else {
+ // view->workingBuffer = GL_BACK;
+ // }
+ view->workingBuffer = GL_BACK;
// add style module
string style_module = pathconfig->getProjectDir() +
@@ -134,8 +135,12 @@
GLuint framebuffer, renderbuffers[2];
GLenum status;
RenderLayer *rl;
+ GLubyte *pixc;
if(render_in_layer) {
+
+ pixc = (GLubyte *) malloc( 4 * re->winx * re->winy * sizeof(GLubyte) );
+
cout << "Freestyle as a render layer - SETUP" << endl;
// set up frame buffer
@@ -146,7 +151,7 @@
glGenRenderbuffersEXT(2, renderbuffers);
glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffers[0]);
- glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA16F_ARB, re->winx, re->winy);
+ glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, re->winx, re->winy);
glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, renderbuffers[0]);
glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffers[1]);
@@ -163,38 +168,51 @@
return;
}
- glPushAttrib(GL_VIEWPORT_BIT);
+ glPushAttrib(GL_VIEWPORT_BIT);
+ glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); // should not be needed
glViewport(0, 0, re->winx, re->winy);
- glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); // really needed ?
- }
-
- FRS_render(re, render_in_layer);
-
- if(render_in_layer) {
- for(rl = (RenderLayer *)re->result->layers.first; rl; rl= rl->next) {
- if(rl->layflag & SCE_LAY_FRS) {
- cout << "Freestyle as a render layer - RESULT" << endl;
-
- // transfer render to layer
- glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
- glReadPixels(0, 0, re->winx, re->winy, GL_RGBA, GL_FLOAT, rl->rectf );
+
+ FRS_render(re, render_in_layer);
- // bind window
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
- glDrawBuffer(GL_BACK);
- glPopAttrib();
- glDeleteRenderbuffersEXT(2, renderbuffers);
- glDeleteFramebuffersEXT(1, &framebuffer);
+ // keep first Freestyle layer
+ for(rl = (RenderLayer *)re->result->layers.first; rl; rl= rl->next)
+ if(rl->layflag & SCE_LAY_FRS)
+ break;
+
+ cout << "Freestyle as a render layer - RESULT" << endl;
+
+ // transfer render to layer
+ glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
+ glReadPixels(0, 0, re->winx, re->winy, GL_RGBA, GL_UNSIGNED_BYTE, pixc );
+
+ int p;
+ for(int i = 0; i < re->winx; i++) {
+ for(int j = 0; j < re->winy; j++){
+ p = 4*(i*re->winy + j);
+ *(rl->rectf + p ) = 1.0*pixc[ p ]/255.0;
+ *(rl->rectf + p + 1) = 1.0*pixc[ p+1 ]/255.0;
+ *(rl->rectf + p + 2) = 1.0*pixc[ p+2 ]/255.0;
+ *(rl->rectf + p + 3) = 1.0*pixc[ p+3 ]/255.0;
}
}
+
+ // bind window
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+ glDrawBuffer(GL_BACK);
+ glPopAttrib();
+ glDeleteRenderbuffersEXT(2, renderbuffers);
+ glDeleteFramebuffersEXT(1, &framebuffer);
+
} else {
- // copy result into render window
+ FRS_render(re, render_in_layer);
+
RenderResult rres;
RE_GetResultImage(re, &rres);
view->readPixels(0, 0, re->winx, re->winy, AppGLWidget::RGBA, rres.rectf );
re->result->renlay = render_get_active_layer(re, re->result);
re->display_draw(re->result, NULL);
}
+
controller->CloseFile();
}
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/CurvePointIterator.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/EdgeModifier/TimestampModifier.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/EdgeModifier.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Id.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0DIterator.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Curve/Chain.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Material.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Noise.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Operators.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/SShape.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeAttribute.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
===================================================================
Added: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list