Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12367


Ignore:
Timestamp:
May 16, 2019, 11:00:57 AM (5 weeks ago)
Author:
ahuwyler
Message:

We have a spaceship!

Location:
code/branches/OrxoBlox_FS19
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

    r12366 r12367  
    8484    <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
    8585    <Light type=directional position="-100, 10000, -700" direction="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
    86     <SpawnPoint team=0 position="0,150,0" lookat="0,0,0" spawnclass= Asteroids2DShip />
     86    <SpawnPoint team=0 position="0,150,0" lookat="0,0,0" spawnclass= OrxoBloxShip pawndesign=spaceshipOrxoBlox/>
    8787
    8888    <!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->
  • code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipOrxoBlox.oxt

    r12337 r12367  
    66   spawnparticleduration  = 3
    77   explosionchunks        = 4
    8 
    9    health            = 10
    10    maxhealth         = 10
    11    initialhealth     = 10
    12 
    13    shieldhealth        = 20
    14    initialshieldhealth = 20
    15    maxshieldhealth     = 20
    16    shieldabsorption    = 0.1
    17    shieldrechargerate  = 1
    18    shieldrechargewaittime = 1
    198
    209   primaryThrust     = 150
     
    3726   linearDamping     = 0.9
    3827   angularDamping    = 0.9999999
    39 
    40    collisiondamage = 100
    41    enablecollisiondamage = true
    4228   
    4329  >
     
    4733    </engines>
    4834    <attached>
    49       <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="escortShip.mesh" />
    50       <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" />
     35      <Model position="0,0,0" direction="0,100,0" roll=0 scale=1 mesh="escortShip.mesh" />
     36      <Model position="0,0,0" direction="0,100,0" roll=0 scale=1 mesh="escortWeapon.mesh" />
    5137<!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
    5238<Model mesh="cube.mesh" mass=10 position="12.6,-2,3" scale3D="2.8,2.8,11" />
     
    5440<Model mesh="cube.mesh" mass=10 position="0,0,-12" scale3D="4,4,7" /-->
    5541    </attached>
    56     <collisionShapes>
    57       <BoxCollisionShape position="0    ,0 ,  3" halfExtents="10,   4,8" />
    58       <BoxCollisionShape position="12.6 ,-2,  3" halfExtents="2.8,2.8,11"/>
    59       <BoxCollisionShape position="-12.6,-2,  3" halfExtents="2.8,2.8,11"/>
    60       <BoxCollisionShape position="0,     0,-12" halfExtents="4  , 4 ,7" />
    61     </collisionShapes>
    6242    <explosion >
    6343      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     
    8060  <OrxoBloxShip>
    8161    <camerapositions>
    82     <!--<CameraPosition position="0,100,180" direction="0, -0.2, -1" drag=false mouselook=true />
    83     <CameraPosition position="0,200,250" direction="0, -0.4, -1" drag=false mouselook=true />
    84     <CameraPosition position="0,30,150" direction="0, 0, -1" drag=false mouselook=true />
    85     <CameraPosition position="0,1300,-100" direction="0, -1, 0" drag=false mouselook=true />
    86 -->
    87     <CameraPosition position="0,600,0" pitch=-90 absolute=true drag = false mouselook=true/>
    88     <CameraPosition position="0,50,160" drag=true mouselook=true />
     62    <CameraPosition position="0,100,0" pitch=-90 absolute=true drag = false mouselook=true/>
     63    <CameraPosition position="0,0,0" drag=true mouselook=true />
    8964    <CameraPosition position="0,40,125" drag=true mouselook=true />
    9065    <CameraPosition position="0,30, 90" drag=true mouselook=true />
     
    9671  <MultiStateEngine
    9772   boostfactor    = 2.2
    98 
    99    speedfront     = 200
    100    speedback      = 200
    101    speedleftright =  100
    102    speedupdown    =  100
    10373
    10474   defEngineSndNormal = "sounds/Engine_low.ogg"
     
    11282  >
    11383
    114   <!-- backlight error if you fly over the edge
    115     <EffectContainer condition="idle">
    116       <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
    117     </EffectContainer>
    118     <EffectContainer condition="not idle">
    119       <FadingBillboard mainstate=activity active=false scale=0.09 position="12, -2, 13" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    120       <FadingBillboard mainstate=activity active=false scale=0.09 position="-12, -2, 13" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    121     </EffectContainer>
    122     <EffectContainer condition="normal or brake">
    123 
    124     </EffectContainer>
    125     <EffectContainer condition="normal or boost">
    126       <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, 0, 10" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    127       <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, 0, 10" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    128     </EffectContainer>
    129     <EffectContainer condition="boost">
    130       <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, 0, 10" colour="0.6, 0.8, 0.75, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    131       <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, 0, 10" colour="0.6, 0.8, 0.75, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    132     </EffectContainer>
    133 
    134   -->
    13584
    13685  </MultiStateEngine>
  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt

    r12366 r12367  
    77  OrxoBloxStones.cc
    88  OrxoBloxScore.cc
    9 
     9  OrxoBloxShip.cc
    1010
    1111)
  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

    r12366 r12367  
    129129    */
    130130    void OrxoBlox::start()
     131
    131132    {
    132133        if (this->center_ != nullptr) // There needs to be a OrxoBloxCenterpoint, i.e. the area the game takes place.
     
    169170        // Set variable to temporarily force the player to spawn.
    170171        // Set variable to temporarily force the player to spawn.
    171         bool temp = this->bForceSpawn_;
     172        //bool temp = this->bForceSpawn_;
    172173        this->bForceSpawn_ = true;
    173174
     
    176177
    177178        // Reset the variable.
    178         this->bForceSpawn_ = temp;
     179        //this->bForceSpawn_ = temp;
    179180
    180181    }
     
    206207    }
    207208   
    208     void OrxoBlox::spawnPlayer(PlayerInfo* player)
    209     {
    210         assert(player);
    211 
    212         if(this->player_ == nullptr)
    213         {
    214             this->player_ = player;
    215             this->players_[player].state_ = PlayerState::Alive;
    216         }
    217 
    218     }
     209    // void OrxoBlox::spawnPlayer(PlayerInfo* player)
     210    // {
     211    //     assert(player);
     212
     213    //     if(this->player_ == nullptr)
     214    //     {
     215    //         this->player_ = player;
     216    //         this->players_[player].state_ = PlayerState::Alive;
     217    //     }
     218
     219    // }
    219220
    220221    void OrxoBlox::LevelUp(){
     
    287288    OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
    288289
    289         orxout() << "Checking for Collision" << endl;
     290        //orxout() << "Checking for Collision" << endl;
    290291        Vector3 BallPosition = Ball->getPosition();
    291292        for(OrxoBloxStones* someStone : this->stones_)
     
    295296                continue;
    296297            }
    297             orxout() << "Checking a stone" << endl;
     298            //orxout() << "Checking a stone" << endl;
    298299            const Vector3& StonePosition = someStone->getPosition(); //!< Saves the position of the currentStone
    299300            int size = someStone->getSize()/2;
     
    307308        return nullptr;
    308309    }
     310
     311    void OrxoBlox::playerPreSpawn(PlayerInfo* player)
     312    {
     313        this->player_ = player;
     314    }
    309315   
    310316}
  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

    r12359 r12367  
    7474
    7575            PlayerInfo* getPlayer();
    76             void spawnPlayer(PlayerInfo* Player) override;
     76            // void spawnPlayer(PlayerInfo* Player) override;
     77            virtual void playerPreSpawn(PlayerInfo* player) override;
     78
    7779
    7880            void LevelUp();
  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.cc

    r12337 r12367  
    3434
    3535#include "OrxoBloxShip.h"
     36#include "OrxoBlox.h"
    3637#include "core/CoreIncludes.h"
    3738
     
    4748        this->width = 120;
    4849        this->height = 100;
    49         orxout() << "Spawned" << std::endl;
     50        orxout() << "SPACESHIP Spawned" << std::endl;
    5051
    5152        //timer.setTimer(3.5f, true, createExecutor(createFunctor(&OrxoBloxShip::showorientation, this)));
     
    7172        Vector3 pos = this->getPosition();
    7273
    73         //ensure that the ship stays in playing field
    74         if(pos.x > width/2)   pos.x = -width/2;
    75         if(pos.x < -width/2)  pos.x = width/2;
    76 
    77         //2D movement, position should always = 0 on y-axis
    78         if(pos.y!=0) pos.y = 0;
    79         this->setPosition(pos);
    80         if(pos.z!=50) pos.z = 50;
    8174    }
    8275
     
    9790    }
    9891}
     92
  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxShip.h

    r12298 r12367  
    3636
    3737
    38 #include "asteroids2D/Asteroids2DPrereqs.h"
     38#include "OrxoBloxPrereqs.h"
    3939
    4040#include "worldentities/pawns/SpaceShip.h"
Note: See TracChangeset for help on using the changeset viewer.