Changeset 10929 for code/branches/hoverHS15
- Timestamp:
- Dec 7, 2015, 2:26:27 PM (9 years ago)
- Location:
- code/branches/hoverHS15/src/modules/hover
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/hoverHS15/src/modules/hover/FlagHUD.cc
r10900 r10929 24 24 * 25 25 */ 26 27 /** 28 @file FlagHUD.cc 29 @brief Implementation of the FlagHUD 30 */ 26 31 27 32 #include "FlagHUD.h" … … 51 56 } 52 57 58 /** 59 @brief Sets the amount of flags displayed, once zero it does not reappear 60 @param flagCount 61 */ 53 62 void FlagHUD::setFlagCount(int flagCount) { 54 63 if(flagCount == 0){ -
code/branches/hoverHS15/src/modules/hover/FlagHUD.h
r10900 r10929 24 24 * 25 25 */ 26 27 /** 28 @file FlagHUD.h 29 @brief Declaration of the FlagHUD class. 30 */ 26 31 27 32 #ifndef _FlagHUD_H__ -
code/branches/hoverHS15/src/modules/hover/HoverShip.cc
r10784 r10929 22 22 * Author: 23 23 * Cyrill Burgener 24 * Co-authors:25 * ...26 24 * 27 25 */ … … 29 27 /** 30 28 @file HoverShip.cc 31 @brief Implementation of the HoverShip c lass.29 @brief Implementation of the HoverShip control 32 30 */ 33 31 … … 74 72 } 75 73 76 74 /** 75 @brief 76 sets this ships jumpBoost 77 @param jumpBoost 78 */ 77 79 void HoverShip::setJumpBoost(float jumpBoost) 78 80 { … … 80 82 } 81 83 82 84 /** 85 @brief 86 returns this ships jumpBoost 87 @returns jumpBoost 88 */ 83 89 float HoverShip::getJumpBoost() 84 90 { … … 88 94 /** 89 95 @brief 90 Rotate in pitch direction. 91 Due to added left, can also lead to an additional up-down motion. 96 Removed, does nothing. 92 97 @param value 93 A vector whose first component specifies the magnitude of the rotation. Positive means pitch up, negative means pitch down.94 98 */ 95 99 void HoverShip::rotatePitch(const Vector2& value) { } … … 97 101 /** 98 102 @brief 99 R otate in roll direction.103 Removed, does nothing. 100 104 @param value 101 A vector whose first component specifies the magnitude of the rotation. Positive means roll left, negative means roll right.102 105 */ 103 106 void HoverShip::rotateRoll(const Vector2& value) { } 104 107 108 /** 109 @brief 110 Checks if the ship is touching the floor. The ship can only jump if there is contact with someting beneath it. 111 */ 105 112 bool HoverShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) 106 113 { … … 118 125 } 119 126 127 /** 128 @brief 129 Makes the ship jump 130 @param bBoost 131 */ 120 132 void HoverShip::boost(bool bBoost) { 121 133 if (bBoost && this->isFloor_) … … 129 141 } 130 142 } 131 132 /*Hover* HoverShip::getGame()133 {134 if (game == NULL)135 {136 for (ObjectList<Hover>::iterator it = ObjectList<Hover>::begin(); it != ObjectList<Hover>::end(); ++it)137 {138 game = *it;139 }140 }141 return game;142 }*/143 143 } -
code/branches/hoverHS15/src/modules/hover/HoverShip.h
r10784 r10929 22 22 * Author: 23 23 * Cyrill Burgener 24 * Co-authors:25 * ...26 24 * 27 25 */ … … 43 41 #include "graphics/Camera.h" 44 42 #include "core/class/Super.h" 45 46 #include "Hover.h" // Is necessary for getGame function47 43 48 44 namespace orxonox -
code/branches/hoverHS15/src/modules/hover/TimeHUD.cc
r10900 r10929 24 24 * 25 25 */ 26 27 /** 28 @file TimeHUD.cc 29 @brief Implementation of the TimeHUD 30 */ 31 26 32 27 33 #include "TimeHUD.h" … … 102 108 } 103 109 110 /** 111 @brief 112 sets if the clock is running 113 @param running 114 */ 104 115 void TimeHUD::setRunning(bool running) 105 116 { … … 107 118 } 108 119 120 /** 121 @brief 122 returns if the clock is running 123 @returns running 124 */ 109 125 bool TimeHUD::isRunning() { 110 126 return this->_running; -
code/branches/hoverHS15/src/modules/hover/TimeHUD.h
r10895 r10929 24 24 * 25 25 */ 26 27 /** 28 @file TimeHUD.h 29 @brief Declaration of the TimeHUD class. 30 */ 26 31 27 32 #ifndef _TimeHUD_H__
Note: See TracChangeset
for help on using the changeset viewer.