Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7444


Ignore:
Timestamp:
Sep 13, 2010, 3:01:54 PM (14 years ago)
Author:
dafrick
Message:

Adding Drone (Which is now called AutonomousDrone) and its controller.

Location:
code/branches/tutorial2
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/tutorial2/data/levels/tutorial.oxw

    r7404 r7444  
    77
    88<Level
    9  name         = "Presentation"
    10  description  = "A simple testlevel"
     9 name         = "PPS Tutorial"
     10 description  = "A level used in the PPS tutorial."
    1111>
    1212  <templates>
    … …  
    1919  >
    2020
    21 
    22 
    23 
    24 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
    25   <attached>
    26     <Model scale="1" mesh="drone.mesh"/>
    27   </attached>
    28   <collisionShapes>
    29     <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
    30   </collisionShapes>
    31 </Drone>
    32 
    33     <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
    34       <attached>
    35         <Model scale="1" mesh="rocket.mesh"/>
    36       </attached>
    37       <collisionShapes>
    38         <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
    39       </collisionShapes>
    40     </Drone>
    41 
    4221    <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" />
    43 
    44     <Model mesh="hs-w01.mesh" scale=10 position="0,0,-100" />
    45     <Model mesh="hs-w01s.mesh" scale=10 position="0,0,-100" />
    4622
    4723    <?lua
    … …  
    5127    <?lua end ?>
    5228
    53     <GlobalShader compositor="Bloom" visible=false>
    54       <events>
    55         <visibility>
    56           <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
    57         </visibility>
    58       </events>
    59     </GlobalShader>
    60     <Model position="0,0,0" scale=8 mesh="ast1.mesh" />
    61     <StaticEntity position="0,0,0" collisionType=static>
     29    <!-- TODO: Insert drone here. -->
     30    <!-- TODO: Remove. -->
     31    <AutonomousDrone
     32      primaryThrust = 100
     33      auxiliaryThrust = 30
     34      rotationThrust = 25
     35      mass = 50
     36      linearDamping = 0.9
     37      angularDamping = 0.7
     38    >
     39      <attached>
     40        <Model scale="10" mesh="drone.mesh"/>
     41      </attached>
    6242      <collisionShapes>
    63         <SphereCollisionShape radius="20" />
     43        <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
    6444      </collisionShapes>
    65     </StaticEntity>
    66 
    67 <!--
    68     <?lua
    69       for i = 1, 70, 1 do
    70     ?>
    71       <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 1000 + 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    72         <attached>
    73           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    74         </attached>
    75       </MovableEntity>
    76       <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * -1000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    77         <attached>
    78           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    79         </attached>
    80       </MovableEntity>
    81 
    82       <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 1000 + 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    83         <attached>
    84           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    85         </attached>
    86       </MovableEntity>
    87       <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * -1000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    88         <attached>
    89           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    90         </attached>
    91       </MovableEntity>
    92 
    93       <MovableEntity position="<?lua print(math.random() * 1000 + 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    94         <attached>
    95           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    96         </attached>
    97       </MovableEntity>
    98       <MovableEntity position="<?lua print(math.random() * -1000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    99         <attached>
    100           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    101         </attached>
    102       </MovableEntity>
    103     <?lua end ?>
    104 -->
     45    </AutonomousDrone>
    10546
    10647  </Scene>

  • code/branches/tutorial2/src/orxonox/controllers/CMakeLists.txt

    r7163 r7444  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
     2  AutonomousDroneController.cc
    23  Controller.cc
    34  HumanController.cc

  • code/branches/tutorial2/src/orxonox/worldentities/CMakeLists.txt

    r7163 r7444  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
     2  AutonomousDrone.cc
    23  WorldEntity.cc
    34  StaticEntity.cc
Note: See TracChangeset for help on using the changeset viewer.