Changeset 11783 for code/trunk/src/orxonox

Timestamp:

Feb 20, 2018, 12:14:40 AM (7 years ago)

Author:

landauf

Message:

merged Presentation_HS17_merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/Highscore.cc (modified) (1 diff, 1 prop)
• src/orxonox/Highscore.h (modified) (1 diff, 1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/controllers/ArrowController.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc)
• src/orxonox/controllers/ArrowController.h (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/DroneController.cc (modified) (2 diffs)
• src/orxonox/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/gametypes/StoryMode.cc (modified) (1 prop)
• src/orxonox/gametypes/StoryMode.h (modified) (1 prop)
• src/orxonox/graphics/Model.cc (modified) (1 diff)
• src/orxonox/graphics/Model.h (modified) (1 diff)
• src/orxonox/interfaces/RadarViewable.h (modified) (1 diff)
• src/orxonox/worldentities/Arrow.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc)
• src/orxonox/worldentities/Arrow.h (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/NameableStaticEntity.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc)
• src/orxonox/worldentities/NameableStaticEntity.h (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h)
• src/orxonox/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (3 diffs)
• src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc)
• src/orxonox/worldentities/pawns/ShootableObstacle.h (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h)
• src/orxonox/worldentities/pawns/StoryModePawn.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc)
• src/orxonox/worldentities/pawns/StoryModePawn.h (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h)

code/trunk/src/orxonox/Highscore.cc

@@ -82 +82 @@
     /**
      * @brief stores a new highscore in the orxonox.ini file if the new score is better than the highest score so far.
+     * @returns true if the given score marks a new high score
      */
-    void Highscore::storeScore(const std::string& level, int points, PlayerInfo* player)
+    bool Highscore::storeScore(const std::string& level, int points, PlayerInfo* player)
     {
         if (points > this->getHighestScoreOfGame(level))
         {
             ModifyConfigValue(highscores_, add, player->getName() + "./." + level + "./." + multi_cast<std::string>(points));
+            return true;
         }
+        else
+            return false;
     }
 }

code/trunk/src/orxonox/Highscore.h

@@ -49 +49 @@
             void setConfigValues(); // Inherited function
 
-            void storeScore(const std::string& level, int points, PlayerInfo* player);
+            bool storeScore(const std::string& level, int points, PlayerInfo* player);
             int getHighestScoreOfGame(const std::string& game);
 

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -152 +152 @@
     // overlays
     class InGameConsole;
-    class Map;
     class OrxonoxOverlay;
     class OverlayGroup;

code/trunk/src/orxonox/controllers/CMakeLists.txt

@@ -19 +19 @@
   FightingController.cc
   MasterController.cc
+  ArrowController.cc
 )

code/trunk/src/orxonox/controllers/DroneController.cc

@@ -49 +49 @@
         RegisterObject(DroneController);
 
+        this->setTeam(0);
         this->owner_ = nullptr;
         this->drone_ = nullptr;
@@ -164 +165 @@
             }
         }
+        
         SUPER(AIController, tick, dt);
     }

code/trunk/src/orxonox/controllers/HumanController.h

@@ -90 +90 @@
                 { return HumanController::localController_s; }
             static Pawn* getLocalControllerEntityAsPawn();
-            //friend class, for mouselook
-            friend class Map;
 
         protected:

code/trunk/src/orxonox/graphics/Model.cc

@@ -155 +155 @@
         this->mesh_.setMaterial(this->materialName_);
     }
+
+    // PRE: a valid  Ogre::Entity* entity with a valid subentity at index
+    // POST: changed material of subentity at index to name
+    void Model::setSubMaterial(const std::string& name, const int index){
+        this->mesh_.setSubMaterial(name, index);
+    }
+
 
     void Model::changedShadows()

code/trunk/src/orxonox/graphics/Model.h

@@ -86 +86 @@
                 { return this->materialName_; }
 
+            void setSubMaterial(const std::string& name, const int index);
+
         protected:
             /**

code/trunk/src/orxonox/interfaces/RadarViewable.h

@@ -151 +151 @@
             return this->uniqueId_;
         }
-        //friend class Map;
 
     private:

code/trunk/src/orxonox/worldentities/CMakeLists.txt

@@ -13 +13 @@
   ExplosionPart.cc
   Actionpoint.cc
+  NameableStaticEntity.cc
+  Arrow.cc
 )
 

code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt

@@ -7 +7 @@
   TeamBaseMatchBase.cc
   Destroyer.cc
+  StoryModePawn.cc
+  ShootableObstacle.cc
 )

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -84 +84 @@
         // set damage multiplier to default value 1, meaning nominal damage
         this->damageMultiplier_ = 1;
+        this->acceptsPickups_ = true;
 
         this->spawnparticleduration_ = 3.0f;

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -199 +199 @@
                 { return this->damageMultiplier_; }
 
+            // Some pawns can-t harvest pickups (e.g. AsteroidMinables). Checked in PickupSpawner. 
+            inline void setPickupAcceptance(bool b)
+                { this->acceptsPickups_ = b; }
+            inline bool doesAcceptPickups()
+                { return this->acceptsPickups_;}
 
             virtual void startLocalHumanControl() override;
@@ -218 +223 @@
                 { return this->weaponSystem_; }
 
-            static void consoleCommand_debugDrawWeapons(bool bDraw);
+            static void consoleCommand_debugDrawWeapons(bool bDraw); 
+
+
 
         protected:
@@ -256 +263 @@
 
             float damageMultiplier_; ///< Used by the Damage Boost Pickup.
+            bool acceptsPickups_; // Added for the asteroidMinable class, avoid that they attempt to grab the resources
 
             WeakPtr<Pawn> lastHitOriginator_;