mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-30 10:20:58 +00:00
Code Issues Releases Wiki Activity

Merge branch 'experimental' into tile-optimization

Browse source 
# Conflicts:
#	Aquaria/ScriptInterface.cpp
#	BBGE/AfterEffect.cpp
#	BBGE/RenderGrid.cpp
#	BBGE/SkeletalSprite.cpp
This commit is contained in:
fgenesis 2023-10-26 01:41:51 +02:00
commit d33e8f9116
17 changed files with 458 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

20
BBGE/SplineGrid.cpp
View file

@ -8,7 +8,11 @@ SplineGridCtrlPoint *SplineGridCtrlPoint::movingPoint;
SplineGridCtrlPoint::SplineGridCtrlPoint()
{
setTexture("gui/open-menu");
setWidthHeight(16, 16);
setWidthHeight(8, 8);
}
SplineGridCtrlPoint::~SplineGridCtrlPoint()
{
}
Vector SplineGridCtrlPoint::getSplinePosition() const
@ -70,7 +74,7 @@ void SplineGridCtrlPoint::onUpdate(float dt)
}
SplineGrid::SplineGrid()
: wasModified(false), deg(0)
: wasModified(false), deg(0), pointscale(1)
{
setWidthHeight(128, 128);
renderQuad = true;
@ -165,6 +169,8 @@ SplineGridCtrlPoint* SplineGrid::createControlPoint(size_t x, size_t y)
const Vector pos01(float(x) / float(cpx-1), float(y) / float(cpy-1));
SplineGridCtrlPoint *cp = new SplineGridCtrlPoint();
cp->position = (pos01 - Vector(0.5f, 0.5f)) * wh;
cp->scale.x = pointscale;
cp->scale.y = pointscale;
this->addChild(cp, PM_POINTER);
return cp;
}
@ -214,4 +220,12 @@ void SplineGrid::onRender(const RenderState& rs) const
}
}
void SplineGrid::setPointScale(const float scale)
{
pointscale = scale;
for(size_t i = 0; i < ctrlp.size(); ++i)
{
ctrlp[i]->scale.x = scale;
ctrlp[i]->scale.y = scale;
}
}