Context Navigation

invader

Timestamp:

Aug 29, 2015, 6:18:30 PM (9 years ago)

Author:

landauf

Message:

cleanup: no need to pass/return WeakPtrs to/from functions. normal pointers are enough.

Location:

code/branches/core7/src/modules/invader

Files:

r9961	r10557
87	87	for (int i = 0; i < 7; i++)
88	88	{
89		~~WeakPtr<BigExplosion>~~ chunk = new BigExplosion(this->center_->getContext());
	89	BigExplosion* chunk = new BigExplosion(this->center_->getContext());
90	90	chunk->setPosition(Vector3(600, 0, 100.f * i - 300));
91	91	chunk->setVelocity(Vector3(1000, 0, 0)); //player->getVelocity()
…	…
99	99	}
100	100
101		~~WeakPtr<InvaderShip>~~ Invader::getPlayer()
	101	InvaderShip* Invader::getPlayer()
102	102	{
103	103	if (player == NULL)
…	…
116	116	for (int i = 0; i < (3*log10(static_cast<double>(level)) + 1); i++)
117	117	{
118		~~WeakPtr<InvaderEnemy>~~ newPawn;
	118	InvaderEnemy* newPawn;
119	119	if (rand() % 42/(1 + level*level) == 0)
120	120	{

r9943	r10557
78	78	private:
79	79	void toggleShowLevel(){bShowLevel = !bShowLevel;}
80		~~WeakPtr<InvaderShip>~~ getPlayer();
	80	InvaderShip* getPlayer();
81	81	WeakPtr<InvaderCenterPoint> center_;
82	82	WeakPtr<InvaderShip> player;

r9961	r10557
69	69	}
70	70
71		~~WeakPtr<Invader>~~ InvaderEnemy::getGame()
	71	Invader* InvaderEnemy::getGame()
72	72	{
73	73	if (game == NULL)

-                      r9943
+                      r10557
             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;

-                      r9943
+                      r10557
         // Camera
         WeakPtr<Camera> camera = this->getCamera();
+        Camera* camera = this->getCamera();
         if (camera != NULL)
+        {
 …
+    {
         // 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)
 …
+    }
     WeakPtr<Invader> InvaderShip::getGame()
+    Invader* InvaderShip::getGame()
+    {
         if (game == NULL)

r10216	r10557
68	68	// Create the projectile.projectile
69	69	projectile = new Projectile(this->getContext());
70		~~WeakPtr<Model>~~ model = new Model(projectile->getContext());
	70	Model* model = new Model(projectile->getContext());
71	71	model->setMeshSource(mesh_);
72	72	model->setCastShadows(false);

Note: See TracChangeset for help on using the changeset viewer.