[Orxonox-commit 5898] r10557 - in code/branches/core7/src: modules/dodgerace modules/invader modules/jump modules/objects/triggers modules/tetris modules/towerdefense orxonox/gametypes orxonox/infos orxonox/interfaces orxonox/sound
landauf at orxonox.net
landauf at orxonox.net
Sat Aug 29 18:18:31 CEST 2015
Author: landauf
Date: 2015-08-29 18:18:30 +0200 (Sat, 29 Aug 2015)
New Revision: 10557
Modified:
code/branches/core7/src/modules/dodgerace/DodgeRace.cc
code/branches/core7/src/modules/dodgerace/DodgeRace.h
code/branches/core7/src/modules/dodgerace/DodgeRaceShip.cc
code/branches/core7/src/modules/dodgerace/DodgeRaceShip.h
code/branches/core7/src/modules/invader/Invader.cc
code/branches/core7/src/modules/invader/Invader.h
code/branches/core7/src/modules/invader/InvaderEnemy.cc
code/branches/core7/src/modules/invader/InvaderEnemy.h
code/branches/core7/src/modules/invader/InvaderShip.cc
code/branches/core7/src/modules/invader/InvaderShip.h
code/branches/core7/src/modules/invader/InvaderWeapon.cc
code/branches/core7/src/modules/jump/JumpEnemy.cc
code/branches/core7/src/modules/jump/JumpEnemy.h
code/branches/core7/src/modules/jump/JumpItem.cc
code/branches/core7/src/modules/jump/JumpItem.h
code/branches/core7/src/modules/jump/JumpPlatform.cc
code/branches/core7/src/modules/jump/JumpPlatform.h
code/branches/core7/src/modules/jump/JumpProjectile.cc
code/branches/core7/src/modules/jump/JumpProjectile.h
code/branches/core7/src/modules/objects/triggers/DistanceTrigger.cc
code/branches/core7/src/modules/tetris/Tetris.h
code/branches/core7/src/modules/towerdefense/TowerDefenseEnemy.cc
code/branches/core7/src/modules/towerdefense/TowerDefenseEnemy.h
code/branches/core7/src/orxonox/gametypes/Dynamicmatch.cc
code/branches/core7/src/orxonox/gametypes/Dynamicmatch.h
code/branches/core7/src/orxonox/infos/PlayerInfo.cc
code/branches/core7/src/orxonox/interfaces/InterfaceCompilation.cc
code/branches/core7/src/orxonox/sound/SoundManager.cc
code/branches/core7/src/orxonox/sound/SoundManager.h
Log:
cleanup: no need to pass/return WeakPtrs to/from functions. normal pointers are enough.
Modified: code/branches/core7/src/modules/dodgerace/DodgeRace.cc
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRace.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/dodgerace/DodgeRace.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -74,7 +74,7 @@
{
for (int i = 0; i < 7; i++)
{
- WeakPtr<BigExplosion> chunk = new BigExplosion(this->center_->getContext());
+ BigExplosion* chunk = new BigExplosion(this->center_->getContext());
chunk->setPosition(Vector3(600, 0, 100.f * i - 300));
chunk->setVelocity(Vector3(1000, 0, 0)); //player->getVelocity()
chunk->setScale(20);
@@ -90,8 +90,6 @@
{
if (getPlayer() != NULL)
{
- //WeakPtr<DodgeRaceShip> ship = getPlayer();
-
currentPosition = getPlayer()->getWorldPosition().x;
counter = counter + (currentPosition - lastPosition);
lastPosition = currentPosition;
@@ -112,7 +110,7 @@
counter = 0;
for(int i = 0; i<6; i++)
{
- WeakPtr<DodgeRaceCube> cube = new DodgeRaceCube(this->center_->getContext());
+ DodgeRaceCube* cube = new DodgeRaceCube(this->center_->getContext());
cubeList.push_back(cube);
switch(pattern)
{
@@ -137,7 +135,7 @@
SUPER(DodgeRace, tick, dt);
}
- WeakPtr<DodgeRaceShip> DodgeRace::getPlayer()
+ DodgeRaceShip* DodgeRace::getPlayer()
{
if (player == NULL)
{
Modified: code/branches/core7/src/modules/dodgerace/DodgeRace.h
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRace.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/dodgerace/DodgeRace.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -104,7 +104,7 @@
private:
Timer endGameTimer;
- WeakPtr<DodgeRaceShip> getPlayer();
+ DodgeRaceShip* getPlayer();
WeakPtr<DodgeRaceShip> player;
std::vector<DodgeRaceCube*> cubeList;
void toggleShowLevel(){bShowLevel = !bShowLevel;}
Modified: code/branches/core7/src/modules/dodgerace/DodgeRaceShip.cc
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRaceShip.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/dodgerace/DodgeRaceShip.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -89,7 +89,7 @@
// Camera
- WeakPtr<Camera> camera = this->getCamera();
+ Camera* camera = this->getCamera();
if (camera != NULL)
{
// camera->setPosition(Vector3(-pos.z, -posforeward, 0));
@@ -149,7 +149,7 @@
return false;
}
- WeakPtr<DodgeRace> DodgeRaceShip::getGame()
+ DodgeRace* DodgeRaceShip::getGame()
{
if (game == NULL)
{
Modified: code/branches/core7/src/modules/dodgerace/DodgeRaceShip.h
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRaceShip.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/dodgerace/DodgeRaceShip.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -77,7 +77,7 @@
private:
virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
- WeakPtr<DodgeRace> getGame();
+ DodgeRace* getGame();
WeakPtr<DodgeRace> game;
WeakPtr<WorldEntity> lastEntity;
Camera* camera;
Modified: code/branches/core7/src/modules/invader/Invader.cc
===================================================================
--- code/branches/core7/src/modules/invader/Invader.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/invader/Invader.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -86,7 +86,7 @@
{
for (int i = 0; i < 7; i++)
{
- WeakPtr<BigExplosion> chunk = new BigExplosion(this->center_->getContext());
+ BigExplosion* chunk = new BigExplosion(this->center_->getContext());
chunk->setPosition(Vector3(600, 0, 100.f * i - 300));
chunk->setVelocity(Vector3(1000, 0, 0)); //player->getVelocity()
chunk->setScale(20);
@@ -98,7 +98,7 @@
showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&Invader::toggleShowLevel, this)));
}
- WeakPtr<InvaderShip> Invader::getPlayer()
+ InvaderShip* Invader::getPlayer()
{
if (player == NULL)
{
@@ -115,7 +115,7 @@
for (int i = 0; i < (3*log10(static_cast<double>(level)) + 1); i++)
{
- WeakPtr<InvaderEnemy> newPawn;
+ InvaderEnemy* newPawn;
if (rand() % 42/(1 + level*level) == 0)
{
newPawn = new InvaderEnemyShooter(this->center_->getContext());
Modified: code/branches/core7/src/modules/invader/Invader.h
===================================================================
--- code/branches/core7/src/modules/invader/Invader.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/invader/Invader.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -77,7 +77,7 @@
bool bShowLevel;
private:
void toggleShowLevel(){bShowLevel = !bShowLevel;}
- WeakPtr<InvaderShip> getPlayer();
+ InvaderShip* getPlayer();
WeakPtr<InvaderCenterPoint> center_;
WeakPtr<InvaderShip> player;
Modified: code/branches/core7/src/modules/invader/InvaderEnemy.cc
===================================================================
--- code/branches/core7/src/modules/invader/InvaderEnemy.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/invader/InvaderEnemy.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -68,7 +68,7 @@
return false;
}
- WeakPtr<Invader> InvaderEnemy::getGame()
+ Invader* InvaderEnemy::getGame()
{
if (game == NULL)
{
@@ -84,4 +84,4 @@
if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL && getHealth() <= 0)
getGame()->addPoints(42);
}
-}
\ No newline at end of file
+}
Modified: code/branches/core7/src/modules/invader/InvaderEnemy.h
===================================================================
--- code/branches/core7/src/modules/invader/InvaderEnemy.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/invader/InvaderEnemy.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -48,11 +48,11 @@
virtual void tick(float dt);
virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
- virtual void setPlayer(WeakPtr<InvaderShip> player){this->player = player;}
+ virtual void setPlayer(InvaderShip* player){this->player = player;}
int level;
protected:
- WeakPtr<Invader> getGame();
+ Invader* getGame();
WeakPtr<Invader> game;
WeakPtr<InvaderShip> player;
Camera* camera;
Modified: code/branches/core7/src/modules/invader/InvaderShip.cc
===================================================================
--- code/branches/core7/src/modules/invader/InvaderShip.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/invader/InvaderShip.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -90,7 +90,7 @@
ControllableEntity::fire(0);
// Camera
- WeakPtr<Camera> camera = this->getCamera();
+ Camera* camera = this->getCamera();
if (camera != NULL)
{
camera->setPosition(Vector3(-pos.z, -posforeward, 0));
@@ -141,8 +141,8 @@
inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
{
// orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
- WeakPtr<InvaderEnemy> enemy = orxonox_cast<InvaderEnemy*>(otherObject);
- WeakPtr<Projectile> shot = orxonox_cast<Projectile*>(otherObject);
+ InvaderEnemy* enemy = orxonox_cast<InvaderEnemy*>(otherObject);
+ Projectile* shot = orxonox_cast<Projectile*>(otherObject);
// ensure that this gets only called once per enemy.
if (enemy != NULL && lastEnemy != enemy)
{
@@ -170,7 +170,7 @@
// SUPER(InvaderShip, collidesAgainst, otherObject, contactPoint);
}
- WeakPtr<Invader> InvaderShip::getGame()
+ Invader* InvaderShip::getGame()
{
if (game == NULL)
{
Modified: code/branches/core7/src/modules/invader/InvaderShip.h
===================================================================
--- code/branches/core7/src/modules/invader/InvaderShip.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/invader/InvaderShip.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -69,7 +69,7 @@
protected:
virtual void death();
private:
- WeakPtr<Invader> getGame();
+ Invader* getGame();
WeakPtr<Invader> game;
Camera* camera;
bool isFireing;
Modified: code/branches/core7/src/modules/invader/InvaderWeapon.cc
===================================================================
--- code/branches/core7/src/modules/invader/InvaderWeapon.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/invader/InvaderWeapon.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -67,7 +67,7 @@
// Create the projectile.projectile
projectile = new Projectile(this->getContext());
- WeakPtr<Model> model = new Model(projectile->getContext());
+ Model* model = new Model(projectile->getContext());
model->setMeshSource(mesh_);
model->setCastShadows(false);
projectile->attach(model);
Modified: code/branches/core7/src/modules/jump/JumpEnemy.cc
===================================================================
--- code/branches/core7/src/modules/jump/JumpEnemy.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/jump/JumpEnemy.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -150,7 +150,7 @@
@param bats
An array (of size 2) of weak pointers, to be set as the new bats.
*/
- void JumpEnemy::setFigure(WeakPtr<JumpFigure> newFigure)
+ void JumpEnemy::setFigure(JumpFigure* newFigure)
{
figure_ = newFigure;
}
Modified: code/branches/core7/src/modules/jump/JumpEnemy.h
===================================================================
--- code/branches/core7/src/modules/jump/JumpEnemy.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/jump/JumpEnemy.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -67,7 +67,7 @@
{ return height_; }
virtual void setProperties(float newLeftBoundary, float newRightBoundary, float newLowerBoundary, float newUpperBoundary, float newHSpeed, float newVSpeed);
- void setFigure(WeakPtr<JumpFigure> bats);
+ void setFigure(JumpFigure* newFigure);
virtual void touchFigure();
bool dead_;
protected:
Modified: code/branches/core7/src/modules/jump/JumpItem.cc
===================================================================
--- code/branches/core7/src/modules/jump/JumpItem.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/jump/JumpItem.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -108,7 +108,7 @@
setVelocity(Vector3(newHSpeed,0,newVSpeed));
}
- void JumpItem::setFigure(WeakPtr<JumpFigure> newFigure)
+ void JumpItem::setFigure(JumpFigure* newFigure)
{
figure_ = newFigure;
}
Modified: code/branches/core7/src/modules/jump/JumpItem.h
===================================================================
--- code/branches/core7/src/modules/jump/JumpItem.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/jump/JumpItem.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -52,7 +52,7 @@
virtual void tick(float dt);
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
virtual void setProperties(float newLeftBoundary, float newRightBoundary, float newLowerBoundary, float newUpperBoundary, float newHSpeed, float newVSpeed);
- virtual void setFigure(WeakPtr<JumpFigure> bats);
+ virtual void setFigure(JumpFigure* newFigure);
virtual void touchFigure();
void setFieldDimension(float width, float height)
Modified: code/branches/core7/src/modules/jump/JumpPlatform.cc
===================================================================
--- code/branches/core7/src/modules/jump/JumpPlatform.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/jump/JumpPlatform.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -124,7 +124,7 @@
}
}
- void JumpPlatform::setFigure(WeakPtr<JumpFigure> newFigure)
+ void JumpPlatform::setFigure(JumpFigure* newFigure)
{
figure_ = newFigure;
}
Modified: code/branches/core7/src/modules/jump/JumpPlatform.h
===================================================================
--- code/branches/core7/src/modules/jump/JumpPlatform.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/jump/JumpPlatform.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -48,7 +48,7 @@
virtual ~JumpPlatform();
virtual void tick(float dt);
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void setFigure(WeakPtr<JumpFigure> bats); //!< Set the bats for the ball.
+ void setFigure(JumpFigure* newFigure);
virtual void touchFigure();
void setDefScoreSound(const std::string& engineSound);
Modified: code/branches/core7/src/modules/jump/JumpProjectile.cc
===================================================================
--- code/branches/core7/src/modules/jump/JumpProjectile.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/jump/JumpProjectile.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -83,7 +83,7 @@
}
}
- void JumpProjectile::setFigure(WeakPtr<JumpFigure> figure)
+ void JumpProjectile::setFigure(JumpFigure* figure)
{
figure_ = figure;
}
Modified: code/branches/core7/src/modules/jump/JumpProjectile.h
===================================================================
--- code/branches/core7/src/modules/jump/JumpProjectile.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/jump/JumpProjectile.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -55,7 +55,7 @@
Vector2 getFieldDimension() const
{ return Vector2(this->fieldWidth_, this->fieldHeight_); }
- void setFigure(WeakPtr<JumpFigure> figure);
+ void setFigure(JumpFigure* figure);
protected:
float fieldWidth_;
Modified: code/branches/core7/src/modules/objects/triggers/DistanceTrigger.cc
===================================================================
--- code/branches/core7/src/modules/objects/triggers/DistanceTrigger.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/objects/triggers/DistanceTrigger.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -212,7 +212,7 @@
}
// Add the entity to the cache.
- this->cache_ = WeakPtr<WorldEntity>(entity);
+ this->cache_ = entity;
return true;
}
Modified: code/branches/core7/src/modules/tetris/Tetris.h
===================================================================
--- code/branches/core7/src/modules/tetris/Tetris.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/tetris/Tetris.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -68,7 +68,7 @@
void setCenterpoint(TetrisCenterpoint* center);
PlayerInfo* getPlayer(void) const; //!< Get the player.
- WeakPtr<TetrisCenterpoint> getCenterpoint(void)
+ TetrisCenterpoint* getCenterpoint(void)
{ return this->center_; }
bool isValidMove(TetrisStone* stone, const Vector3& position);
Modified: code/branches/core7/src/modules/towerdefense/TowerDefenseEnemy.cc
===================================================================
--- code/branches/core7/src/modules/towerdefense/TowerDefenseEnemy.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/towerdefense/TowerDefenseEnemy.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -48,7 +48,7 @@
SUPER(TowerDefenseEnemy, tick, dt);
}
- WeakPtr<TowerDefense> TowerDefenseEnemy::getGame()
+ TowerDefense* TowerDefenseEnemy::getGame()
{
if (game == NULL)
{
Modified: code/branches/core7/src/modules/towerdefense/TowerDefenseEnemy.h
===================================================================
--- code/branches/core7/src/modules/towerdefense/TowerDefenseEnemy.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/modules/towerdefense/TowerDefenseEnemy.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -46,7 +46,7 @@
private:
- WeakPtr<TowerDefense> getGame();
+ TowerDefense* getGame();
WeakPtr<TowerDefense> game;
TowerDefense* td;
bool once_;
Modified: code/branches/core7/src/orxonox/gametypes/Dynamicmatch.cc
===================================================================
--- code/branches/core7/src/orxonox/gametypes/Dynamicmatch.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/orxonox/gametypes/Dynamicmatch.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -309,12 +309,9 @@
// Give victim boost
if (spaceship)
{
- WeakPtr<SpaceShip>* ptr = new WeakPtr<SpaceShip>(spaceship);
- if(ptr == NULL)
- return;
spaceship->addSpeedFactor(5);
ExecutorPtr executor = createExecutor(createFunctor(&Dynamicmatch::resetSpeedFactor, this));
- executor->setDefaultValue(0, ptr);
+ executor->setDefaultValue(0, spaceship);
new Timer(10, false, executor, true);
}
}
@@ -592,13 +589,12 @@
return this->playerParty_[player];
}
- void Dynamicmatch::resetSpeedFactor(WeakPtr<SpaceShip>* ptr)// helper function
+ void Dynamicmatch::resetSpeedFactor(SpaceShip* spaceship)// helper function
{
- if (*ptr)
+ if (spaceship)
{
- (*ptr)->addSpeedFactor(1.0f/5.0f);
+ spaceship->addSpeedFactor(1.0f/5.0f);
}
- delete ptr;
}
bool Dynamicmatch::playerChangedName(PlayerInfo* player) //standardfunction
Modified: code/branches/core7/src/orxonox/gametypes/Dynamicmatch.h
===================================================================
--- code/branches/core7/src/orxonox/gametypes/Dynamicmatch.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/orxonox/gametypes/Dynamicmatch.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -76,7 +76,7 @@
virtual void furtherInstructions();*/
virtual void rewardPig();
void grantPigBoost(SpaceShip* spaceship); // Grant the piggy a boost.
- void resetSpeedFactor(WeakPtr<SpaceShip>* ptr);
+ void resetSpeedFactor(SpaceShip* spaceship);
void tick (float dt);// used to end the game
SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
Modified: code/branches/core7/src/orxonox/infos/PlayerInfo.cc
===================================================================
--- code/branches/core7/src/orxonox/infos/PlayerInfo.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/orxonox/infos/PlayerInfo.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -185,7 +185,7 @@
return;
this->controllableEntity_->destroyHud(); // HACK-ish
- this->previousControllableEntity_.push_back(WeakPtr<ControllableEntity>(this->controllableEntity_));
+ this->previousControllableEntity_.push_back(this->controllableEntity_);
this->controllableEntity_ = entity;
this->controllableEntityID_ = entity->getObjectID();
Modified: code/branches/core7/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- code/branches/core7/src/orxonox/interfaces/InterfaceCompilation.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/orxonox/interfaces/InterfaceCompilation.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -71,9 +71,9 @@
void PlayerTrigger::setTriggeringPawn(Pawn* pawn)
{
assert(pawn);
- this->pawn_ = WeakPtr<Pawn>(pawn);
+ this->pawn_ = pawn;
if (pawn)
- this->player_ = WeakPtr<PlayerInfo>(pawn->getPlayer());
+ this->player_ = pawn->getPlayer();
}
//----------------------------
Modified: code/branches/core7/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/core7/src/orxonox/sound/SoundManager.cc 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/orxonox/sound/SoundManager.cc 2015-08-29 16:18:30 UTC (rev 10557)
@@ -418,7 +418,7 @@
}
}
- void SoundManager::fadeIn(const StrongPtr<AmbientSound>& sound)
+ void SoundManager::fadeIn(AmbientSound* sound)
{
// If we're already fading out --> remove that
for (std::list<StrongPtr<AmbientSound> >::iterator it = this->fadeOutList_.begin(); it != this->fadeOutList_.end(); it++)
@@ -434,7 +434,7 @@
this->fadeInList_.push_back(sound);
}
- void SoundManager::fadeOut(const StrongPtr<AmbientSound>& sound)
+ void SoundManager::fadeOut(AmbientSound* sound)
{
// If we're already fading in --> remove that
for (std::list<StrongPtr<AmbientSound> >::iterator it = this->fadeInList_.begin(); it != this->fadeInList_.end(); it++)
Modified: code/branches/core7/src/orxonox/sound/SoundManager.h
===================================================================
--- code/branches/core7/src/orxonox/sound/SoundManager.h 2015-08-29 15:40:08 UTC (rev 10556)
+++ code/branches/core7/src/orxonox/sound/SoundManager.h 2015-08-29 16:18:30 UTC (rev 10557)
@@ -105,8 +105,8 @@
private:
void processCrossFading(float dt);
- void fadeIn(const StrongPtr<AmbientSound>& sound);
- void fadeOut(const StrongPtr<AmbientSound>& sound);
+ void fadeIn(AmbientSound* sound);
+ void fadeOut(AmbientSound* sound);
void checkFadeStepValidity();
More information about the Orxonox-commit
mailing list