mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-26 06:35:51 +00:00
Code Issues Releases Wiki Activity

Some scene editor enhancements.

Browse source 
Added Shift+Mousewheel as faster alternative to E and R for tile selection
(had to change the undocumented and probably unused Shift+R action to Alt+R).

Allow applying element effects (numpad 0-9) to multiple selected tiles,
and not only one.

A new node does no longer have "NewPath" as default text when created,
which always forces the user to hammer backspace 6 times before own text can be entered.
This commit is contained in:
fgenesis 2011-09-18 22:02:29 +02:00
parent b0d9fdc1cc
commit 2bc86c21ee
2 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Aquaria/Game.h
View file

@ -516,6 +516,7 @@ protected:
void changeShape(); void changeShape();
int skinMinX, skinMinY, skinMaxX, skinMaxY; int skinMinX, skinMinY, skinMaxX, skinMaxY;
void setGridPattern(int gi);
void setGridPattern0(); void setGridPattern0();
void setGridPattern1(); void setGridPattern1();
void setGridPattern2(); void setGridPattern2();

48
Aquaria/SceneEditor.cpp
View file

@ -972,35 +972,45 @@ void SceneEditor::toggleWarpAreaRender()
//warpAreaRender->alpha.interpolateTo(1, 0.2); //warpAreaRender->alpha.interpolateTo(1, 0.2);
} }
void SceneEditor::setGridPattern(int gi)
{
if (selectedElements.size())
for (int i = 0; i < selectedElements.size(); ++i)
selectedElements[i]->setElementEffectByIndex(gi);
else if (editingElement)
editingElement->setElementEffectByIndex(gi);
}
void SceneEditor::setGridPattern0() void SceneEditor::setGridPattern0()
{ if (editingElement) editingElement->setElementEffectByIndex(-1); } { setGridPattern(-1); }
void SceneEditor::setGridPattern1() void SceneEditor::setGridPattern1()
{ if (editingElement) editingElement->setElementEffectByIndex(0); } { setGridPattern(0); }
void SceneEditor::setGridPattern2() void SceneEditor::setGridPattern2()
{ if (editingElement) editingElement->setElementEffectByIndex(1); } { setGridPattern(1); }
void SceneEditor::setGridPattern3() void SceneEditor::setGridPattern3()
{ if (editingElement) editingElement->setElementEffectByIndex(2); } { setGridPattern(2); }
void SceneEditor::setGridPattern4() void SceneEditor::setGridPattern4()
{ if (editingElement) editingElement->setElementEffectByIndex(3); } { setGridPattern(3); }
void SceneEditor::setGridPattern5() void SceneEditor::setGridPattern5()
{ if (editingElement) editingElement->setElementEffectByIndex(4); } { setGridPattern(4); }
void SceneEditor::setGridPattern6() void SceneEditor::setGridPattern6()
{ if (editingElement) editingElement->setElementEffectByIndex(5); } { setGridPattern(5); }
void SceneEditor::setGridPattern7() void SceneEditor::setGridPattern7()
{ if (editingElement) editingElement->setElementEffectByIndex(6); } { setGridPattern(6); }
void SceneEditor::setGridPattern8() void SceneEditor::setGridPattern8()
{ if (editingElement) editingElement->setElementEffectByIndex(7); } { setGridPattern(7); }
void SceneEditor::setGridPattern9() void SceneEditor::setGridPattern9()
{ if (editingElement) editingElement->setElementEffectByIndex(8); } { setGridPattern(8); }
void SceneEditor::moveToFront() void SceneEditor::moveToFront()
{ {
@ -2860,7 +2870,7 @@ void SceneEditor::nextElement()
return; return;
} }
if (core->getShiftState()) if (core->getAltState())
{ {
debugLog("rebuilding level!"); debugLog("rebuilding level!");
dsq->game->reconstructGrid(true); dsq->game->reconstructGrid(true);
@ -3126,7 +3136,7 @@ void SceneEditor::placeElement()
{ {
// new path // new path
Path *p = new Path; Path *p = new Path;
p->name = "NewPath"; p->name = "";
PathNode n; PathNode n;
n.position = dsq->getGameCursorPosition(); n.position = dsq->getGameCursorPosition();
p->nodes.push_back(n); p->nodes.push_back(n);
@ -3534,9 +3544,19 @@ void SceneEditor::update(float dt)
else if (isActing(ACTION_ZOOMIN)) else if (isActing(ACTION_ZOOMIN))
zoom *= (1 + spd*dt); zoom *= (1 + spd*dt);
else if (core->mouse.scrollWheelChange < 0) else if (core->mouse.scrollWheelChange < 0)
zoom /= 1.05f; {
if (core->getShiftState() && !core->getCtrlState()) // hackish: to prevent accidental recache()
nextElement();
else
zoom /= 1.05f;
}
else if (core->mouse.scrollWheelChange > 0) else if (core->mouse.scrollWheelChange > 0)
zoom *= 1.05f; {
if (core->getShiftState() && !core->getCtrlState()) // hackish: to prevent accidental entity selection
prevElement();
else
zoom *= 1.05f;
}
if (zoom.x < 0.04f) if (zoom.x < 0.04f)
zoom.x = zoom.y = 0.04f; zoom.x = zoom.y = 0.04f;
core->globalScale = zoom; core->globalScale = zoom;