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

Move RenderObject::positionSnapTo to PauseQuad

Browse source 
And another RenderObject member less...
This commit is contained in:
fgenesis 2022-05-18 02:49:14 +02:00
parent 046b98c725
commit c82aab1e51
7 changed files with 15 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

9
BBGE/Quad.cpp
View file

@ -622,16 +622,23 @@ void Quad::onSetTexture()
}
}
PauseQuad::PauseQuad() : Quad(), pauseLevel(0)
PauseQuad::PauseQuad() : Quad(), pauseLevel(0), positionSnapTo(0)
{
addType(SCO_PAUSEQUAD);
}
void PauseQuad::onUpdate(float dt)
{
if (positionSnapTo)
this->position = *positionSnapTo;
if (core->particlesPaused <= pauseLevel)
{
Quad::onUpdate(dt);
}
}
void PauseQuad::setPositionSnapTo(InterpolatedVector *positionSnapTo)
{
this->positionSnapTo = positionSnapTo;
}

3
BBGE/Quad.h
View file

@ -128,7 +128,10 @@ class PauseQuad : public Quad
public:
PauseQuad();
int pauseLevel;
void setPositionSnapTo(InterpolatedVector *positionSnapTo);
protected:
InterpolatedVector *positionSnapTo;
void onUpdate(float dt);
};

14
BBGE/RenderObject.cpp
View file

@ -151,9 +151,6 @@ RenderObject::RenderObject()
pm = PM_NONE;
positionSnapTo = 0;
blendEnabled = true;
texture = 0;
width = 0;
@ -576,12 +573,6 @@ void RenderObject::render()
void RenderObject::renderCall()
{
if (positionSnapTo)
this->position = *positionSnapTo;
position += offset;
@ -1095,11 +1086,6 @@ StateData *RenderObject::getStateData()
return stateData;
}
void RenderObject::setPositionSnapTo(InterpolatedVector *positionSnapTo)
{
this->positionSnapTo = positionSnapTo;
}
void RenderObject::setOverrideCullRadius(float ovr)
{
overrideCullRadiusSqr = ovr * ovr;

4
BBGE/RenderObject.h
View file

@ -167,8 +167,6 @@ public:
StateData *getStateData();
void setPositionSnapTo(InterpolatedVector *positionSnapTo);
// HACK: This is defined in RenderObject_inline.h because it needs
// the class Core definition. --achurch
inline bool isOnScreen();
@ -258,8 +256,6 @@ public:
float updateCull;
int layer;
InterpolatedVector *positionSnapTo;
typedef std::vector<RenderObject*> Children;
Children children, childGarbage;