Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8014 for code/branches


Ignore:
Timestamp:
Mar 3, 2011, 4:26:30 PM (14 years ago)
Author:
dafrick
Message:

Removing all the solution stuff.

Location:
code/branches/tutorial
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r8012 r8014  
    3434   
    3535    <!-- TODO: Insert drone here. -->
    36     <AutonomousDrone primaryThrust=100 auxilaryThrust=30 rotationThrust=25 collisionType="dynamic" mass = 50 linearDamping = 0.9 angularDamping = 0.7>
    37         <attached>
    38             <Model scale="10" mesh="drone.mesh"/>
    39         </attached>
    40         <collisionShapes>
    41             <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
    42         </collisionShapes>
    43     </AutonomousDrone>
    4436
    4537  </Scene>

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

    r8012 r8014  
    3535{
    3636
    37     CreateFactory(AutonomousDroneController);
    38 
    3937    /**
    4038    @brief
    … …  
    4846        // Make sure to register the object in the factory.
    4947        // Do some kind of initialisation.
    50         RegisterObject(AutonomousDroneController);
    5148
    5249        // This checks that our creator really is a drone
    … …  
    8178        // - rotatePitch, rotateYaw, rotateRoll
    8279        // Apply the to myDrone (e.g. myDrone->rotateYaw(..) )
    83         myDrone->rotateYaw(dt);
    8480
    8581    }

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

    r8012 r8014  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    2   AutonomousDroneController.cc
    32  Controller.cc
    43  HumanController.cc

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

    r8012 r8014  
    3636    //TODO: Put your code in here:
    3737    // Create the factory for the drone.
    38     CreateFactory(AutonomousDrone);
    3938
    4039    /**
    … …  
    4847        //TODO: Put your code in here:
    4948        // Register the drone class to the core.
    50         RegisterObject(AutonomousDrone);
    5149
    5250        this->myController_ = NULL;
    … …  
    8987        // Variables can be added by the following command
    9088        // XMLPortParam(Classname, "xml-attribute-name (i.e. variablename)", setFunction, getFunction, xmlelement, mode);
    91         XMLPortParam(AutonomousDrone, "auxiliaryThrust", setAuxiliaryThrust, getAuxiliaryThrust, xmlelement, mode);
    92         XMLPortParam(AutonomousDrone, "rotationThrust", setRotationThrust, getRotationThrust, xmlelement, mode);
    9389
    9490    }

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

    r8012 r8014  
    109109            //TODO: Place your set-functions here.
    110110            // - hint: auxiliary thrust, rotation thrust.
    111             /**
    112             @brief Sets the auxiliary thrust to the input amount.
    113             @param thrust The amount of thrust.
    114             */
    115             inline void setAuxiliaryThrust( float thrust )
    116                 { this->auxiliaryThrust_ = thrust; }
    117             /**
    118             @brief Sets the rotation thrust to the input amount.
    119             @param thrust The amount of thrust.
    120             */
    121             inline void setRotationThrust( float thrust )
    122                 { this->rotationThrust_ = thrust; }
    123111           
    124112            /**
    … …  
    129117                { return this->primaryThrust_; }
    130118            //TODO: Place your get-functions here.
    131             /**
    132             @brief Gets the auxiliary thrust to the input amount.
    133             @return The amount of thrust.
    134             */
    135             inline float getAuxiliaryThrust()
    136                 { return this->auxiliaryThrust_; }
    137                 /**
    138             @brief Gets the rotation thrust to the input amount.
    139             @return The amount of thrust.
    140             */
    141             inline float getRotationThrust()
    142                 { return this->auxiliaryThrust_; }
    143119
    144120        private:

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

    r8012 r8014  
    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.