Changeset 4992 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Aug 13, 2005, 10:02:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: optimizations

Location:

orxonox/trunk/src/world_entities

Files:

• camera.cc (modified) (5 diffs)
• weapons/weapon_manager.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/camera.cc

@@ -98 +98 @@
 
 /**
-  \brief Sets a new clipping region
-* @param nearClip The near clip plane
-* @param farClip The far clip plane
+ * Sets a new clipping region
+ * @param nearClip The near clip plane
+ * @param farClip The far clip plane
 */
 void Camera::setClipRegion(float nearClip, float farClip)
@@ -119 +119 @@
     case VIEW_NORMAL:
       this->toFovy = 60.0;
-      this->setRelCoorSoft(Vector(-10, 5, 0));
-      this->target->setRelCoorSoft(Vector(0,0,0));
+      this->softReparent("TrackNode");
+      this->target->softReparent("TrackNode");
+      this->setRelCoorSoft(-10, 5, 0);
+      this->target->setRelCoorSoft(0,0,0);
       break;
     case VIEW_BEHIND:
@@ -131 +133 @@
       else
         this->target->softReparent("Player");
+      this->getParent()->debug(0);
 
 //      this->setParent("main-Turret");
@@ -138 +141 @@
       break;
     case VIEW_FRONT:
-      this->toFovy = 95.0;
-      this->setRelCoorSoft(Vector(10, 2, 0));
-      this->target->setRelCoorSoft(Vector(0,0,0));
+      this->toFovy = 120.0;
+      //this->softReparent("Player");
+      this->target->softReparent("Player");
+      this->setRelCoorSoft(4, 0, 0);
+      this->target->setRelCoorSoft(10,0,0);
       break;
     case VIEW_LEFT:
       this->toFovy = 90;
-      this->setRelCoorSoft(Vector(0, 1, -10));
-      this->target->setRelCoorSoft(Vector(0,0,0));
+      this->softReparent("TrackNode");
+      this->target->softReparent("TrackNode");
+      this->setRelCoorSoft(0, 1, -10, .5);
+      this->target->setRelCoorSoft(0,0,0);
       break;
     case VIEW_RIGHT:
       this->toFovy = 90;
+      this->softReparent("TrackNode");
+      this->target->softReparent("TrackNode");
       this->setRelCoorSoft(Vector(0, 1, 10));
-      this->target->setRelCoorSoft(Vector(0,0,0));
+      this->target->setRelCoorSoft(0,0,0);
       break;
     case VIEW_TOP:
       this->toFovy= 120;
+      this->softReparent("TrackNode");
+      this->target->softReparent("TrackNode");
       this->setRelCoorSoft(Vector(0, 10, 0));
-      this->target->setRelCoorSoft(Vector(0,0,0));
+      this->target->setRelCoorSoft(0,0,0);
     }
 }
@@ -169 +180 @@
   if (tmpFovy > .001)
     this->fovy += (this->toFovy - this->fovy) * dt;
+
+  this->getParent()->debug(2);
+  //this->debug(1);
+  //this->target->debug(1);
 }
 

orxonox/trunk/src/world_entities/weapons/weapon_manager.cc

@@ -76 +76 @@
     this->currentSlotConfig[i].currentWeapon = NULL;
     this->currentSlotConfig[i].nextWeapon = NULL;
+
+    // NAMING
+    char* tmpName;
+    if (this->getName())
+    {
+      tmpName = new char[strlen(this->getName()) + 10];
+      sprintf(tmpName, "%s_slot%d", this->getName(), i);
+    }
+    else
+    {
+      tmpName = new char[30];
+      sprintf(tmpName, "WeaponMan_slot%d", i);
+    }
+    this->currentSlotConfig[i].position.setName(tmpName);
+    delete tmpName;
   }
 
@@ -131 +146 @@
 }
 
+/**
+ * sets the Parent of the WeaponManager.
+ * @param parent the parent of the WeaponManager
+ *
+ * this is used, to identify to which ship/man/whatever this WeaponManager is connected.
+ * also all the Slots will be subconnected to this parent.
+ */
 void WeaponManager::setParent(PNode* parent)
 {