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.
239 lines
6.1 KiB
C++
239 lines
6.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/view_map/BoxGrid.cpp
|
|
* \ingroup freestyle
|
|
* \brief Class to define a cell grid surrounding the projected image of a scene
|
|
* \author Alexander Beels
|
|
* \date 2011-1-29
|
|
*/
|
|
|
|
#include <algorithm>
|
|
#include <stdexcept>
|
|
|
|
#include "BoxGrid.h"
|
|
|
|
#include "BKE_global.h"
|
|
|
|
using namespace std;
|
|
|
|
namespace Freestyle {
|
|
|
|
// Helper Classes
|
|
|
|
// OccluderData
|
|
///////////////
|
|
|
|
// Cell
|
|
/////////
|
|
|
|
BoxGrid::Cell::Cell() {}
|
|
|
|
BoxGrid::Cell::~Cell() {}
|
|
|
|
void BoxGrid::Cell::setDimensions(real x, real y, real sizeX, real sizeY)
|
|
{
|
|
const real epsilon = 1.0e-06;
|
|
boundary[0] = x - epsilon;
|
|
boundary[1] = x + sizeX + epsilon;
|
|
boundary[2] = y - epsilon;
|
|
boundary[3] = y + sizeY + epsilon;
|
|
}
|
|
|
|
bool BoxGrid::Cell::compareOccludersByShallowestPoint(const BoxGrid::OccluderData *a, const BoxGrid::OccluderData *b)
|
|
{
|
|
return a->shallowest < b->shallowest;
|
|
}
|
|
|
|
void BoxGrid::Cell::indexPolygons()
|
|
{
|
|
// Sort occluders by their shallowest points.
|
|
sort(faces.begin(), faces.end(), compareOccludersByShallowestPoint);
|
|
}
|
|
|
|
// Iterator
|
|
//////////////////
|
|
|
|
BoxGrid::Iterator::Iterator (BoxGrid& grid, Vec3r& center, real epsilon)
|
|
: _target(grid.transform(center)), _foundOccludee(false)
|
|
{
|
|
// Find target cell
|
|
_cell = grid.findCell(_target);
|
|
#if BOX_GRID_LOGGING
|
|
if (G.debug & G_DEBUG_FREESTYLE) {
|
|
cout << "Searching for occluders of edge centered at " << _target << " in cell [" <<
|
|
1_cell->boundary[0] << ", " << _cell->boundary[1] << ", " << _cell->boundary[2] <<
|
|
", " << _cell->boundary[3] << "] (" << _cell->faces.size() << " occluders)" << endl;
|
|
}
|
|
#endif
|
|
|
|
// Set iterator
|
|
_current = _cell->faces.begin();
|
|
}
|
|
|
|
BoxGrid::Iterator::~Iterator() {}
|
|
|
|
// BoxGrid
|
|
/////////////////
|
|
|
|
BoxGrid::BoxGrid(OccluderSource& source, GridDensityProvider& density, ViewMap *viewMap, Vec3r& viewpoint,
|
|
bool enableQI)
|
|
: _viewpoint(viewpoint), _enableQI(enableQI)
|
|
{
|
|
// Generate Cell structure
|
|
if (G.debug & G_DEBUG_FREESTYLE) {
|
|
cout << "Generate Cell structure" << endl;
|
|
}
|
|
assignCells(source, density, viewMap);
|
|
|
|
// Fill Cells
|
|
if (G.debug & G_DEBUG_FREESTYLE) {
|
|
cout << "Distribute occluders" << endl;
|
|
}
|
|
distributePolygons(source);
|
|
|
|
// Reorganize Cells
|
|
if (G.debug & G_DEBUG_FREESTYLE) {
|
|
cout << "Reorganize cells" << endl;
|
|
}
|
|
reorganizeCells();
|
|
|
|
if (G.debug & G_DEBUG_FREESTYLE) {
|
|
cout << "Ready to use BoxGrid" << endl;
|
|
}
|
|
}
|
|
|
|
BoxGrid::~BoxGrid() {}
|
|
|
|
void BoxGrid::assignCells (OccluderSource& source, GridDensityProvider& density, ViewMap *viewMap)
|
|
{
|
|
_cellSize = density.cellSize();
|
|
_cellsX = density.cellsX();
|
|
_cellsY = density.cellsY();
|
|
_cellOrigin[0] = density.cellOrigin(0);
|
|
_cellOrigin[1] = density.cellOrigin(1);
|
|
|
|
// Now allocate the cell table and fill it with default (empty) cells
|
|
_cells.resize(_cellsX * _cellsY);
|
|
for (cellContainer::iterator i = _cells.begin(), end = _cells.end(); i != end; ++i) {
|
|
(*i) = NULL;
|
|
}
|
|
|
|
// Identify cells that will be used, and set the dimensions for each
|
|
ViewMap::fedges_container& fedges = viewMap->FEdges();
|
|
for (ViewMap::fedges_container::iterator f = fedges.begin(), fend = fedges.end(); f != fend; ++f) {
|
|
if ((*f)->isInImage()) {
|
|
Vec3r point = transform((*f)->center3d());
|
|
unsigned int i, j;
|
|
getCellCoordinates(point, i, j);
|
|
if (_cells[i * _cellsY + j] == NULL) {
|
|
// This is an uninitialized cell
|
|
real x, y, width, height;
|
|
|
|
x = _cellOrigin[0] + _cellSize * i;
|
|
width = _cellSize;
|
|
|
|
y = _cellOrigin[1] + _cellSize * j;
|
|
height = _cellSize;
|
|
|
|
// Initialize cell
|
|
Cell *b = _cells[i * _cellsY + j] = new Cell();
|
|
b->setDimensions(x, y, width, height);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void BoxGrid::distributePolygons(OccluderSource& source)
|
|
{
|
|
unsigned long nFaces = 0;
|
|
unsigned long nKeptFaces = 0;
|
|
|
|
for (source.begin(); source.isValid(); source.next()) {
|
|
OccluderData *occluder = NULL;
|
|
|
|
try {
|
|
if (insertOccluder(source, occluder)) {
|
|
_faces.push_back(occluder);
|
|
++nKeptFaces;
|
|
}
|
|
}
|
|
catch (...) {
|
|
// If an exception was thrown, _faces.push_back() cannot have succeeded.
|
|
// occluder is not owned by anyone, and must be deleted.
|
|
// If the exception was thrown before or during new OccluderData(), then
|
|
// occluder is NULL, and this delete is harmless.
|
|
delete occluder;
|
|
throw;
|
|
}
|
|
++nFaces;
|
|
}
|
|
if (G.debug & G_DEBUG_FREESTYLE) {
|
|
cout << "Distributed " << nFaces << " occluders. Retained " << nKeptFaces << "." << endl;
|
|
}
|
|
}
|
|
|
|
void BoxGrid::reorganizeCells()
|
|
{
|
|
// Sort the occluders by shallowest point
|
|
for (vector<Cell*>::iterator i = _cells.begin(), end = _cells.end(); i != end; ++i) {
|
|
if (*i != NULL) {
|
|
(*i)->indexPolygons();
|
|
}
|
|
}
|
|
}
|
|
|
|
void BoxGrid::getCellCoordinates(const Vec3r& point, unsigned& x, unsigned& y)
|
|
{
|
|
x = min(_cellsX - 1, (unsigned) floor (max((double) 0.0f, point[0] - _cellOrigin[0]) / _cellSize));
|
|
y = min(_cellsY - 1, (unsigned) floor (max((double) 0.0f, point[1] - _cellOrigin[1]) / _cellSize));
|
|
}
|
|
|
|
BoxGrid::Cell *BoxGrid::findCell(const Vec3r& point)
|
|
{
|
|
unsigned int x, y;
|
|
getCellCoordinates(point, x, y);
|
|
return _cells[x * _cellsY + y];
|
|
}
|
|
|
|
bool BoxGrid::orthographicProjection() const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
const Vec3r& BoxGrid::viewpoint() const
|
|
{
|
|
return _viewpoint;
|
|
}
|
|
|
|
bool BoxGrid::enableQI() const
|
|
{
|
|
return _enableQI;
|
|
}
|
|
|
|
BoxGrid::Transform::Transform() : GridHelpers::Transform() {}
|
|
|
|
Vec3r BoxGrid::Transform::operator()(const Vec3r& point) const
|
|
{
|
|
return Vec3r(point[0], point[1], -point[2]);
|
|
}
|
|
|
|
} /* namespace Freestyle */
|