mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-12 17:29:54 +00:00
Code Issues Releases Wiki Activity

Merge pull request #41

Browse source
This commit is contained in:
Valentin Ochs 2017-01-12 22:14:26 +01:00 • committed by fgenesis
parent 548da72632
commit dcd21b57bd
40 changed files with 281 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Aquaria/SceneEditor.cpp
View file

@ -2863,6 +2863,9 @@ void SceneEditor::updateText()
if (getSelectedPath())
os << " name: " << getSelectedPath()->name;
break;
case ET_SELECTENTITY:
case ET_MAX:
break;
}
text->setText(os.str());
}
@ -2992,6 +2995,10 @@ void SceneEditor::update(float dt)
else
placer->alpha = 0.5;
break;
case ET_PATHS:
case ET_SELECTENTITY:
case ET_MAX:
break;
}
updateText();
@ -3099,6 +3106,9 @@ void SceneEditor::update(float dt)
if (selectedIdx >= 0)
dsq->game->getPath(selectedIdx)->nodes[selectedNode].position = dsq->getGameCursorPosition() + cursorOffset;
break;
case ES_ROTATING:
case ES_MAX:
break;
}
}
else if (editType == ET_ENTITIES)
@ -3126,6 +3136,11 @@ void SceneEditor::update(float dt)
}
}
}
break;
case ES_SELECTING:
case ES_SCALING:
case ES_MAX:
break;
}
}
else if (editType == ET_ELEMENTS)
@ -3193,7 +3208,7 @@ void SceneEditor::update(float dt)
else if (cursorOffset.x < oldPosition.x-10)
right = false;
else
noSide++;
noSide = true;
if (cursorOffset.y > oldPosition.y+10)
down = true;
else if (cursorOffset.y < oldPosition.y-10)
@ -3291,6 +3306,8 @@ void SceneEditor::update(float dt)
}
}
break;
case ES_MAX:
break;
}
}
}