Changeset 1747 for code/trunk/src/orxonox/objects/Model.cc
- Timestamp:
- Sep 9, 2008, 4:25:52 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core3 (added) merged: 1573-1574,1583-1586,1591-1594,1596-1597,1603,1606-1607,1610-1611,1655,1658,1676-1679,1681-1685,1687,1716-1723,1725-1729,1736
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/Model.cc
r1627 r1747 65 65 void Model::XMLPort(Element& xmlelement, XMLPort::Mode mode) 66 66 { 67 WorldEntity::XMLPort(xmlelement, mode);67 SUPER(Model, XMLPort, xmlelement, mode); 68 68 69 XMLPortParam LoadOnly(Model, "mesh", setMesh, xmlelement, mode);69 XMLPortParam(Model, "mesh", setMesh, getMesh, xmlelement, mode); 70 70 71 71 Model::create(); 72 }73 74 void Model::setMesh(const std::string& meshname)75 {76 this->meshSrc_ = meshname;77 72 } 78 73 … … 98 93 void Model::changedVisibility() 99 94 { 100 WorldEntity::changedVisibility();95 SUPER(Model, changedVisibility); 101 96 if (this->isInitialized()) 102 97 this->mesh_.setVisible(this->isVisible());
Note: See TracChangeset
for help on using the changeset viewer.