Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to build with correct two phase name lookup (xcode 4.3 compatibility for OpenMesh). The template base class members are not found otherwise.

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@552 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-03-02 16:16:30 +00:00
parent a28d019323
commit 03fd666b9b
7 changed files with 138 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc
View File

@@ -104,16 +104,16 @@ compute_new_positions_C0()
for (v_it=Base::mesh_.vertices_begin(); v_it!=v_end; ++v_it)
{
if (is_active(v_it))
if (this->is_active(v_it))
{
// compute umbrella
u = zero;
for (vv_it=Base::mesh_.cvv_iter(v_it); vv_it; ++vv_it)
{
w = weight(Base::mesh_.edge_handle(vv_it.current_halfedge_handle()));
w = this->weight(Base::mesh_.edge_handle(vv_it.current_halfedge_handle()));
u += vector_cast<typename Mesh::Normal>(Base::mesh_.point(vv_it)) * w;
}
u *= weight(v_it);
u *= this->weight(v_it);
u -= vector_cast<typename Mesh::Normal>(Base::mesh_.point(v_it));
// damping
@@ -122,7 +122,7 @@ compute_new_positions_C0()
// store new position
p = vector_cast<typename Mesh::Normal>(Base::mesh_.point(v_it));
p += u;
set_new_position(v_it, p);
this->set_new_position(v_it, p);
}
}
}
@@ -148,10 +148,10 @@ compute_new_positions_C1()
u = zero;
for (vv_it=Base::mesh_.cvv_iter(v_it); vv_it; ++vv_it)
{
w = weight(Base::mesh_.edge_handle(vv_it.current_halfedge_handle()));
w = this->weight(Base::mesh_.edge_handle(vv_it.current_halfedge_handle()));
u -= vector_cast<typename Mesh::Normal>(Base::mesh_.point(vv_it))*w;
}
u *= weight(v_it);
u *= this->weight(v_it);
u += vector_cast<typename Mesh::Normal>(Base::mesh_.point(v_it));
Base::mesh_.property(umbrellas_, v_it) = u;
@@ -161,18 +161,18 @@ compute_new_positions_C1()
// 2nd pass: compute updates
for (v_it=Base::mesh_.vertices_begin(); v_it!=v_end; ++v_it)
{
if (is_active(v_it))
if (this->is_active(v_it))
{
uu = zero;
diag = 0.0;
for (vv_it=Base::mesh_.cvv_iter(v_it); vv_it; ++vv_it)
{
w = weight(Base::mesh_.edge_handle(vv_it.current_halfedge_handle()));
w = this->weight(Base::mesh_.edge_handle(vv_it.current_halfedge_handle()));
uu -= Base::mesh_.property(umbrellas_, vv_it);
diag += (w * weight(vv_it) + 1.0) * w;
diag += (w * this->weight(vv_it) + 1.0) * w;
}
uu *= weight(v_it);
diag *= weight(v_it);
uu *= this->weight(v_it);
diag *= this->weight(v_it);
uu += Base::mesh_.property(umbrellas_, v_it);
if (diag) uu *= 1.0/diag;
@@ -182,7 +182,7 @@ compute_new_positions_C1()
// store new position
p = vector_cast<typename Mesh::Normal>(Base::mesh_.point(v_it));
p -= uu;
set_new_position(v_it, p);
this->set_new_position(v_it, p);
}
}
}

42
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
View File

@@ -98,7 +98,7 @@ Tvv3<M>::raise(typename M::FaceHandle& _fh, state_t _target_state)
{
if (MOBJ(_fh).state() < _target_state)
{
update(_fh, _target_state);
this->update(_fh, _target_state);
typename M::VertexVertexIter vv_it;
typename M::FaceVertexIter fv_it;
@@ -314,7 +314,7 @@ void Tvv3<M>::raise(typename M::VertexHandle& _vh, state_t _target_state) {
if (MOBJ(_vh).state() < _target_state) {
update(_vh, _target_state);
this->update(_vh, _target_state);
// multiply old position by 3
MOBJ(_vh).set_position(_target_state, MOBJ(_vh).position(_target_state - 1) * 3.0);
@@ -336,7 +336,7 @@ Tvv4<M>::raise(typename M::FaceHandle& _fh, state_t _target_state)
if (MOBJ(_fh).state() < _target_state) {
update(_fh, _target_state);
this->update(_fh, _target_state);
typename M::FaceVertexIter fv_it;
typename M::VertexHandle temp_vh;
@@ -638,7 +638,7 @@ Tvv4<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
if (MOBJ(_vh).state() < _target_state)
{
update(_vh, _target_state);
this->update(_vh, _target_state);
// multiply old position by 4
MOBJ(_vh).set_position(_target_state, MOBJ(_vh).position(_target_state - 1) * 4.0);
@@ -654,7 +654,7 @@ Tvv4<M>::raise(typename M::EdgeHandle& _eh, state_t _target_state)
{
if (MOBJ(_eh).state() < _target_state)
{
update(_eh, _target_state);
this->update(_eh, _target_state);
typename M::FaceHandle fh(Base::mesh_.FH(Base::mesh_.HEH(_eh, 0)));
@@ -815,7 +815,7 @@ void VF<M>::raise(typename M::FaceHandle& _fh, state_t _target_state)
{
if (MOBJ(_fh).state() < _target_state) {
update(_fh, _target_state);
this->update(_fh, _target_state);
// raise all neighbour vertices to level x-1
typename M::FaceVertexIter fv_it;
@@ -872,7 +872,7 @@ void FF<M>::raise(typename M::FaceHandle& _fh, state_t _target_state) {
if (MOBJ(_fh).state() < _target_state) {
update(_fh, _target_state);
this->update(_fh, _target_state);
// raise all neighbour faces to level x-1
typename M::FaceFaceIter ff_it;
@@ -936,7 +936,7 @@ void FFc<M>::raise(typename M::FaceHandle& _fh, state_t _target_state)
{
if (MOBJ(_fh).state() < _target_state) {
update(_fh, _target_state);
this->update(_fh, _target_state);
// raise all neighbour faces to level x-1
typename M::FaceFaceIter ff_it(Base::mesh_.ff_iter(_fh));
@@ -1001,7 +1001,7 @@ void FV<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
if (MOBJ(_vh).state() < _target_state) {
update(_vh, _target_state);
this->update(_vh, _target_state);
// raise all neighbour vertices to level x-1
typename M::VertexFaceIter vf_it(Base::mesh_.vf_iter(_vh));
@@ -1070,7 +1070,7 @@ void FVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
{
if (MOBJ(_vh).state() < _target_state) {
update(_vh, _target_state);
this->update(_vh, _target_state);
typename M::VertexOHalfedgeIter voh_it;
typename M::FaceHandle fh;
@@ -1245,7 +1245,7 @@ void VV<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
{
if (MOBJ(_vh).state() < _target_state)
{
update(_vh, _target_state);
this->update(_vh, _target_state);
// raise all neighbour vertices to level x-1
typename M::VertexVertexIter vv_it(Base::mesh_.vv_iter(_vh));
@@ -1315,7 +1315,7 @@ void VVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
{
if (MOBJ(_vh).state() < _target_state) {
update(_vh, _target_state);
this->update(_vh, _target_state);
// raise all neighbour vertices to level x-1
typename M::VertexVertexIter vv_it(Base::mesh_.vv_iter(_vh));
@@ -1390,7 +1390,7 @@ void VE<M>::raise(typename M::EdgeHandle& _eh, state_t _target_state)
{
if (MOBJ(_eh).state() < _target_state) {
update(_eh, _target_state);
this->update(_eh, _target_state);
// raise all neighbour vertices to level x-1
typename M::VertexHandle vh;
@@ -1432,7 +1432,7 @@ void VdE<M>::raise(typename M::EdgeHandle& _eh, state_t _target_state)
{
if (MOBJ(_eh).state() < _target_state)
{
update(_eh, _target_state);
this->update(_eh, _target_state);
// raise all neighbour vertices to level x-1
typename M::VertexHandle vh;
@@ -1509,7 +1509,7 @@ VdEc<M>::raise(typename M::EdgeHandle& _eh, state_t _target_state)
{
if (MOBJ(_eh).state() < _target_state)
{
update(_eh, _target_state);
this->update(_eh, _target_state);
// raise all neighbour vertices to level x-1
typename M::VertexHandle vh;
@@ -1585,7 +1585,7 @@ void EV<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
{
if (MOBJ(_vh).state() < _target_state) {
update(_vh, _target_state);
this->update(_vh, _target_state);
// raise all neighbour vertices to level x-1
typename M::VertexEdgeIter ve_it(Base::mesh_.ve_iter(_vh));
@@ -1661,7 +1661,7 @@ void EVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
{
if (MOBJ(_vh).state() < _target_state)
{
update(_vh, _target_state);
this->update(_vh, _target_state);
// raise all neighbour vertices to level x-1
typename M::VertexOHalfedgeIter voh_it;
@@ -1783,7 +1783,7 @@ EF<M>::raise(typename M::FaceHandle& _fh, state_t _target_state) {
if (MOBJ(_fh).state() < _target_state) {
update(_fh, _target_state);
this->update(_fh, _target_state);
// raise all neighbour edges to level x-1
typename M::FaceEdgeIter fe_it(Base::mesh_.fe_iter(_fh));
@@ -1853,7 +1853,7 @@ FE<M>::raise(typename M::EdgeHandle& _eh, state_t _target_state) {
if (MOBJ(_eh).state() < _target_state) {
update(_eh, _target_state);
this->update(_eh, _target_state);
// raise all neighbour faces to level x-1
typename M::FaceHandle fh;
@@ -1898,7 +1898,7 @@ EdE<M>::raise(typename M::EdgeHandle& _eh, state_t _target_state) {
if (MOBJ(_eh).state() < _target_state) {
update(_eh, _target_state);
this->update(_eh, _target_state);
// raise all neighbour faces and edges to level x-1
typename M::HalfedgeHandle hh1, hh2;
@@ -1955,7 +1955,7 @@ EdEc<M>::raise(typename M::EdgeHandle& _eh, state_t _target_state)
{
if (MOBJ(_eh).state() < _target_state) {
update(_eh, _target_state);
this->update(_eh, _target_state);
// raise all neighbour faces and edges to level x-1
typename M::HalfedgeHandle hh1, hh2;

2
src/OpenMesh/Tools/Utils/HeapT.hh
View File

@@ -172,7 +172,7 @@ public:
/// insert the entry _h
void insert(HeapEntry _h)
{
push_back(_h);
this->push_back(_h);
upheap(size()-1);
}