Changeset 12410 for code/branches/Presentation_FS19/src/modules

Timestamp:

May 22, 2019, 2:45:31 PM (6 years ago)

Author:

wiesep

Message:

Merged Boxhead_FS19

Location:

code/branches/Presentation_FS19

Files:

• . (modified) (1 prop)
• src/modules/hover/Hover.cc (modified) (3 diffs)
• src/modules/hover/Hover.h (modified) (3 diffs)
• src/modules/hover/HoverShip.cc (modified) (2 diffs)
• src/modules/hover/HoverShip.h (modified) (1 diff)
• src/modules/hover/HoverWall.cc (modified) (3 diffs)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/HoverGunProjectile.cc (copied) (copied from code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.cc)
• src/modules/weapons/projectiles/HoverGunProjectile.h (copied) (copied from code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.h)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (2 diffs)
• src/modules/weapons/weaponmodes/HoverGun.cc (copied) (copied from code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/HoverGun.cc)
• src/modules/weapons/weaponmodes/HoverGun.h (copied) (copied from code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/HoverGun.h)

code/branches/Presentation_FS19/src/modules/hover/Hover.cc

@@ -36 +36 @@
 #include "HoverOrigin.h"
 #include "HoverWall.h"
-#include "HoverFlag.h"
+
 #include "MazeGenerator.h"
 #include "core/CoreIncludes.h"
+#include "worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/ScriptableControllerDrone.h"
+#include "worldentities/pawns/SpaceShip.h"
+
+#include "tools/Timer.h"
+#include "infos/Bot.h"
+#include "worldentities/pawns/ModularSpaceShip.h"
+#include "graphics/Model.h"
+
+
+
 
 namespace orxonox
@@ -49 +60 @@
 
         this->origin_ = nullptr;
-        this->numberOfFlags_ = 1;
         this->firstTick_ = true;
 
         this->setHUDTemplate("HoverHUD");
     }
+    // void Hover::spawnZombie(std::string id)
+    // {
+    //     Identifier *identifier = ClassByString("SpaceShip");
+
+    //       if(!identifier)
+    //     {
+    //         orxout(user_error) << "Script tried to spawn unknown object" << std::endl;
+    //         return;
+    //     }
+
+    //     if(!identifier->isLoadable())
+    //     {
+    //         orxout(user_error) << "Script tried to spawn unloadable object" << std::endl;
+    //         return;
+    //     }
+        
+    
+    //     WorldEntity *entity;
+    //     Identifiable *obj = identifier->fabricate(this->controller_->getWorldEntityByID("Player")->getContext());
+
+
+
+    //     orxout(user_status) << "First hit!" << std::endl;
+
+    //    if(obj->isA(ClassIdentifier<WorldEntity>::getIdentifier()))
+    //     {
+    //         orxout(user_status) << "Is WorldEntity!" << std::endl;
+    //         entity = orxonox_cast<WorldEntity*>(obj);
+    //     }
+    //     else if(obj->isA(ClassIdentifier<PlayerInfo>::getIdentifier()))
+    //     {
+    //         // TODO This does not work yet because somehow the controllable entity is not set
+    //         // yet at this stage.
+    // //        entity = orxonox_cast<PlayerInfo*>(obj)->getControllableEntity();
+
+    //         orxout(user_status) << "Is PlayerInfo!" << std::endl;
+
+    //         //use TEMPLATES in the map to define objects that are not present on the map yet
+    //         return;
+    //     }
+    //     else
+    //     {
+    //         orxout(user_warning) << "Script tried to spawn an object that is neither a WorldEntity, nor a PlayerInfo" << std::endl;
+            
+    //         return;
+    //     }
+       
+    //     if(entity->isA(ClassIdentifier<MobileEntity>::getIdentifier())) {
+    //         orxout(user_status) << "Is MobileEntity!" << std::endl;
+    //         this->controller_->registerMobileEntity(id, orxonox_cast<MobileEntity*>(entity));
+    //     }
+
+        
+
+    //     if(entity->isA(ClassIdentifier<Pawn>::getIdentifier())) {
+    //         orxout(user_status) << "Is Pawn!" << std::endl;
+    //         this->controller_->registerPawn(id, orxonox_cast<Pawn*>(entity));
+    //     }
+        
+    //     this->controller_->registerWorldEntity(id, orxonox_cast<WorldEntity*>(entity));
+
+
+    //     ///////////////GOLD!!!!!!!!!!!!!!!////////////////////////
+    //     Pawn* pawn = this->controller_->getPawnByID(id);
+
+    //     //Attach to pawn
+    //     SpaceShip* drone = new SpaceShip(pawn->getContext()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something)
+        
+    //     drone->addTemplate("spaceshipzombie"); //ScriptableControllerDroneTemplate spaceshipescort
+
+    //     Vector3 spawnPosition = pawn->getWorldPosition() + Vector3(500,20,500);
+    //     drone->setPosition(spawnPosition);
+    // }
 
     void Hover::tick(float dt)
@@ -82 +165 @@
 
             //Generate inner Walls according to levelcode
-            for(int y=0; y<numCells; y++){
-                for(int x=0; x<numCells; x++){
-                    switch(levelcode[ y * numCells + x ]){
-                        case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
-                                break;
-                        case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
-                        case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0);
-                        default: break;
-                    }
-                }   
-            }
+            // for(int y=0; y<numCells; y++){
+            //     for(int x=0; x<numCells; x++){
+            //         switch(levelcode[ y * numCells + x ]){
+            //             case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
+            //                     break;
+            //             case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
+            //             case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0);
+            //             default: break;
+            //         }
+            //     }   
+            // }
+
+            
+
+
 
             //Generate 5 flags randomly
-            for ( int i = 0; i < 5; i++ )
-            {
-                HoverFlag* flag = new HoverFlag(origin_->getContext());
-                flag->init(rand()%numCells, rand()%numCells, cellSize);
-                flags_.push_back(flag);
-            }
+            // for ( int i = 0; i < 5; i++ )
+            // {
+            //     HoverFlag* zombieship = new SpaceShip(origin_->getContext());
+            //     flag->init(rand()%numCells, rand()%numCells, cellSize);
+            //     flags_.push_back(flag);
+            // }
+
+
 
         }//firsttick end
 
         // Check if ship collided with one of the flags
-        for ( unsigned int i = 0; i < flags_.size(); i++ ){
-            if(flags_[i]->getCollided()){
-                flags_[i]->destroyLater();
-                flags_.erase (flags_.begin()+i);
-            }
-        }
-        numberOfFlags_ = flags_.size();
+        // for ( unsigned int i = 0; i < flags_.size(); i++ ){
+        //     if(flags_[i]->getCollided()){
+        //         flags_[i]->destroyLater();
+        //         flags_.erase (flags_.begin()+i);
+        //     }
+        // }
+        // numberOfFlags_ = flags_.size();
+
+        //Spawn Zombies
+        //spawnZombie(z1);
+
+
     }
 }

code/branches/Presentation_FS19/src/modules/hover/Hover.h

@@ -45 +45 @@
 namespace orxonox
 {
+
+
+   
+
     class _HoverExport Hover : public Gametype
     {
@@ -58 +62 @@
                 { return this->numberOfFlags_; }
 
+
         private:
             WeakPtr<HoverOrigin> origin_;
@@ -66 +71 @@
 }
 
+
 #endif /* _Hover_H__ */

code/branches/Presentation_FS19/src/modules/hover/HoverShip.cc

@@ -48 +48 @@
     }
 
+    // //moves slightly right and left, that zombieship approaches
+    // void HoverShip::leftright(const Vector2& value)
+    //     {   
+    //         this->steering_.z += 5;
+    //         this->steering_.z -= 5;
+    //     }
+
     void HoverShip::moveFrontBack(const Vector2& value)
         { this->steering_.z -= value.x; }
 
     void HoverShip::moveRightLeft(const Vector2& value)
-        { this->steering_.x += value.x; }
+        { this->steering_.x += value.x;
+            // value.x += 0.001;
+            // value.x -= 0.001;
+        }
 
     void HoverShip::moveUpDown(const Vector2& value)
@@ -101 +111 @@
         }
 
+        if(otherObject->isA(Class(SpaceShip)))
+        {
+            removeHealth(0.2);
+        }
+
         return false;
     }

code/branches/Presentation_FS19/src/modules/hover/HoverShip.h

@@ -53 +53 @@
                 { return this->jumpBoost_; }
 
+            /////moves slightly right and left, that zombieship approaches
+            // virtual void leftright(const Vector2& value);
+
             virtual void moveFrontBack(const Vector2& value) override;
 

code/branches/Presentation_FS19/src/modules/hover/HoverWall.cc

@@ -1 @@
-/*
+    /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
  *                    > www.orxonox.net <
@@ -102 +102 @@
 
         model_ = new Model(this->getContext());
-        model_->setMeshSource("CuboidBody.mesh");
-        model_->setScale3D(Vector3(xSize_*1.0f, cellHeight*1.0f, zSize_*1.0f));
+        // model_->setMeshSource("CuboidBody.mesh");
+        model_->setScale3D(Vector3(xSize_*1.0f, cellHeight*400000000.0f, zSize_*1.0f));
         model_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f));
 
@@ -109 +109 @@
 
         cs_ = new BoxCollisionShape(this->getContext());
-        cs_->setHalfExtents(Vector3(xSize_*1.0f, cellHeight*1.0f, zSize_*1.0f));
+        cs_->setHalfExtents(Vector3(xSize_*1.0f, cellHeight*400000000.0f, zSize_*1.0f));
         cs_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f));
 

code/branches/Presentation_FS19/src/modules/weapons/projectiles/CMakeLists.txt

@@ -15 +15 @@
   MineProjectile.cc
   WagnisProjectile.cc
+  HoverGunProjectile.cc
 )

code/branches/Presentation_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -5 +5 @@
   HsW01.cc
   LightningGun.cc
+  HoverGun.cc
   SplitGun.cc
   IceGun.cc
@@ -14 +15 @@
   MineGun.cc
   WagnisGun.cc
+  HoverGun.cc
 )