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.
176 lines
4.3 KiB
C++
176 lines
4.3 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/scene_graph/NodeTransform.cpp
|
|
* \ingroup freestyle
|
|
* \brief Class to represent a transform node. A Transform node contains one or several children,
|
|
* \brief all affected by the transformation.
|
|
* \author Stephane Grabli
|
|
* \date 06/02/2002
|
|
*/
|
|
|
|
#include "NodeTransform.h"
|
|
|
|
#include "../system/FreestyleConfig.h"
|
|
|
|
namespace Freestyle {
|
|
|
|
void NodeTransform::Translate(real x, real y, real z)
|
|
{
|
|
_Matrix(0, 3) += x;
|
|
_Matrix(1, 3) += y;
|
|
_Matrix(2, 3) += z;
|
|
}
|
|
|
|
void NodeTransform::Rotate(real iAngle, real x, real y, real z)
|
|
{
|
|
//Normalize the x,y,z vector;
|
|
real norm = (real)sqrt(x * x + y * y + z * z);
|
|
if (0 == norm)
|
|
return;
|
|
|
|
x /= norm;
|
|
y /= norm;
|
|
z /= norm;
|
|
|
|
/* find the corresponding matrix with the Rodrigues formula:
|
|
* R = I + sin(iAngle)*Ntilda + (1-cos(iAngle))*Ntilda*Ntilda
|
|
*/
|
|
Matrix33r Ntilda;
|
|
Ntilda(0, 0) = Ntilda(1, 1) = Ntilda(2, 2) = 0.0f;
|
|
Ntilda(0, 1) = -z;
|
|
Ntilda(0, 2) = y;
|
|
Ntilda(1, 0) = z;
|
|
Ntilda(1, 2) = -x;
|
|
Ntilda(2, 0) = -y;
|
|
Ntilda(2, 1) = x;
|
|
|
|
const Matrix33r Ntilda2(Ntilda * Ntilda);
|
|
|
|
|
|
const real sinAngle = (real)sin((iAngle / 180.0f) * M_PI);
|
|
const real cosAngle = (real)cos((iAngle / 180.0f) * M_PI);
|
|
|
|
Matrix33r NS(Ntilda * sinAngle);
|
|
Matrix33r NC(Ntilda2 * (1.0f - cosAngle));
|
|
Matrix33r R;
|
|
R = Matrix33r::identity();
|
|
R += NS + NC;
|
|
|
|
// R4 is the corresponding 4x4 matrix
|
|
Matrix44r R4;
|
|
R4 = Matrix44r::identity();
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
for (int j = 0; j < 3; j++)
|
|
R4(i, j) = R(i, j);
|
|
}
|
|
|
|
// Finally, we multiply our current matrix by R4:
|
|
Matrix44r mat_tmp(_Matrix);
|
|
_Matrix = mat_tmp * R4;
|
|
}
|
|
|
|
void NodeTransform::Scale(real x, real y, real z)
|
|
{
|
|
_Matrix(0, 0) *= x;
|
|
_Matrix(1, 1) *= y;
|
|
_Matrix(2, 2) *= z;
|
|
|
|
_Scaled = true;
|
|
}
|
|
|
|
void NodeTransform::MultiplyMatrix(const Matrix44r &iMatrix)
|
|
{
|
|
Matrix44r mat_tmp(_Matrix);
|
|
_Matrix = mat_tmp * iMatrix;
|
|
}
|
|
|
|
void NodeTransform::setMatrix(const Matrix44r &iMatrix)
|
|
{
|
|
_Matrix = iMatrix;
|
|
if (isScaled(iMatrix))
|
|
_Scaled = true;
|
|
}
|
|
|
|
void NodeTransform::accept(SceneVisitor& v)
|
|
{
|
|
v.visitNodeTransform(*this);
|
|
|
|
v.visitNodeTransformBefore(*this);
|
|
for (vector<Node *>::iterator node = _Children.begin(), end = _Children.end(); node != end; ++node)
|
|
(*node)->accept(v);
|
|
v.visitNodeTransformAfter(*this);
|
|
}
|
|
|
|
void NodeTransform::AddBBox(const BBox<Vec3r>& iBBox)
|
|
{
|
|
Vec3r oldMin(iBBox.getMin());
|
|
Vec3r oldMax(iBBox.getMax());
|
|
|
|
// compute the 8 corners of the bbox
|
|
HVec3r box[8];
|
|
box[0] = HVec3r(iBBox.getMin());
|
|
box[1] = HVec3r(oldMax[0], oldMin[1], oldMin[2]);
|
|
box[2] = HVec3r(oldMax[0], oldMax[1], oldMin[2]);
|
|
box[3] = HVec3r(oldMin[0], oldMax[1], oldMin[2]);
|
|
box[4] = HVec3r(oldMin[0], oldMin[1], oldMax[2]);
|
|
box[5] = HVec3r(oldMax[0], oldMin[1], oldMax[2]);
|
|
box[6] = HVec3r(oldMax[0], oldMax[1], oldMax[2]);
|
|
box[7] = HVec3r(oldMin[0], oldMax[1], oldMax[2]);
|
|
|
|
// Computes the transform iBBox
|
|
HVec3r tbox[8];
|
|
unsigned int i;
|
|
for (i = 0; i < 8; i++)
|
|
tbox[i] = _Matrix * box[i];
|
|
|
|
Vec3r newMin(tbox[0]);
|
|
Vec3r newMax(tbox[0]);
|
|
for (i = 0; i < 8; i++) {
|
|
for (unsigned int j = 0; j < 3; j++) {
|
|
if (newMin[j] > tbox[i][j])
|
|
newMin[j] = tbox[i][j];
|
|
if (newMax[j] < tbox[i][j])
|
|
newMax[j] = tbox[i][j];
|
|
}
|
|
}
|
|
|
|
BBox<Vec3r> transformBox(newMin, newMax);
|
|
|
|
Node::AddBBox(transformBox);
|
|
}
|
|
|
|
bool NodeTransform::isScaled(const Matrix44r &M)
|
|
{
|
|
for (unsigned int j = 0; j < 3; j++) {
|
|
real norm = 0;
|
|
for (unsigned int i = 0; i < 3; i++) {
|
|
norm += M(i, j) * M(i, j);
|
|
}
|
|
if ((norm > 1.01) || (norm < 0.99))
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
} /* namespace Freestyle */
|