Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8999 for code/branches


Ignore:
Timestamp:
Dec 18, 2011, 3:22:43 PM (13 years ago)
Author:
jo
Message:

Old version of the SpaceRace added.

Location:
code/branches/presentation2011
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation2011/data/levels/spaceRace.oxw

    r8977 r8999  
    11<LevelInfo
    2  name = "Space Race"
     2 name = "Old Space Race"
    33 description = "Have a furious Race in Space: Reach the checkpoints as fast as possible."
    44 tags = "gametype"
    … …  
    1818
    1919<Level
    20  gametype = "SpaceRace"
     20 gametype = "OldSpaceRace"
    2121>
    2222  <templates>
    … …  
    5252   
    5353    <!-- ------------------CheckPoints----------------- -->
    54     <RaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false">
    55         <attached>
    56             <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
    57         </attached>
    58         <collisionShapes>
    59             <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
    60             <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
    61             <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
    62             <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    63         </collisionShapes>
    64     </RaceCheckPoint>
    65 
    66     <RaceCheckPoint name="checkpoint2" position="0,-900,2300" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="1" islast="false">
     54    <OldRaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false">
     55        <attached>
     56            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
     57        </attached>
     58        <collisionShapes>
     59            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
     60            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
     61            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
     62            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
     63        </collisionShapes>
     64    </OldRaceCheckPoint>
     65
     66    <OldRaceCheckPoint name="checkpoint2" position="0,-900,2300" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="1" islast="false">
    6767        <attached>
    6868            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
    … …  
    9696            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    9797        </collisionShapes>
    98     </RaceCheckPoint>
    99 
    100     <RaceCheckPoint name="checkpoint3" position="0,700,2700" stayActive="true" direction="0,0,1" collisionType="static" scale="1" distance="40" checkpointindex="2" islast="false">
     98    </OldRaceCheckPoint>
     99
     100    <OldRaceCheckPoint name="checkpoint3" position="0,700,2700" stayActive="true" direction="0,0,1" collisionType="static" scale="1" distance="40" checkpointindex="2" islast="false">
    101101        <attached>
    102102            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
    … …  
    130130            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    131131        </collisionShapes>
    132     </RaceCheckPoint>
    133 
    134     <RaceCheckPoint name="checkpoint4" position="0,2100,2300" stayActive="true" direction="0,1,1" collisionType="static" scale="1" distance="40" checkpointindex="3" islast="false">
     132    </OldRaceCheckPoint>
     133
     134    <OldRaceCheckPoint name="checkpoint4" position="0,2100,2300" stayActive="true" direction="0,1,1" collisionType="static" scale="1" distance="40" checkpointindex="3" islast="false">
    135135        <attached>
    136136            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
    … …  
    165165            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    166166        </collisionShapes>
    167     </RaceCheckPoint>
    168 
    169     <RaceCheckPoint name="checkpoint5" position="0,2200,500" stayActive="true" direction="0,1,0" collisionType="static" scale="1" distance="40" checkpointindex="4" islast="false">
     167    </OldRaceCheckPoint>
     168
     169    <OldRaceCheckPoint name="checkpoint5" position="0,2200,500" stayActive="true" direction="0,1,0" collisionType="static" scale="1" distance="40" checkpointindex="4" islast="false">
    170170        <attached>
    171171        <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
    … …  
    200200            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    201201        </collisionShapes>
    202     </RaceCheckPoint>
    203 
    204     <RaceCheckPoint name="checkpoint6" position="0,1500,-800" stayActive="true" direction="0,1,-1" collisionType="static" scale="1" distance="40" checkpointindex="5" islast="false">
     202    </OldRaceCheckPoint>
     203
     204    <OldRaceCheckPoint name="checkpoint6" position="0,1500,-800" stayActive="true" direction="0,1,-1" collisionType="static" scale="1" distance="40" checkpointindex="5" islast="false">
    205205        <attached>
    206206            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
    … …  
    235235            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    236236        </collisionShapes>
    237     </RaceCheckPoint>
    238 
    239     <RaceCheckPoint name="checkpoint7" position="0,200,-1900" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="6" islast="false">
     237    </OldRaceCheckPoint>
     238
     239    <OldRaceCheckPoint name="checkpoint7" position="0,200,-1900" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="6" islast="false">
    240240        <attached>
    241241            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
    … …  
    270270            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    271271        </collisionShapes>
    272     </RaceCheckPoint>
    273 
    274     <RaceCheckPoint name="checkpoint8" position="0,-700,-1400" stayActive="true" direction="0,-1,-1" collisionType="static" scale="1" distance="40" checkpointindex="7" islast="false">
     272    </OldRaceCheckPoint>
     273
     274    <OldRaceCheckPoint name="checkpoint8" position="0,-700,-1400" stayActive="true" direction="0,-1,-1" collisionType="static" scale="1" distance="40" checkpointindex="7" islast="false">
    275275        <attached>
    276276        <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
    … …  
    305305            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    306306        </collisionShapes>
    307     </RaceCheckPoint>
    308 
    309     <RaceCheckPoint name="checkpoint9" position="0,-1300,-800" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="8" islast="false">
     307    </OldRaceCheckPoint>
     308
     309    <OldRaceCheckPoint name="checkpoint9" position="0,-1300,-800" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="8" islast="false">
    310310        <attached>
    311311            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
    … …  
    331331            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    332332        </collisionShapes>
    333     </RaceCheckPoint>
    334 
    335     <RaceCheckPoint name="checkpoint10" position="0,-2100,0" collisionType="static" scale="1" distance="40" checkpointindex="9" islast="true" timelimit="150">
     333    </OldRaceCheckPoint>
     334
     335    <OldRaceCheckPoint name="checkpoint10" position="0,-2100,0" collisionType="static" scale="1" distance="40" checkpointindex="9" islast="true" timelimit="150">
    336336        <attached>
    337337        <   Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
    … …  
    343343            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    344344        </collisionShapes>
    345     </RaceCheckPoint>
     345    </OldRaceCheckPoint>
    346346
    347347    <!-- ------------------Planet----------------- -->

  • code/branches/presentation2011/src/modules/gametypes/CMakeLists.txt

    r8998 r8999  
    33  RaceCheckPoint.cc
    44  SpaceRaceManager.cc
     5  OldSpaceRace.cc
     6  OldRaceCheckPoint.cc
    57)
    68

  • code/branches/presentation2011/src/modules/gametypes/GametypesPrereqs.h

    r8706 r8999  
    6666{
    6767    class SpaceRace;
     68    class OldSpaceRace;
    6869}
    6970

  • code/branches/presentation2011/src/orxonox/controllers/FormationController.h

    r8992 r8999  
    7777
    7878      inline void setTeam(int team)
    79            { this->team_ = team;
    80              orxout(debug_output) << "Set team to: "<<team<<" in "<<this<< endl;}
     79           { this->team_ = team; }
    8180      inline int getTeam() const
    8281           { return this->team_; }
    … …  
    8786               Defend-just defend the master
    8887               Attack-leave formation, attack every target
    89       */ 
     88      */
    9089      enum FormationMode {NORMAL,DEFEND,ATTACK};
    91      
     90
    9291      /**
    9392        @brief Sets the new mode. If master, set it for all slaves.
    … …  
    104103      int freedomCount_;
    105104      enum State {SLAVE, MASTER, FREE};
    106      
     105
    107106      State state_;
    108107      std::vector<FormationController*> slaves_;
    … …  
    135134
    136135      void takeLeadOfFormation();
    137       void masterAttacked(Pawn* originator);     
     136      void masterAttacked(Pawn* originator);
    138137
    139138      void specificMasterActionHold();
    … …  
    155154
    156155      static bool sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype); // hack
    157      
     156
    158157
    159158      void setTarget(Pawn* target);
    … …  
    162161
    163162      void targetDied();
    164      
     163
    165164      bool bHasTargetPosition_;
    166165      Vector3 targetPosition_;
Note: See TracChangeset for help on using the changeset viewer.