Changeset 11099 for code/trunk/src/modules
- Timestamp:
- Jan 27, 2016, 6:50:51 PM (9 years ago)
- Location:
- code/trunk/src/modules
- Files:
-
- 40 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/modules/docking/DockingAnimation.h
r9667 r11099 53 53 /** 54 54 @brief 55 Base class for docking animations used by @ref orxonox::Dock ing"Docks".55 Base class for docking animations used by @ref orxonox::Dock "Docks". 56 56 57 57 @author -
code/trunk/src/modules/docking/DockingEffect.h
r9667 r11099 51 51 /** 52 52 @brief 53 Handles DockingEffects for @ref orxonox::Dock ing"Docks".53 Handles DockingEffects for @ref orxonox::Dock "Docks". 54 54 55 55 @author -
code/trunk/src/modules/docking/DockingTarget.h
r11071 r11099 45 45 /** 46 46 @brief 47 DockingTargets for @ref orxonox::Dock ing"Docks".47 DockingTargets for @ref orxonox::Dock "Docks". 48 48 49 49 @author -
code/trunk/src/modules/docking/MoveToDockingTarget.h
r11071 r11099 46 46 /** 47 47 @brief 48 Base class for docking animations used by @ref orxonox::Dock ing"Docks".48 Base class for docking animations used by @ref orxonox::Dock "Docks". 49 49 50 50 @author -
code/trunk/src/modules/gametypes/SpaceRaceController.cc
r11083 r11099 24 24 */ 25 25 26 /**27 * Conventions:28 * -first Checkpoint has index 029 * -staticCheckPoint= static Point (see def over = constructor)30 */31 32 /*TODO:33 * tICK KORRIGIEREN34 *35 *36 */37 26 #include <gametypes/SpaceRaceController.h> 38 27 #include "core/CoreIncludes.h" -
code/trunk/src/modules/gametypes/SpaceRaceController.h
r11071 r11099 36 36 namespace orxonox 37 37 { 38 /** 39 * Conventions: 40 * -first Checkpoint has index 0 41 * -staticCheckPoint= static Point (see def over = constructor) 42 *@todo: 43 * tICK KORRIGIEREN 44 */ 38 45 class _GametypesExport SpaceRaceController: public ArtificialController, 39 46 public Tickable -
code/trunk/src/modules/hover/HoverFlag.cc
r11071 r11099 80 80 @param yCoordinate 81 81 Y-Coordinate of the flage, 0-9, origin is bottom left 82 @param cellSize 83 The size of the cells 82 84 */ 83 85 void HoverFlag::init(int xCoordinate, int yCoordinate, int cellSize) -
code/trunk/src/modules/hover/HoverOrigin.h
r11071 r11099 41 41 The HoverOrigin implements the playing field @ref orxonox::Hover "Hover" takes place in and allows for many parameters of the minigame to be set. 42 42 The playing field resides in the x,z-plane, with the x-axis being the horizontal axis and the z-axis being the vertical axis. 43 44 Various parameters can be set: 45 - The <b>dimension</b> is a vector, that defines the width and height of the playing field. The default is <em>(200, 120)</em>. 46 - The <b>balltemplate</b> is a template that is applied to the @ref orxonox::HoverPlatform "HoverPlatform", it can be used to attach different things to it, e.g. its @ref orxonox::Model "Model". See below for a usage example. 47 - The <b>battemplate</b> is a template that is applied to the @ref orxonox::HoverPlatform "HoverFigure", it can be used to attach different things to it, e.g. its @ref orxonox::Model "Model". See below for a usage example. 48 - The <b>ballspeed</b> is the speed with which the @ref orxonox::HoverPlatform "HoverPlatform" moves. The default is <em>100</em>. 49 - The <b>ballaccfactor</b> is the acceleration factor for the @ref orxonox::HoverPlatform "HoverPlatform". The default is <em>1.0</em>. 50 - The <b>batspeed</b> is the speed with which the @ref orxonox::HoverFigure "HoverFigures" move. The default is <em>60</em>. 51 - The <b>batlength</b> is the length of the @ref orxonox::HoverFigure "HoverFigures" as the percentage of the height of the playing field. The default is <em>0.25</em>. 52 53 An example in XML of the HoverOrigin would be: 54 55 First the needed templates: 56 The template for the @ref orxonox::HoverPlatform "HoverPlatform". 57 @code 58 <Template name="Hoverball"> 59 <HoverPlatform> 60 <attached> 61 <Model mesh="sphere.mesh" scale="2" /> 62 <ParticleSpawner name="hiteffect" position="0,0,0" source="Orxonox/sparks2" lifetime="0.01" autostart="0" mainstate="spawn" /> 63 </attached> 64 <eventlisteners> 65 <EventTarget target="hiteffect" /> 66 </eventlisteners> 67 </HoverPlatform> 68 </Template> 69 @endcode 70 As can be seen, a sphere is attached as the @ref orxonox::Model "Model" for the @ref orxonox::HoverPlatform "HoverPlatform", and also an @ref orxonox::EventListener "EventListener" that triggers a @ref orxonox::ParticleSpawner "ParticleSpawner", whenever the ball hits the boundaries is attached. 71 72 Additionally the template for the @ref orxonox::HoverFigure "HoverFigure". 73 @code 74 <Template name="Hoverbatcameras" defaults="0"> 75 <HoverFigure> 76 <camerapositions> 77 <CameraPosition position="0,200,0" pitch="-90" absolute="true" /> 78 </camerapositions> 79 </HoverFigure> 80 </Template> 81 82 <Template name="Hoverbat"> 83 <HoverFigure camerapositiontemplate=Hoverbatcameras> 84 <attached> 85 <Model position="0,0,3" mesh="cube.mesh" scale3D="14,2,2" /> 86 </attached> 87 </HoverFigure> 88 </Template> 89 @endcode 90 As can be seen, there are actually two templates. The first template is needed to set the camera for the @ref orxonox::HoverFigure "HoverFigure". The second template ist the actual template for the @ref orxonox::HoverFigure "HoverFigure", the template for the camera position is added and a @ref orxonox::Model "Model" for the @ref orxonox::HoverFigure "HoverFigure" is attached. 91 propellerTemplate_ 92 Finally the HoverOrigin is created. 93 @code 94 <HoverOrigin name="Hovercenter" dimension="200,120" balltemplate="Hoverball" battemplate="Hoverbat" ballspeed="200" ballaccfactor="1.0" batspeed="130" batlength="0.25"> 95 <attached> 96 <Model position="0,0,60" mesh="cube.mesh" scale3D="105,1,1" /> 97 <Model position="0,0,-60" mesh="cube.mesh" scale3D="105,1,1" /> 98 </attached> 99 </HoverOrigin> 100 @endcode 101 All parameters are specified. And also two @ref orxonox::Model "Models" (for the upper and lower boundary) are attached. 102 103 For a more elaborate example, have a look at the <code>Hover.oxw</code> level file. 43 For an example, have a look at the <code>Hover.oxw</code> level file. 104 44 105 45 */ -
code/trunk/src/modules/hover/HoverWall.cc
r11071 r11099 76 76 @param y 77 77 y-Coordinate of the Square that the Wall is attached to, 0-9, Origin is Bottom left 78 @param cellSize 79 The size of a cell 80 @param cellHeight 81 The height of a cell 78 82 @param orientation 79 83 Wall on the right side (1) or on top (2) of this square, 0-1 -
code/trunk/src/modules/jump/JumpEnemy.cc
r11071 r11099 139 139 } 140 140 141 /**142 @brief143 Set the bats for the ball.144 @param bats145 An array (of size 2) of weak pointers, to be set as the new bats.146 */147 141 void JumpEnemy::setFigure(JumpFigure* newFigure) 148 142 { -
code/trunk/src/modules/mini4dgame/Mini4DgameBoard.cc
r11071 r11099 72 72 73 73 /** 74 @brief checks if the move is valid75 @param the position where to put the stone plus the player who makes the move74 @brief Checks if the move is valid 75 @param move The position where to put the stone 76 76 */ 77 77 bool Mini4DgameBoard::isValidMove(const Mini4DgamePosition& move) … … 98 98 /** 99 99 @brief makes a move on the logic playboard 100 @param the position where to put the stone plus the player who makes the move100 @param move The position where to put the stone 101 101 */ 102 102 void Mini4DgameBoard::makeMove(const Mini4DgamePosition& move) -
code/trunk/src/modules/notifications/NotificationDispatcher.h
r11071 r11099 103 103 /** 104 104 @brief Set the NotificationDispatcher to broadcast. 105 @param broadcastWhether the NotificationDispatcher is set to broadcast or singlecast.105 @param v Whether the NotificationDispatcher is set to broadcast or singlecast. 106 106 */ 107 107 void setBroadcasting(bool v) -
code/trunk/src/modules/notifications/NotificationQueue.cc
r11071 r11099 49 49 @brief 50 50 Default constructor. Registers and initializes the object. 51 @param creator52 The creator of the NotificationQueue.53 51 */ 54 52 NotificationQueue::NotificationQueue(Context* context) : BaseObject(context), Synchronisable(context), registered_(false) … … 65 63 this->registerVariables(); 66 64 } 67 68 // TODO move to docu.69 /**70 @brief71 Constructor. Registers and initializes the object.72 @param creator73 The creator of the NotificationQueue74 @param name75 The name of the new NotificationQueue. It needs to be unique76 @param senders77 The senders that are targets of this NotificationQueue, i.e. the names of senders whose Notifications this NotificationQueue displays.78 The senders need to be seperated by commas.79 @param size80 The size (the maximum number of displayed Notifications) of this NotificationQueue.81 @param displayTime82 The time during which a Notification is (at most) displayed.83 */84 65 85 66 /** -
code/trunk/src/modules/objects/Script.cc
r11071 r11099 58 58 @brief 59 59 Constructor. Registers and initializes the object. 60 @param creator61 The creator of this object.62 60 */ 63 61 Script::Script(Context* context) : BaseObject(context) -
code/trunk/src/modules/objects/Turret.h
r11071 r11099 28 28 29 29 /** 30 @file Turret.h 30 31 @brief Definition of the Turret class. 31 32 @ingroup Objects -
code/trunk/src/modules/objects/controllers/TurretController.h
r10262 r11099 26 26 * 27 27 */ 28 29 /**30 @brief Definition for the controller for turrets.31 */32 28 33 29 #ifndef _TurretController_H__ -
code/trunk/src/modules/objects/triggers/DistanceTrigger.cc
r11071 r11099 54 54 @brief 55 55 Constructor. Registers and initializes the object. 56 @param creator57 The creator of this trigger.58 56 */ 59 57 DistanceTrigger::DistanceTrigger(Context* context) : Trigger(context) -
code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc
r9667 r11099 45 45 @brief 46 46 Constructor. Registers the object. 47 @param creator48 The creator of this object.49 47 */ 50 48 DistanceTriggerBeacon::DistanceTriggerBeacon(Context* context) : StaticEntity(context) -
code/trunk/src/modules/objects/triggers/EventTrigger.cc
r11071 r11099 45 45 @brief 46 46 Constructor. Registers and initializes the object. 47 @param creator48 The creator of the EventTrigger.49 47 */ 50 48 EventTrigger::EventTrigger(Context* context) : Trigger(context) -
code/trunk/src/modules/objects/triggers/MultiTrigger.cc
r11071 r11099 48 48 @brief 49 49 Constructor. Registers the objects and initializes default values. 50 @param creator51 The creator.52 50 */ 53 51 MultiTrigger::MultiTrigger(Context* context) : TriggerBase(context) -
code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc
r11071 r11099 47 47 @brief 48 48 Default constructor. Registers the object and creates an empty container. 49 @param creator50 The creator.51 49 */ 52 50 MultiTriggerContainer::MultiTriggerContainer(Context* context) : BaseObject(context), originator_(nullptr), data_(nullptr) … … 58 56 @brief 59 57 Constructor. Registers the object and sets the input values. 60 @param c reator61 The c reator.58 @param context 59 The context. 62 60 @param originator 63 61 A pointer to the originator of the Event, i.e. the MultiTrigger that fired the Event. (or is about to fire) -
code/trunk/src/modules/objects/triggers/Trigger.cc
r11071 r11099 51 51 @brief 52 52 Constructor. Registers and initializes the object. 53 @param creator54 The creator of the Trigger.55 53 */ 56 54 Trigger::Trigger(Context* context) : TriggerBase(context) -
code/trunk/src/modules/pickup/Pickup.cc
r11071 r11099 53 53 @brief 54 54 Constructor. Registers and initializes the object. 55 @param creator56 The objects creator.57 55 */ 58 56 Pickup::Pickup(Context* context) : BaseObject(context) -
code/trunk/src/modules/pickup/PickupCollection.cc
r11071 r11099 50 50 @brief 51 51 Default Constructor. 52 @param creator53 The creator of the object.54 52 */ 55 53 PickupCollection::PickupCollection(Context* context) : BaseObject(context) -
code/trunk/src/modules/pickup/PickupManager.cc
r11071 r11099 335 335 @param representationObjectId 336 336 The objectId identifying (over the network) the PickupRepresentation that represents this Pickupable. 337 @param representationName 338 The name of the associated PickupRepresentation 337 339 @param pickedUp 338 340 The pickedUp status the Pickupable changed to. -
code/trunk/src/modules/pickup/PickupSpawner.cc
r11071 r11099 52 52 @brief 53 53 Constructor. Creates a blank PickupSpawner. 54 @param creator55 Pointer to the object which created this item.56 54 */ 57 55 PickupSpawner::PickupSpawner(Context* context) : StaticEntity(context), pickup_(nullptr), representation_(nullptr), pickupTemplate_(nullptr) … … 90 88 @brief 91 89 Factory method, Creates a fully functional PickupSpawner. 92 @param c reator93 The c reatorof this PickupSpawner.90 @param context 91 The context of this PickupSpawner. 94 92 @param pickup 95 93 The Pickupable to be spawned by this PickupSpawner. -
code/trunk/src/modules/pickup/items/DamageBoostPickup.h
r9667 r11099 68 68 69 69 /** 70 @brief set Damage multiplier 71 @param multiplier The default damage multiplier to set 70 @brief Get Damage multiplier 72 71 */ 73 72 inline float getDamageMultiplier() -
code/trunk/src/modules/tetris/TetrisCenterpoint.h
r11071 r11099 105 105 /** 106 106 @brief Set the template for the stones. 107 @param template The template name to be applied to each stone.107 @param templateName The template name to be applied to each stone. 108 108 */ 109 109 void setStoneTemplate(const std::string& templateName) … … 118 118 /** 119 119 @brief Set the template for the bricks. 120 @param template The template name to be applied to each brick.120 @param templateName The template name to be applied to each brick. 121 121 */ 122 122 void setBrickTemplate(const std::string& templateName) -
code/trunk/src/modules/towerdefense/TowerDefense.h
r11071 r11099 27 27 */ 28 28 29 /**30 @brief31 GameType class for TowerDefense. See TowerDefenseReadme.txt for Information.32 33 @ingroup TowerDefense34 */35 36 29 37 30 #ifndef _TowerDefense_H__ … … 47 40 namespace orxonox 48 41 { 42 /** 43 @brief 44 GameType class for TowerDefense. See TowerDefenseReadme.txt for Information. 45 46 @ingroup TowerDefense 47 */ 49 48 class _TowerDefenseExport TowerDefense : public TeamDeathmatch 50 49 { -
code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h
r11071 r11099 27 27 */ 28 28 29 /**30 @brief31 See TowerDefenseReadme.txt for Information.32 @ingroup TowerDefense33 */34 35 29 36 30 #ifndef _TowerDefenseCenterpoint_H__ … … 46 40 namespace orxonox 47 41 { 42 /** 43 @brief 44 See TowerDefenseReadme.txt for Information. 45 @ingroup TowerDefense 46 */ 48 47 class _TowerDefenseExport TowerDefenseCenterpoint : public MobileEntity 49 48 { -
code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc
r11071 r11099 5 5 // Created by Jonas Erb on 22.10.14. 6 6 7 /**8 @brief9 See TowerDefenseReadme.txt for Information.10 11 @ingroup TowerDefense12 */13 7 #include "TowerDefenseEnemy.h" 14 8 #include "core/CoreIncludes.h" -
code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h
r11071 r11099 5 5 // Created by Jonas Erb on 22.10.14. 6 6 7 /**8 @brief9 See TowerDefenseReadme.txt for Information.10 7 11 @ingroup TowerDefense12 */13 8 14 9 … … 26 21 namespace orxonox 27 22 { 28 /* Class to give the TowerDefenseEnemy spaceships waypoints and 29 * 30 */ 23 /** 24 @brief 25 See TowerDefenseReadme.txt for Information. 26 27 @ingroup TowerDefense 28 */ 31 29 class _TowerDefenseExport TowerDefenseEnemy : public SpaceShip 32 30 { -
code/trunk/src/modules/towerdefense/TowerDefenseField.h
r11071 r11099 27 27 */ 28 28 29 /**30 @brief31 See TowerDefenseReadme.txt for Information.32 @ingroup TowerDefense33 */34 29 35 30 … … 56 51 }; 57 52 58 53 /** 54 @brief 55 See TowerDefenseReadme.txt for Information. 56 @ingroup TowerDefense 57 */ 59 58 class _TowerDefenseExport TowerDefenseField : public MovableEntity 60 59 { -
code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h
r11071 r11099 27 27 */ 28 28 29 /**30 @brief31 This subclass of OverlayText is used to display the stats of the player in the HUD32 33 @ingroup TowerDefense34 */35 36 29 37 30 #ifndef _TowerDefenseHUDController_H__ … … 46 39 namespace orxonox 47 40 { 41 /** 42 @brief 43 This subclass of OverlayText is used to display the stats of the player in the HUD 44 45 @ingroup TowerDefense 46 */ 48 47 class _TowerDefenseExport TowerDefenseHUDController : public OverlayText, public Tickable 49 48 { -
code/trunk/src/modules/towerdefense/TowerDefenseTower.h
r10629 r11099 6 6 // Copyright (c) 2012 __MyCompanyName__. All rights reserved. 7 7 // 8 9 /**10 @brief11 See TowerDefenseTowerDefenseReadme.txt for Information.12 13 @ingroup TowerDefenseTowerDefense14 */15 8 16 9 … … 24 17 namespace orxonox 25 18 { 19 /** 20 @brief 21 See TowerDefenseTowerDefenseReadme.txt for Information. 22 23 @ingroup TowerDefenseTowerDefense 24 */ 26 25 class _TowerDefenseExport TowerDefenseTower : public Turret 27 26 { -
code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc
r11071 r11099 74 74 @param contactPoint 75 75 A btManifoldPoint indicating the point of contact/impact. 76 @param cs 77 The btCollisionShape of the other object 76 78 @return 77 79 Returns true if the collision resulted in a successful hit. -
code/trunk/src/modules/weapons/projectiles/BasicProjectile.h
r10293 r11099 97 97 /** 98 98 @brief Get the shield-damage done by this projectile. 99 Shield-damage only reduces shield health.100 @param shielddamage The amount of damage. Is non-negative.101 99 */ 102 100 inline float getShieldDamage() const -
code/trunk/src/modules/weapons/projectiles/GravityBombField.h
r11071 r11099 50 50 * @date 23.05.2015 51 51 * 52 * @param [in,out] the Pawn that created the field.52 * @param [in,out] shooter the Pawn that created the field. 53 53 */ 54 54 void setShooter(Pawn* shooter) -
code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc
r11052 r11099 80 80 /** 81 81 @brief 82 This function starts a timer that will cause the projectile to split after a time defined by the argument @param splitTime. 82 This function starts a timer that will cause the projectile to split after a time defined by the argument @p splitTime. 83 @param splitTime The time 83 84 */ 84 85 void SplitGunProjectile::setSplitTime(float splitTime) -
code/trunk/src/modules/weapons/weaponmodes/HsW01.h
r11071 r11099 76 76 /** 77 77 @brief Set the sound. 78 @param meshThe Sound name.78 @param sound The Sound name. 79 79 */ 80 80 void setSound(const std::string& sound)
Note: See TracChangeset
for help on using the changeset viewer.