Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 06:26:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more clean up

Browse source
This commit is contained in:
Jeffrey Ventrella 2013-07-17 17:07:53 -07:00
parent 1264b3ce66
commit 9c2ea6e7e4
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -73,7 +73,7 @@ using namespace std;
static char STAR_FILE[] = "https://s3-us-west-1.amazonaws.com/highfidelity/stars.txt"; static char STAR_FILE[] = "https://s3-us-west-1.amazonaws.com/highfidelity/stars.txt";
static char STAR_CACHE_FILE[] = "cachedStars.txt"; static char STAR_CACHE_FILE[] = "cachedStars.txt";
static const bool TESTING_PARTICLE_SYSTEM = true; static const bool TESTING_PARTICLE_SYSTEM = false;
static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored

11
interface/src/ParticleSystem.cpp
View file

@ -271,17 +271,6 @@ void ParticleSystem::updateParticle(int p, float deltaTime) {
_particle[p].age += deltaTime; _particle[p].age += deltaTime;
} }
/*
void ParticleSystem::setCollisionSphere(int e, glm::vec3 position, float radius) {
int lifeStage = 0;
_emitter[e].particleAttributes[lifeStage].usingCollisionSphere = true;
_emitter[e].particleAttributes[lifeStage].collisionSpherePosition = position;
_emitter[e].particleAttributes[lifeStage].collisionSphereRadius = radius;
}
*/
void ParticleSystem::setEmitterBaseParticle(int emitterIndex, bool showing ) { void ParticleSystem::setEmitterBaseParticle(int emitterIndex, bool showing ) {
_emitter[emitterIndex].baseParticle.alive = true; _emitter[emitterIndex].baseParticle.alive = true;