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

update texcoords of quads which have AUTO_VIRTUAL* set properly

Browse source 
move auto size vars & handling to PauseQuad, since not every quad needs this.
This commit is contained in:
fgenesis 2023-10-20 03:15:55 +02:00
parent 0391052e51
commit 4852eb533b
10 changed files with 98 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

35
BBGE/Quad.cpp
View file

@ -49,8 +49,6 @@ void Quad::initQuad()
borderAlpha = 0.5;
repeatToFillScale = Vector(1,1);
autoWidth = autoHeight = 0;
renderBorder = false;
renderCenter = true;
width = 2; height = 2;
@ -292,16 +290,6 @@ void Quad::onUpdate(float dt)
{
RenderObject::onUpdate(dt);
if (autoWidth == AUTO_VIRTUALWIDTH)
width = core->getVirtualWidth();
else if (autoWidth == AUTO_VIRTUALHEIGHT)
width = core->getVirtualHeight();
if (autoHeight == AUTO_VIRTUALWIDTH)
height = core->getVirtualWidth();
else if (autoHeight == AUTO_VIRTUALHEIGHT)
height = core->getVirtualHeight();
if (grid && alpha.x > 0 && alphaMod > 0)
{
grid->update(dt);
@ -341,7 +329,7 @@ void Quad::onSetTexture()
}
}
PauseQuad::PauseQuad() : Quad(), pauseLevel(0), positionSnapTo(0)
PauseQuad::PauseQuad() : Quad(), pauseLevel(0), positionSnapTo(0), autoWidth(0), autoHeight(0)
{
addType(SCO_PAUSEQUAD);
}
@ -352,6 +340,27 @@ PauseQuad::~PauseQuad()
void PauseQuad::onUpdate(float dt)
{
if(autoWidth || autoHeight)
{
float w = width, h = height;
if (autoWidth == AUTO_VIRTUALWIDTH)
w = core->getVirtualWidth();
else if (autoWidth == AUTO_VIRTUALHEIGHT)
w = core->getVirtualHeight();
if (autoHeight == AUTO_VIRTUALWIDTH)
h = core->getVirtualWidth();
else if (autoHeight == AUTO_VIRTUALHEIGHT)
h = core->getVirtualHeight();
if(w != width || h != height)
{
width = w;
height = h;
updateTexCoords();
}
}
if (positionSnapTo)
this->position = *positionSnapTo;

5
BBGE/Quad.h
View file

@ -87,7 +87,7 @@ public:
TexCoordBox texcoords;
// TODO: this should be a bitmask
char autoWidth, autoHeight;
bool renderQuad, renderCenter, renderBorder;
float borderAlpha;
@ -119,6 +119,7 @@ public:
PauseQuad();
virtual ~PauseQuad();
int pauseLevel;
char autoWidth, autoHeight;
void setPositionSnapTo(InterpolatedVector *positionSnapTo);
protected:
@ -137,7 +138,5 @@ public:
float collideRadius;
};
#define QUAD(x) Quad *x = new Quad; addRenderObject(x);
#endif