Revision: 15681
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15681
Author: mxcurioni
Date: 2008-07-21 23:24:37 +0200 (Mon, 21 Jul 2008)
Log Message:
-----------
Added StrokeAttribute class. Beginning of StrokeVertex.
IMPORTANT: The setters functions' names were normalized due to constant
confusion regarding capitalization. All the function names start with set...
instead of Set.... This convention was changed all throughout Freestyle. To use
Freestyle as an external renderer, the SWIG library MUST be regenerated.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppCanvas.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppCanvas.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppGLWidget.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppGLWidget.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppMainWindow.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/Controller.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/Main.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/QGLBasicWidget.cpp
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/intern/app_blender/api.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GeomCleaner.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/GaussianFilter.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/image/GaussianFilter.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate0D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Freestyle.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Freestyle.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Id.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/IntegrationType.h
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/CurvePoint.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/SVertex.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Nature.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeAttribute.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate0D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLDebugRenderer.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLRenderer.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/LineRep.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/LineRep.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/Material.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/Node.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeShape.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/NodeTransform.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/Rep.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/TriangleRep.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/VertexRep.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/scene_graph/VertexRep.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Canvas.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Canvas.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Curve.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Modifiers.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Operators.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/QInformationMap.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Stroke.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/Stroke.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StrokeLayer.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StrokeRep.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StrokeTesselator.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/swig/ModuleWrapper.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Silhouette.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMap.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMap.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/winged_edge/WEdge.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/winged_edge/WEdge.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/winged_edge/WXEdge.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/python/Freestyle.py
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/anisotropic_diffusion.py
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/shaders.py
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/sketchy_topology_broken.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeAttribute.h
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
2008-07-21 20:42:11 UTC (rev 15680)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
2008-07-21 21:24:37 UTC (rev 15681)
@@ -68,11 +68,13 @@
prefix + '/IntegrationType.cpp',
prefix + '/Interface0D.cpp',
prefix + '/Interface0D/CurvePoint.cpp',
+ # prefix +
'/Interface0D/CurvePoint/StrokeVertex.cpp',
prefix + '/Interface0D/SVertex.cpp',
prefix + '/Interface0D/ViewVertex.cpp',
prefix + '/Interface1D.cpp',
prefix + '/Interface1D/FEdge.cpp',
prefix + '/Nature.cpp',
+ prefix + '/StrokeAttribute.cpp',
prefix + '/UnaryFunction0D.cpp',
prefix + '/UnaryFunction1D.cpp',
prefix + '/UnaryPredicate0D.cpp',
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppCanvas.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppCanvas.cpp
2008-07-21 20:42:11 UTC (rev 15680)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppCanvas.cpp
2008-07-21 21:24:37 UTC (rev 15681)
@@ -68,7 +68,7 @@
_pViewer = 0;
}
-void AppCanvas::SetViewer(AppGLWidget *iViewer)
+void AppCanvas::setViewer(AppGLWidget *iViewer)
{
_pViewer = iViewer;
}
@@ -181,7 +181,7 @@
// qtmp.save("densityQuery"+QString::number(number)+".png", "PNG");
//
// GaussianFilter filter;
- // filter.SetSigma(4.0);
+ // filter.setSigma(4.0);
// int bound = filter.getBound();
// QImage qtmp2(width(), height(), 32);
// for(int py2=0;py2<height();++py2){
@@ -246,7 +246,7 @@
glEnable(GL_LIGHTING);
glEnable(GL_DEPTH_TEST);
- _pViewer->Set3DContext();
+ _pViewer->set3DContext();
_pViewer->DrawScene(_pViewer->glRenderer());
glDisable(GL_DEPTH_TEST);
glDisable(GL_LIGHTING);
@@ -347,7 +347,7 @@
glEnable(GL_LIGHTING);
glEnable(GL_DEPTH_TEST);
- _pViewer->Set3DContext();
+ _pViewer->set3DContext();
_pViewer->DrawScene(_pViewer->glRenderer());
glDisable(GL_DEPTH_TEST);
glDisable(GL_LIGHTING);
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppCanvas.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppCanvas.h
2008-07-21 20:42:11 UTC (rev 15680)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppCanvas.h
2008-07-21 21:24:37 UTC (rev 15681)
@@ -77,7 +77,7 @@
inline const AppGLWidget * viewer() const {return _pViewer;}
/*! modifiers */
- void SetViewer(AppGLWidget *iViewer) ;
+ void setViewer(AppGLWidget *iViewer) ;
};
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
2008-07-21 20:42:11 UTC (rev 15680)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
2008-07-21 21:24:37 UTC (rev 15681)
@@ -1,23 +1,23 @@
-
-//
-// Copyright (C) : Please refer to the COPYRIGHT file distributed
-// with this source distribution.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-///////////////////////////////////////////////////////////////////////////////
+
+//
+// Copyright (C) : Please refer to the COPYRIGHT file distributed
+// with this source distribution.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+///////////////////////////////////////////////////////////////////////////////
#include "AppDensityCurvesWindow.h"
#include "../scene_graph/NodeGroup.h"
#include "AppGL2DCurvesViewer.h"
@@ -33,7 +33,7 @@
AppDensityCurvesWindow::~AppDensityCurvesWindow(){
}
-void AppDensityCurvesWindow::SetOrientationCurve(int i, const Vec2d& vmin,
const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char
*ylabel){
+void AppDensityCurvesWindow::setOrientationCurve(int i, const Vec2d& vmin,
const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char
*ylabel){
AppGL2DCurvesViewer * viewer = 0;
switch(i){
case 0:viewer = CurvesViewer0; break;
@@ -44,10 +44,10 @@
default:return;
}
- viewer->SetCurve(vmin, vmax, iCurve, xlabel, ylabel);
+ viewer->setCurve(vmin, vmax, iCurve, xlabel, ylabel);
}
-void AppDensityCurvesWindow::SetLevelCurve(int i, const Vec2d& vmin, const
Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char
*ylabel){
+void AppDensityCurvesWindow::setLevelCurve(int i, const Vec2d& vmin, const
Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char
*ylabel){
AppGL2DCurvesViewer * viewer = 0;
switch(i){
case 1:viewer = LevelCurveViewer1; break;
@@ -61,5 +61,5 @@
default:return;
}
- viewer->SetCurve(vmin, vmax, iCurve, xlabel, ylabel);
+ viewer->setCurve(vmin, vmax, iCurve, xlabel, ylabel);
}
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
2008-07-21 20:42:11 UTC (rev 15680)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
2008-07-21 21:24:37 UTC (rev 15681)
@@ -60,7 +60,7 @@
* \param ylabel
* The label of the y-axis
*/
- void SetOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const
vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
+ void setOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const
vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
/*! Sets the node that contains the level curve i in
* viewer i (i in [1,8]).
@@ -77,7 +77,7 @@
* \param ylabel
* The label of the y-axis
*/
- void SetLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const
vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
+ void setLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const
vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
};
#endif // APPDENSITYCURVESWINDOW_H
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
2008-07-21 20:42:11 UTC (rev 15680)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
2008-07-21 21:24:37 UTC (rev 15681)
@@ -1,24 +1,24 @@
-
-//
-// Copyright (C) : Please refer to the COPYRIGHT file distributed
-// with this source distribution.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (C) : Please refer to the COPYRIGHT file distributed
+// with this source distribution.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+///////////////////////////////////////////////////////////////////////////////
+
#include "AppGL2DCurvesViewer.h"
#include "../rendering/GLRenderer.h"
#include "../scene_graph/NodeShape.h"
@@ -28,8 +28,8 @@
AppGL2DCurvesViewer::AppGL2DCurvesViewer(QWidget *iParent, const char *iName)
: QGLViewer(iParent)
{
- _RootNode.SetLightingEnabled(false);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
