Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9776 for code/branches


Ignore:
Timestamp:
Nov 11, 2013, 3:55:34 PM (11 years ago)
Author:
agermann
Message:

Hack - Spacestation Docking mit abdocken funktioniert.

Location:
code/branches/spacestationentry
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/spacestationentry/data/levels/docking.oxw

    r9348 r9776  
     1<!-- -->
    12<LevelInfo
    23 name = "Transporter"
  • code/branches/spacestationentry/data/levels/dockingToASpaceStation.oxw

    r9745 r9776  
    7171    </StaticEntity>
    7272
    73 <!-- Wuerfel -->
    74 
    75   <StaticEntity position="0,-10000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
    76       <attached>
    77         <Model position="0,0,0" mesh="crate.mesh" scale3D="50,50,5" />
    78        
    79       </attached>
    80       <collisionShapes>
    81         <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
    82       </collisionShapes>
    83   </StaticEntity>
    84 <ForceField position="2500,-100000,2500" mode="sphere" diameter="182000" velocity="-5000" />
    85 <ForceField position="2500,-100000,-2500" mode="sphere" diameter="182000" velocity="-5000" />
    86 <ForceField position="-2500,-100000,2500" mode="sphere" diameter="182000" velocity="-5000" />
    87 <ForceField position="-2500,-100000,-2500" mode="sphere" diameter="182000" velocity="-5000" />
    88 
    89 
    90    <!-- Docking -->
     73   <!-- Docking (Andocken) -->
    9174    <Dock position="2830,20,50" roll=0 yaw=0 >
    9275        <animations>
     
    140123    </SpaceShip-->
    141124   
    142 <FpsPlayer template = "fps" radarname = "First Person Player" position = "0,-9900,0" >
     125<FpsPlayer template = "fps" radarname = "First Person Player" position = "0,-1900,0" >
    143126      <attached>
    144127        <DockingTarget name="spaceShip" />
     
    147130      </attached>
    148131</FpsPlayer>
     132
     133<!-- Wuerfel -->
     134
     135  <StaticEntity position="0,-2000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
     136      <attached>
     137        <Model position="0,0,0" mesh="crate.mesh" scale3D="22,22,5" />
     138       
     139      </attached>
     140      <collisionShapes>
     141        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
     142      </collisionShapes>
     143  </StaticEntity>
     144
     145<!-- Schwerkraftfeld -->
     146
     147<ForceField position="2500,-92000,2500" mode="sphere" diameter="182000" velocity="-5000" />
     148<ForceField position="2500,-92000,-2500" mode="sphere" diameter="182000" velocity="-5000" />
     149<ForceField position="-2500,-92000,2500" mode="sphere" diameter="182000" velocity="-5000" />
     150<ForceField position="-2500,-92000,-2500" mode="sphere" diameter="182000" velocity="-5000" />
     151
     152<!-- Ausgang -->
     153
     154  <StaticEntity position="120,-1950,120" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
     155      <attached>
     156        <Model position="0,0,0" mesh="cube.mesh" scale3D="4,4,4" />
     157      </attached>
     158      <collisionShapes>
     159        <BoxCollisionShape position="0,0,0" halfExtents="4,4,4" />
     160      </collisionShapes>
     161  </StaticEntity>
     162
     163<DistanceTrigger name="ausgang" position="120,-1950,120"  target="Pawn" distance=50 stayActive="false" delay=0 />
     164    <Script code="undock" onLoad="false">
     165        <events>
     166            <trigger>
     167                <EventListener event=ausgang />
     168            </trigger>
     169        </events>
     170    </Script>
     171
     172
    149173
    150174    <!-- triple large belt around the planet  -->
  • code/branches/spacestationentry/src/orxonox/infos/PlayerInfo.cc

    r9667 r9776  
    229229            return;
    230230
    231         this->controllableEntity_->getController()->setActive(false);
     231        Controller* tmp =this->controllableEntity_->getController();
     232        if (tmp == NULL)
     233        {
     234                orxout(verbose) <<  "PlayerInfo: pauseControl, Controller is NULL " << endl;
     235                return;
     236        }
     237        tmp->setActive(false);
    232238        //this->controllableEntity_->getController()->setControllableEntity(NULL);
    233239        this->controllableEntity_->setController(0);
Note: See TracChangeset for help on using the changeset viewer.