[Orxonox-commit 6097] r10755 - in code/branches/explosionChunksHS15/src/orxonox/worldentities: . pawns

[vaydin at orxonox.net]

Author: vaydin
Date: 2015-11-02 15:56:46 +0100 (Mon, 02 Nov 2015)
New Revision: 10755

Modified:
   code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc
   code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc
Log:
removed lag at first explosion

Modified: code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc
===================================================================
--- code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc	2015-11-02 14:29:36 UTC (rev 10754)
+++ code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc	2015-11-02 14:56:46 UTC (rev 10755)
@@ -47,6 +47,8 @@
 		this->particleInterface_= NULL;
 		this->explosionEntity_ = new MovableEntity(this->getContext());
 
+
+
 	}
 
 
@@ -68,15 +70,17 @@
 		orxout() << getMesh() << endl;
 		orxout() << getEffect() << endl;
 
-		this->explosionEntity_->setSyncMode(0);
+		this->model_->setVisible(true);
 
-		this->model_->setSyncMode(0);
+		//this->explosionEntity_->setSyncMode(0);
 
+		//this->model_->setSyncMode(0);
+
 		this->particleInterface_ = new ParticleInterface(this->getScene()->getSceneManager(), effect_, this->LOD_);
 
 		this->model_->attachOgreObject(this->particleInterface_->getParticleSystem());
 
-		this->model_->setMeshSource(mesh_);
+		
 
 		this->explosionEntity_->setVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(50,100));
         this->explosionEntity_->setAngularVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1)).normalisedCopy() * Degree(400).valueRadians());
@@ -94,6 +98,8 @@
 	void ExplosionPart::setMesh(const std::string& newString)
 	{
 		this->mesh_ = newString;
+		this->model_->setMeshSource(mesh_);
+		this->model_->setVisible(false);
 		orxout() << newString << endl;
 	}
 

Modified: code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc	2015-11-02 14:29:36 UTC (rev 10754)
+++ code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc	2015-11-02 14:56:46 UTC (rev 10755)
@@ -386,11 +386,6 @@
         this->bAlive_ = false;
         this->setDestroyWhenPlayerLeft(false);
 
-        /*ExplosionPart* chunk = new ExplosionPart(this->getContext());
-        chunk->setPosition(this->getPosition());
-        chunk->setVelocity(this->getVelocity());
-        chunk->Explode();*/
-
         while(!explosionPartList_.empty())
         {
             explosionPartList_.back()->setPosition(this->getPosition());