Changeset 11679 for code/branches/Presentation_HS17

Timestamp:

Dec 16, 2017, 12:52:32 PM (7 years ago)

Author:

patricwi

Message:

merged AsteroidMining

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• data/levels/AsteroidFarming.oxw (copied) (copied from code/branches/AsteroidMining_HS17/data/levels/AsteroidFarming.oxw) (1 diff)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/asteroidmining (copied) (copied from code/branches/AsteroidMining_HS17/src/modules/asteroidmining)
• src/modules/pickup/Pickup.h (modified) (1 diff)
• src/modules/pickup/PickupSpawner.cc (modified) (1 diff)
• src/modules/pickup/PickupSpawner.h (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (3 diffs)

code/branches/Presentation_HS17/data/levels/AsteroidFarming.oxw

@@ -3 +3 @@
  description = "Testing the Asteroid Mining Project, PPS HS 17"
  tags = "test, showcase"
- screenshot = "AsteroidFarming.png"
+ screenshot = "asteroids.png"
 />
 

code/branches/Presentation_HS17/src/modules/CMakeLists.txt

@@ -26 +26 @@
 ################ Sub Directories ################
 
+ADD_SUBDIRECTORY(asteroidmining)
 ADD_SUBDIRECTORY(dialogue)
 ADD_SUBDIRECTORY(designtools)

code/branches/Presentation_HS17/src/modules/pickup/Pickup.h

@@ -145 +145 @@
             virtual void changedPickedUp(void) override; //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
 
+
+            virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
+
+
         protected:
-            virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
 
             /**

code/branches/Presentation_HS17/src/modules/pickup/PickupSpawner.cc

@@ -158 +158 @@
             for(Pawn* pawn : ObjectList<Pawn>())
             {
-                if(spawner == nullptr) // Stop if the PickupSpawner has been deleted (e.g. because it has run out of pickups to distribute).
+                // Stop if the PickupSpawner has been deleted (e.g. because it has run out of pickups to distribute). 2nd condition prevents a possible error in isTarget(...) below. 
+                if(spawner == nullptr || this->pickup_ == nullptr) 
                     break;
+
+                if(!(pawn->doesAcceptPickups())){continue;} // skip those pawns, e.g. AsteroidMinables. 
 
                 Vector3 distance = pawn->getWorldPosition() - this->getWorldPosition();

code/branches/Presentation_HS17/src/modules/pickup/PickupSpawner.h

@@ -114 +114 @@
                 {return this->pickupTemplate_; }
 
+
+            void setPickupTemplateName(const std::string& name);
+            void setMaxSpawnedItems(int items); //!< Sets the maximum number of spawned items.
+
+            inline void setRespawnTime(float time)
+                { this->respawnTime_ = time; }
+
+
         private:
             void initialize(void);
@@ -141 +149 @@
             @param time New time after which this gets re-actived.
             */
-            inline void setRespawnTime(float time)
-                { this->respawnTime_ = time; }
 
-            void setMaxSpawnedItems(int items); //!< Sets the maximum number of spawned items.
 
-            void setPickupTemplateName(const std::string& name);
+
             void setPickupTemplate(Template* temp);
 

code/branches/Presentation_HS17/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/branches/Presentation_HS17/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_;