Changeset 10845 for code/branches
- Timestamp:
- Nov 23, 2015, 10:20:29 PM (9 years ago)
- Location:
- code/branches/cpp11_v2/src
- Files:
-
- 91 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/libraries/core/BaseObject.h
r10768 r10845 163 163 inline void setScene(const StrongOrWeakPtr<Scene>& scene, uint32_t sceneID) { this->scene_ = scene; this->sceneID_=sceneID; } 164 164 inline Scene* getScene() const { return this->scene_.get(); } 165 inline virtualuint32_t getSceneID() const { return this->sceneID_; }165 virtual inline uint32_t getSceneID() const { return this->sceneID_; } 166 166 167 167 inline void setGametype(const StrongOrWeakPtr<Gametype>& gametype) { this->gametype_ = gametype; } -
code/branches/cpp11_v2/src/libraries/core/GUIManager.cc
r10817 r10845 124 124 { 125 125 public: 126 v oid logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard) override126 virtual void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard) override 127 127 { 128 128 OutputLevel orxonoxLevel = level::debug_output; … … 143 143 144 144 /// Carbon copy from CEGUIDefaultLogger.cpp with a bugfix for Windows 145 v oid setLogFilename(const CEGUI::String& filename, bool append = false) override145 virtual void setLogFilename(const CEGUI::String& filename, bool append = false) override 146 146 { 147 147 // Close current log file (if any) … … 228 228 public: 229 229 /// Callback from Ogre invoked before other stuff in our target queue is rendered 230 v oid renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue) override230 virtual void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue) override 231 231 { 232 232 if (id == Ogre::RENDER_QUEUE_OVERLAY && invocation.empty()) -
code/branches/cpp11_v2/src/libraries/core/GUIManager.h
r10817 r10845 169 169 170 170 // keyHandler functions 171 v oid buttonPressed (const KeyEvent& evt) override;172 v oid buttonReleased(const KeyEvent& evt) override;171 virtual void buttonPressed (const KeyEvent& evt) override; 172 virtual void buttonReleased(const KeyEvent& evt) override; 173 173 174 174 // mouseHandler functions 175 v oid buttonPressed (MouseButtonCode::ByEnum id) override;176 v oid buttonReleased(MouseButtonCode::ByEnum id) override;177 v oid mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;178 v oid mouseScrolled (int abs, int rel) override;175 virtual void buttonPressed (MouseButtonCode::ByEnum id) override; 176 virtual void buttonReleased(MouseButtonCode::ByEnum id) override; 177 virtual void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override; 178 virtual void mouseScrolled (int abs, int rel) override; 179 179 void mouseLeft (); 180 180 -
code/branches/cpp11_v2/src/libraries/core/Game.h
r10817 r10845 135 135 { 136 136 public: 137 std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) override137 virtual std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) override 138 138 { return std::shared_ptr<GameState>(std::make_shared<T>(info)); } 139 139 }; -
code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc
r10817 r10845 82 82 { 83 83 public: 84 v oid windowResized (Ogre::RenderWindow* rw) override84 virtual void windowResized (Ogre::RenderWindow* rw) override 85 85 { orxonox::WindowEventListener::resizeWindow(rw->getWidth(), rw->getHeight()); } 86 v oid windowFocusChange (Ogre::RenderWindow* rw) override86 virtual void windowFocusChange (Ogre::RenderWindow* rw) override 87 87 { orxonox::WindowEventListener::changeWindowFocus(rw->isActive()); } 88 v oid windowClosed (Ogre::RenderWindow* rw) override88 virtual void windowClosed (Ogre::RenderWindow* rw) override 89 89 { orxonox::Game::getInstance().stop(); } 90 v oid windowMoved (Ogre::RenderWindow* rw) override90 virtual void windowMoved (Ogre::RenderWindow* rw) override 91 91 { orxonox::WindowEventListener::moveWindow(); } 92 92 }; -
code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h
r10817 r10845 111 111 // event from Ogre::LogListener 112 112 #if OGRE_VERSION >= 0x010800 113 v oid messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) override;113 virtual void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) override; 114 114 #else 115 v oid messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName);115 virtual void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName) override; 116 116 #endif 117 117 -
code/branches/cpp11_v2/src/libraries/core/XMLPort.h
r10817 r10845 556 556 } 557 557 558 v oid callLoadExecutor(BaseObject* object, BaseObject* newObject) override558 virtual void callLoadExecutor(BaseObject* object, BaseObject* newObject) override 559 559 { 560 560 T* castObject = orxonox_cast<T*>(object); -
code/branches/cpp11_v2/src/libraries/core/command/Functor.h
r10828 r10845 249 249 250 250 // see Functor::operator()() 251 MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override251 virtual MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override 252 252 { 253 253 // call the function if an object was assigned … … 262 262 263 263 // see Functor::getType() 264 inline Functor::Type::Enum getType() const override264 virtual inline Functor::Type::Enum getType() const override 265 265 { return Functor::Type::Member; } 266 266 … … 280 280 281 281 // see Functor::setRawObjectPointer() 282 inline void setRawObjectPointer(void* object) override282 virtual inline void setRawObjectPointer(void* object) override 283 283 { this->setObject((O*)object); } 284 284 // see Functor::getRawObjectPointer() 285 inline void* getRawObjectPointer() const override285 virtual inline void* getRawObjectPointer() const override 286 286 { return this->object_; } 287 287 288 288 // see Functor::setSafeMode() 289 inline void setSafeMode(bool bSafeMode) override289 virtual inline void setSafeMode(bool bSafeMode) override 290 290 { 291 291 if (bSafeMode == this->bSafeMode_) … … 309 309 310 310 /// Will be called by Destroyable::~Destroyable() if the stored object is deleted and the Functor is in safe mode. 311 inline void objectDeleted() override311 virtual inline void objectDeleted() override 312 312 { this->object_ = nullptr; } 313 313 … … 328 328 329 329 // see Functor::operator()() 330 MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override330 virtual MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override 331 331 { 332 332 return (*this)((void*)nullptr, param1, param2, param3, param4, param5); … … 334 334 335 335 // see Functor::getType() 336 inline Functor::Type::Enum getType() const override336 virtual inline Functor::Type::Enum getType() const override 337 337 { return Functor::Type::Static; } 338 338 339 339 // see Functor::setRawObjectPointer() 340 inline void setRawObjectPointer(void*) override340 virtual inline void setRawObjectPointer(void*) override 341 341 { orxout(internal_warning) << "Can't assign an object pointer to a static functor" << endl; } 342 342 // see Functor::getRawObjectPointer() 343 inline void* getRawObjectPointer() const override343 virtual inline void* getRawObjectPointer() const override 344 344 { return nullptr; } 345 345 346 346 // see Functor::setSafeMode() 347 inline void setSafeMode(bool) override {}347 virtual inline void setSafeMode(bool) override {} 348 348 }; 349 349 -
code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h
r10817 r10845 65 65 66 66 // Methods from ShellListener 67 v oid linesChanged() override;68 v oid lineAdded() override;69 v oid inputChanged() override;70 v oid cursorChanged() override;71 v oid executed() override;72 v oid exit() override;67 virtual void linesChanged() override; 68 virtual void lineAdded() override; 69 virtual void inputChanged() override; 70 virtual void cursorChanged() override; 71 virtual void executed() override; 72 virtual void exit() override; 73 73 74 74 bool willPrintStatusLines(); -
code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h
r10817 r10845 67 67 68 68 // Methods from ShellListener 69 v oid linesChanged() override;70 v oid lineAdded() override;71 v oid inputChanged() override;72 v oid cursorChanged() override;73 v oid executed() override;74 v oid exit() override;69 virtual void linesChanged() override; 70 virtual void lineAdded() override; 71 virtual void inputChanged() override; 72 virtual void cursorChanged() override; 73 virtual void executed() override; 74 virtual void exit() override; 75 75 76 76 void resetTerminalMode(); -
code/branches/cpp11_v2/src/libraries/core/command/Shell.h
r10817 r10845 151 151 152 152 // DevModeListener 153 v oid devModeChanged(bool value) override;153 virtual void devModeChanged(bool value) override; 154 154 155 155 void addToHistory(const std::string& command); -
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h
r10817 r10845 54 54 55 55 /// Destructor 56 inline virtual~ConfigFileEntryComment() {}56 virtual inline ~ConfigFileEntryComment() {} 57 57 58 inline virtualconst std::string& getName() const override58 virtual inline const std::string& getName() const override 59 59 { return this->comment_; } 60 60 61 inline virtualvoid setComment(const std::string& comment) override61 virtual inline void setComment(const std::string& comment) override 62 62 { this->comment_ = comment; } 63 63 64 inline virtualvoid setValue(const std::string& value) override64 virtual inline void setValue(const std::string& value) override 65 65 {} 66 inline virtualconst std::string& getValue() const override66 virtual inline const std::string& getValue() const override 67 67 { return BLANKSTRING; } 68 68 69 inline void setString(bool bString) override69 virtual inline void setString(bool bString) override 70 70 {} 71 71 72 inline virtualconst std::string& getFileEntry() const override72 virtual inline const std::string& getFileEntry() const override 73 73 { return this->comment_; } 74 74 -
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h
r10817 r10845 67 67 68 68 /// Destructor 69 inline virtual~ConfigFileEntryValue() {}69 virtual inline ~ConfigFileEntryValue() {} 70 70 71 inline virtualconst std::string& getName() const override71 virtual inline const std::string& getName() const override 72 72 { return this->name_; } 73 73 74 inline virtualvoid setComment(const std::string& comment) override74 virtual inline void setComment(const std::string& comment) override 75 75 { this->additionalComment_ = comment; this->update(); } 76 76 77 inline virtualvoid setValue(const std::string& value) override77 virtual inline void setValue(const std::string& value) override 78 78 { this->value_ = value; this->update(); } 79 inline virtualconst std::string& getValue() const override79 virtual inline const std::string& getValue() const override 80 80 { return this->value_; } 81 81 82 inline void virtualsetString(bool bString) override82 virtual inline void setString(bool bString) override 83 83 { this->bString_ = bString; this->update(); } 84 84 85 inline virtualconst std::string& getFileEntry() const override85 virtual inline const std::string& getFileEntry() const override 86 86 { return this->fileEntry_; } 87 87 88 88 /// Returns the "key" of the value (in this case it's just the name of the entry, but for vectors it's different) 89 inline virtualconst std::string& getKeyString() const89 virtual inline const std::string& getKeyString() const 90 90 { return this->name_; } 91 91 -
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h
r10817 r10845 67 67 inline ~ConfigFileEntryVectorValue() {} 68 68 69 inline unsigned int getIndex() const override69 virtual inline unsigned int getIndex() const override 70 70 { return this->index_; } 71 71 72 72 /// Returns the "key" of the value (the name of the vector plus the index of the element) 73 inline const std::string& getKeyString() const override73 virtual inline const std::string& getKeyString() const override 74 74 { return this->keyString_; } 75 75 76 76 private: 77 v oid update() override;77 virtual void update() override; 78 78 79 79 unsigned int index_; ///< The index of the element in the vector -
code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h
r10821 r10845 59 59 public: 60 60 virtual void call(void* object) = 0; 61 inline virtual~ConfigValueCallbackBase() {}61 virtual inline ~ConfigValueCallbackBase() {} 62 62 }; 63 63 … … 67 67 public: 68 68 inline ConfigValueCallback(void (T::*function) (void)) : function_(function) {} 69 inline virtual~ConfigValueCallback() {}70 inline virtualvoid call(void* object) override69 virtual inline ~ConfigValueCallback() {} 70 virtual inline void call(void* object) override 71 71 { 72 72 if (!IdentifierManager::getInstance().isCreatingHierarchy()) -
code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h
r10818 r10845 68 68 ~SettingsConfigFile(); 69 69 70 v oid load() override; // tolua_export70 virtual void load() override; // tolua_export 71 71 void setFilename(const std::string& filename); // tolua_export 72 72 void clean(bool bCleanComments = false); // tolua_export -
code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h
r10817 r10845 56 56 using Button::execute; 57 57 bool execute(); 58 bool addParamCommand(ParamCommand* command) override;59 v oid clear() override;58 virtual bool addParamCommand(ParamCommand* command) override; 59 virtual void clear() override; 60 60 void reset(); 61 61 -
code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h
r10817 r10845 66 66 { } 67 67 virtual ~InputBufferListenerTuple() { } 68 v oid callFunction() override68 virtual void callFunction() override 69 69 { 70 70 (listener_->*function_)(); … … 165 165 { if (this->cursor_ > 0) { --this->cursor_; } } 166 166 167 v oid buttonPressed(const KeyEvent& evt) override;167 virtual void buttonPressed(const KeyEvent& evt) override; 168 168 169 169 private: 170 170 bool charIsAllowed(const char& input); 171 171 172 v oid buttonHeld(const KeyEvent& evt) override;173 void processKey 172 virtual void buttonHeld (const KeyEvent& evt) override; 173 void processKey (const KeyEvent& evt); 174 174 175 v oid keyboardUpdated(float dt) override;175 virtual void keyboardUpdated(float dt) override; 176 176 177 177 std::string buffer_; -
code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h
r10817 r10845 76 76 { 77 77 public: 78 bool execute(float abs = 1.0f, float rel = 1.0f) override;79 CommandEvaluation* getEvaluation() override;78 virtual bool execute(float abs = 1.0f, float rel = 1.0f) override; 79 virtual CommandEvaluation* getEvaluation() override; 80 80 virtual SimpleCommand* clone() override { return new SimpleCommand(*this); } 81 81 … … 104 104 public: 105 105 ParamCommand() : scale_(1.0f), paramCommand_(nullptr) { } 106 bool execute(float abs = 1.0f, float rel = 1.0f) override;107 CommandEvaluation* getEvaluation() override;106 virtual bool execute(float abs = 1.0f, float rel = 1.0f) override; 107 virtual CommandEvaluation* getEvaluation() override; 108 108 virtual ParamCommand* clone() override { return new ParamCommand(*this); } 109 109 -
code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h
r10821 r10845 153 153 154 154 //! Captures OIS events (which then get distributed to the derived class) and creates the button held events 155 v oid update(const Clock& time) override155 virtual void update(const Clock& time) override 156 156 { 157 157 oisDevice_->capture(); … … 171 171 172 172 //! Clears the list of pressed buttons and calls the derived class's method 173 v oid clearBuffers() override173 virtual void clearBuffers() override 174 174 { 175 175 pressedButtons_.clear(); … … 180 180 OISDeviceClass* getOISDevice() { return this->oisDevice_; } 181 181 // Returns the name of the derived class as string 182 std::string getClassName() const override { return DeviceClass::getClassNameImpl(); }182 virtual std::string getClassName() const override { return DeviceClass::getClassNameImpl(); } 183 183 184 184 protected: -
code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
r10817 r10845 208 208 209 209 // From WindowEventListener 210 v oid windowFocusChanged(bool bFocus) override;210 virtual void windowFocusChanged(bool bFocus) override; 211 211 212 212 private: // variables -
code/branches/cpp11_v2/src/libraries/core/input/InputState.h
r10817 r10845 157 157 ~InputState() { } 158 158 159 v oid JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;159 virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override; 160 160 161 161 //! Sets the priority (only to be used by the InputManager!) -
code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h
r10817 r10845 77 77 78 78 private: 79 v oid calibrationStarted() override;80 v oid calibrationStopped() override;79 virtual void calibrationStarted() override; 80 virtual void calibrationStopped() override; 81 81 void evaluateCalibration(); 82 82 … … 86 86 87 87 //! OIS event handler 88 bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override88 virtual bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override 89 89 { 90 90 super::buttonPressed(static_cast<JoyStickButtonCode::ByEnum>(button)); … … 93 93 94 94 //! OIS event handler 95 bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override95 virtual bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override 96 96 { 97 97 super::buttonReleased(static_cast<JoyStickButtonCode::ByEnum>(button)); … … 99 99 } 100 100 101 bool axisMoved (const OIS::JoyStickEvent &arg, int axis) override;102 bool sliderMoved (const OIS::JoyStickEvent &arg, int id) override;103 bool povMoved (const OIS::JoyStickEvent &arg, int id) override;101 virtual bool axisMoved (const OIS::JoyStickEvent &arg, int axis) override; 102 virtual bool sliderMoved (const OIS::JoyStickEvent &arg, int id) override; 103 virtual bool povMoved (const OIS::JoyStickEvent &arg, int id) override; 104 104 //! OIS event handler (don't remove that because of OIS version issues!) 105 bool vector3Moved (const OIS::JoyStickEvent &arg, int id) override { return true; }105 virtual bool vector3Moved (const OIS::JoyStickEvent &arg, int id) override { return true; } 106 106 107 107 //! Returns the class name as string -
code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h
r10821 r10845 86 86 virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override; 87 87 88 v oid allDevicesUpdated(float dt) override;89 v oid mouseUpdated(float dt) override;90 v oid joyStickUpdated(unsigned int joyStick, float dt) override;88 virtual void allDevicesUpdated(float dt) override; 89 virtual void mouseUpdated(float dt) override; 90 virtual void joyStickUpdated(unsigned int joyStick, float dt) override; 91 91 // internal 92 92 void tickHalfAxis(HalfAxis& halfAxis); 93 93 94 v oid buttonPressed (const KeyEvent& evt) override;95 v oid buttonReleased(const KeyEvent& evt) override;96 v oid buttonHeld (const KeyEvent& evt) override;97 98 v oid buttonPressed (MouseButtonCode::ByEnum button) override;99 v oid buttonReleased(MouseButtonCode::ByEnum button) override;100 v oid buttonHeld (MouseButtonCode::ByEnum button) override;101 v oid mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;102 v oid mouseScrolled (int abs, int rel) override;103 104 v oid buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button) override;105 v oid buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button) override;106 v oid buttonHeld (unsigned int device, JoyStickButtonCode::ByEnum button) override;107 v oid axisMoved (unsigned int device, unsigned int axis, float value) override;94 virtual void buttonPressed (const KeyEvent& evt) override; 95 virtual void buttonReleased(const KeyEvent& evt) override; 96 virtual void buttonHeld (const KeyEvent& evt) override; 97 98 virtual void buttonPressed (MouseButtonCode::ByEnum button) override; 99 virtual void buttonReleased(MouseButtonCode::ByEnum button) override; 100 virtual void buttonHeld (MouseButtonCode::ByEnum button) override; 101 virtual void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override; 102 virtual void mouseScrolled (int abs, int rel) override; 103 104 virtual void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button) override; 105 virtual void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button) override; 106 virtual void buttonHeld (unsigned int device, JoyStickButtonCode::ByEnum button) override; 107 virtual void axisMoved (unsigned int device, unsigned int axis, float value) override; 108 108 109 109 protected: // variables -
code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h
r10817 r10845 51 51 52 52 void callback(const std::string& name); 53 v oid JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;53 virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override; 54 54 void assignCommands(); 55 55 -
code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h
r10817 r10845 75 75 } 76 76 77 bool keyPressed(const OIS::KeyEvent& arg) override;78 bool keyReleased(const OIS::KeyEvent& arg) override;77 virtual bool keyPressed(const OIS::KeyEvent& arg) override; 78 virtual bool keyReleased(const OIS::KeyEvent& arg) override; 79 79 80 80 //! Returns the class name as string -
code/branches/cpp11_v2/src/libraries/core/input/Mouse.h
r10817 r10845 74 74 private: 75 75 //! OIS event handler 76 bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override76 virtual bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override 77 77 { 78 78 super::buttonPressed(static_cast<MouseButtonCode::ByEnum>(id)); … … 81 81 82 82 //! OIS event handler 83 bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override83 virtual bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override 84 84 { 85 85 super::buttonReleased(static_cast<MouseButtonCode::ByEnum>(id)); … … 87 87 } 88 88 89 bool mouseMoved(const OIS::MouseEvent &arg) override;89 virtual bool mouseMoved(const OIS::MouseEvent &arg) override; 90 90 91 v oid windowResized(unsigned int newWidth, unsigned int newHeight) override;91 virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override; 92 92 93 93 // Returns the class name as string -
code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h
r10817 r10845 124 124 125 125 /// Destructor 126 inline virtual~WeakPtr()126 virtual inline ~WeakPtr() 127 127 { 128 128 this->unregisterAsDestructionListener(this->base_); … … 230 230 private: 231 231 /// Will be called by Destroyable::~Destroyable() if the stored object is deleted. Resets the wrapped pointer and executes the callback. 232 inline void objectDeleted() override232 virtual inline void objectDeleted() override 233 233 { 234 234 this->base_ = nullptr; -
code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h
r10817 r10845 102 102 103 103 //! Called if the Scope of the Singleton gets active (creates the instance) 104 v oid activated() override104 virtual void activated() override 105 105 { 106 106 assert(singletonPtr_ == nullptr); … … 109 109 110 110 //! Called if the Scope of this Singleton gets deactivated (destroys the instance) 111 v oid deactivated() override111 virtual void deactivated() override 112 112 { 113 113 assert(singletonPtr_ != nullptr); … … 157 157 158 158 //! Called if the Scope of the Singleton gets active (creates the instance) 159 v oid activated() override159 virtual void activated() override 160 160 { 161 161 assert(singletonPtr_ == nullptr); … … 169 169 170 170 //! Called if the Scope of this Singleton gets deactivated (destroys the instance) 171 v oid deactivated() override171 virtual void deactivated() override 172 172 { 173 173 if (singletonPtr_ != nullptr) -
code/branches/cpp11_v2/src/libraries/network/Client.h
r10817 r10845 76 76 static Client* getInstance(){ return singletonPtr_s; } // tolua_export 77 77 78 bool establishConnection() override;78 virtual bool establishConnection() override; 79 79 void setDestination( const std::string& serverAddress, unsigned int port ); // tolua_export 80 bool closeConnection() override;81 v oid queuePacket(ENetPacket* packet, int clientID, uint8_t channelID) override;80 virtual bool closeConnection() override; 81 virtual void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID) override; 82 82 virtual bool sendPacket( packet::Packet* packet ) override{ return packet->send( static_cast<Host*>(this) ); } 83 83 virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override; … … 91 91 Client(const Client& copy); // not used 92 92 virtual bool isServer_() override{return false;} 93 v oid processPacket(packet::Packet* packet) override;93 virtual void processPacket(packet::Packet* packet) override; 94 94 95 95 static Client* singletonPtr_s; -
code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h
r10817 r10845 142 142 { } 143 143 144 inline bool call(uint32_t objectID) override144 virtual inline bool call(uint32_t objectID) override 145 145 { 146 146 if ( Synchronisable::getSynchronisable(objectID)!=nullptr ) … … 152 152 return false; 153 153 } 154 inline bool call(uint32_t objectID, const MultiType& mt1) override154 virtual inline bool call(uint32_t objectID, const MultiType& mt1) override 155 155 { 156 156 if ( Synchronisable::getSynchronisable(objectID)!=nullptr ) … … 162 162 return false; 163 163 } 164 inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override164 virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override 165 165 { 166 166 if ( Synchronisable::getSynchronisable(objectID)!=nullptr ) … … 172 172 return false; 173 173 } 174 inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override174 virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override 175 175 { 176 176 if ( Synchronisable::getSynchronisable(objectID)!=nullptr ) … … 182 182 return false; 183 183 } 184 inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override184 virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override 185 185 { 186 186 if ( Synchronisable::getSynchronisable(objectID)!=nullptr ) … … 192 192 return false; 193 193 } 194 inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override194 virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override 195 195 { 196 196 if ( Synchronisable::getSynchronisable(objectID)!=nullptr ) -
code/branches/cpp11_v2/src/libraries/network/Server.h
r10817 r10845 61 61 void open(); 62 62 void close(); 63 v oid queuePacket(ENetPacket *packet, int clientID, uint8_t channelID) override;63 virtual void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID) override; 64 64 virtual bool sendPacket( packet::Packet* packet ) override{ return packet->send( static_cast<Host*>(this) ); } 65 65 void update(const Clock& time); … … 76 76 unsigned int playerID(){return 0;} 77 77 78 v oid addPeer(uint32_t peerID) override;79 v oid removePeer(uint32_t peerID) override;80 v oid processPacket(packet::Packet* packet) override;78 virtual void addPeer(uint32_t peerID) override; 79 virtual void removePeer(uint32_t peerID) override; 80 virtual void processPacket(packet::Packet* packet) override; 81 81 82 82 bool createClient(int clientID); -
code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h
r10817 r10845 46 46 ~Acknowledgement(); 47 47 48 inline unsigned int getSize() const override;48 virtual inline unsigned int getSize() const override; 49 49 virtual bool process(orxonox::Host* host) override; 50 50 -
code/branches/cpp11_v2/src/libraries/network/packet/Chat.h
r10817 r10845 49 49 50 50 /* get size of packet */ 51 inline unsigned int getSize() const override;51 virtual inline unsigned int getSize() const override; 52 52 53 53 /* process chat message packet and remove it afterwards */ -
code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h
r10817 r10845 47 47 ~ClassID(); 48 48 49 uint32_t getSize() const override;49 virtual uint32_t getSize() const override; 50 50 virtual bool process(orxonox::Host* host) override; 51 51 -
code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h
r10817 r10845 48 48 bool fetchIDs(); 49 49 50 inline unsigned int getSize() const override;50 virtual inline unsigned int getSize() const override; 51 51 virtual bool process(orxonox::Host* host) override; 52 52 -
code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h
r10817 r10845 52 52 ~FunctionCalls(); 53 53 54 inline unsigned int getSize() const override54 virtual inline unsigned int getSize() const override 55 55 { assert(!this->isDataENetAllocated()); return currentSize_; } 56 56 virtual bool process(orxonox::Host* host) override; -
code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h
r10817 r10845 45 45 virtual ~Welcome(); 46 46 47 uint8_t *getData() override;48 inline unsigned int getSize() const override;47 virtual uint8_t *getData() override; 48 virtual inline unsigned int getSize() const override; 49 49 virtual bool process(orxonox::Host* host) override; 50 50 -
code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h
r10817 r10845 44 44 45 45 protected: 46 bool frameStarted(const Ogre::FrameEvent& evt) override;47 bool frameEnded(const Ogre::FrameEvent& evt) override;46 virtual bool frameStarted(const Ogre::FrameEvent& evt) override; 47 virtual bool frameEnded(const Ogre::FrameEvent& evt) override; 48 48 49 49 private: -
code/branches/cpp11_v2/src/libraries/util/MultiType.h
r10817 r10845 175 175 public: 176 176 inline MT_ValueBase(void* data, Type::Enum type) : type_(type), bLastConversionSuccessful(true), data_(data) {} 177 inline virtual~MT_ValueBase() {}177 virtual inline ~MT_ValueBase() {} 178 178 179 179 virtual MT_ValueBase* clone() const = 0; -
code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h
r10817 r10845 58 58 59 59 /// Creates a copy of itself. 60 inline MT_ValueBase* clone() const override { return new MT_Value<T>(this->value_, this->type_); }60 virtual inline MT_ValueBase* clone() const override { return new MT_Value<T>(this->value_, this->type_); } 61 61 62 62 /// Resets the current value to the default. 63 inline void reset() override { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }64 65 inline bool getValue(char* value) const override { return convertValue<T, char >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.66 inline bool getValue(unsigned char* value) const override { return convertValue<T, unsigned char >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.67 inline bool getValue(short* value) const override { return convertValue<T, short >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.68 inline bool getValue(unsigned short* value) const override { return convertValue<T, unsigned short >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.69 inline bool getValue(int* value) const override { return convertValue<T, int >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.70 inline bool getValue(unsigned int* value) const override { return convertValue<T, unsigned int >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.71 inline bool getValue(long* value) const override { return convertValue<T, long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.72 inline bool getValue(unsigned long* value) const override { return convertValue<T, unsigned long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.73 inline bool getValue(long long* value) const override { return convertValue<T, long long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.74 inline bool getValue(unsigned long long* value) const override { return convertValue<T, unsigned long long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.75 inline bool getValue(float* value) const override { return convertValue<T, float >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.76 inline bool getValue(double* value) const override { return convertValue<T, double >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.77 inline bool getValue(long double* value) const override { return convertValue<T, long double >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.78 inline bool getValue(bool* value) const override { return convertValue<T, bool >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.79 inline bool getValue(void** value) const override { return convertValue<T, void* >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.80 inline bool getValue(std::string* value) const override { return convertValue<T, std::string >(value, value_, NilValue<std::string> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.81 inline bool getValue(orxonox::Vector2* value) const override { return convertValue<T, orxonox::Vector2 >(value, value_, NilValue<orxonox::Vector2> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.82 inline bool getValue(orxonox::Vector3* value) const override { return convertValue<T, orxonox::Vector3 >(value, value_, NilValue<orxonox::Vector3> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.83 inline bool getValue(orxonox::Vector4* value) const override { return convertValue<T, orxonox::Vector4 >(value, value_, NilValue<orxonox::Vector4> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.84 inline bool getValue(orxonox::ColourValue* value) const override { return convertValue<T, orxonox::ColourValue>(value, value_, NilValue<orxonox::ColourValue>()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.85 inline bool getValue(orxonox::Quaternion* value) const override { return convertValue<T, orxonox::Quaternion >(value, value_, NilValue<orxonox::Quaternion> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.86 inline bool getValue(orxonox::Radian* value) const override { return convertValue<T, orxonox::Radian >(value, value_, NilValue<orxonox::Radian> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.87 inline bool getValue(orxonox::Degree* value) const override { return convertValue<T, orxonox::Degree >(value, value_, NilValue<orxonox::Degree> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.63 virtual inline void reset() override { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; } 64 65 virtual inline bool getValue(char* value) const override { return convertValue<T, char >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 66 virtual inline bool getValue(unsigned char* value) const override { return convertValue<T, unsigned char >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 67 virtual inline bool getValue(short* value) const override { return convertValue<T, short >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 68 virtual inline bool getValue(unsigned short* value) const override { return convertValue<T, unsigned short >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 69 virtual inline bool getValue(int* value) const override { return convertValue<T, int >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 70 virtual inline bool getValue(unsigned int* value) const override { return convertValue<T, unsigned int >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 71 virtual inline bool getValue(long* value) const override { return convertValue<T, long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 72 virtual inline bool getValue(unsigned long* value) const override { return convertValue<T, unsigned long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 73 virtual inline bool getValue(long long* value) const override { return convertValue<T, long long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 74 virtual inline bool getValue(unsigned long long* value) const override { return convertValue<T, unsigned long long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 75 virtual inline bool getValue(float* value) const override { return convertValue<T, float >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 76 virtual inline bool getValue(double* value) const override { return convertValue<T, double >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 77 virtual inline bool getValue(long double* value) const override { return convertValue<T, long double >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 78 virtual inline bool getValue(bool* value) const override { return convertValue<T, bool >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 79 virtual inline bool getValue(void** value) const override { return convertValue<T, void* >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 80 virtual inline bool getValue(std::string* value) const override { return convertValue<T, std::string >(value, value_, NilValue<std::string> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 81 virtual inline bool getValue(orxonox::Vector2* value) const override { return convertValue<T, orxonox::Vector2 >(value, value_, NilValue<orxonox::Vector2> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 82 virtual inline bool getValue(orxonox::Vector3* value) const override { return convertValue<T, orxonox::Vector3 >(value, value_, NilValue<orxonox::Vector3> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 83 virtual inline bool getValue(orxonox::Vector4* value) const override { return convertValue<T, orxonox::Vector4 >(value, value_, NilValue<orxonox::Vector4> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 84 virtual inline bool getValue(orxonox::ColourValue* value) const override { return convertValue<T, orxonox::ColourValue>(value, value_, NilValue<orxonox::ColourValue>()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 85 virtual inline bool getValue(orxonox::Quaternion* value) const override { return convertValue<T, orxonox::Quaternion >(value, value_, NilValue<orxonox::Quaternion> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 86 virtual inline bool getValue(orxonox::Radian* value) const override { return convertValue<T, orxonox::Radian >(value, value_, NilValue<orxonox::Radian> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 87 virtual inline bool getValue(orxonox::Degree* value) const override { return convertValue<T, orxonox::Degree >(value, value_, NilValue<orxonox::Degree> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match. 88 88 89 89 /** … … 91 91 @param other The other MultiType 92 92 */ 93 inline bool setValue(const MultiType& other) override93 virtual inline bool setValue(const MultiType& other) override 94 94 { 95 95 if (other.value_) … … 104 104 } 105 105 106 inline bool setValue(const char& value) override{ return (bLastConversionSuccessful = convertValue<char , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.107 inline bool setValue(const unsigned char& value) override{ return (bLastConversionSuccessful = convertValue<unsigned char , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.108 inline bool setValue(const short& value) override{ return (bLastConversionSuccessful = convertValue<short , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.109 inline bool setValue(const unsigned short& value) override{ return (bLastConversionSuccessful = convertValue<unsigned short , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.110 inline bool setValue(const int& value) override{ return (bLastConversionSuccessful = convertValue<int , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.111 inline bool setValue(const unsigned int& value) override{ return (bLastConversionSuccessful = convertValue<unsigned int , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.112 inline bool setValue(const long& value) override{ return (bLastConversionSuccessful = convertValue<long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.113 inline bool setValue(const unsigned long& value) override{ return (bLastConversionSuccessful = convertValue<unsigned long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.114 inline bool setValue(const long long& value) override{ return (bLastConversionSuccessful = convertValue<long long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.115 inline bool setValue(const unsigned long long& value) override{ return (bLastConversionSuccessful = convertValue<unsigned long long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.116 inline bool setValue(const float& value) override{ return (bLastConversionSuccessful = convertValue<float , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.117 inline bool setValue(const double& value) override{ return (bLastConversionSuccessful = convertValue<double , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.118 inline bool setValue(const long double& value) override{ return (bLastConversionSuccessful = convertValue<long double , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.119 inline bool setValue(const bool& value) override{ return (bLastConversionSuccessful = convertValue<bool , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.120 inline bool setValue( void* const& value) override{ return (bLastConversionSuccessful = convertValue<void* , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.121 inline bool setValue(const std::string& value) override{ return (bLastConversionSuccessful = convertValue<std::string , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.122 inline bool setValue(const orxonox::Vector2& value) override{ return (bLastConversionSuccessful = convertValue<orxonox::Vector2 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.123 inline bool setValue(const orxonox::Vector3& value) override{ return (bLastConversionSuccessful = convertValue<orxonox::Vector3 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.124 inline bool setValue(const orxonox::Vector4& value) override{ return (bLastConversionSuccessful = convertValue<orxonox::Vector4 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.125 inline bool setValue(const orxonox::ColourValue& value) override { return (bLastConversionSuccessful = convertValue<orxonox::ColourValue, T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.126 inline bool setValue(const orxonox::Quaternion& value) override{ return (bLastConversionSuccessful = convertValue<orxonox::Quaternion , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.127 inline bool setValue(const orxonox::Radian& value) override{ return (bLastConversionSuccessful = convertValue<orxonox::Radian , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.128 inline bool setValue(const orxonox::Degree& value) override{ return (bLastConversionSuccessful = convertValue<orxonox::Degree , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.106 virtual inline bool setValue(const char& value) override { return (bLastConversionSuccessful = convertValue<char , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 107 virtual inline bool setValue(const unsigned char& value) override { return (bLastConversionSuccessful = convertValue<unsigned char , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 108 virtual inline bool setValue(const short& value) override { return (bLastConversionSuccessful = convertValue<short , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 109 virtual inline bool setValue(const unsigned short& value) override { return (bLastConversionSuccessful = convertValue<unsigned short , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 110 virtual inline bool setValue(const int& value) override { return (bLastConversionSuccessful = convertValue<int , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 111 virtual inline bool setValue(const unsigned int& value) override { return (bLastConversionSuccessful = convertValue<unsigned int , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 112 virtual inline bool setValue(const long& value) override { return (bLastConversionSuccessful = convertValue<long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 113 virtual inline bool setValue(const unsigned long& value) override { return (bLastConversionSuccessful = convertValue<unsigned long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 114 virtual inline bool setValue(const long long& value) override { return (bLastConversionSuccessful = convertValue<long long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 115 virtual inline bool setValue(const unsigned long long& value) override { return (bLastConversionSuccessful = convertValue<unsigned long long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 116 virtual inline bool setValue(const float& value) override { return (bLastConversionSuccessful = convertValue<float , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 117 virtual inline bool setValue(const double& value) override { return (bLastConversionSuccessful = convertValue<double , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 118 virtual inline bool setValue(const long double& value) override { return (bLastConversionSuccessful = convertValue<long double , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 119 virtual inline bool setValue(const bool& value) override { return (bLastConversionSuccessful = convertValue<bool , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 120 virtual inline bool setValue( void* const& value) override { return (bLastConversionSuccessful = convertValue<void* , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 121 virtual inline bool setValue(const std::string& value) override { return (bLastConversionSuccessful = convertValue<std::string , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 122 virtual inline bool setValue(const orxonox::Vector2& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Vector2 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 123 virtual inline bool setValue(const orxonox::Vector3& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Vector3 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 124 virtual inline bool setValue(const orxonox::Vector4& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Vector4 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 125 virtual inline bool setValue(const orxonox::ColourValue& value) override { return (bLastConversionSuccessful = convertValue<orxonox::ColourValue, T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 126 virtual inline bool setValue(const orxonox::Quaternion& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Quaternion , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 127 virtual inline bool setValue(const orxonox::Radian& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Radian , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 128 virtual inline bool setValue(const orxonox::Degree& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Degree , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T. 129 129 130 130 /// Puts the current value on the stream 131 inline void toString(std::ostream& outstream) const override { outstream << this->value_; }131 virtual inline void toString(std::ostream& outstream) const override { outstream << this->value_; } 132 132 133 133 /// loads data from the bytestream (mem) into the MT and increases the bytestream pointer by the size of the data 134 inline void importData( uint8_t*& mem ) override { loadAndIncrease( /*(const T&)*/this->value_, mem ); }134 virtual inline void importData( uint8_t*& mem ) override { loadAndIncrease( /*(const T&)*/this->value_, mem ); } 135 135 /// saves data from the MT into the bytestream (mem) and increases the bytestream pointer by the size of the data 136 inline void exportData( uint8_t*& mem ) const override { saveAndIncrease( /*(const T&)*/this->value_, mem ); }136 virtual inline void exportData( uint8_t*& mem ) const override { saveAndIncrease( /*(const T&)*/this->value_, mem ); } 137 137 /// returns the size of the data that would be saved by exportData 138 inline uint8_t getSize() const override { return returnSize( this->value_ ); }138 virtual inline uint8_t getSize() const override { return returnSize( this->value_ ); } 139 139 140 140 T value_; ///< The stored value -
code/branches/cpp11_v2/src/modules/designtools/CreateStars.h
r10817 r10845 43 43 void createBillboards(); 44 44 45 v oid XMLPort(Element& xmlelement, XMLPort::Mode mode) override;45 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 46 46 47 47 void setNumStars(int num) { -
code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h
r10817 r10845 65 65 SkyboxGenerator(); 66 66 virtual ~SkyboxGenerator(); 67 v oid tick(float dt) override; // This is where the skybox generation happens.67 virtual void tick(float dt) override; // This is where the skybox generation happens. 68 68 static void createSkybox(void); // Generate the 6 faces of a skybox. 69 69 void setConfigValues(void); // Sets some config values. -
code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h
r10817 r10845 64 64 inline float getTimeLimit() 65 65 { return this->bTimeLimit_;} 66 inline const WorldEntity* getWorldEntity() const override66 virtual inline const WorldEntity* getWorldEntity() const override 67 67 { return this; } 68 68 -
code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h
r10817 r10845 94 94 virtual void fire(bool bIsTriggered, BaseObject* originator) override; 95 95 96 inline const WorldEntity* getWorldEntity() const override96 virtual inline const WorldEntity* getWorldEntity() const override 97 97 { 98 98 return this; -
code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h
r10817 r10845 57 57 virtual ~SpaceRace() {} 58 58 59 v oid tick(float dt) override;59 virtual void tick(float dt) override; 60 60 61 61 virtual void end() override; … … 70 70 { return this->clock_; } 71 71 72 bool allowPawnHit(Pawn* victim, Pawn* originator) override;73 bool allowPawnDamage(Pawn* victim, Pawn* originator) override;74 bool allowPawnDeath(Pawn* victim, Pawn* originator) override;72 virtual bool allowPawnHit(Pawn* victim, Pawn* originator) override; 73 virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override; 74 virtual bool allowPawnDeath(Pawn* victim, Pawn* originator) override; 75 75 76 76 private: -
code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h
r10817 r10845 58 58 virtual ~SpaceRaceManager() ; 59 59 60 v oid XMLPort(Element& xmlelement, XMLPort::Mode mode) override;60 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 61 61 62 62 void addCheckpoint(RaceCheckPoint* checkpoint); … … 69 69 std::vector<RaceCheckPoint*> getAllCheckpoints(); 70 70 71 v oid tick(float dt) override;71 virtual void tick(float dt) override; 72 72 73 73 protected: -
code/branches/cpp11_v2/src/modules/objects/Attacher.h
r10817 r10845 64 64 { return this->targetname_; } 65 65 66 v oid loadedNewXMLName(BaseObject* object) override;66 virtual void loadedNewXMLName(BaseObject* object) override; 67 67 68 68 private: -
code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h
r10817 r10845 93 93 int getReaction(); 94 94 95 v oid XMLPort(Element& xmlelement, XMLPort::Mode mode) override;95 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 96 96 97 v oid tick(float dt) override;97 virtual void tick(float dt) override; 98 98 99 99 private: -
code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h
r10817 r10845 45 45 virtual void changedOwner() override; 46 46 47 v oid announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;47 virtual void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override; 48 48 49 49 private: -
code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h
r10817 r10845 45 45 virtual void changedOwner() override; 46 46 47 v oid deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;47 virtual void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override; 48 48 49 49 private: -
code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h
r10817 r10845 45 45 virtual void changedOwner() override; 46 46 47 v oid fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;47 virtual void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override; 48 48 49 49 private: -
code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h
r10817 r10845 48 48 virtual void changedOwner() override; 49 49 50 v oid staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;50 virtual void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override; 51 51 52 52 private: -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h
r10817 r10845 43 43 virtual void tick(float dt) override; 44 44 45 v oid changedOwner() override;45 virtual void changedOwner() override; 46 46 47 47 private: -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h
r10817 r10845 65 65 virtual void radarTick(float dt) override {} 66 66 67 inline float getRadarSensitivity() const override67 virtual inline float getRadarSensitivity() const override 68 68 { return 1.0f; } 69 69 -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h
r10817 r10845 80 80 void set3DMaterialBack(std::string material3DBack) { this->material3DBack_ = material3DBack; } 81 81 82 float getRadarSensitivity() const override { return this->sensitivity_; }82 virtual float getRadarSensitivity() const override { return this->sensitivity_; } 83 83 // used also by RadarListener interface! 84 84 void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; } … … 92 92 virtual void removeObject(RadarViewable* viewable) override; 93 93 virtual void objectChanged( RadarViewable* rv ) override; 94 v oid radarTick(float dt) override;94 virtual void radarTick(float dt) override; 95 95 bool showObject( RadarViewable* rv ); //!< Do not display an object on radar, if showObject(.) is false. 96 96 -
code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h
r10817 r10845 45 45 virtual void changedOwner() override; 46 46 47 v oid killmessage(const GametypeInfo* gtinfo, const std::string& message) override;47 virtual void killmessage(const GametypeInfo* gtinfo, const std::string& message) override; 48 48 49 49 private: -
code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h
r10817 r10845 69 69 { this->trigger_->addTarget(target); } 70 70 71 v oid XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;71 virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override; 72 72 static std::map<unsigned int, PortalEndPoint *> idMap_s; //!< Maps the id of each PortalEndPoint to a pointer to that PortalEndPoint 73 73 inline void setReenterDelay(unsigned int seconds) -
code/branches/cpp11_v2/src/orxonox/PlayerManager.h
r10817 r10845 50 50 { return this->clients_; } 51 51 52 v oid clientConnected(unsigned int clientID) override;53 v oid clientDisconnected(unsigned int clientID) override;52 virtual void clientConnected(unsigned int clientID) override; 53 virtual void clientDisconnected(unsigned int clientID) override; 54 54 void disconnectAllClients(); 55 55 -
code/branches/cpp11_v2/src/orxonox/Scene.h
r10818 r10845 80 80 { return this->radar_; } 81 81 82 inline virtualuint32_t getSceneID() const override { return this->getObjectID(); }82 virtual inline uint32_t getSceneID() const override { return this->getObjectID(); } 83 83 84 84 virtual void tick(float dt) override; -
code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h
r10817 r10845 125 125 * history window of the full chat window) 126 126 */ 127 v oid incomingChat(const std::string& message, const std::string& name) override;127 virtual void incomingChat(const std::string& message, const std::string& name) override; 128 128 129 129 /** \param full true means show full chat window with history, -
code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h
r10817 r10845 74 74 private: 75 75 void updatePublicShape(); 76 inline virtualbtCollisionShape* createNewShape() const override76 virtual inline btCollisionShape* createNewShape() const override 77 77 { assert(false); return nullptr; } 78 78 -
code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h
r10817 r10845 49 49 50 50 private: 51 v oid parentChanged() override;51 virtual void parentChanged() override; 52 52 53 53 WorldEntity* worldEntityOwner_; -
code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h
r10817 r10845 43 43 ~GSClient(); 44 44 45 v oid activate() override;46 v oid deactivate() override;47 v oid update(const Clock& time) override;45 virtual void activate() override; 46 virtual void deactivate() override; 47 virtual void update(const Clock& time) override; 48 48 }; 49 49 } -
code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h
r10817 r10845 53 53 ~GSGraphics(); 54 54 55 v oid activate() override;56 v oid deactivate() override;57 v oid update(const Clock& time) override;55 virtual void activate() override; 56 virtual void deactivate() override; 57 virtual void update(const Clock& time) override; 58 58 59 59 private: -
code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h
r10817 r10845 44 44 ~GSLevel(); 45 45 46 v oid activate() override;47 v oid deactivate() override;48 v oid update(const Clock& time) override;46 virtual void activate() override; 47 virtual void deactivate() override; 48 virtual void update(const Clock& time) override; 49 49 50 50 static void startMainMenu(void); //!< Starts the MainMenu -
code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h
r10817 r10845 44 44 ~GSMainMenu(); 45 45 46 v oid activate() override;47 v oid deactivate() override;48 v oid update(const Clock& time) override;46 virtual void activate() override; 47 virtual void deactivate() override; 48 virtual void update(const Clock& time) override; 49 49 50 50 void setConfigValues(); -
code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h
r10817 r10845 45 45 ~GSMasterServer(); 46 46 47 v oid activate() override;48 v oid deactivate() override;49 v oid update(const Clock& time) override;47 virtual void activate() override; 48 virtual void deactivate() override; 49 virtual void update(const Clock& time) override; 50 50 51 51 private: -
code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h
r10817 r10845 44 44 static void printObjects(); 45 45 46 v oid activate() override;47 v oid deactivate() override;48 v oid update(const Clock& time) override;46 virtual void activate() override; 47 virtual void deactivate() override; 48 virtual void update(const Clock& time) override; 49 49 50 50 // this has to be public because proteced triggers a bug in msvc -
code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h
r10817 r10845 43 43 ~GSServer(); 44 44 45 v oid activate() override;46 v oid deactivate() override;47 v oid update(const Clock& time) override;45 virtual void activate() override; 46 virtual void deactivate() override; 47 virtual void update(const Clock& time) override; 48 48 49 49 private: -
code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h
r10817 r10845 41 41 ~GSStandalone(); 42 42 43 v oid activate() override;44 v oid deactivate() override;45 v oid update(const Clock& time) override;43 virtual void activate() override; 44 virtual void deactivate() override; 45 virtual void update(const Clock& time) override; 46 46 47 47 private: -
code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h
r10817 r10845 78 78 void grantPigBoost(SpaceShip* spaceship); // Grant the piggy a boost. 79 79 void resetSpeedFactor(SpaceShip* spaceship); 80 v oid tick (float dt) override;// used to end the game81 SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;80 virtual void tick (float dt) override;// used to end the game 81 virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override; 82 82 83 83 -
code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h
r10817 r10845 80 80 81 81 void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining". 82 v oid tick (float dt) override; //!< used to end the game82 virtual void tick (float dt) override; //!< used to end the game 83 83 }; 84 84 } -
code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h
r10817 r10845 80 80 virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //!< If a player shoot's an opponent, his punishment countdown will be resetted. 81 81 virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override; //!< Resets punishment time and respawn delay. 82 v oid tick (float dt) override; //!< used to end the game82 virtual void tick (float dt) override; //!< used to end the game 83 83 virtual void end() override; //!< Sends an end message. 84 84 void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining". -
code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h
r10817 r10845 43 43 44 44 void setConfigValues(); 45 v oid tick (float dt) override;45 virtual void tick (float dt) override; 46 46 void addDestroyer(Destroyer* destroyer); 47 47 inline Destroyer* getDestroyer() const -
code/branches/cpp11_v2/src/orxonox/graphics/Camera.h
r10817 r10845 72 72 void configvaluecallback_changedNearClipDistance(); 73 73 74 v oid windowResized(unsigned int newWidth, unsigned int newHeight) override;74 virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override; 75 75 76 76 Ogre::Camera* camera_; -
code/branches/cpp11_v2/src/orxonox/infos/Bot.h
r10817 r10845 45 45 void setConfigValues(); 46 46 47 inline bool isInitialized() const override47 virtual inline bool isInitialized() const override 48 48 { return true; } 49 inline float getPing() const override49 virtual inline float getPing() const override 50 50 { return 0; } 51 inline float getPacketLossRatio() const override51 virtual inline float getPacketLossRatio() const override 52 52 { return 0; } 53 53 -
code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h
r10817 r10845 45 45 void setConfigValues(); 46 46 47 bool isInitialized() const override;48 float getPing() const override;49 float getPacketLossRatio() const override;47 virtual bool isInitialized() const override; 48 virtual float getPing() const override; 49 virtual float getPacketLossRatio() const override; 50 50 51 51 void setClientID(unsigned int clientID); -
code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h
r10817 r10845 77 77 PickupCarrier(); //!< Constructor. 78 78 virtual ~PickupCarrier(); //!< Destructor. 79 v oid preDestroy(void) override; //!< Is called before the PickupCarrier is effectively destroyed.79 virtual void preDestroy(void) override; //!< Is called before the PickupCarrier is effectively destroyed. 80 80 81 81 bool isTarget(const Pickupable* pickup) const; //!< Can be used to check whether the PickupCarrier or a child of his is a target ot the input Pickupable. -
code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h
r10817 r10845 44 44 ~GUISheet(); 45 45 46 v oid XMLPort(Element& xmlelement, XMLPort::Mode mode) override;46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 47 47 48 48 void show(); -
code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h
r10817 r10845 53 53 void setConfigValues(); 54 54 55 v oid preUpdate(const Clock& time) override;56 v oid postUpdate(const Clock& time) override { /*no action*/ }55 virtual void preUpdate(const Clock& time) override; 56 virtual void postUpdate(const Clock& time) override { /*no action*/ } 57 57 58 58 static void openConsole(); … … 65 65 void deactivate(); 66 66 67 v oid linesChanged() override;68 v oid lineAdded() override;69 v oid inputChanged() override;70 v oid cursorChanged() override;71 v oid executed() override;72 v oid exit() override;67 virtual void linesChanged() override; 68 virtual void lineAdded() override; 69 virtual void inputChanged() override; 70 virtual void cursorChanged() override; 71 virtual void executed() override; 72 virtual void exit() override; 73 73 74 74 void shiftLines(); … … 77 77 void print(const std::string& text, Shell::LineType type, int index, bool alwaysShift = false); 78 78 79 v oid windowResized(unsigned int newWidth, unsigned int newHeight) override;79 virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override; 80 80 81 81 // config value related -
code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h
r10817 r10845 206 206 207 207 private: 208 v oid windowResized(unsigned int newWidth, unsigned int newHeight) override;208 virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override; 209 209 210 210 static unsigned int hudOverlayCounter_s; //!< Static counter for hud elements -
code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h
r10817 r10845 50 50 AmbientSound(); 51 51 52 v oid play() override;53 bool stop() override;54 v oid pause() override;52 virtual void play() override; 53 virtual bool stop() override; 54 virtual void pause() override; 55 55 56 56 bool setAmbientSource(const std::string& source); … … 66 66 67 67 private: 68 v oid preDestroy() override;69 float getRealVolume() override;70 bool moodChanged(const std::string& mood) override;68 virtual void preDestroy() override; 69 virtual float getRealVolume() override; 70 virtual bool moodChanged(const std::string& mood) override; 71 71 inline void ambientSourceChanged() 72 72 { this->setAmbientSource(this->ambientSource_); } -
code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h
r10817 r10845 68 68 ~SoundManager(); 69 69 70 v oid preUpdate(const Clock& time) override;71 v oid postUpdate(const Clock& time) override { /*no action*/ }70 virtual void preUpdate(const Clock& time) override; 71 virtual void postUpdate(const Clock& time) override { /*no action*/ } 72 72 void setConfigValues(); 73 73 -
code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h
r10817 r10845 50 50 virtual ~WorldAmbientSound(); 51 51 52 v oid XMLPort(Element& xmlelement, XMLPort::Mode mode) override;53 v oid XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;52 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 53 virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override; 54 54 55 55 virtual void changedActivity() override; -
code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h
r10817 r10845 47 47 WorldSound(Context* context); 48 48 49 v oid XMLPort(Element& xmlelement, XMLPort::Mode mode) override;50 v oid XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;51 v oid changedActivity() override;49 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 50 virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override; 51 virtual void changedActivity() override; 52 52 53 v oid tick(float dt) override;53 virtual void tick(float dt) override; 54 54 55 55 protected: … … 58 58 private: 59 59 void registerVariables(); 60 v oid initialiseSource() override;61 float getRealVolume() override;60 virtual void initialiseSource() override; 61 virtual float getRealVolume() override; 62 62 }; 63 63 } -
code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h
r10817 r10845 141 141 using MobileEntity::setAngularVelocity; 142 142 143 v oid setPosition(const Vector3& position) override;144 v oid setOrientation(const Quaternion& orientation) override;145 v oid setVelocity(const Vector3& velocity) override;146 v oid setAngularVelocity(const Vector3& velocity) override;143 virtual void setPosition(const Vector3& position) override; 144 virtual void setOrientation(const Quaternion& orientation) override; 145 virtual void setVelocity(const Vector3& velocity) override; 146 virtual void setAngularVelocity(const Vector3& velocity) override; 147 147 148 148 inline bool hasLocalController() const … … 214 214 215 215 // Bullet btMotionState related 216 v oid setWorldTransform(const btTransform& worldTrans) override;216 virtual void setWorldTransform(const btTransform& worldTrans) override; 217 217 218 218 unsigned int server_overwrite_; -
code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h
r10817 r10845 64 64 inline void setVelocity(float x, float y, float z) 65 65 { this->setVelocity(Vector3(x, y, z)); } 66 inline const Vector3& getVelocity() const override66 virtual inline const Vector3& getVelocity() const override 67 67 { return this->linearVelocity_; } 68 68 /** … … 109 109 // Bullet btMotionState related 110 110 virtual void setWorldTransform(const btTransform& worldTrans) override; 111 v oid getWorldTransform(btTransform& worldTrans) const override;111 virtual void getWorldTransform(btTransform& worldTrans) const override; 112 112 113 113 Vector3 linearAcceleration_; -
code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h
r10817 r10845 52 52 using WorldEntity::setOrientation; 53 53 54 inline void setPosition(const Vector3& position) override54 virtual inline void setPosition(const Vector3& position) override 55 55 { MobileEntity::setPosition(position); this->overwrite_position_ = this->getPosition(); } 56 inline void setOrientation(const Quaternion& orientation) override56 virtual inline void setOrientation(const Quaternion& orientation) override 57 57 { MobileEntity::setOrientation(orientation); this->overwrite_orientation_ = this->getOrientation(); } 58 58 … … 79 79 private: 80 80 void registerVariables(); 81 v oid clientConnected(unsigned int clientID) override;82 v oid clientDisconnected(unsigned int clientID) override;81 virtual void clientConnected(unsigned int clientID) override; 82 virtual void clientDisconnected(unsigned int clientID) override; 83 83 void resynchronize(); 84 84 -
code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h
r10817 r10845 55 55 using WorldEntity::setOrientation; 56 56 57 v oid setPosition(const Vector3& position) override;58 v oid setOrientation(const Quaternion& orientation) override;57 virtual void setPosition(const Vector3& position) override; 58 virtual void setOrientation(const Quaternion& orientation) override; 59 59 60 60 private: 61 61 void registerVariables(); 62 bool isCollisionTypeLegal(CollisionType type) const override;62 virtual bool isCollisionTypeLegal(CollisionType type) const override; 63 63 64 64 // network callbacks … … 69 69 70 70 // Bullet btMotionState related 71 v oid setWorldTransform(const btTransform& worldTrans) override;72 v oid getWorldTransform(btTransform& worldTrans) const override;71 virtual void setWorldTransform(const btTransform& worldTrans) override; 72 virtual void getWorldTransform(btTransform& worldTrans) const override; 73 73 }; 74 74 } -
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h
r10818 r10845 69 69 virtual void fire(); 70 70 71 bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;71 virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override; 72 72 73 73 virtual void addedWeaponPack(WeaponPack* wPack);
Note: See TracChangeset
for help on using the changeset viewer.