Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8573


Ignore:
Timestamp:
May 25, 2011, 6:08:21 PM (14 years ago)
Author:
dafrick
Message:

Fixing Space Race.

Location:
code/branches/spacerace
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r8552 r8573  
    4242
    4343    <!-- ------------------SpawnPoint----------------- -->
    44     <SpawnPoint team=0 position="0,-2100,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="true" >
     44    <SpawnPoint position="0,-2100,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="true" >
    4545      <events>
    4646        <activity>
    47           <EventListener event="trigger1" />
     47          <EventTrigger invert="true">
     48            <events>
     49                <trigger>
     50                    <EventListener event="checkpoint2" />
     51                </trigger>
     52            </events>
     53          </EventTrigger>
    4854        </activity>
    4955      </events>
    … …  
    5258    <!-- ------------------CheckPoints----------------- -->
    5359    <RaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false">
    54     <attached>
    55       <Model mass="50" scale="50" mesh="checkPoint.mesh" />
     60        <attached>
     61        <Model mass="50" scale="50" mesh="checkPoint.mesh" />
     62        </attached>
     63        <collisionShapes>
     64        <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
     65        <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
     66        <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
     67        <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
     68        </collisionShapes>
     69    </RaceCheckPoint>
     70
     71    <RaceCheckPoint name="checkpoint2" position="0,-900,2300" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="1" islast="false">
     72    <attached>
     73      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
     74      <SpawnPoint position="0,0,0" lookat="0,700,2700" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
     75        <events>
     76          <activity>
     77            <Trigger mode="xor" invert="true" >
     78                <EventTrigger>
     79                    <events>
     80                        <trigger>
     81                            <EventListener event="checkpoint2" />
     82                        </trigger>
     83                    </events>
     84                </EventTrigger>
     85                <EventTrigger invert="true">
     86                    <events>
     87                        <trigger>
     88                            <EventListener event="checkpoint3" />
     89                        </trigger>
     90                    </events>
     91                </EventTrigger>
     92            </Trigger>
     93          </activity>
     94        </events>
     95      </SpawnPoint>
    5696    </attached>
    5797    <collisionShapes>
    … …  
    63103    </RaceCheckPoint>
    64104
    65     <RaceCheckPoint name="checkpoint2" position="0,-900,2300" collisionType="static" scale="1" distance="40" checkpointindex="1" islast="false">
    66     <attached>
    67       <Model mass="50" scale="50" mesh="checkPoint.mesh" />
    68       <DistanceTrigger name="trigger1" position="0,0,0" distance=40 stayActive="true" />
    69       <SpawnPoint team=0 position="0,0,0" lookat="0,700,2700" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
    70         <events>
    71           <activity>
    72             <EventListener event="trigger1" />
    73             <EventListener event="trigger2" />
    74           </activity>
    75         </events>
    76       </SpawnPoint>
    77     </attached>
    78     <collisionShapes>
    79       <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
    80       <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
    81       <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
    82       <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    83     </collisionShapes>
    84     </RaceCheckPoint>
    85 
    86     <RaceCheckPoint name="checkpoint3" position="0,700,2700" direction="0,0,1" collisionType="static" scale="1" distance="40" checkpointindex="2" islast="false">
    87     <attached>
    88       <Model mass="50" scale="50" mesh="checkPoint.mesh" />
    89       <DistanceTrigger name="trigger2" position="0,0,0" distance=40 stayActive="true" />
    90       <SpawnPoint team=0 position="0,0,0" lookat="0,2100,2300" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
    91         <events>
    92           <activity>
    93             <EventListener event="trigger2" />
    94             <EventListener event="trigger3" />
    95           </activity>
    96         </events>
    97       </SpawnPoint>
    98     </attached>
    99      <collisionShapes>
    100       <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
    101       <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
    102       <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
    103       <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    104     </collisionShapes>
    105     </RaceCheckPoint>
    106 
    107     <RaceCheckPoint name="checkpoint4" position="0,2100,2300" direction="0,1,1" collisionType="static" scale="1" distance="40" checkpointindex="3" islast="false">
     105    <RaceCheckPoint name="checkpoint3" position="0,700,2700" stayActive="true" direction="0,0,1" collisionType="static" scale="1" distance="40" checkpointindex="2" islast="false">
     106    <attached>
     107      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
     108      <SpawnPoint position="0,0,0" lookat="0,2100,2300" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
     109        <events>
     110          <activity>
     111            <Trigger mode="xor" invert="true" >
     112                <EventTrigger>
     113                    <events>
     114                        <trigger>
     115                            <EventListener event="checkpoint3" />
     116                        </trigger>
     117                    </events>
     118                </EventTrigger>
     119                <EventTrigger invert="true">
     120                    <events>
     121                        <trigger>
     122                            <EventListener event="checkpoint4" />
     123                        </trigger>
     124                    </events>
     125                </EventTrigger>
     126            </Trigger>
     127          </activity>
     128        </events>
     129      </SpawnPoint>
     130    </attached>
     131     <collisionShapes>
     132      <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
     133      <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
     134      <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
     135      <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
     136    </collisionShapes>
     137    </RaceCheckPoint>
     138
     139    <RaceCheckPoint name="checkpoint4" position="0,2100,2300" stayActive="true" direction="0,1,1" collisionType="static" scale="1" distance="40" checkpointindex="3" islast="false">
    108140   <attached>
    109141      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
    110142      <DistanceTrigger name="trigger3" position="0,0,0" distance=40 stayActive="true" />
    111       <SpawnPoint team=0 position="0,0,0" lookat="0,2200,500" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
    112         <events>
    113           <activity>
    114             <EventListener event="trigger3" />
    115             <EventListener event="trigger4" />
    116           </activity>
    117         </events>
    118       </SpawnPoint>
    119     </attached>
    120      <collisionShapes>
    121       <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
    122       <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
    123       <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
    124       <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    125     </collisionShapes>
    126     </RaceCheckPoint>
    127 
    128     <RaceCheckPoint name="checkpoint5" position="0,2200,500" direction="0,1,0" collisionType="static" scale="1" distance="40" checkpointindex="4" islast="false">
     143      <SpawnPoint position="0,0,0" lookat="0,2200,500" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
     144        <events>
     145          <activity>
     146            <Trigger mode="xor" invert="true" >
     147                <EventTrigger>
     148                    <events>
     149                        <trigger>
     150                            <EventListener event="checkpoint4" />
     151                        </trigger>
     152                    </events>
     153                </EventTrigger>
     154                <EventTrigger invert="true">
     155                    <events>
     156                        <trigger>
     157                            <EventListener event="checkpoint5" />
     158                        </trigger>
     159                    </events>
     160                </EventTrigger>
     161            </Trigger>
     162          </activity>
     163        </events>
     164      </SpawnPoint>
     165    </attached>
     166     <collisionShapes>
     167      <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
     168      <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
     169      <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
     170      <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
     171    </collisionShapes>
     172    </RaceCheckPoint>
     173
     174    <RaceCheckPoint name="checkpoint5" position="0,2200,500" stayActive="true" direction="0,1,0" collisionType="static" scale="1" distance="40" checkpointindex="4" islast="false">
    129175    <attached>
    130176      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
    131177      <DistanceTrigger name="trigger4" position="0,0,0" distance=40 stayActive="true" />
    132       <SpawnPoint team=0 position="0,0,0" lookat="0,1500,-800" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
    133         <events>
    134           <activity>
    135             <EventListener event="trigger4" />
    136             <EventListener event="trigger5" />
    137           </activity>
    138         </events>
    139       </SpawnPoint>
    140     </attached>
    141      <collisionShapes>
    142       <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
    143       <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
    144       <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
    145       <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    146     </collisionShapes>
    147     </RaceCheckPoint>
    148 
    149     <RaceCheckPoint name="checkpoint6" position="0,1500,-800" direction="0,1,-1" collisionType="static" scale="1" distance="40" checkpointindex="5" islast="false">
     178      <SpawnPoint position="0,0,0" lookat="0,1500,-800" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
     179         <events>
     180          <activity>
     181            <Trigger mode="xor" invert="true" >
     182                <EventTrigger>
     183                    <events>
     184                        <trigger>
     185                            <EventListener event="checkpoint5" />
     186                        </trigger>
     187                    </events>
     188                </EventTrigger>
     189                <EventTrigger invert="true">
     190                    <events>
     191                        <trigger>
     192                            <EventListener event="checkpoint6" />
     193                        </trigger>
     194                    </events>
     195                </EventTrigger>
     196            </Trigger>
     197          </activity>
     198        </events>
     199      </SpawnPoint>
     200    </attached>
     201     <collisionShapes>
     202      <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
     203      <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
     204      <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
     205      <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
     206    </collisionShapes>
     207    </RaceCheckPoint>
     208
     209    <RaceCheckPoint name="checkpoint6" position="0,1500,-800" stayActive="true" direction="0,1,-1" collisionType="static" scale="1" distance="40" checkpointindex="5" islast="false">
    150210    <attached>
    151211      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
    152212      <DistanceTrigger name="trigger5" position="0,0,0" distance=40 stayActive="true" />
    153       <SpawnPoint team=0 position="0,0,0" lookat="0,200,-1900" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
    154         <events>
    155           <activity>
    156             <EventListener event="trigger5" />
    157             <EventListener event="trigger6" />
    158           </activity>
    159         </events>
    160       </SpawnPoint>
    161     </attached>
    162      <collisionShapes>
    163       <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
    164       <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
    165       <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
    166       <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    167     </collisionShapes>
    168     </RaceCheckPoint>
    169 
    170     <RaceCheckPoint name="checkpoint7" position="0,200,-1900" collisionType="static" scale="1" distance="40" checkpointindex="6" islast="false">
     213      <SpawnPoint position="0,0,0" lookat="0,200,-1900" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
     214        <events>
     215          <activity>
     216            <Trigger mode="xor" invert="true" >
     217                <EventTrigger>
     218                    <events>
     219                        <trigger>
     220                            <EventListener event="checkpoint6" />
     221                        </trigger>
     222                    </events>
     223                </EventTrigger>
     224                <EventTrigger invert="true">
     225                    <events>
     226                        <trigger>
     227                            <EventListener event="checkpoint7" />
     228                        </trigger>
     229                    </events>
     230                </EventTrigger>
     231            </Trigger>
     232          </activity>
     233        </events>
     234      </SpawnPoint>
     235    </attached>
     236     <collisionShapes>
     237      <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
     238      <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
     239      <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
     240      <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
     241    </collisionShapes>
     242    </RaceCheckPoint>
     243
     244    <RaceCheckPoint name="checkpoint7" position="0,200,-1900" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="6" islast="false">
    171245    <attached>
    172246      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
    173247      <DistanceTrigger name="trigger6" position="0,0,0" distance=40 stayActive="true" />
    174       <SpawnPoint team=0 position="0,0,0" lookat="0,-700,-1400" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
    175         <events>
    176           <activity>
    177             <EventListener event="trigger6" />
    178             <EventListener event="trigger7" />
    179           </activity>
    180         </events>
    181       </SpawnPoint>
    182     </attached>
    183      <collisionShapes>
    184       <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
    185       <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
    186       <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
    187       <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    188     </collisionShapes>
    189     </RaceCheckPoint>
    190 
    191     <RaceCheckPoint name="checkpoint8" position="0,-700,-1400" direction="0,-1,-1" collisionType="static" scale="1" distance="40" checkpointindex="7" islast="false">
     248      <SpawnPoint position="0,0,0" lookat="0,-700,-1400" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
     249        <events>
     250          <activity>
     251            <Trigger mode="xor" invert="true" >
     252                <EventTrigger>
     253                    <events>
     254                        <trigger>
     255                            <EventListener event="checkpoint7" />
     256                        </trigger>
     257                    </events>
     258                </EventTrigger>
     259                <EventTrigger invert="true">
     260                    <events>
     261                        <trigger>
     262                            <EventListener event="checkpoint8" />
     263                        </trigger>
     264                    </events>
     265                </EventTrigger>
     266            </Trigger>
     267          </activity>
     268        </events>
     269      </SpawnPoint>
     270    </attached>
     271     <collisionShapes>
     272      <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
     273      <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
     274      <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
     275      <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
     276    </collisionShapes>
     277    </RaceCheckPoint>
     278
     279    <RaceCheckPoint name="checkpoint8" position="0,-700,-1400" stayActive="true" direction="0,-1,-1" collisionType="static" scale="1" distance="40" checkpointindex="7" islast="false">
    192280    <attached>
    193281      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
    194282      <DistanceTrigger name="trigger7" position="0,0,0" distance=40 stayActive="true" />
    195       <SpawnPoint team=0 position="0,0,0" lookat="0,-1300,-800" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
    196         <events>
    197           <activity>
    198             <EventListener event="trigger7" />
    199             <EventListener event="trigger8" />
    200           </activity>
    201         </events>
    202       </SpawnPoint>
    203     </attached>
    204      <collisionShapes>
    205       <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
    206       <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
    207       <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
    208       <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
    209     </collisionShapes>
    210     </RaceCheckPoint>
    211 
    212     <RaceCheckPoint name="checkpoint9" position="0,-1300,-800" collisionType="static" scale="1" distance="40" checkpointindex="8" islast="false">
     283      <SpawnPoint position="0,0,0" lookat="0,-1300,-800" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
     284        <events>
     285          <activity>
     286            <Trigger mode="xor" invert="true" >
     287                <EventTrigger>
     288                    <events>
     289                        <trigger>
     290                            <EventListener event="checkpoint8" />
     291                        </trigger>
     292                    </events>
     293                </EventTrigger>
     294                <EventTrigger invert="true">
     295                    <events>
     296                        <trigger>
     297                            <EventListener event="checkpoint9" />
     298                        </trigger>
     299                    </events>
     300                </EventTrigger>
     301            </Trigger>
     302          </activity>
     303        </events>
     304      </SpawnPoint>
     305    </attached>
     306     <collisionShapes>
     307      <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
     308      <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
     309      <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
     310      <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
     311    </collisionShapes>
     312    </RaceCheckPoint>
     313
     314    <RaceCheckPoint name="checkpoint9" position="0,-1300,-800" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="8" islast="false">
    213315    <attached>
    214316      <Model mass="50" scale="50" mesh="checkPoint.mesh" />
    215317      <DistanceTrigger name="trigger8" position="0,0,0" distance=40 stayActive="true" />
    216       <SpawnPoint team=0 position="0,0,0" lookat="0,-2400,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
    217         <events>
    218           <activity>
    219             <EventListener event="trigger8" />
    220           </activity>
    221         </events>
     318      <SpawnPoint position="0,0,0" lookat="0,-2400,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
     319        <events>
     320          <activity>
     321            <EventTrigger>
     322                <events>
     323                    <trigger>
     324                        <EventListener event="checkpoint9" />
     325                    </trigger>
     326                </events>
     327            </EventTrigger>
     328          </activity>
     329        </events>
    222330      </SpawnPoint>
    223331    </attached>

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

    r8251 r8573  
    1212  LINK_LIBRARIES
    1313    orxonox
     14    objects
    1415  SOURCE_FILES ${GAMETYPES_SRC_FILES}
    1516)

  • code/branches/spacerace/src/modules/gametypes/SpaceRace.cc

    r8552 r8573  
    8383        this->startTimer();
    8484        clock_= new Clock();
    85         std::string message("The match has started! Reach the check points as quick as possible!");
     85        std::string message("The match has started! Reach the check points as quickly as possible!");
    8686        COUT(0) << message << std::endl;
    8787        Host::Broadcast(message);
Note: See TracChangeset for help on using the changeset viewer.