Merge branch 'main' of https://github.com/GodVenn/AVT-ColdShadowWorld …

…into main
GodVenn · Jan 20, 2021 · 0af7500 · 0af7500
2 parents 65b8461 + 4cffa13
commit 0af7500
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Engine/Headers/ParticleSystem.h b/Engine/Headers/ParticleSystem.h
@@ -7,20 +7,20 @@
 #include "Camera.h"
 #include "Texture.h"
 
-#define POOL_SIZE 5000
+#define POOL_SIZE 35000
 #define OFFSET_ARRAY 7
 
 namespace engine
 {
 	struct Particle
 	{
-		Vec3 Position = Vec3(0.0f, 2.0f, 0.0f);
+		Vec3 Position = Vec3(0.0f, 5.0f, 0.0f);
 		Vec3 Velocity = Vec3(0.0f);
 		Vec4 Color = { 1.0f, 1.0f, 1.0f, 1.0f };
 		float Rotation = 0.0f;
 		float Size = 0.5f;
 
-		float LifeTime = 15.0f;
+		float LifeTime = 30.0f;
 		float LifeRemaining = 0.0f;
 
 		bool Active = false;
@@ -45,7 +45,7 @@ namespace engine
 		unsigned int VBO, VAO;
 		ShaderProgram* ParticleShader;
 
-		float circleSize = 6.0f;
+		float circleSize = 20.0f;
 		Vec3 cameraMovement;
 	};
 }
diff --git a/Engine/Source/MyApp.cpp b/Engine/Source/MyApp.cpp
@@ -73,7 +73,7 @@ class MyApp : public IApp, IUpdatable
 
 	//Particles
 	Particle default_Particle;
-	int particlesToSpawn = 5;
+	int particlesToSpawn = 50;
 	float maxTime = 0.0001f; //Particle respawn time
 	float timer = maxTime;
 

diff --git a/Engine/Source/ParticleSystem.cpp b/Engine/Source/ParticleSystem.cpp
@@ -105,8 +105,8 @@ namespace engine {
 
 		Particle_Pool_Index = ++Particle_Pool_Index % (POOL_SIZE);
 
-		//if(Particle_Pool_Index % 100 == 0)
-			//std::cout << "index: " << Particle_Pool_Index << std::endl;
+		if(Particle_Pool_Index % 1000 == 0)
+			std::cout << "index: " << Particle_Pool_Index << std::endl;
 	}
 
 	void ParticleSystem::SetCameraMovement(const Vec3& movement)