Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9820


Ignore:
Timestamp:
Nov 25, 2013, 4:02:44 PM (11 years ago)
Author:
agermann
Message:

Keine Grossen Fortschritte, die Loesung mit dem undock Konsolenbefehl wird verwendet. Spaeter noch versuchen, das homogene Schwerkraftfeld in die Forcefieldklasse zu integrieren.

Location:
code/branches/spacestationentry
Files:
3 edited

Legend:

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

    r9789 r9820  
    3232
    3333  <Scene
    34     ambientlight = "0.8, 0.8, 0.8"
     34    ambientlight = "0.5, 0.5, 0.5"
    3535    skybox       = "Orxonox/Starbox"
    3636    negativeWorldRange = "-100000, -100000, -100000"
     
    4444    ?>
    4545
    46     <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"/>
     46    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0,1.0,1.0,0.5" specular="1.0, 0.9, 0.9, 1.0"/>
    4747    <SpawnPoint team=0 position="3200,0,0" lookat="2800,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
    4848
     
    9797    </Dock>
    9898
    99    <!-- Docking (Ausdocken)-->
    100     <Dock position="100,-1950,100" roll=0 yaw=0 >
    101         <animations>
    102             <MoveToDockingTarget target="spaceShip" />
    103         </animations>
    104         <effects>
    105             <DockToShip target="destroyer" />
    106         </effects>
    107         <events>
    108             <execute>
    109                 <EventListener event="undockMe" />
    110             </execute>
    111        
    112             <activity>
    113                 <EventListener event=notGameEnd />
    114             </activity>
    115         </events>
    116         <attached>
    117             <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 />
    118             <DistanceTrigger position="0,0,0" distance="5" target="Pawn"
    119                 beaconMode="exclude" targetname="bcnDestroyer" name="undockMe"
    120             />
    121         </attached>
    122 
    123     </Dock>
    12499
    125100       
     
    154129  <StaticEntity position="0,-2000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
    155130      <attached>
    156         <Model position="0,0,0" mesh="crate.mesh" scale3D="22,22,5" />
     131        <Model position="0,0,0" mesh="crate.mesh" scale3D="66,15,5" />
    157132       
    158133      </attached>
    159134      <collisionShapes>
    160         <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
     135        <BoxCollisionShape position="0,0,0" halfExtents="330,330,10" />
    161136      </collisionShapes>
    162137  </StaticEntity>
     
    169144<ForceField position="-2500,-92000,-2500" mode="sphere" diameter="184000" velocity="-5000" />
    170145
    171 <!-- Ausgang Trigger Falsch
    172 
    173   <StaticEntity position="100,-1950,100" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
    174       <attached>
    175         <Model position="0,0,0" mesh="cube.mesh" scale3D="4,4,4" />
    176       </attached>
    177       <collisionShapes>
    178         <BoxCollisionShape position="0,0,0" halfExtents="4,4,4" />
    179       </collisionShapes>
    180   </StaticEntity>
     146<!-- Ausgang - Trigger -->
     147
     148<Billboard position="150,-1950,150" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 />
    181149
    182150<DistanceTrigger name="ausgang" position="100,-1950,100"  target="Pawn" distance=50 stayActive="false" delay=0 />
     
    188156        </events>
    189157    </Script>
    190 -->
    191 
    192 
     158
     159
     160<!-- Rest -->
    193161
    194162    <!-- triple large belt around the planet  -->
  • code/branches/spacestationentry/src/modules/docking/Dock.cc

    r9789 r9820  
    6969        XMLPortObject(Dock, DockingAnimation, "animations", addAnimation, getAnimation, xmlelement, mode);
    7070        XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
     71        //XMLPortEventSink(Dock, BaseObject, "undocking", undocking, xmlelement, mode);
    7172
    7273    }
     
    7879        XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
    7980
    80    //     XMLPortEventSink(Dock, BaseObject, "execute2", execute2, xmlelement, mode);
    81     }
     81        //XMLPortEventSink(Dock, BaseObject, "undocking", undocking, xmlelement, mode);
     82    }
     83
     84    /*
     85    bool Dock::undocking(bool bTriggered, BaseObject* trigger)
     86    {
     87        orxout(user_warning)<<"undocking"<<endl;
     88
     89        return true;
     90    }
     91
     92    */
    8293
    8394    bool Dock::execute(bool bTriggered, BaseObject* trigger)
     
    123134    }
    124135
    125     /*bool Dock::execute2(bool bTriggered, BaseObject* trigger)
    126         {
    127         orxout(user_warning)<<"execute2"<<endl;
    128             PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
    129             PlayerInfo* player = NULL;
    130 
    131             // Check whether it is a player trigger and extract pawn from it
    132             if(pTrigger != NULL)
    133             {
    134                 if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
    135                     orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
    136                     return false;
    137                 }
    138                 player = pTrigger->getTriggeringPlayer();
    139             }
    140             else
    141             {
    142                 orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
    143                 return false;
    144             }
    145             if(player == NULL)
    146             {
    147                 orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
    148                 return false;
    149             }
    150 
    151             if(bTriggered)
    152             {
    153                 // Add player to this Docks candidates
    154                 docked_.insert(player);
    155 
    156                 // Show docking dialog
    157                 this->showDockingDialogHelper(player);
    158             }
    159             else
    160             {
    161                 // Remove player from candidates list
    162                 docked_.erase(player);
    163             }
    164 
    165             return true;
    166         }
    167 
    168 */
     136
    169137    void Dock::showDockingDialogHelper(PlayerInfo* player)
    170138    {
  • code/branches/spacestationentry/src/modules/docking/Dock.h

    r9789 r9820  
    6262            // Trigger interface
    6363            bool execute(bool bTriggered, BaseObject* trigger);
    64         //    bool execute2(bool bTriggered, BaseObject* trigger);
     64            //bool undocking(bool bTriggered, BaseObject* trigger);
    6565
    6666            // XML interface
Note: See TracChangeset for help on using the changeset viewer.