Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5765


Ignore:
Timestamp:
Sep 23, 2009, 4:54:09 PM (15 years ago)
Author:
scheusso
Message:

this is the complete (and migrated) version of the tutorial branch fs09

Location:
code/branches/tutorial
Files:
5 edited
4 copied

Legend:

Unmodified
Added
Removed

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

    r5700 r5765  
    1414  >
    1515
    16 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
     16<Drone name="meineDrohne" position="0,0,-10" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
    1717  <attached>
    1818    <Model scale="10" mesh="drone.mesh"/>

  • code/branches/tutorial/src/orxonox/controllers

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/libraries2/src/orxonox/controllersmergedeligible
      /code/branches/buildsystem/src/orxonox/controllers1874-2276,​2278-2400
      /code/branches/buildsystem2/src/orxonox/controllers2506-2658
      /code/branches/buildsystem3/src/orxonox/controllers2662-2708
      /code/branches/ceguilua/src/orxonox/controllers1802-1808
      /code/branches/core3/src/orxonox/controllers1572-1739
      /code/branches/core4/src/orxonox/controllers3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/gametypes/src/orxonox/controllers2826-3031
      /code/branches/gcc43/src/orxonox/controllers1580
      /code/branches/gui/src/orxonox/controllers1635-1723,​2795-2894
      /code/branches/input/src/orxonox/controllers1629-1636
      /code/branches/libraries/src/orxonox/controllers5612-5692
      /code/branches/lodfinal/src/orxonox/controllers2372-2411
      /code/branches/map/src/orxonox/controllers2801-3086,​3089
      /code/branches/miniprojects/src/orxonox/controllers2754-2824
      /code/branches/netp2/src/orxonox/controllers2835-2988
      /code/branches/netp3/src/orxonox/controllers2988-3082
      /code/branches/netp6/src/orxonox/controllers3214-3302
      /code/branches/network/src/orxonox/controllers2356
      /code/branches/network64/src/orxonox/controllers2210-2355
      /code/branches/objecthierarchy/src/orxonox/controllers1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/orxonox/controllers2171-2479
      /code/branches/overlay/src/orxonox/controllers2117-2385
      /code/branches/particles/src/orxonox/controllers2829-3085
      /code/branches/pch/src/orxonox/controllers3113-3194
      /code/branches/physics/src/orxonox/controllers1912-2055,​2107-2439
      /code/branches/physics_merge/src/orxonox/controllers2436-2457
      /code/branches/pickups/src/orxonox/controllers1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/orxonox/controllers2107-2497,​2915-3071
      /code/branches/presentation/src/orxonox/controllers2369-2652,​2654-2660
      /code/branches/questsystem/src/orxonox/controllers1894-2088
      /code/branches/questsystem2/src/orxonox/controllers2107-2259
      /code/branches/questsystem5/src/orxonox/controllers2776-2905
      /code/branches/resource/src/orxonox/controllers3327-3366
      /code/branches/resource2/src/orxonox/controllers3372-5694
      /code/branches/script_trigger/src/orxonox/controllers1295-1953,​1955
      /code/branches/sound/src/orxonox/controllers2829-3010
      /code/branches/tutorial/src/orxonox/objects/controllers2761-2765
      /code/branches/weapon/src/orxonox/controllers1925-2094
      /code/branches/weapon2/src/orxonox/controllers2107-2488
      /code/branches/weapons/src/orxonox/controllers2897-3051
      /code/branches/weaponsystem/src/orxonox/controllers2742-2890

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

    r5738 r5765  
    44  ArtificialController.cc
    55  AIController.cc
     6  DroneController.cc
    67  ScriptController.cc
    78  WaypointController.cc

  • code/branches/tutorial/src/orxonox/controllers/DroneController.cc

    r2765 r5765  
    2727 */
    2828
    29 #include "OrxonoxStableHeaders.h"
    3029#include "DroneController.h"
    31 #include "objects/worldentities/Drone.h"
     30#include "worldentities/Drone.h"
    3231#include "util/Math.h"
    3332
    … …  
    5958        totaltime += dt;
    6059        Drone *myDrone = static_cast<Drone*>(this->getControllableEntity());
    61         if(totaltime<1)
     60        if(totaltime<100)
    6261        {
    6362            myDrone->moveFrontBack( -sqrt(dt) );

  • code/branches/tutorial/src/orxonox/controllers/DroneController.h

    r2765 r5765  
    3333
    3434#include "Controller.h"
    35 #include "objects/Tickable.h"
     35#include "tools/interfaces/Tickable.h"
    3636
    3737namespace orxonox

  • code/branches/tutorial/src/orxonox/worldentities

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/libraries2/src/orxonox/worldentitiesmergedeligible
      /code/branches/buildsystem/src/orxonox/worldentities1874-2276,​2278-2400
      /code/branches/buildsystem2/src/orxonox/worldentities2506-2658
      /code/branches/buildsystem3/src/orxonox/worldentities2662-2708
      /code/branches/ceguilua/src/orxonox/worldentities1802-1808
      /code/branches/core3/src/orxonox/worldentities1572-1739
      /code/branches/core4/src/orxonox/worldentities3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/gametypes/src/orxonox/worldentities2826-3031
      /code/branches/gcc43/src/orxonox/worldentities1580
      /code/branches/gui/src/orxonox/worldentities1635-1723,​2795-2894
      /code/branches/input/src/orxonox/worldentities1629-1636
      /code/branches/libraries/src/orxonox/worldentities5612-5692
      /code/branches/lodfinal/src/orxonox/worldentities2372-2411
      /code/branches/map/src/orxonox/worldentities2801-3086,​3089
      /code/branches/miniprojects/src/orxonox/worldentities2754-2824
      /code/branches/netp2/src/orxonox/worldentities2835-2988
      /code/branches/netp3/src/orxonox/worldentities2988-3082
      /code/branches/netp6/src/orxonox/worldentities3214-3302
      /code/branches/network/src/orxonox/worldentities2356
      /code/branches/network64/src/orxonox/worldentities2210-2355
      /code/branches/objecthierarchy/src/orxonox/worldentities1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/orxonox/worldentities2171-2479
      /code/branches/overlay/src/orxonox/worldentities2117-2385
      /code/branches/particles/src/orxonox/worldentities2829-3085
      /code/branches/pch/src/orxonox/worldentities3113-3194
      /code/branches/physics/src/orxonox/worldentities1912-2055,​2107-2439
      /code/branches/physics_merge/src/orxonox/worldentities2436-2457
      /code/branches/pickups/src/orxonox/worldentities1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/orxonox/worldentities2107-2497,​2915-3071
      /code/branches/presentation/src/orxonox/worldentities2369-2652,​2654-2660
      /code/branches/questsystem/src/orxonox/worldentities1894-2088
      /code/branches/questsystem2/src/orxonox/worldentities2107-2259
      /code/branches/questsystem5/src/orxonox/worldentities2776-2905
      /code/branches/resource/src/orxonox/worldentities3327-3366
      /code/branches/resource2/src/orxonox/worldentities3372-5694
      /code/branches/script_trigger/src/orxonox/worldentities1295-1953,​1955
      /code/branches/sound/src/orxonox/worldentities2829-3010
      /code/branches/tutorial/src/orxonox/objects/worldentities2761-2765
      /code/branches/weapon/src/orxonox/worldentities1925-2094
      /code/branches/weapon2/src/orxonox/worldentities2107-2488
      /code/branches/weapons/src/orxonox/worldentities2897-3051
      /code/branches/weaponsystem/src/orxonox/worldentities2742-2890

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

    r5738 r5765  
    77
    88  BigExplosion.cc
     9  Drone.cc
    910  ExplosionChunk.cc
    1011  CameraPosition.cc

  • code/branches/tutorial/src/orxonox/worldentities/Drone.cc

    r2765 r5765  
    2727 */
    2828
    29 #include "OrxonoxStableHeaders.h"
    3029#include "Drone.h"
    3130
    … …  
    5352        this->rotationThrust_ = 10;
    5453        this->steering_ = Vector3::ZERO;
     54
     55        std::cout << "sdfasdfasdf====================";
    5556       
    5657        this->setCollisionType(WorldEntity::Dynamic);

  • code/branches/tutorial/src/orxonox/worldentities/Drone.h

    r2765 r5765  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "objects/worldentities/ControllableEntity.h"
    34 #include "objects/controllers/DroneController.h"
     33#include "worldentities/ControllableEntity.h"
     34#include "controllers/DroneController.h"
    3535
    3636namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.