reformatting code according to guidelines defined at

http://wololo.net/forum/viewtopic.php?f=35&t=2235&start=10
This commit is contained in:
techdragon.nguyen@gmail.com
2010-11-16 00:55:16 +00:00
parent c79fdcbf50
commit acd7bb1aa4
103 changed files with 38044 additions and 31222 deletions

View File

@@ -4,45 +4,47 @@
using namespace std;
PlayGuiObject::PlayGuiObject(float desiredHeight, float x, float y, bool hasFocus) : JGuiObject(0), Pos(x, y, 1.0, 0.0, 255) {
defaultHeight = desiredHeight;
mHeight = desiredHeight;
mHasFocus = hasFocus;
type = 0;
wave = 0;
PlayGuiObject::PlayGuiObject(float desiredHeight, float x, float y, bool hasFocus) :
JGuiObject(0), Pos(x, y, 1.0, 0.0, 255)
{
defaultHeight = desiredHeight;
mHeight = desiredHeight;
mHasFocus = hasFocus;
type = 0;
wave = 0;
}
PlayGuiObject::PlayGuiObject(float desiredHeight, const Pos& ref, bool hasFocus) : JGuiObject(0), Pos(ref) {
defaultHeight = desiredHeight;
mHeight = desiredHeight;
mHasFocus = hasFocus;
type = 0;
wave = 0;
PlayGuiObject::PlayGuiObject(float desiredHeight, const Pos& ref, bool hasFocus) :
JGuiObject(0), Pos(ref)
{
defaultHeight = desiredHeight;
mHeight = desiredHeight;
mHasFocus = hasFocus;
type = 0;
wave = 0;
}
void PlayGuiObject::Update(float dt)
{
if (mHasFocus && mHeight < defaultHeight * 1.2)
{
mHeight += defaultHeight * 0.8f * dt;
// fprintf(stderr, "increasing size to %f - %d", mHeight, GetId() );
void PlayGuiObject::Update(float dt){
if (mHasFocus && mHeight < defaultHeight * 1.2)
{
mHeight += defaultHeight * 0.8f * dt;
// fprintf(stderr, "increasing size to %f - %d", mHeight, GetId() );
if (mHeight > defaultHeight * 1.2f)
mHeight = defaultHeight * 1.2f;
}
else if (!mHasFocus && mHeight > defaultHeight)
{
mHeight -= defaultHeight * 0.8f * dt;
if (mHeight < defaultHeight)
mHeight = defaultHeight;
}
wave = (wave +2 * (int) (100 * dt) ) % 255;
for (vector<Effect*>::iterator it = effects.begin(); it != effects.end(); ++it)
(*it)->Update(dt);
Pos::Update(dt);
if (mHeight > defaultHeight * 1.2f) mHeight = defaultHeight * 1.2f;
}
else if (!mHasFocus && mHeight > defaultHeight)
{
mHeight -= defaultHeight * 0.8f * dt;
if (mHeight < defaultHeight) mHeight = defaultHeight;
}
wave = (wave + 2 * (int) (100 * dt)) % 255;
for (vector<Effect*>::iterator it = effects.begin(); it != effects.end(); ++it)
(*it)->Update(dt);
Pos::Update(dt);
}
void PlayGuiObject::Render()
{
for (vector<Effect*>::iterator it = effects.begin(); it != effects.end(); ++it)
(*it)->Render();
for (vector<Effect*>::iterator it = effects.begin(); it != effects.end(); ++it)
(*it)->Render();
}