Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7446 for code/branches


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

Removing all the stuff the students are supposed to fill in themselves.

Location:
code/branches/tutorial2
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r7444 r7446  
    2828
    2929    <!-- 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>
    42       <collisionShapes>
    43         <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
    44       </collisionShapes>
    45     </AutonomousDrone>
    4630
    4731  </Scene>

  • code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.cc

    r7444 r7446  
    4646        // Make sure to register the object in the factory.
    4747        // Do some kind of initialisation.
    48         //TODO: Remove.
    49         RegisterObject(AutonomousDroneController);
    5048
    5149        // This checks that our creator really is a drone
    … …  
    8078        // - rotatePitch, rotateYaw, rotateRoll
    8179        // Apply the to myDrone (e.g. myDrone->rotateYaw(..) )
    82         //TODO: Remove:
    83         myDrone->rotateRoll(dt*2);
    84         myDrone->moveFrontBack(dt*50);
    85         myDrone->rotateYaw(dt);
    8680
    8781    }

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

    r7444 r7446  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    2   AutonomousDroneController.cc
    32  Controller.cc
    43  HumanController.cc

  • code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.cc

    r7444 r7446  
    3636    //TODO: Put your code in here:
    3737    // Create the factory for the drone.
    38     //TODO: Remove.
    39     CreateFactory(AutonomousDrone);
    4038
    4139    /**
    … …  
    4947        //TODO: Put your code in here:
    5048        // Register the drone class to the core.
    51         //TODO: Remove.
    52         RegisterObject(AutonomousDrone);
    5349
    5450        this->myController_ = NULL;
    … …  
    9187        // Variables can be added by the following command
    9288        // XMLPortParam(Classname, "xml-attribute-name (i.e. variablename)", setFunction, getFunction, xmlelement, mode)
    93         //TODO: Remove.
    94         XMLPortParam(AutonomousDrone, "auxiliaryThrus", setAuxiliaryThrust, getAuxiliaryThrust, xmlelement, mode);
    95         XMLPortParam(AutonomousDrone, "rotationThrust", setRotationThrust, getRotationThrust, xmlelement, mode);
    9689
    9790    }

  • code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.h

    r7444 r7446  
    109109            //TODO: Place your set-functions here.
    110110            // - hint: auxiliary thrust, rotation thrust.
    111             //TODO: Remove.
    112             /**
    113             @brief Sets the auxiliary thrust to the input amount.
    114             @param thrust The amount of thrust.
    115             */
    116             inline void setAuxiliaryThrust( float thrust )
    117                 { this->auxiliaryThrust_ = thrust; }
    118             /**
    119             @brief Sets the rotation thrust to the input amount.
    120             @param thrust The amount of thrust.
    121             */
    122             inline void setRotationThrust( float thrust )
    123                 { this->rotationThrust_ = thrust; }
    124111
    125112            /**
    … …  
    130117                { return this->primaryThrust_; }
    131118            //TODO: Place your get-functions here.
    132             //TODO: Remove.
    133             /**
    134             @brief Gets the auxiliary thrust to the input amount.
    135             @return The amount of thrust.
    136             */
    137             inline float getAuxiliaryThrust()
    138                 { return this->auxiliaryThrust_; }
    139                 /**
    140             @brief Gets the rotation thrust to the input amount.
    141             @return The amount of thrust.
    142             */
    143             inline float getRotationThrust()
    144                 { return this->rotationThrust_; }
    145119
    146120        private:

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

    r7444 r7446  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    2   AutonomousDrone.cc
    32  WorldEntity.cc
    43  StaticEntity.cc
Note: See TracChangeset for help on using the changeset viewer.