Changeset 158 in flair-src for trunk/lib/FlairSimulator/src/Parser.cpp


Ignore:
Timestamp:
Mar 5, 2017, 10:50:56 AM (5 years ago)
Author:
Sanahuja Guillaume
Message:

corrected simu/device id for sensors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairSimulator/src/Parser.cpp

    r138 r158  
    4040namespace flair {
    4141namespace simulator {
    42 Parser::Parser(Simulator *parent, int app_width, int app_height,
     42Parser::Parser(int app_width, int app_height,
    4343               int scene_width, int scene_height, std::string media_path,
    4444               std::string xmlFile)
    45     : Gui(parent, "Parser", app_width, app_height, scene_width, scene_height,
     45    : Gui("Parser", app_width, app_height, scene_width, scene_height,
    4646          media_path) {
    4747  this->media_path = media_path;
    48   this->parent = parent;
    4948  xmlNode *root_element = NULL;
    5049  doc = xmlReadFile(xmlFile.c_str(), NULL, 0);
     
    121120      if (fp != NULL) {
    122121        GenericObject *object =
    123             new GenericObject(parent, getGui()->getMesh((char *)xmlGetProp(cur_node, (xmlChar *)"model")));
     122            new GenericObject(getGui()->getMesh((char *)xmlGetProp(cur_node, (xmlChar *)"model")));
    124123        object->setPosition(
    125124            getMeshVect(cur_node->children, (xmlChar *)"position"));
     
    140139          getScolor(cur_node->children));
    141140          //SColor(100, 255, 100, 100));
    142       GenericObject *object = new GenericObject(parent, mesh);
     141      GenericObject *object = new GenericObject(mesh);
    143142      object->setPosition(getMeshVect(cur_node->children, (xmlChar *)"position"));
    144143      object->setRotation(getMeshVect(cur_node->children, (xmlChar *)"rotation"));
     
    152151                    atof((char *)xmlGetProp(cur_node, (xmlChar *)"eight"))));
    153152                       
    154       GenericObject *object =
    155           new GenericObject(parent, mesh);
     153      GenericObject *object =new GenericObject(mesh);
    156154      object->setPosition(
    157155          getMeshVect(cur_node->children, (xmlChar *)"position"));
Note: See TracChangeset for help on using the changeset viewer.