mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-14 18:39:51 +00:00
Code Issues Releases Wiki Activity

Continue implementing support for multiple ActionSets

Browse source
This commit is contained in:
fgenesis 2016-07-16 03:09:44 +02:00
parent 520239a845
commit b438064517
12 changed files with 104 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Aquaria/SceneEditor.cpp
View file

@ -2786,11 +2786,11 @@ void SceneEditor::update(float dt)
{
case ET_ELEMENTS:
editingEntity = 0;
if (isActing(ACTION_MULTISELECT) || !selectedElements.empty())
if (isActing(ACTION_MULTISELECT, -1) || !selectedElements.empty())
{
editingElement = 0;
}
if (state == ES_SELECTING && !isActing(ACTION_MULTISELECT))
if (state == ES_SELECTING && !isActing(ACTION_MULTISELECT, -1))
editingElement = this->getElementAtCursor();
if (editingElement)
@ -2819,13 +2819,13 @@ void SceneEditor::update(float dt)
int camSpeed = 500/zoom.x;
if (core->getShiftState())
camSpeed = 5000/zoom.x;
if (isActing(ACTION_CAMLEFT))
if (isActing(ACTION_CAMLEFT, -1))
dsq->cameraPos.x -= dt*camSpeed;
if (isActing(ACTION_CAMRIGHT))
if (isActing(ACTION_CAMRIGHT, -1))
dsq->cameraPos.x += dt*camSpeed;
if (isActing(ACTION_CAMUP))
if (isActing(ACTION_CAMUP, -1))
dsq->cameraPos.y -= dt*camSpeed;
if (isActing(ACTION_CAMDOWN))
if (isActing(ACTION_CAMDOWN, -1))
dsq->cameraPos.y += dt*camSpeed;
if (core->mouse.buttons.middle && !core->mouse.change.isZero())
{
@ -2835,9 +2835,9 @@ void SceneEditor::update(float dt)
float spd = 0.5;
const Vector oldZoom = zoom;
if (isActing(ACTION_ZOOMOUT))
if (isActing(ACTION_ZOOMOUT, -1))
zoom /= (1 + spd*dt);
else if (isActing(ACTION_ZOOMIN))
else if (isActing(ACTION_ZOOMIN, -1))
zoom *= (1 + spd*dt);
else if (core->mouse.scrollWheelChange < 0)
{