Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11523 for code


Ignore:
Timestamp:
Oct 30, 2017, 4:18:57 PM (7 years ago)
Author:
jostoffe
Message:

EmptyLevel funktioniert nicht wegen AutonomousDroneController, HUD geaendert aber brauch ich nicht mehr. Mit movableentity weitermachen

Location:
code/branches/Waypoints_HS17
Files:
9 added
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/Waypoints_HS17/data/levels/emptyLevel.oxw

    r11357 r11523  
    1616  include("templates/spaceshipEscort.oxt")
    1717  include("templates/endurancetest_template.oxt")
     18  include("templates/endurancetest_template.oxt")
     19  include("templates/spaceshipPirate.oxt")
     20  include("templates/spaceshipAssff.oxt")
     21
     22
    1823?>
    1924
    … …  
    2328  </templates>
    2429  <?lua include("includes/notifications.oxi") ?>
     30
     31  <NotificationQueueCEGUI
     32    name="narrative"
     33    targets="simpleNotification"
     34    size=3
     35    displayTime=3.9
     36    position="0.2, 0, 0.1, 0"
     37    fontSize="23"
     38    fontColor="0.3, 1, 0.2, 0.8"
     39    alignment="HorzCentred"
     40    displaySize="0.6, 0, 0, 0"
     41    />
    2542
    2643  <Scene
    … …  
    3754      </templates>
    3855    </ModularSpaceShip>
    39    
     56    <AutonomousDroneController>
     57    </AutonomousDroneController>
     58
     59<SpaceShip position="0,2000,200" lookat="0,0,0">
     60      <templates>
     61        <Template link=spaceshipassff />
     62      </templates>
     63      <controller>
     64        <WaypointController alertnessradius=1000 team=10>
     65          <waypoints>
     66            <Model mesh="cube.mesh" scale=8 position="  0,2000,-200" />
     67            <Model mesh="cube.mesh" scale=8 position="  0,2000,-700" />
     68            <Model mesh="cube.mesh" scale=8 position="500,2000,-700" />
     69            <Model mesh="cube.mesh" scale=8 position="500,2000,-200" />
     70          </waypoints>
     71        </WaypointController>
     72      </controller>
     73    </SpaceShip>
     74
     75   <DistanceTrigger name="flying1" position="0,0,0" distance=100 stayActive="true" delay=6/>
     76    <SimpleNotification message="Let's fly to the blinking light.">
     77        <events>
     78            <trigger>
     79                <EventListener event="flying1" />
     80            </trigger>
     81        </events>
     82    </SimpleNotification>
     83
     84
    4085  </Scene>
    4186</Level>

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

    r9348 r11523  
    22 name = "Coding Tutorial"
    33 description = "Level for the coding tutorial."
    4  tags = "tutorial, shipselection"
     4 tags = "tutorial"
    55 screenshot = "codingtutorial.png"
    6  startingships = "spaceshipassff, spaceshipghost, spaceshipspacecruiser"
    76/>
    87
    … …  
    1110  include("stats.oxo")
    1211  include("templates/spaceshipAssff.oxt")
    13   include("templates/spaceshipGhost.oxt")
    14   include("templates/spaceshipSpacecruiser.oxt")
    1512  include("templates/lodInformation.oxt")
    1613?>
    … …  
    2421  <Scene
    2522   ambientlight = "0.5, 0.5, 0.5"
    26    skybox       = "Orxonox/skyBoxBasic"
     23   skybox       = "Orxonox/Starbox"
    2724  >
    28 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
    29   <attached>
    30     <Model scale="1" mesh="drone.mesh"/>
    31   </attached>
    32   <collisionShapes>
    33     <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
    34   </collisionShapes>
    35 </Drone>
    3625
    37     <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
    38       <attached>
    39         <Model scale="1" mesh="rocket.mesh"/>
    40       </attached>
    41       <collisionShapes>
    42         <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
    43       </collisionShapes>
    44     </Drone>
    4526
    4627    <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" />
    4728
    48     <Model mesh="hs-w01.mesh" scale=10 position="0,0,-100" />
    49     <Model mesh="hs-w01s.mesh" scale=10 position="0,0,-100" />
    5029
    5130    <?lua
    5231      for i = 1, 10, 1 do
    5332    ?>
    54       <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=shipselection />
     33      <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    5534    <?lua end ?>
    5635
    57     <GlobalShader compositor="Bloom" visible=false>
    58       <events>
    59         <visibility>
    60           <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
    61         </visibility>
    62       </events>
    63     </GlobalShader>
    64     <Model position="0,0,0" scale=8 mesh="ast1.mesh" />
    65     <StaticEntity position="0,0,0" collisionType=static>
     36   
     37    <AutonomousDroneController>
     38    </AutonomousDroneController>
     39   
     40    <AutonomousDrone mass=50 linearDamping=0.9 angularDamping=0.7>
     41       <attached>
     42        <Model scale="10" mesh="drone.mesh"/>
     43      </attached>
     44     
    6645      <collisionShapes>
    67         <SphereCollisionShape radius="20" />
     46        <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
    6847      </collisionShapes>
    69     </StaticEntity>
     48    </AutonomousDrone>
    7049
    71 <!--
    72     <?lua
    73       for i = 1, 70, 1 do
    74     ?>
    75       <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) ?>">
    76         <attached>
    77           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    78         </attached>
    79       </MovableEntity>
    80       <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) ?>">
    81         <attached>
    82           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    83         </attached>
    84       </MovableEntity>
    8550
    86       <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) ?>">
    87         <attached>
    88           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    89         </attached>
    90       </MovableEntity>
    91       <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) ?>">
    92         <attached>
    93           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    94         </attached>
    95       </MovableEntity>
    96 
    97       <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) ?>">
    98         <attached>
    99           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    100         </attached>
    101       </MovableEntity>
    102       <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) ?>">
    103         <attached>
    104           <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
    105         </attached>
    106       </MovableEntity>
    107     <?lua end ?>
    108 -->
    10951
    11052  </Scene>

  • code/branches/Waypoints_HS17/data/overlays/HUDPickupTemplate.oxo

    r11354 r11523  
    9292     correctaspect = true
    9393     iconmaterial  = "Orxonox/BarIconSpeed"
    94     >
     94     >
    9595      <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
    9696      <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
    … …  
    193193    />
    194194
     195
    195196    <HUDTimer
    196197     name     = "Timer"

  • code/branches/Waypoints_HS17/data/overlays/HUDTemplates3.oxo

    r11451 r11523  
    190190     position               = "0.32, 0.81"
    191191     pickpoint              = "0.0, 0.0"
    192      visible                = "false"
     192     visible                = "true"
    193193    />
    194194

  • code/branches/Waypoints_HS17/src/modules/overlays/hud/CMakeLists.txt

    r11353 r11523  
    1111  HUDEnemyHealthBar.cc
    1212  HUDEnemyShieldBar.cc
     13  HUDWaypoints.cc
    1314  HUDWeaponMode.cc
    1415  HUDWeapon.cc

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

    r11052 r11523  
    1919  FightingController.cc
    2020  MasterController.cc
     21  AutonomousDroneController.cc
    2122)

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

    r11052 r11523  
    1313  ExplosionPart.cc
    1414  Actionpoint.cc
     15  AutonomousDrone.cc
    1516)
    1617
Note: See TracChangeset for help on using the changeset viewer.