mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-23 08:22:50 +02:00
Code Issues Projects Releases Wiki Activity

- try to see if this helps with the tween bug

Browse Source
This commit is contained in:
Mark Vejvoda
2011-07-19 00:47:25 +00:00
parent ae6b085d7a
commit 45db0a3290
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/shared_lib/sources/graphics/gl/particle_renderer_gl.cpp
View File

@@ -263,7 +263,11 @@ void ParticleRendererGl::renderModel(GameParticleSystem *ps, ModelRenderer *mr){
//render //render
mr->begin(true, true, false); mr->begin(true, true, false);
float t = ps->getTween(); float t = ps->getTween();
assert(t >= 0.0f && t <= 1.0f);
if(t < 0.0f || t > 1.0f) {
printf("ERROR setting tween to [%f]\n",t);
assert(t >= 0.0f && t <= 1.0f);
}
model->updateInterpolationData(t, false); model->updateInterpolationData(t, false);
mr->render(model); mr->render(model);
mr->end(); mr->end();

9
source/shared_lib/sources/graphics/interpolation.cpp
View File

@@ -80,8 +80,9 @@ void InterpolationData::updateVertices(float t, bool cycle) {
//assert(t>=0.0f && t<=1.0f); //assert(t>=0.0f && t<=1.0f);
if(t < 0.0f || t > 1.0f) { if(t < 0.0f || t > 1.0f) {
throw runtime_error("t < 0.0f || t > 1.0f t = [" + floatToStr(t) + "]"); throw runtime_error("t < 0.0f || t > 1.0f t = [" + floatToStr(t) + "]");
assert(t >= 0.f && t <= 1.f);
} }
assert(t >= 0.f && t <= 1.f);
uint32 frameCount= mesh->getFrameCount(); uint32 frameCount= mesh->getFrameCount();
uint32 vertexCount= mesh->getVertexCount(); uint32 vertexCount= mesh->getVertexCount();
@@ -137,7 +138,11 @@ void InterpolationData::updateVertices(float t, bool cycle) {
} }
void InterpolationData::updateNormals(float t, bool cycle){ void InterpolationData::updateNormals(float t, bool cycle){
assert(t>=0.0f && t<=1.0f); if(t < 0.0f || t > 1.0f) {
throw runtime_error("t < 0.0f || t > 1.0f t = [" + floatToStr(t) + "]");
assert(t>=0.0f && t<=1.0f);
}
uint32 frameCount= mesh->getFrameCount(); uint32 frameCount= mesh->getFrameCount();
uint32 vertexCount= mesh->getVertexCount(); uint32 vertexCount= mesh->getVertexCount();