Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public :
"' found in the context node.");
return false;
}
return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

sofa::core::topology::BaseMeshTopology* getCollisionTopology() override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class PointCollisionModel : public core::CollisionModel
"' found in the context node.");
return false;
}
return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

void computeBBox(const core::ExecParams* params, bool onlyVisible) override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class SphereCollisionModel : public core::CollisionModel
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

template<class T>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ class TriangleCollisionModel : public core::CollisionModel
"' found in the context node.");
return false;
}
return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

void computeBBox(const core::ExecParams* params, bool onlyVisible=false) override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API ContactListener : public vir
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

template<class T>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class PairBoxROI : public core::DataEngine
}
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class PlaneROI : public core::DataEngine
}
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class ProximityROI : public core::DataEngine
}
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class SubsetTopology : public core::DataEngine
}
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class ValuesFromPositions : public core::DataEngine
}
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class LCPForceFeedback : public MechanicalStateForceFeedback<TDataTypes>
return false;
}

return core::objectmodel::BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

/// Override method to lock or unlock the force feedback computation. According to parameter, value == true (resp. false) will lock (resp. unlock) mutex @sa lockForce
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class SOFA_COMPONENT_IO_MESH_API BlenderExporter: public sofa::simulation::BaseS
"' found in the context node.");
return false;
}
return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class PrecomputedWarpPreconditioner : public sofa::component::linearsolver::Matr
arg->logError(std::string("No mechanical state with the datatype '") + TDataTypes::Name() + "' found in the context node.");
return false;
}
return sofa::core::objectmodel::BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

protected :
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class SOFA_COMPONENT_PLAYBACK_API CompareState: public ReadState
arg->logError("No mechanical state found in the context node.");
return false;
}
return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

/// Return the total errors (position and velocity)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class SOFA_COMPONENT_PLAYBACK_API CompareTopology: public ReadTopology
arg->logError("Cannot find a mesh topology in the current context");
return false;
}
return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

/// Return the total number of errors
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class SOFA_COMPONENT_PLAYBACK_API ReadState: public core::objectmodel::BaseObjec
arg->logError("No mechanical state found in the context node.");
return false;
}
return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class SOFA_COMPONENT_PLAYBACK_API ReadTopology: public core::objectmodel::BaseOb
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class SOFA_COMPONENT_PLAYBACK_API WriteState: public core::objectmodel::BaseObje
arg->logError("No mechanical state found in the context node.");
return false;
}
return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class SOFA_COMPONENT_PLAYBACK_API WriteTopology: public core::objectmodel::BaseO
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class PointSetGeometryAlgorithms : public core::topology::GeometryAlgorithms
"' found in the context node.");
return false;
}
return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

/** \brief Called by the state change callback to initialize added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class SOFA_COMPONENT_TOPOLOGY_UTILITY_API TopologicalChangeProcessor: public cor
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

void draw(const core::visual::VisualParams* vparams) override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class ConstraintCorrection : public BaseConstraintCorrection, public virtual Sin
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

void setMState(MechanicalState<DataTypes> *_mstate)
Expand Down
2 changes: 1 addition & 1 deletion Sofa/framework/Core/src/sofa/core/behavior/ForceField.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class ForceField : public BaseForceField, public virtual SingleStateAccessor<TDa
}
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class LagrangianConstraint : public BaseLagrangianConstraint, public virtual Sin
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

virtual type::vector<std::string> getBaseConstraintIdentifiers() override final
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class ProjectiveConstraintSet : public BaseProjectiveConstraintSet, public virtu
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ class SOFA_CORE_API TopologicalMapping : public virtual objectmodel::BaseObject
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

/// Construction method called by ObjectFactory.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class TBulletConvexHullModel : public sofa::core::CollisionModel ,public BulletC
{
if (dynamic_cast<core::behavior::MechanicalState<DataTypes>*>(context->getMechanicalState()) == NULL)
return false;
return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

// -- Bullet interface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class CapsuleCollisionModel : public core::CollisionModel
}
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

sofa::core::topology::BaseMeshTopology* getCollisionTopology() override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class OBBCollisionModel : public core::CollisionModel
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class CapsuleCollisionModel<sofa::defaulttype::StdRigidTypes<3,MyReal> > : publi
return false;
}

return BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

Data<VecReal > & writeRadii();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class OglTetrahedralModel< gpu::cuda::CudaVectorTypes<TCoord,TDeriv,TReal> > : p
{
if (dynamic_cast<core::behavior::MechanicalState<DataTypes>*>(context->getMechanicalState()) == NULL)
return false;
return core::objectmodel::BaseObject::canCreate(obj, context, arg);
return sofa::core::objectmodel::BaseComponent::canCreate(obj, context, arg);
}

protected:
Expand Down
Loading