Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6782


Ignore:
Timestamp:
Apr 26, 2010, 3:59:43 PM (14 years ago)
Author:
gasserlu
Message:

drone, dronecontroller implemented

Location:
code/branches/ai
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/ai/data/levels/pickup.oxw

    r6524 r6782  
    2222  include("includes/pickups.oxi")
    2323?>
     24
     25    <Template name=droneTemplate>
     26        <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
     27        <attached>
     28            <Model scale="10" mesh="drone.mesh"/>
     29        </attached>
     30        <collisionShapes>
     31            <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
     32        </collisionShapes>
    2433   
     34
     35    <weaponslots>
     36      <WeaponSlot position="    0,   0,0" />
     37    </weaponslots>
     38    <weaponsets>
     39      <WeaponSet firemode=0 />
     40    </weaponsets>
     41    <weapons>
     42      <WeaponPack>
     43        <links>
     44          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
     45        </links>
     46        <Weapon>
     47          <attached>
     48            <Model mesh="hs-w01.mesh" roll="195" position="0,1,0" scale=2 />
     49            <Model mesh="hs-w01s.mesh" roll="195" position="0.1,0.5,0" scale=2 />
     50          </attached>
     51          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.7, 1.5,-4" />
     52          <HsW01 mode=0 munitionpershot=0 delay=0     material="Flares/point_lensflare" muzzleoffset="-0.9, 1.1,-4" />
     53        </Weapon>
     54      </WeaponPack>
     55    </weapons>
     56
     57
     58        </Drone>
     59     </Template>
     60
    2561    <PickupSpawner position="-100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    2662        <pickup>
    27             <MetaPickup metaType="drop" />
     63            <DronePickup droneTemplate=droneTemplate />
    2864        </pickup>
    2965    </PickupSpawner>
    30    
     66
     67
     68
    3169    <PickupSpawner position="-75,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    3270        <pickup>

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

    r5781 r6782  
    1414  >
    1515
    16 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
     16    <PickupSpawner position="0,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
     17        <drones>
     18            <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
    1719  <attached>
    1820    <Model scale="10" mesh="drone.mesh"/>
    … …  
    2224  </collisionShapes>
    2325</Drone>
     26        </drones>
     27    </PickupSpawner>
    2428
    2529

  • code/branches/ai/src/modules/pickup/PickupPrereqs.h

    r6524 r6782  
    7575   
    7676    //items
     77    class DronePickup;
    7778    class HealthPickup;
    7879    class MetaPickup;

  • code/branches/ai/src/modules/pickup/items/CMakeLists.txt

    r6524 r6782  
    22  HealthPickup.cc
    33  MetaPickup.cc
     4  DronePickup.cc
    45)

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

    r6417 r6782  
    88  WaypointController.cc
    99  WaypointPatrolController.cc
     10  DroneController.cc
    1011)

  • code/branches/ai/src/orxonox/interfaces/PickupCarrier.h

    r6563 r6782  
    5252    class HealthPickup;
    5353    class MetaPickup;
     54    class DronePickup;
    5455
    5556    /**
    … …  
    6768        friend class HealthPickup;
    6869        friend class MetaPickup;
     70        friend class DronePickup;
    6971       
    7072        public:

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

    r6417 r6782  
    55  MobileEntity.cc
    66  ControllableEntity.cc
    7 
     7  Drone.cc
    88  BigExplosion.cc
    99  EffectContainer.cc
Note: See TracChangeset for help on using the changeset viewer.