Tamito Kajiyama
800f86c845
A crash in the Freestyle renderer was reported by Ton on IRC with a stack trace below. Note that #2 is in Freestyle, whereas #1 is in the compositor. The problem was observed in a debug build on OS X 10.7 (gcc 4.2, openmp disabled, no llvm). ---------------------------------------------------------------------- Program received signal EXC_BAD_ACCESS, Could not access memory. Reason: 13 at address: 0x0000000000000000 [Switching to process 72386 thread 0xf303] 0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43 43 delete (this->m_outputsockets.back()); Current language: auto; currently c++ (gdb) where #0 0x0000000100c129f3 in NodeBase::~NodeBase (this=0x10e501c80) at COM_NodeBase.cpp:43 #1 0x0000000100c29066 in Node::~Node (this=0x10e501c80) at COM_Node.h:49 #2 0x000000010089c273 in NodeShape::~NodeShape (this=0x10e501c80) at NodeShape.cpp:43 #3 0x000000010089910b in NodeGroup::destroy (this=0x10e501da0) at NodeGroup.cpp:61 #4 0x00000001008990cd in NodeGroup::destroy (this=0x10e5014b0) at NodeGroup.cpp:59 #5 0x00000001008990cd in NodeGroup::destroy (this=0x114e18da0) at NodeGroup.cpp:59 #6 0x00000001007e6602 in Controller::ClearRootNode (this=0x114e19640) at Controller.cpp:329 #7 0x00000001007ea52e in Controller::LoadMesh (this=0x114e19640, re=0x10aba4638, srl=0x1140f5258) at Controller.cpp:302 #8 0x00000001008030ad in prepare (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:302 #9 0x000000010080457a in FRS_do_stroke_rendering (re=0x10aba4638, srl=0x1140f5258) at FRS_freestyle.cpp:600 #10 0x00000001006aeb9d in add_freestyle (re=0x10aba4638) at pipeline.c:1584 #11 0x00000001006aceb7 in do_render_3d (re=0x10aba4638) at pipeline.c:1094 #12 0x00000001006ae061 in do_render_fields_blur_3d (re=0x10aba4638) at pipeline.c:1367 #13 0x00000001006afa16 in do_render_composite_fields_blur_3d (re=0x10aba4638) at pipeline.c:1815 #14 0x00000001006b04e4 in do_render_all_options (re=0x10aba4638) at pipeline.c:2021 ---------------------------------------------------------------------- Apparently a name conflict between the two Blender modules is taking place. The present commit hence intends to address it by putting all the Freestyle C++ classes in the namespace 'Freestyle'. This revision will also prevent potential name conflicts with other Blender modules in the future. Special thanks to Lukas Toenne for the help with C++ namespace.
104 lines
3.1 KiB
C++
104 lines
3.1 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/** \file blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
|
|
* \ingroup freestyle
|
|
* \brief Class to define the Postscript rendering of a stroke
|
|
* \author Stephane Grabli
|
|
* \date 10/26/2004
|
|
*/
|
|
|
|
#include "Canvas.h"
|
|
#include "PSStrokeRenderer.h"
|
|
|
|
namespace Freestyle {
|
|
|
|
PSStrokeRenderer::PSStrokeRenderer(const char *iFileName) : StrokeRenderer()
|
|
{
|
|
if (!iFileName)
|
|
iFileName = "freestyle.ps";
|
|
// open the stream:
|
|
_ofstream.open(iFileName, ios::out);
|
|
if (!_ofstream.is_open()) {
|
|
cerr << "couldn't open the output file " << iFileName << endl;
|
|
}
|
|
_ofstream << "%!PS-Adobe-2.0 EPSF-2.0" << endl;
|
|
_ofstream << "%%Creator: Freestyle (http://artis.imag.fr/Software/Freestyle)" << endl;
|
|
_ofstream << "%%BoundingBox: " << 0 << " "<< 0 << " " << Canvas::getInstance()->width() << " " <<
|
|
Canvas::getInstance()->height() << endl;
|
|
_ofstream << "%%EndComments" << endl;
|
|
}
|
|
|
|
PSStrokeRenderer::~PSStrokeRenderer()
|
|
{
|
|
Close();
|
|
}
|
|
|
|
void PSStrokeRenderer::RenderStrokeRep(StrokeRep *iStrokeRep) const
|
|
{
|
|
RenderStrokeRepBasic(iStrokeRep);
|
|
}
|
|
|
|
void PSStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const
|
|
{
|
|
vector<Strip*>& strips = iStrokeRep->getStrips();
|
|
Strip::vertex_container::iterator v[3];
|
|
StrokeVertexRep *svRep[3];
|
|
Vec3r color[3];
|
|
for (vector<Strip*>::iterator s = strips.begin(), send = strips.end(); s != send; ++s) {
|
|
Strip::vertex_container& vertices = (*s)->vertices();
|
|
v[0] = vertices.begin();
|
|
v[1] = v[0];
|
|
++(v[1]);
|
|
v[2] = v[1];
|
|
++(v[2]);
|
|
|
|
while (v[2] != vertices.end()) {
|
|
svRep[0] = *(v[0]);
|
|
svRep[1] = *(v[1]);
|
|
svRep[2] = *(v[2]);
|
|
|
|
color[0] = svRep[0]->color();
|
|
//color[1] = svRep[1]->color();
|
|
//color[2] = svRep[2]->color();
|
|
|
|
_ofstream << "newpath" << endl;
|
|
_ofstream << (color[0])[0] << " " << (color[0])[1] << " " << (color[0])[2] << " setrgbcolor" <<endl;
|
|
_ofstream << svRep[0]->point2d()[0] << " " <<svRep[0]->point2d()[1] << " moveto" << endl;
|
|
_ofstream << svRep[1]->point2d()[0] << " " <<svRep[1]->point2d()[1] << " lineto" << endl;
|
|
_ofstream << svRep[2]->point2d()[0] << " " <<svRep[2]->point2d()[1] << " lineto" << endl;
|
|
_ofstream << "closepath" << endl;
|
|
_ofstream << "fill" << endl;
|
|
|
|
++v[0];
|
|
++v[1];
|
|
++v[2];
|
|
}
|
|
}
|
|
}
|
|
|
|
void PSStrokeRenderer::Close()
|
|
{
|
|
if (_ofstream.is_open())
|
|
_ofstream.close();
|
|
}
|
|
|
|
} /* namespace Freestyle */
|