Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11539


Ignore:
Timestamp:
Nov 6, 2017, 4:01:33 PM (6 years ago)
Author:
jostoffe
Message:

Arrow- und ArrowControllerfiles hinzugefuegt. Position vom Schiff wird an ArrowController uerbergeben aber noch nichts damit gemacht

Location:
code/branches/Waypoints_HS17
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

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

    r11523 r11539  
    4141    />
    4242
    43   <Scene
    44     ambientlight = "0.8, 0.8, 0.8"
    45     skybox       = "Orxonox/Starbox"
     43   <Scene
     44   ambientlight = "0.5, 0.5, 0.5"
     45   skybox       = "Orxonox/Starbox"
    4646  >
    4747
    48     <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"/>
    49     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
    5048
    51     <ModularSpaceShip velocity= "20,0,0" position="0,0,200" lookat= "0,0,0" health="1000" maxhealth="1000" initialhealth="1000">
    52       <templates>
    53         <Template link=endurance />
    54       </templates>
    55     </ModularSpaceShip>
    56     <AutonomousDroneController>
    57     </AutonomousDroneController>
     49    <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" />
    5850
    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>
    7451
    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>
     52   
     53    <SpawnPoint position="50,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     54
     55
     56   
     57   
     58    <Arrow position = "0,50,5">
     59      <attached>
     60       <Model scale="10" mesh="arrow.mesh"/>
     61      </attached>
     62      <controllers>
     63        <ArrowController>
     64        </ArrowController>
     65      </controllers>
     66    </Arrow>
     67
    8368
    8469

  • code/branches/Waypoints_HS17/src/modules/questsystem/Quest.cc

    r11071 r11539  
    8080        XMLPortObject(Quest, QuestEffect, "fail-effects", addFailEffect, getFailEffect, xmlelement, mode);
    8181        XMLPortObject(Quest, QuestEffect, "complete-effects", addCompleteEffect, getCompleteEffect, xmlelement, mode);
     82        XMLPortObject(Quest, Worldentity, "arrowtarget", addArrowTarget, getArrowTarget, xmlelement, mode);
    8283
    8384        QuestManager::getInstance().registerQuest(this); // Registers the Quest with the QuestManager.
    8485    }
     86
     87
     88    bool Quest::addArrowTarget(Quest* quest){
     89
     90        assert(quest);
     91
     92
     93    }
     94
     95
    8596
    8697    /**

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

    r11523 r11539  
    2020  MasterController.cc
    2121  AutonomousDroneController.cc
     22  ArrowController.cc
    2223)

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

    r11523 r11539  
    1414  Actionpoint.cc
    1515  AutonomousDrone.cc
     16  Arrow.cc
    1617)
    1718
Note: See TracChangeset for help on using the changeset viewer.