Changeset 10391 in orxonox.OLD for trunk/src/world_entities/camera.cc

Timestamp:

Jan 26, 2007, 7:12:37 PM (19 years ago)

Author:

patrick

Message:

more on camera loading and many planet properties

File:

• trunk/src/world_entities/camera.cc (modified) (4 diffs)

trunk/src/world_entities/camera.cc

@@ -41 +41 @@
 {
   this->registerObject(this, Camera::_objectList);
+
   this->init();
 }
 
-/*
+
 Camera::Camera(const TiXmlElement* root)
 {
   this->registerObject(this, Camera::_objectList);
+
+  if( root != NULL)
+    this->loadParams(root);
+
   this->init();
-  this->loadParams(root);
-}
-*/
+
+}
+
 
 /**
@@ -87 +92 @@
   this->viewLeftDistance = 10;
 
-  //this->loadParams(doc.RootElement());
-
   this->setViewMode(Camera::ViewNormal);
 
   this->setParentMode(PNODE_ALL);
   this->eventHandling = true;
-  
+
   //add to track
   if(this->entityTrack)
@@ -213 +216 @@
   if (fabsf(tmpFovy) > 0.01)
     this->fovy += tmpFovy * fabsf(dt);
-    
+
   if(this->entityTrack)
     this->entityTrack->tick(dt);
@@ -302 +305 @@
 {
   // Do the PNode loading stuff
-  PNode::loadParams(root);
+  WorldEntity::loadParams(root);
 
   LoadParam(root, "viewTopFovy", this, Camera, setViewTopFovy);