Sprite: Implement Y based Z draw ordering (RGSS2)
If two sprites have the same Z, their order is decided based on their Y coordinate first, and only then (if equal) by creation time.
This commit is contained in:
parent
3887342439
commit
e208bc49e8
|
@ -105,12 +105,14 @@ void Scene::composite()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SceneElement::SceneElement(Scene &scene, int z)
|
SceneElement::SceneElement(Scene &scene, int z, bool isSprite)
|
||||||
: link(this),
|
: link(this),
|
||||||
creationStamp(shState->genTimeStamp()),
|
creationStamp(shState->genTimeStamp()),
|
||||||
z(z),
|
z(z),
|
||||||
visible(true),
|
visible(true),
|
||||||
scene(&scene)
|
scene(&scene),
|
||||||
|
spriteY(0),
|
||||||
|
isSprite(isSprite)
|
||||||
{
|
{
|
||||||
scene.insert(*this);
|
scene.insert(*this);
|
||||||
}
|
}
|
||||||
|
@ -120,7 +122,9 @@ SceneElement::SceneElement(Scene &scene, int z, unsigned int cStamp)
|
||||||
creationStamp(cStamp),
|
creationStamp(cStamp),
|
||||||
z(z),
|
z(z),
|
||||||
visible(true),
|
visible(true),
|
||||||
scene(&scene)
|
scene(&scene),
|
||||||
|
spriteY(0),
|
||||||
|
isSprite(false)
|
||||||
{
|
{
|
||||||
scene.insert(*this);
|
scene.insert(*this);
|
||||||
}
|
}
|
||||||
|
@ -167,11 +171,23 @@ void SceneElement::setVisible(bool value)
|
||||||
|
|
||||||
bool SceneElement::operator<(const SceneElement &o) const
|
bool SceneElement::operator<(const SceneElement &o) const
|
||||||
{
|
{
|
||||||
|
/* Element draw order is decided by their Z value.
|
||||||
|
* If two Z values are equal, the later created object
|
||||||
|
* has priority */
|
||||||
|
|
||||||
if (z <= o.z)
|
if (z <= o.z)
|
||||||
{
|
{
|
||||||
if (z == o.z)
|
if (z == o.z)
|
||||||
if (creationStamp > o.creationStamp)
|
{
|
||||||
return false;
|
#ifdef RGSS2
|
||||||
|
/* RGSS2: If two sprites' Z values collide,
|
||||||
|
* their Y coordinates decide draw order. Only
|
||||||
|
* on equal Y does the creation time take effect */
|
||||||
|
if (isSprite && o.isSprite && spriteY != o.spriteY)
|
||||||
|
return (spriteY < o.spriteY);
|
||||||
|
#endif
|
||||||
|
return (creationStamp <= o.creationStamp);
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -179,6 +195,12 @@ bool SceneElement::operator<(const SceneElement &o) const
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SceneElement::setSpriteY(int value)
|
||||||
|
{
|
||||||
|
spriteY = value;
|
||||||
|
scene->reinsert(*this);
|
||||||
|
}
|
||||||
|
|
||||||
void SceneElement::unlink()
|
void SceneElement::unlink()
|
||||||
{
|
{
|
||||||
if (scene)
|
if (scene)
|
||||||
|
|
|
@ -71,7 +71,7 @@ protected:
|
||||||
class SceneElement
|
class SceneElement
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
SceneElement(Scene &scene, int z = 0);
|
SceneElement(Scene &scene, int z = 0, bool isSprite = false);
|
||||||
SceneElement(Scene &scene, int z, unsigned int cStamp);
|
SceneElement(Scene &scene, int z, unsigned int cStamp);
|
||||||
virtual ~SceneElement();
|
virtual ~SceneElement();
|
||||||
|
|
||||||
|
@ -108,6 +108,7 @@ protected:
|
||||||
* elements with lower priority are drawn earlier */
|
* elements with lower priority are drawn earlier */
|
||||||
bool operator<(const SceneElement &o) const;
|
bool operator<(const SceneElement &o) const;
|
||||||
|
|
||||||
|
void setSpriteY(int value);
|
||||||
void unlink();
|
void unlink();
|
||||||
|
|
||||||
IntruListLink<SceneElement> link;
|
IntruListLink<SceneElement> link;
|
||||||
|
@ -119,6 +120,10 @@ protected:
|
||||||
friend class Scene;
|
friend class Scene;
|
||||||
friend class Viewport;
|
friend class Viewport;
|
||||||
friend struct TilemapPrivate;
|
friend struct TilemapPrivate;
|
||||||
|
|
||||||
|
private:
|
||||||
|
int spriteY;
|
||||||
|
const bool isSprite;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SCENE_H
|
#endif // SCENE_H
|
||||||
|
|
|
@ -302,7 +302,7 @@ struct SpritePrivate
|
||||||
};
|
};
|
||||||
|
|
||||||
Sprite::Sprite(Viewport *viewport)
|
Sprite::Sprite(Viewport *viewport)
|
||||||
: ViewportElement(viewport)
|
: ViewportElement(viewport, 0, true)
|
||||||
{
|
{
|
||||||
p = new SpritePrivate;
|
p = new SpritePrivate;
|
||||||
onGeometryChange(scene->getGeometry());
|
onGeometryChange(scene->getGeometry());
|
||||||
|
@ -393,6 +393,8 @@ void Sprite::setY(int value)
|
||||||
|
|
||||||
#ifdef RGSS2
|
#ifdef RGSS2
|
||||||
p->wave.dirty = true;
|
p->wave.dirty = true;
|
||||||
|
|
||||||
|
setSpriteY(value);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -218,8 +218,8 @@ void Viewport::onGeometryChange(const Geometry &geo)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ViewportElement::ViewportElement(Viewport *viewport, int z)
|
ViewportElement::ViewportElement(Viewport *viewport, int z, bool isSprite)
|
||||||
: SceneElement(viewport ? *viewport : *shState->screen(), z),
|
: SceneElement(viewport ? *viewport : *shState->screen(), z, isSprite),
|
||||||
m_viewport(viewport)
|
m_viewport(viewport)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ private:
|
||||||
class ViewportElement : public SceneElement
|
class ViewportElement : public SceneElement
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ViewportElement(Viewport *viewport = 0, int z = 0);
|
ViewportElement(Viewport *viewport = 0, int z = 0, bool isSprite = false);
|
||||||
ViewportElement(Viewport *viewport, int z, unsigned int cStamp);
|
ViewportElement(Viewport *viewport, int z, unsigned int cStamp);
|
||||||
|
|
||||||
Viewport *getViewport() const;
|
Viewport *getViewport() const;
|
||||||
|
|
Loading…
Reference in New Issue