mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-04 15:04:36 +00:00
Code Issues Releases Wiki Activity

very little SceneEditor enhancements

Browse source
This commit is contained in:
fgenesis 2012-01-03 04:45:28 +01:00
parent 4320b8296b
commit dd05ed18fd
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Aquaria/SceneEditor.cpp
View file

@ -608,7 +608,7 @@ void SceneEditor::init()
text->setFontSize(6); text->setFontSize(6);
text->followCamera = 1; text->followCamera = 1;
text->position = Vector(200,20,4.5); text->position = Vector(125,20,4.5);
//text->setAlign(ALIGN_CENTER); //text->setAlign(ALIGN_CENTER);
dsq->game->addRenderObject(text, LR_HUD); dsq->game->addRenderObject(text, LR_HUD);
text->alpha = 0; text->alpha = 0;
@ -2584,6 +2584,11 @@ void SceneEditor::loadScene()
{ {
reloadScene(); reloadScene();
} }
// HACK: reload stuff when (re-) loading a map this way
particleManager->loadParticleBank(dsq->particleBank1, dsq->particleBank2);
Shot::loadShotBank(dsq->shotBank1, dsq->shotBank2);
dsq->game->loadEntityTypeList();
} }
void SceneEditor::saveScene() void SceneEditor::saveScene()
@ -3334,7 +3339,7 @@ void SceneEditor::updateText()
switch(editType) switch(editType)
{ {
case ET_ELEMENTS: case ET_ELEMENTS:
os << "elements"; os << "elements (" << dsq->getNumElements() << ")";
if (selectedElements.size() > 1) if (selectedElements.size() > 1)
{ {
os << " - " << selectedElements.size() << " selected"; os << " - " << selectedElements.size() << " selected";
@ -3352,11 +3357,12 @@ void SceneEditor::updateText()
ElementTemplate *et = game->getElementTemplateByIdx(e->templateIdx); ElementTemplate *et = game->getElementTemplateByIdx(e->templateIdx);
if (et) if (et)
os << " gfx: " << et->gfx; os << " gfx: " << et->gfx;
os << " efx: " << (e->getElementEffectIndex() + 1); // +1 so that it resembles the layout on numpad
} }
} }
break; break;
case ET_ENTITIES: case ET_ENTITIES:
os << "entities"; os << "entities (" << dsq->entities.size() << ")";
if (editingEntity) if (editingEntity)
{ {
os << " id: " << editingEntity->getID() << " name: " << editingEntity->name << " flag: " << dsq->continuity.getEntityFlag(dsq->game->sceneName, editingEntity->getID()); os << " id: " << editingEntity->getID() << " name: " << editingEntity->name << " flag: " << dsq->continuity.getEntityFlag(dsq->game->sceneName, editingEntity->getID());
@ -3365,7 +3371,7 @@ void SceneEditor::updateText()
} }
break; break;
case ET_PATHS: case ET_PATHS:
os << "paths si[" << selectedIdx << "]"; os << "paths (" << dsq->game->getNumPaths()<< ") si[" << selectedIdx << "]";
if (getSelectedPath()) if (getSelectedPath())
os << " name: " << getSelectedPath()->name; os << " name: " << getSelectedPath()->name;
break; break;