mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 09:44:02 +00:00
Code Issues Releases Wiki Activity

make RenderObject::scale not modified during rendering

Browse source
This commit is contained in:
fgenesis 2023-03-02 02:19:48 +01:00
parent 7a5a5feb39
commit f4147b99c4
5 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Aquaria/Entity.cpp
View file

@ -2363,15 +2363,9 @@ void Entity::render(const RenderState& rsold) const
if(renderPass != RENDER_ALL && rsold.pass != renderPass)
return;
InterpolatedVector bscale = scale;
scale *= flipScale;
RenderState rs(rsold);
rs.color *= color;
rs.scale *= flipScale;
if (multColor.isInterpolating())
rs.color *= multColor;
rs.alpha *= alpha.x;
@ -2393,8 +2387,6 @@ void Entity::render(const RenderState& rsold) const
rs.pass = RENDER_ALL;
Quad::render(rs);
scale = bscale;
}
void Entity::doGlint(const Vector &position, const Vector &scale, const std::string &tex, BlendType bt)

3
BBGE/RenderObject.cpp
View file

@ -567,7 +567,8 @@ void RenderObject::renderCall(const RenderState& rs, const Vector& renderAt) con
}
glTranslatef(beforeScaleOffset.x, beforeScaleOffset.y, beforeScaleOffset.z);
glScalef(scale.x, scale.y, 1);
const Vector renderScale = scale * rs.scale;
glScalef(renderScale.x, renderScale.y, 1);
glTranslatef(internalOffset.x, internalOffset.y, internalOffset.z);
for (Children::const_iterator i = children.begin(); i != children.end(); i++)

2
BBGE/RenderObject.h
View file

@ -253,7 +253,7 @@ public:
InterpolatedVector position;
mutable InterpolatedVector scale;
InterpolatedVector scale;
InterpolatedVector color, alpha;
mutable InterpolatedVector rotation;
InterpolatedVector offset, rotationOffset, internalOffset, beforeScaleOffset;

2
BBGE/RenderState.cpp
View file

@ -4,7 +4,7 @@
RenderState::RenderState(GPUState &gpu)
: gpu(gpu), color(1,1,1), alpha(1), pass(0)
: gpu(gpu), color(1,1,1), scale(1,1), alpha(1), pass(0)
, forceRenderBorder(false), forceRenderCenter(false), renderBorderAlpha(1)
{
}

1
BBGE/RenderState.h
View file

@ -26,6 +26,7 @@ struct RenderState
GPUState& gpu;
Vector color;
Vector scale;
float alpha;
int pass;