← Back to branch summary

~ubuntu-branches/ubuntu/raring/openwalnut/raring

« back to all changes in this revision

Viewing changes to src/modules/voxelizer/WBresenham.cpp

  • Committer: Package Import Robot
  • Author(s): Sebastian Eichelbaum
  • Date: 2012-12-12 11:26:32 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20121212112632-xhiuwkxuz5h0idkh
Tags: 1.3.1+hg5849-1
* Minor changes compared to 1.3.0 but included several bug fixes.
* See http://www.openwalnut.org/versions/4

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/voxelizer/WBresenham.cpp
30
30
 
31
31
#include "core/common/math/WLine.h"
32
32
#include "core/common/math/linearAlgebra/WLinearAlgebra.h"
33
 
#include "core/common/math/WValue.h"
 
33
#include "core/common/math/linearAlgebra/WVectorFixed.h"
34
34
#include "core/common/WAssert.h"
35
35
#include "core/common/WLogger.h"
36
36
#include "core/dataHandler/WGridRegular3D.h"
69
69
void WBresenham::rasterSegment( const WPosition& start, const WPosition& end )
70
70
{
71
71
    int i;
72
 
    WValue< int > gridStartPos = m_grid->getVoxelCoord( start );
73
 
    WValue< int > gridEndPos = m_grid->getVoxelCoord( end );
 
72
    WVector3i gridStartPos = m_grid->getVoxelCoord( start );
 
73
    WVector3i gridEndPos = m_grid->getVoxelCoord( end );
74
74
    int dx = gridEndPos[0] - gridStartPos[0];
75
75
    int dy = gridEndPos[1] - gridStartPos[1];
76
76
    int dz = gridEndPos[2] - gridStartPos[2];
84
84
    int dx2 = l << 1;
85
85
    int dy2 = m << 1;
86
86
    int dz2 = n << 1;
87
 
    WValue< int > voxel = gridStartPos;
 
87
    WVector3i voxel = gridStartPos;
88
88
 
89
89
    if( ( l >= m ) && ( l >= n ) )
90
90
    {
191
191
    // return newValue + existingValue;
192
192
}
193
193
 
194
 
void WBresenham::markVoxel( const WValue< int >& voxel, const int axis, const WPosition& start, const WPosition& end )
 
194
void WBresenham::markVoxel( const WVector3i& voxel, const int axis, const WPosition& start, const WPosition& end )
195
195
{
196
196
    size_t nbX  = m_grid->getNbCoordsX();
197
197
    size_t nbXY = m_grid->getNbCoordsX() * m_grid->getNbCoordsY();