Browse Source

ParticleEmitter

Panagiotis Christopoulos Charitos 14 years ago
parent
commit
b33c079f69

File diff suppressed because it is too large
+ 0 - 1
build/debug/Makefile


+ 4 - 5
src/Main.cpp

@@ -186,7 +186,6 @@ void init()
 
 	imp->addChild(*cam);
 
-	return;
 
 	// sarge
 	/*sarge = new MeshNode();
@@ -226,13 +225,13 @@ void init()
 	node->init("maps/sponza/dark-marbles.mesh");*/
 	//node->setLocalTransform(Transform(Vec3(0.0, -0.0, 0.0), Mat3::getIdentity(), 0.01));
 
-	return;
-
 	// particle emitter
 	partEmitter = new ParticleEmitter;
 	partEmitter->init("asdf");
 	partEmitter->getLocalTransform().setOrigin(Vec3(3.0, 0.0, 0.0));
 
+	return;
+
 	// character
 	/*PhyCharacter::Initializer init;
 	init.sceneNode = imp;
@@ -450,12 +449,12 @@ void mainLoop()
 //======================================================================================================================
 int main(int argc, char* argv[])
 {
-	std::stringstream ss("lala\n\n\n\n1a");
+	/*std::stringstream ss("lala\n\n\n\n1a");
 	Scanner::Scanner scanner(ss);
 
 	scanner.getAllPrintAll();
 
-	return 0;
+	return 0;*/
 
 	try
 	{

+ 1 - 1
src/Resources/ParticleEmitterRsrc.cpp

@@ -111,7 +111,7 @@ void ParticleEmitterRsrc::load(const char* /*filename*/)
 	maxNumOfParticles = 50;
 	emissionPeriod = 1.5;
 	particlesPerEmittion = 2;
-	modelName = "*todo*";
+	modelName = "meshes/horse/horse.mdl";
 
 	// sanity checks
 	if(particleLife <= 0.0)

+ 1 - 1
src/Resources/Texture/Texture.cpp

@@ -14,7 +14,7 @@
 //======================================================================================================================
 int Texture::textureUnitsNum = -1;
 bool Texture::mipmappingEnabled = true;
-bool Texture::compressionEnabled = true;
+bool Texture::compressionEnabled = false;
 int Texture::anisotropyLevel = 8;
 
 

Some files were not shown because too many files changed in this diff