mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 14:34:34 +00:00
Code Issues Releases Wiki Activity

Restore & correct collision radius rendering. Enabled toggling the debug console on Mac.

Browse source 
Collision rendering is now mapped to Ctrl+Shift+Return instead of capslock.
Also fixed one float->int truncation in script interface,
and removed useless debug message when particle effect "" was supposed
to be spawned (but does never exist).
This commit is contained in:
fgenesis 2012-05-05 17:00:46 +02:00
parent 5cef84ad9d
commit 1350876b3d
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
BBGE/RenderObject.cpp
View file

@ -965,13 +965,15 @@ void RenderObject::renderCollision()
}
else if (collideRadius > 0)
{
/*
glPushMatrix();
glLoadIdentity();
core->setupRenderPositionAndScale();
glBindTexture(GL_TEXTURE_2D, 0);
//glScalef(-scale.x, -scale.y, 0);
glTranslatef(-offset.x, -offset.y,0);
glTranslatef(position.x+offset.x, position.y+offset.y, 0);
//glScalef(scale.x, scale.y, 0);
glTranslatef(internalOffset.x, internalOffset.y, 0);
glEnable(GL_BLEND);
glTranslatef(collidePosition.x, collidePosition.y,0);
//glTranslatef(collidePosition.x, collidePosition.y,0);
//glEnable(GL_ALPHA_TEST);
//glAlphaFunc(GL_GREATER, 0);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@ -980,7 +982,6 @@ void RenderObject::renderCollision()
glDisable(GL_BLEND);
glTranslatef(offset.x, offset.y,0);
glPopMatrix();
*/
}
}