diff --git a/src/Registration/ClosestPointRegistrationForceField.inl b/src/Registration/ClosestPointRegistrationForceField.inl index a4c9304..2de91a5 100644 --- a/src/Registration/ClosestPointRegistrationForceField.inl +++ b/src/Registration/ClosestPointRegistrationForceField.inl @@ -151,7 +151,7 @@ template void ClosestPointRegistrationForceField::initSource() { // build k-d tree - const VecCoord& p = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord& p = this->mstate->read(core::vec_id::read_access::position)->getValue(); if(p.size()) sourceKdTree.build(p); // detect border @@ -177,7 +177,7 @@ void ClosestPointRegistrationForceField::initTarget() template void ClosestPointRegistrationForceField::updateClosestPoints() { - const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue(); const VecCoord& tp = targetPositions.getValue(); unsigned int nbs=x.size(),nbt=tp.size(); @@ -210,7 +210,7 @@ void ClosestPointRegistrationForceField::updateClosestPoints() #pragma omp parallel for #endif for(int i=0;i<(int)nbt;i++) - sourceKdTree.getNClosest(closestTarget[i],tp[i], this->mstate->read(core::ConstVecCoordId::position())->getValue(),1); + sourceKdTree.getNClosest(closestTarget[i],tp[i], this->mstate->read(core::vec_id::read_access::position)->getValue(),1); } @@ -379,8 +379,8 @@ void ClosestPointRegistrationForceField::draw(const core::visual::Vis if (!vparams->displayFlags().getShowForceFields() && !drawColorMap.getValue()) return; - ReadAccessor< Data< VecCoord > > x(*this->getMState()->read(core::ConstVecCoordId::position())); - //const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + ReadAccessor< Data< VecCoord > > x(*this->getMState()->read(core::vec_id::read_access::position)); + //const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue(); unsigned int nb = this->closestPos.size(); if (vparams->displayFlags().getShowForceFields()) diff --git a/src/Registration/IntensityProfileRegistrationForceField.inl b/src/Registration/IntensityProfileRegistrationForceField.inl index 5c880a8..7c5d4ce 100644 --- a/src/Registration/IntensityProfileRegistrationForceField.inl +++ b/src/Registration/IntensityProfileRegistrationForceField.inl @@ -114,8 +114,8 @@ void IntensityProfileRegistrationForceField::init() if(this->mstate) { - const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); - //RDataRefVecCoord x(*this->getMState()->read(core::ConstVecCoordId::position())); + const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue(); + //RDataRefVecCoord x(*this->getMState()->read(core::vec_id::read_access::position)); RDataRefVecCoord dir(this->directions); if (dir.size() != x.size()) @@ -158,8 +158,8 @@ void IntensityProfileRegistrationForceField::udpateProfile // get current data const CImg& img = in->getCImg(t); const VecCoord& pos = (ref? - this->mstate->read(core::ConstVecCoordId::restPosition())->getValue(): - this->mstate->read(core::ConstVecCoordId::position())->getValue()); + this->mstate->read(core::vec_id::read_access::restPosition)->getValue(): + this->mstate->read(core::vec_id::read_access::position)->getValue()); const RDataRefVecCoord dir(ref?this->refDirections:this->directions); if(dir.size() != pos.size()) return; @@ -250,7 +250,7 @@ void IntensityProfileRegistrationForceField::udpateSimilar if( IP->isEmpty() || IPref->isEmpty() || !this->mstate) return; - const VecCoord& pos = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord& pos = this->mstate->read(core::vec_id::read_access::position)->getValue(); const CImg& prof = IP->getCImg(0); const CImg& profref = IPref->getCImg(0); @@ -471,8 +471,8 @@ void IntensityProfileRegistrationForceField::draw(const co if (!vparams->displayFlags().getShowForceFields()) return; - RDataRefVecCoord x(*this->getMState()->read(core::ConstVecCoordId::position())); - //const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + RDataRefVecCoord x(*this->getMState()->read(core::vec_id::read_access::position)); + //const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue(); unsigned int nb = this->targetPos.size(); if (vparams->displayFlags().getShowForceFields()) diff --git a/src/Registration/RegistrationContactForceField.inl b/src/Registration/RegistrationContactForceField.inl index 64f1f47..ea1ee58 100644 --- a/src/Registration/RegistrationContactForceField.inl +++ b/src/Registration/RegistrationContactForceField.inl @@ -158,8 +158,8 @@ void RegistrationContactForceField::draw(const core::visual::VisualPa { #if REGISTRATION_HAVE_SOFA_GL == 1 if (!((this->mstate1 == this->mstate2)?vparams->displayFlags().getShowForceFields():vparams->displayFlags().getShowInteractionForceFields())) return; - const VecCoord& p1 = this->mstate1->read(core::ConstVecCoordId::position())->getValue(); - const VecCoord& p2 = this->mstate2->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord& p1 = this->mstate1->read(core::vec_id::read_access::position)->getValue(); + const VecCoord& p2 = this->mstate2->read(core::vec_id::read_access::position)->getValue(); const type::vector& cc = contacts.getValue(); glDisable(GL_LIGHTING); @@ -237,7 +237,7 @@ template if (contacts.getValue()[i].m1 == (int)index[j]) { result.push_back(std::make_pair(static_cast< core::objectmodel::BaseObject *>(this), - this->mstate2->read(core::ConstVecCoordId::position())->getValue()[contacts.getValue()[i].m2]) + this->mstate2->read(core::vec_id::read_access::position)->getValue()[contacts.getValue()[i].m2]) ); triangle.push_back(contacts.getValue()[i].index2); index_point.push_back(index[j]); @@ -255,7 +255,7 @@ template if (contacts.getValue()[i].m2 == (int)index[j]) { result.push_back(std::make_pair(static_cast< core::objectmodel::BaseObject *>(this), - this->mstate1->read(core::ConstVecCoordId::position())->getValue()[contacts.getValue()[i].m1]) + this->mstate1->read(core::vec_id::read_access::position)->getValue()[contacts.getValue()[i].m1]) ); triangle.push_back(contacts.getValue()[i].index1);