Changeset 158 in flair-src for trunk/lib/FlairSimulator/src/Parser.cpp
- Timestamp:
- 03/05/17 10:50:56 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/FlairSimulator/src/Parser.cpp
r138 r158 40 40 namespace flair { 41 41 namespace simulator { 42 Parser::Parser( Simulator *parent,int app_width, int app_height,42 Parser::Parser(int app_width, int app_height, 43 43 int scene_width, int scene_height, std::string media_path, 44 44 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, 46 46 media_path) { 47 47 this->media_path = media_path; 48 this->parent = parent;49 48 xmlNode *root_element = NULL; 50 49 doc = xmlReadFile(xmlFile.c_str(), NULL, 0); … … 121 120 if (fp != NULL) { 122 121 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"))); 124 123 object->setPosition( 125 124 getMeshVect(cur_node->children, (xmlChar *)"position")); … … 140 139 getScolor(cur_node->children)); 141 140 //SColor(100, 255, 100, 100)); 142 GenericObject *object = new GenericObject( parent,mesh);141 GenericObject *object = new GenericObject(mesh); 143 142 object->setPosition(getMeshVect(cur_node->children, (xmlChar *)"position")); 144 143 object->setRotation(getMeshVect(cur_node->children, (xmlChar *)"rotation")); … … 152 151 atof((char *)xmlGetProp(cur_node, (xmlChar *)"eight")))); 153 152 154 GenericObject *object = 155 new GenericObject(parent, mesh); 153 GenericObject *object =new GenericObject(mesh); 156 154 object->setPosition( 157 155 getMeshVect(cur_node->children, (xmlChar *)"position"));
Note:
See TracChangeset
for help on using the changeset viewer.