raised home position

Jeffrey Ventrella committed 13 years ago

Commit 171c10d1 parent 8ae10a61 file · +2 −2Browse files

Showing the changes to interface/src/ParticleSystem.cpp (1 of 1 file). Show all

Unified · Split

interface/src/ParticleSystem.cpp+2−2

@@ -25,7 +25,7 @@ ParticleSystem::ParticleSystem() { · 24 unmodified lines
25	_neighborAttraction = 0.02f;	25	_neighborAttraction = 0.02f;
26	_neighborRepulsion = 0.9f;	26	_neighborRepulsion = 0.9f;
27	_tornadoAxis = glm::normalize(glm::vec3(0.1f, 1.0f, 0.1f));	27	_tornadoAxis = glm::normalize(glm::vec3(0.1f, 1.0f, 0.1f));
28	_home = glm::vec3(5.0f, 0.5f, 5.0f);	28	_home = glm::vec3(5.0f, 1.0f, 5.0f);
29		29
30	_TEST_bigSphereRadius = 0.5f;	30	_TEST_bigSphereRadius = 0.5f;
31	_TEST_bigSpherePosition = glm::vec3( 5.0f, _TEST_bigSphereRadius, 5.0f);	31	_TEST_bigSpherePosition = glm::vec3( 5.0f, _TEST_bigSphereRadius, 5.0f);
@@ -129,7 +129,7 @@ void ParticleSystem::simulate(float deltaTime) { · 97 unmodified lines
129	if (distanceToSphereCenter > 0.0f){	129	if (distanceToSphereCenter > 0.0f){
130	glm::vec3 directionToSphereCenter = vectorToSphereCenter / distanceToSphereCenter;	130	glm::vec3 directionToSphereCenter = vectorToSphereCenter / distanceToSphereCenter;
131	_particle[p].position = _TEST_bigSpherePosition - directionToSphereCenter * combinedRadius;	131	_particle[p].position = _TEST_bigSpherePosition - directionToSphereCenter * combinedRadius;
132	_particle[p].velocity.y += 0.005f;	132	//_particle[p].velocity.y += 0.005f;
133	}	133	}
134	}	134	}
135	}	135	}