Changeset 7221 in orxonox.OLD for trunk/src/lib/physics

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

Location:

trunk/src/lib/physics

Files:

• physics_connection.cc (modified) (2 diffs)
• physics_connection.h (modified) (1 diff)
• physics_engine.cc (modified) (3 diffs)
• physics_engine.h (modified) (1 diff)

trunk/src/lib/physics/physics_connection.cc

@@ -73 +73 @@
  * @param subjectName the name of the Subject for this PhysicsConnection
 */
-void PhysicsConnection::setSubject(const char* subjectName)
+void PhysicsConnection::setSubject(const std::string& subjectName)
 {
   this->subject = PhysicsEngine::getInstance()->getPhysicsInterfaceByName(subjectName);
   if (this->subject == NULL)
   {
-    PRINTF(2)("subject: (%s) not found for PhysicsConnection\n", subjectName);
+    PRINTF(2)("subject: (%s) not found for PhysicsConnection\n", subjectName.c_str());
   }
   else
@@ -87 +87 @@
 * @param fieldName the Name of the Field for this connection
 */
-void PhysicsConnection::setField(const char* fieldName)
+void PhysicsConnection::setField(const std::string& fieldName)
 {
   this->field = PhysicsEngine::getInstance()->getFieldByName(fieldName);
   if (this->field == NULL)
   {
-        PRINTF(2)("field: (%s) not found for PhysicsConnection\n", fieldName);
+    PRINTF(2)("field: (%s) not found for PhysicsConnection\n", fieldName.c_str());
   }
   else

trunk/src/lib/physics/physics_connection.h

@@ -35 +35 @@
   virtual ~PhysicsConnection();
 
-  void setSubject(const char* subjectName);
-  void setField(const char* fieldName);
+  void setSubject(const std::string& subjectName);
+  void setField(const std::string& fieldName);
 
   void apply() const;

trunk/src/lib/physics/physics_engine.cc

@@ -128 +128 @@
   @returns the PhysicsInterface if found, or NULL if not
  */
-PhysicsInterface* PhysicsEngine::getPhysicsInterfaceByName(const char* physicsInterfaceName) const
+PhysicsInterface* PhysicsEngine::getPhysicsInterfaceByName(const std::string& physicsInterfaceName) const
 {
   BaseObject* interface = ClassList::getObject(physicsInterfaceName, CL_PHYSICS_INTERFACE);
@@ -157 +157 @@
 
 /**
-* @param FieldName the Name of the PhysicsInterface to search for
+* @param fieldName the Name of the PhysicsInterface to search for
   @returns the Field if found, or NULL if not
  */
-Field* PhysicsEngine::getFieldByName(const char* FieldName) const
+Field* PhysicsEngine::getFieldByName(const std::string& fieldName) const
 {
   list<Field*>::const_iterator field;
   for (field = this->fields.begin(); field != this->fields.end(); field++)
-    if (!strcmp(FieldName, (*field)->getName()))
+    if (fieldName == (*field)->getName())
       return (*field);
   return NULL;
@@ -197 +197 @@
   @returns the PhysicsConnection if found, or NULL if not
  */
-PhysicsConnection* PhysicsEngine::getPhysicsConnectionByName(const char* physicsConnectionName) const
+PhysicsConnection* PhysicsEngine::getPhysicsConnectionByName(const std::string& physicsConnectionName) const
 {
   list<PhysicsConnection*>::const_iterator pc;
   for (pc = this->connections.begin(); pc != this->connections.end(); pc++)
-    if (!strcmp(physicsConnectionName, (*pc)->getName()))
+    if (physicsConnectionName == (*pc)->getName())
       delete (*pc);
   return NULL;

trunk/src/lib/physics/physics_engine.h

@@ -31 +31 @@
   void loadConnections(const TiXmlElement* root);
 
-  PhysicsInterface*      getPhysicsInterfaceByName(const char* physicsInterfaceName) const;
+  PhysicsInterface*      getPhysicsInterfaceByName(const std::string& physicsInterfaceName) const;
 
   void                   addField(Field* field);
   void                   removeField(Field* field);
-  Field*                 getFieldByName(const char* FieldName) const;
+  Field*                 getFieldByName(const std::string& fieldName) const;
 
   void                   addConnection(PhysicsConnection* connection);
   void                   removeConnection(PhysicsConnection* connection);
-  PhysicsConnection*     getPhysicsConnectionByName(const char* physicsConnectionName) const;
+  PhysicsConnection*     getPhysicsConnectionByName(const std::string& physicsConnectionName) const;