songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1301 from maxGimeno/Polyhedron_demo-Fix_image_item-GF 

Polyhedron_demo: Fix the image item
This commit is contained in:
Laurent Rineau 2016-07-26 16:26:04 +02:00 committed by GitHub
parent 762f22961f e212202027
commit e7c52f3b82
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Polyhedron/demo/Polyhedron/Scene_image_item.cpp
View File

@ -323,10 +323,24 @@ Vertex_buffer_helper::push_vertex(std::size_t i, std::size_t j, std::size_t k)
{ {
indices_.insert(std::make_pair(compute_position(i,j,k), indices_.insert(std::make_pair(compute_position(i,j,k),
vertices_.size()/3)); vertices_.size()/3));
//resize the "border vertices"
double di(i),dj(j),dk(k);
if (di == 0)
di = 0.5;
if (dj == 0)
dj = 0.5;
if (dk == 0)
dk = 0.5;
if (di == data_.xdim())
di = data_.xdim()-0.5;
if (dj == data_.xdim())
dj = data_.ydim()-0.5;
if (dk == data_.zdim())
dk = data_.zdim()-0.5;
vertices_.push_back( (i - 0.5) * data_.vx()); vertices_.push_back( (di - 0.5) * data_.vx());
vertices_.push_back( (j - 0.5) * data_.vy()); vertices_.push_back( (dj - 0.5) * data_.vy());
vertices_.push_back( (k - 0.5) * data_.vz()); vertices_.push_back( (dk - 0.5) * data_.vz());
} }
void void
@ -334,7 +348,7 @@ Vertex_buffer_helper::push_quads(std::size_t i, std::size_t j, std::size_t k)
{ {
int pos1 = vertex_index(i-dx(), j , k); int pos1 = vertex_index(i-dx(), j , k);
int pos2 = vertex_index(i-dx(), j-dy(), k); int pos2 = vertex_index(i-dx(), j-dy(), k);
int pos3 = vertex_index(i , j-dy(), k); int pos3 = vertex_index(i , j-dy(), k) ;
int pos4 = vertex_index(i ,j , k); int pos4 = vertex_index(i ,j , k);
push_quad(pos1, pos2, pos3, pos4); push_quad(pos1, pos2, pos3, pos4);
@ -637,12 +651,12 @@ Scene_image_item::compute_bbox() const
if(!m_image) if(!m_image)
_bbox = Bbox(); _bbox = Bbox();
else else
_bbox = Bbox(-0.5*m_image->vx(), _bbox = Bbox(0,
-0.5*m_image->vy(), 0,
-0.5*m_image->vz(), 0,
(m_image->xdim()- 0.5) * m_image->vx(), (m_image->xdim()-1) * m_image->vx(),
(m_image->ydim()- 0.5) * m_image->vy(), (m_image->ydim()-1) * m_image->vy(),
(m_image->zdim()- 0.5) * m_image->vz()); (m_image->zdim()-1) * m_image->vz());
} }
void void