Showing the changes to interface/src/ParticleTreeRenderer.cpp (1 of 1 file). Show all
Unified · Split
| @@ -99,7 +99,11 @@ void ParticleTreeRenderer::renderElement(OctreeElement* element, RenderArgs* arg · 98 unmodified lines | |||
| 99 | // TODO: need to figure out correct scale adjust, this was arbitrarily set to make a couple models work | 99 | // TODO: need to figure out correct scale adjust, this was arbitrarily set to make a couple models work |
| 100 | const float MODEL_SCALE = 0.00575f; | 100 | const float MODEL_SCALE = 0.00575f; |
| 101 | glm::vec3 scale(1.0f,1.0f,1.0f); | 101 | glm::vec3 scale(1.0f,1.0f,1.0f); |
| 102 | model->setScale(scale * MODEL_SCALE * radius * particle.getModelScale()); | 102 | |
| 103 | // TODO: There is some kind of a bug in packing of the particle packets which is causing modelscale to | ||
| 104 | // sometimes be garbage. We will temporarily make it always 1.0 | ||
| 105 | float modelScale = 1.0f; /// particle.getModelScale() | ||
| 106 | model->setScale(scale * MODEL_SCALE * radius * modelScale); | ||
| 103 | 107 | ||
| 104 | model->simulate(0.0f); | 108 | model->simulate(0.0f); |
| 105 | model->render(alpha); // TODO: should we allow particles to have alpha on their models? | 109 | model->render(alpha); // TODO: should we allow particles to have alpha on their models? |