Changeset 426 in flair-src for trunk

Timestamp:

May 20, 2021, 4:07:59 PM (4 years ago)

Author:

Sanahuja Guillaume

Message:

up

Location:

trunk/lib

Files:

• FlairSensorActuator/src/VrpnObject.cpp (modified) (1 diff)
• FlairSimulator/src/GenericObject.cpp (modified) (1 diff)
• FlairSimulator/src/Parser.cpp (modified) (2 diffs)

trunk/lib/FlairSensorActuator/src/VrpnObject.cpp

@@ -18 +18 @@
 #include "VrpnObject.h"
 #include "VrpnObject_impl.h"
-#include <string.h>
 #include <Matrix.h>
 

trunk/lib/FlairSimulator/src/GenericObject.cpp

@@ -37 +37 @@
 namespace simulator {
 
-GenericObject::GenericObject(IMesh *mesh)
-{
+GenericObject::GenericObject(IMesh *mesh) {
         meshSceneNode=getGui()->getSceneManager()->addMeshSceneNode(mesh);
         /*

trunk/lib/FlairSimulator/src/Parser.cpp

@@ -117 +117 @@
                         FILE *fp;
                         std::string fileName = this->media_path+"/";
+      fileName.append((char *)xmlGetProp(cur_node, (xmlChar *)"model"));
       fp = NULL;
-      fp = fopen(fileName.append((char *)xmlGetProp(
-                                     cur_node, (xmlChar *)"model")).c_str(),"rb");
+      fp = fopen(fileName.c_str(),"rb");
       if (fp != NULL) {
-        GenericObject *object =
-            new GenericObject(getGui()->getMesh((char *)xmlGetProp(cur_node, (xmlChar *)"model")));
-        object->setPosition(
-            getMeshVect(cur_node->children, (xmlChar *)"position"));
-        object->setRotation(
-            getMeshVect(cur_node->children, (xmlChar *)"rotation"));
+        fclose(fp);
+        GenericObject *object =new GenericObject(getGui()->getMesh((char *)xmlGetProp(cur_node, (xmlChar *)"model")));
+        object->setPosition(getMeshVect(cur_node->children, (xmlChar *)"position"));
+        object->setRotation(getMeshVect(cur_node->children, (xmlChar *)"rotation"));
         object->setScale(getMeshVect(cur_node->children, (xmlChar *)"scale"));
       } else {
-        Err("FATAL ERROR : File %s %s doesn't exist !\r\n",
-            (char *)xmlGetProp(cur_node, (xmlChar *)"model"),fileName.c_str());
+        Err("FATAL ERROR : File %s doesn't exist !\n",fileName.c_str());
       }
     } else if (xmlStrEqual(cur_node->name, (xmlChar *)"cylinder")) {
@@ -154 +151 @@
                         
       GenericObject *object =new GenericObject(mesh);
-      object->setPosition(
-          getMeshVect(cur_node->children, (xmlChar *)"position"));
-      object->setRotation(
-          getMeshVect(cur_node->children, (xmlChar *)"rotation"));
+      object->setPosition(getMeshVect(cur_node->children, (xmlChar *)"position"));
+      object->setRotation(getMeshVect(cur_node->children, (xmlChar *)"rotation"));
       object->setScale(getMeshVect(cur_node->children, (xmlChar *)"scale"));
     }