[Orxonox-commit 2324] r7039 - in code/branches/presentation3/src: libraries/network modules/designtools modules/pickup/items modules/weapons modules/weapons/projectiles orxonox orxonox/graphics orxonox/worldentities
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon May 31 09:33:10 CEST 2010
Author: rgrieder
Date: 2010-05-31 09:33:09 +0200 (Mon, 31 May 2010)
New Revision: 7039
Modified:
code/branches/presentation3/src/libraries/network/ChatListener.h
code/branches/presentation3/src/modules/designtools/CreateStars.cc
code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc
code/branches/presentation3/src/modules/designtools/ScreenshotManager.h
code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc
code/branches/presentation3/src/modules/pickup/items/ShieldPickup.h
code/branches/presentation3/src/modules/weapons/RocketController.h
code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h
code/branches/presentation3/src/orxonox/Level.h
code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc
code/branches/presentation3/src/orxonox/worldentities/Drone.cc
code/branches/presentation3/src/orxonox/worldentities/Drone.h
Log:
Removed some tabs.
Modified: code/branches/presentation3/src/libraries/network/ChatListener.h
===================================================================
--- code/branches/presentation3/src/libraries/network/ChatListener.h 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/libraries/network/ChatListener.h 2010-05-31 07:33:09 UTC (rev 7039)
@@ -37,7 +37,7 @@
class _NetworkExport ChatListener : virtual public OrxonoxClass
{
public:
- /* constructor, destructor */
+ /* constructor, destructor */
ChatListener();
virtual ~ChatListener() {}
Modified: code/branches/presentation3/src/modules/designtools/CreateStars.cc
===================================================================
--- code/branches/presentation3/src/modules/designtools/CreateStars.cc 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/modules/designtools/CreateStars.cc 2010-05-31 07:33:09 UTC (rev 7039)
@@ -120,6 +120,6 @@
XMLPortParam(CreateStars, "alphaDiff", setAlphaDiff, getAlphaDiff, xmlelement, mode);
XMLPortParam(CreateStars, "radiusDiff", setRadiusDiff, getRadiusDiff, xmlelement, mode);
XMLPortParam(CreateStars, "radius", setRadius, getRadius, xmlelement, mode);
- }
+ }
}
Modified: code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc
===================================================================
--- code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc 2010-05-31 07:33:09 UTC (rev 7039)
@@ -24,8 +24,8 @@
// flag for overlay rendering
mDisableOverlays = overlayFlag;
//get current window size
- mWindowWidth = pRenderWindow->getWidth();
- mWindowHeight = pRenderWindow->getHeight();
+ mWindowWidth = pRenderWindow->getWidth();
+ mWindowHeight = pRenderWindow->getHeight();
//create temporary texture
mTempTex = Ogre::TextureManager::getSingleton().createManual("ScreenShotTex",
Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::TEX_TYPE_2D,
@@ -63,7 +63,7 @@
//set the viewport settings
Ogre::Viewport *vp = mRT->getViewport(0);
- vp->setClearEveryFrame(true);
+ vp->setClearEveryFrame(true);
vp->setOverlaysEnabled(false);
// remind current overlay flag
@@ -77,7 +77,7 @@
{
// Simple case where the contents of the screen are taken directly
// Also used when an invalid value is passed within gridSize (zero or negative grid size)
- mRT->update(); //render
+ mRT->update(); //render
//write the file on the Harddisk
mRT->writeContentsToFile(fileName + "." + mFileExtension);
@@ -90,8 +90,8 @@
camera->getFrustumExtents(originalFrustumLeft, originalFrustumRight, originalFrustumTop, originalFrustumBottom);
// compute the Stepsize for the drid
- Ogre::Real frustumGridStepHorizontal = (originalFrustumRight * 2) / mGridSize;
- Ogre::Real frustumGridStepVertical = (originalFrustumTop * 2) / mGridSize;
+ Ogre::Real frustumGridStepHorizontal = (originalFrustumRight * 2) / mGridSize;
+ Ogre::Real frustumGridStepVertical = (originalFrustumTop * 2) / mGridSize;
// process each grid
Ogre::Real frustumLeft, frustumRight, frustumTop, frustumBottom;
@@ -102,17 +102,17 @@
// Shoggoth frustum extents setting
// compute the new frustum extents
- frustumLeft = originalFrustumLeft + frustumGridStepHorizontal * x;
- frustumRight = frustumLeft + frustumGridStepHorizontal;
- frustumTop = originalFrustumTop - frustumGridStepVertical * y;
- frustumBottom = frustumTop - frustumGridStepVertical;
+ frustumLeft = originalFrustumLeft + frustumGridStepHorizontal * x;
+ frustumRight = frustumLeft + frustumGridStepHorizontal;
+ frustumTop = originalFrustumTop - frustumGridStepVertical * y;
+ frustumBottom = frustumTop - frustumGridStepVertical;
// set the frustum extents value to the camera
camera->setFrustumExtents(frustumLeft, frustumRight, frustumTop, frustumBottom);
// ignore time duration between frames
Ogre::Root::getSingletonPtr()->clearEventTimes();
- mRT->update(); //render
+ mRT->update(); //render
//define the current
Ogre::Box subBox = Ogre::Box(x* mWindowWidth,y * mWindowHeight,x * mWindowWidth + mWindowWidth, y * mWindowHeight + mWindowHeight);
Modified: code/branches/presentation3/src/modules/designtools/ScreenshotManager.h
===================================================================
--- code/branches/presentation3/src/modules/designtools/ScreenshotManager.h 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/modules/designtools/ScreenshotManager.h 2010-05-31 07:33:09 UTC (rev 7039)
@@ -39,7 +39,7 @@
void makeScreenshot(Ogre::Camera* camera, Ogre::String fileName) const;
protected:
- std::string mFileExtension;
+ std::string mFileExtension;
unsigned int mGridSize, mWindowWidth, mWindowHeight;
bool mDisableOverlays;
//temp texture with current screensize
Modified: code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc
===================================================================
--- code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc 2010-05-31 07:33:09 UTC (rev 7039)
@@ -150,10 +150,10 @@
}
}
-
- void SkyboxGenerator::createSkybox( )
- {
+
+ void SkyboxGenerator::createSkybox( )
+ {
SkyboxGenerator::getInstance().takeScreenshot_ = true;
CommandExecutor::execute("pause");
- }
+ }
}
Modified: code/branches/presentation3/src/modules/pickup/items/ShieldPickup.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/ShieldPickup.h 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/modules/pickup/items/ShieldPickup.h 2010-05-31 07:33:09 UTC (rev 7039)
@@ -49,8 +49,8 @@
@brief
A Pickup which can add a Shield to the Pawn.
- 1) The percentage: The percentage the shield takes from the damage dealt to a Pawn
- 2) The hit points: The amount of damage points a shield can teake before collapsing
+ 1) The percentage: The percentage the shield takes from the damage dealt to a Pawn
+ 2) The hit points: The amount of damage points a shield can teake before collapsing
3) The activation type: 'immediate' or 'onUse'. defines if the item is used when it's picked up or only after the player chooses to use it.
4) The duration: the activation time of the pickup.
Modified: code/branches/presentation3/src/modules/weapons/RocketController.h
===================================================================
--- code/branches/presentation3/src/modules/weapons/RocketController.h 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/modules/weapons/RocketController.h 2010-05-31 07:33:09 UTC (rev 7039)
@@ -48,23 +48,23 @@
{
public:
RocketController(BaseObject* creator);
- virtual ~RocketController();
+ virtual ~RocketController();
virtual void tick(float dt);
- SimpleRocket* getRocket() const
+ SimpleRocket* getRocket() const
{ return this->rocket_; };
- void setTarget(WorldEntity* target);
+ void setTarget(WorldEntity* target);
protected:
- void moveToPosition(const Vector3& target);
- void setTargetPosition();
- void moveToTargetPosition();
+ void moveToPosition(const Vector3& target);
+ void setTargetPosition();
+ void moveToTargetPosition();
private:
- SimpleRocket* rocket_; //!<The Rocket it controlls
- Vector3 targetPosition_;
- WeakPtr<PlayerInfo> player_;
-
- WeakPtr<WorldEntity> target_;
+ SimpleRocket* rocket_; //!<The Rocket it controlls
+ Vector3 targetPosition_;
+ WeakPtr<PlayerInfo> player_;
+
+ WeakPtr<WorldEntity> target_;
};
Modified: code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h
===================================================================
--- code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h 2010-05-31 07:33:09 UTC (rev 7039)
@@ -50,7 +50,7 @@
public:
SimpleRocket(BaseObject* creator);
virtual ~SimpleRocket();
- virtual void tick(float dt);
+ virtual void tick(float dt);
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a SimpleRocket through XML.
virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
@@ -65,7 +65,7 @@
virtual void rotateYaw(const Vector2& value);
virtual void rotatePitch(const Vector2& value);
virtual void rotateRoll(const Vector2& value);
- void setDestroy();
+ void setDestroy();
/**
@brief Moves the SimpleRocket in the Front/Back-direction by the specifed amount.
@@ -98,14 +98,14 @@
*/
inline void rotatePitch(float value)
{
- this->rotatePitch(Vector2(value, 0)); }
+ this->rotatePitch(Vector2(value, 0)); }
/**
@brief Rotates the SimpleRocket around the z-axis by the specifed amount.
@param value The amount by which the SimpleRocket is to be rotated.
*/
inline void rotateRoll(float value)
{
- this->rotateRoll(Vector2(value, 0)); }
+ this->rotateRoll(Vector2(value, 0)); }
void setOwner(Pawn* owner);
inline Pawn* getOwner() const
Modified: code/branches/presentation3/src/orxonox/Level.h
===================================================================
--- code/branches/presentation3/src/orxonox/Level.h 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/orxonox/Level.h 2010-05-31 07:33:09 UTC (rev 7039)
@@ -56,7 +56,7 @@
void playerEntered(PlayerInfo* player);
void playerLeft(PlayerInfo* player);
-
+
MeshLodInformation* getLodInfo(std::string meshName) const;
Modified: code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc 2010-05-31 07:33:09 UTC (rev 7039)
@@ -40,7 +40,7 @@
CreateFactory(MeshLodInformation);
MeshLodInformation::MeshLodInformation(BaseObject* creator)
- : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15)
+ : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15)
{
RegisterObject(MeshLodInformation);
}
@@ -61,25 +61,25 @@
std::string MeshLodInformation::getMeshName()
{
- return MeshLodInformation::getMeshSource();
+ return MeshLodInformation::getMeshSource();
}
-
- void MeshLodInformation::setLodLevel(float lodLevel)
- {
+
+ void MeshLodInformation::setLodLevel(float lodLevel)
+ {
if(lodLevel>=0)
- lodLevel_=lodLevel;
- }
- float MeshLodInformation::getLodLevel()
- {
- return lodLevel_;
- }
- void MeshLodInformation::setMeshSource(std::string meshSource)
- {
- meshSource_ = meshSource;
- }
- std::string MeshLodInformation::getMeshSource()
- {
- return meshSource_;
- }
+ lodLevel_=lodLevel;
+ }
+ float MeshLodInformation::getLodLevel()
+ {
+ return lodLevel_;
+ }
+ void MeshLodInformation::setMeshSource(std::string meshSource)
+ {
+ meshSource_ = meshSource;
+ }
+ std::string MeshLodInformation::getMeshSource()
+ {
+ return meshSource_;
+ }
}
Modified: code/branches/presentation3/src/orxonox/worldentities/Drone.cc
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/Drone.cc 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/orxonox/worldentities/Drone.cc 2010-05-31 07:33:09 UTC (rev 7039)
@@ -1,9 +1,3 @@
-
-
-
-
-
-
/*
* ORXONOX - the hottest 3D action shooter ever to exist
* > www.orxonox.net <
@@ -46,7 +40,7 @@
*/
Drone::Drone(BaseObject* creator) : Pawn(creator)
{
- RegisterObject(Drone);
+ RegisterObject(Drone);
this->myController_ = 0;
@@ -79,9 +73,9 @@
{
SUPER(Drone, XMLPort, xmlelement, mode);
- XMLPortParam(Drone, "primaryThrust_", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
- XMLPortParam(Drone, "auxilaryThrust_", setAuxilaryThrust, getAuxilaryThrust, xmlelement, mode);
- XMLPortParam(Drone, "rotationThrust_", setRotationThrust, getRotationThrust, xmlelement, mode);
+ XMLPortParam(Drone, "primaryThrust_", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
+ XMLPortParam(Drone, "auxilaryThrust_", setAuxilaryThrust, getAuxilaryThrust, xmlelement, mode);
+ XMLPortParam(Drone, "rotationThrust_", setRotationThrust, getRotationThrust, xmlelement, mode);
XMLPortParam(Drone, "maxDistanceToOwner_", setMaxDistanceToOwner, getMaxDistanceToOwner, xmlelement, mode);
XMLPortParam(Drone, "minDistanceToOwner_", setMinDistanceToOwner, getMinDistanceToOwner, xmlelement, mode);
}
Modified: code/branches/presentation3/src/orxonox/worldentities/Drone.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/Drone.h 2010-05-31 07:24:33 UTC (rev 7038)
+++ code/branches/presentation3/src/orxonox/worldentities/Drone.h 2010-05-31 07:33:09 UTC (rev 7039)
@@ -113,19 +113,19 @@
{ this->maxDistanceToOwner_=distance; }
inline void setMinDistanceToOwner( float distance)
{ this->minDistanceToOwner_=distance; }
-
+
/**
@brief Gets the primary thrust to the input amount.
- @preturn The amount of thrust.
+ @return The amount of thrust.
*/
inline float getPrimaryThrust()
{ return this->primaryThrust_; }
- inline float getAuxilaryThrust()
+ inline float getAuxilaryThrust()
{ return this->auxilaryThrust_; }
- inline float getRotationThrust()
+ inline float getRotationThrust()
{ return this->rotationThrust_; }
- inline float getMaxDistanceToOwner()
+ inline float getMaxDistanceToOwner()
{ return this->maxDistanceToOwner_; }
inline float getMinDistanceToOwner()
{ return this->minDistanceToOwner_; }
More information about the Orxonox-commit
mailing list