Browse Source

Bug fixing

Panagiotis Christopoulos Charitos 15 years ago
parent
commit
612e3eff94

+ 1 - 5
src/Main.cpp

@@ -292,7 +292,7 @@ void init()
 	app->getScene()->skybox.load(skybox_fnames);
 
 
-	initPhysics();
+	//initPhysics();
 
 	INFO("Engine initialization ends (" << App::getTicks()-ticks << ")");
 }
@@ -424,10 +424,6 @@ int main(int argc, char* argv[])
 {
 	new App(argc, argv);
 
-	RsrcPtr<Material> mtl;
-	mtl.loadRsrc("/users/panoscc/Desktop/temp.txt");
-	return 0;
-
 	init();
 
 	mainLoop();

+ 1 - 1
src/Renderer/Ms.cpp

@@ -73,7 +73,7 @@ void Renderer::Ms::run()
 		glClear(GL_DEPTH_BUFFER_BIT);
 	}
 
-	r.setProjectionViewMatrices(cam);
+	r.setProjectionViewMatrices(cam); ///< @todo remove this
 	Renderer::setViewport(0, 0, r.width, r.height);
 
 	//glEnable(GL_DEPTH_TEST);

+ 1 - 1
src/Resources/ParticleEmitterProps.cpp

@@ -69,7 +69,7 @@ bool ParticleEmitterProps::load(const char* filename)
 	startingPosMargin = Vec3(0.0, 0.0, 0.0);
 	size = 0.5;
 	maxNumOfParticles = 50;
-	emittionPeriod = 0.05;
+	emittionPeriod = 0.5;
 	particlesPerEmittion = 2;
 
 	// set some values

+ 1 - 1
src/Scene/ParticleEmitter.cpp

@@ -90,7 +90,7 @@ void ParticleEmitter::update()
 			Particle& p = particles[i];
 			if(p.timeOfDeath > 0.0) continue; // its alive so skip it
 
-			INFO("Reiniting " << i);
+			//INFO("Reiniting " << i);
 
 			// life
 			if(particleLifeMargin != 0.0)

+ 1 - 0
src/Scene/Scene.cpp

@@ -122,6 +122,7 @@ void Scene::updateAllWorldStuff()
 		SceneNode* obj = queue[head++]; // queue pop
 
 		obj->updateWorldTransform();
+		obj->updateTrf();
 		obj->update();
 		++num;