Changeset 10970 for code/branches/presentationHS15/src/orxonox

Timestamp:

Dec 11, 2015, 3:26:20 PM (9 years ago)

Author:

maxima

Message:

Merged campaign and presentation. Everything seems to work fine.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/ActionpointController.cc (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc)
• src/orxonox/controllers/ActionpointController.h (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/CommonController.cc (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc)
• src/orxonox/controllers/CommonController.h (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/CommonController.h)
• src/orxonox/controllers/DivisionController.cc (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc)
• src/orxonox/controllers/DivisionController.h (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h)
• src/orxonox/controllers/FightingController.cc (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc)
• src/orxonox/controllers/FightingController.h (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/FightingController.h)
• src/orxonox/controllers/FlyingController.cc (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc)
• src/orxonox/controllers/FlyingController.h (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h)
• src/orxonox/controllers/FormationController.cc (modified) (4 diffs)
• src/orxonox/controllers/MasterController.cc (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc)
• src/orxonox/controllers/MasterController.h (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/MasterController.h)
• src/orxonox/controllers/SectionController.cc (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc)
• src/orxonox/controllers/SectionController.h (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/SectionController.h)
• src/orxonox/controllers/WingmanController.cc (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc)
• src/orxonox/controllers/WingmanController.h (copied) (copied from code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h)
• src/orxonox/worldentities/Actionpoint.cc (copied) (copied from code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.cc)
• src/orxonox/worldentities/Actionpoint.h (copied) (copied from code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.h)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/SpawnPoint.h (modified) (1 diff)
• src/orxonox/worldentities/TeamSpawnPoint.cc (modified) (1 diff)
• src/orxonox/worldentities/TeamSpawnPoint.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/presentationHS15/src/orxonox/controllers/CMakeLists.txt

@@ -11 +11 @@
   FormationController.cc
   ControllerDirector.cc
+  DivisionController.cc
+  WingmanController.cc
+  SectionController.cc
+  CommonController.cc
+  ActionpointController.cc
+  FlyingController.cc
+  FightingController.cc
+  MasterController.cc
 )

code/branches/presentationHS15/src/orxonox/controllers/FormationController.cc

@@ -277 +277 @@
         }
 
-        Vector2 coord = get2DViewcoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
+        Vector2 coord = get2DViewCoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
         float distance = (target - this->getControllableEntity()->getPosition()).length();
         float rotateX = clamp(coord.x * 10, -1.0f, 1.0f);
@@ -970 +970 @@
         if (controller)
         {
+            if (controller->getIdentifier()->getName() == "MasterController")
+                return true;
             FormationController* ac = orxonox_cast<FormationController*>(controller);
             if (ac)
@@ -981 +983 @@
         if (controller)
         {
+            if (controller->getIdentifier()->getName() == "MasterController")
+                return true;
             FormationController* ac = orxonox_cast<FormationController*>(controller);
             if (ac)
@@ -1069 +1073 @@
             return;
 
-        Vector2 coord = get2DViewcoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
+        Vector2 coord = get2DViewCoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
         float distance = (target - this->getControllableEntity()->getPosition()).length();
 

code/branches/presentationHS15/src/orxonox/worldentities/CMakeLists.txt

@@ -12 +12 @@
   TeamSpawnPoint.cc
   ExplosionPart.cc
+  Actionpoint.cc
 )
 

code/branches/presentationHS15/src/orxonox/worldentities/SpawnPoint.h

@@ -55 +55 @@
                 { return this->template_; }
 
-            Pawn* spawn();
+            virtual Pawn* spawn();
             void spawn(ControllableEntity* entity);
 

code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.cc

@@ -49 +49 @@
         XMLPortParam(TeamSpawnPoint, "team", setTeamNumber, getTeamNumber, xmlelement, mode).defaultValues(0);
     }
+    Pawn* TeamSpawnPoint::spawn()
+    {
+        Pawn* entity = SpawnPoint::spawn();
+        static_cast<ControllableEntity*>(entity)->setTeam (this->teamNumber_);
+        return entity;
+    }
 }

code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.h

@@ -49 +49 @@
             unsigned int getTeamNumber() const
                 { return this->teamNumber_; }
+            virtual Pawn* spawn();
 
         private:
-            unsigned int teamNumber_;
+            int teamNumber_;
     };
 }

code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h

@@ -201 +201 @@
             const std::string& getExplosionSound();
 
+            virtual const WeaponSystem* getWeaponSystem() const
+                { return this->weaponSystem_; }
+
         protected:
             virtual void preDestroy();