marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Editor object list: Remove effects; add Global and Scenario

directional-lights
Sven Eberhardt 2016-10-15 09:48:28 -04:00
parent 4b3f8c0fef
commit 06a438e05e
8 changed files with 84 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
src/editor/C4ConsoleQtObjectListViewer.cpp
View File

@ -66,25 +66,23 @@ int C4ConsoleQtObjectListModel::rowCount(const QModelIndex & parent) const
if (parent.isValid())
{
// Child row count of object
C4PropList *parent_item = static_cast<C4PropList *>(parent.internalPointer());
C4PropList *parent_item = GetItemByModelIndex(parent);
if (!parent_item) return result;
C4Object *obj = parent_item->GetObject();
if (!obj) return result;
// Contained objects plus effects
// Contained objects
for (C4Object *contents : obj->Contents)
if (contents && contents->Status)
++result;
for (C4Effect *fx = obj->pEffects; fx; fx = fx->pNext) if (fx->IsActive())
++result;
}
else
{
// Main object + effect count
// Static lists
result = IDX_Objects;
// Main object count
for (C4Object *obj : ::Objects)
if (obj && obj->Status && !obj->Contained)
++result;
for (C4Effect *fx = ::ScriptEngine.pGlobalEffects; fx; fx = fx->pNext) if (fx->IsActive())
++result;
last_row_count = result;
}
return result;
@ -98,7 +96,7 @@ int C4ConsoleQtObjectListModel::columnCount(const QModelIndex & parent) const
QVariant C4ConsoleQtObjectListModel::data(const QModelIndex & index, int role) const
{
// Object list lookup is done in index(). Here we just use the pointer.
C4PropList *data = static_cast<C4PropList *>(index.internalPointer());
C4PropList *data = GetItemByModelIndex(index);
if (role == Qt::DisplayRole)
{
// Deleted proplist?
@ -109,8 +107,6 @@ QVariant C4ConsoleQtObjectListModel::data(const QModelIndex & index, int role) c
// If no name is set, fall back to definition name for objects
C4Object *obj = data->GetObject();
if (obj) return QString(obj->Def->id.ToString());
// Fallback to effect names for effects
return QString("Fx???");
}
else if (role == Qt::ForegroundRole)
{
@ -135,53 +131,61 @@ QModelIndex C4ConsoleQtObjectListModel::index(int row, int column, const QModelI
if (parent.isValid())
{
// Child of valid object?
C4PropList *parent_item = static_cast<C4PropList *>(parent.internalPointer());
if (!parent_item) return QModelIndex();
C4Object *obj = parent_item->GetObject();
if (!obj) return QModelIndex();
// Contained objects plus effects
for (C4Object *contents : obj->Contents)
if (contents && contents->Status)
if (!index--)
return createIndex(row, column, contents);
for (C4Effect *fx = obj->pEffects; fx; fx = fx->pNext) if (fx->IsActive())
if (!index--)
return createIndex(row, column, fx);
C4PropList *pobj = GetItemByModelIndex(parent);
C4Object *container = pobj->GetObject();
if (container)
{
for (C4Object *contents : container->Contents)
{
if (contents && contents->Status)
{
if (!index--)
{
return createIndex(row, column, static_cast<C4PropList *>(contents));
}
}
}
}
}
else
{
// Main object list
for (C4Object *obj : ::Objects)
if (obj && obj->Status && !obj->Contained)
if (!index--)
return createIndex(row, column, obj);
// Static entries
if (index == IDX_Global)
{
return createIndex(row, column, static_cast<C4PropList *>(&::ScriptEngine));
}
else if (index == IDX_Scenario)
{
// This may create a null pointer entry. That's OK; it's only for the disabled display before the scenario is loaded
return createIndex(row, column, static_cast<C4PropList *>(::GameScript.ScenPropList.getPropList()));
}
else
{
// Main object list
for (C4Object *obj : ::Objects)
{
if (obj && obj->Status && !obj->Contained)
{
if (!index--)
{
return createIndex(row, column, static_cast<C4PropList *>(obj));
}
}
}
}
}
return QModelIndex(); // out of range
}
QModelIndex C4ConsoleQtObjectListModel::parent(const QModelIndex &index) const
{
// Find parent of object or effect
// Find parent of object
if (!index.isValid()) return QModelIndex();
C4PropList *data = static_cast<C4PropList *>(index.internalPointer());
C4PropList *data = GetItemByModelIndex(index);
if (!data) return QModelIndex();
C4Object *obj = data->GetObject();
if (obj) return GetModelIndexByItem(obj->Contained);
// Parent object of effect
// TODO: Effects currently don't keep track of their owners.
// If this ever changes, lookup can be much more efficient...
C4Effect *fx = data->GetEffect();
if (fx)
{
for (C4Object *cobj : ::Objects) if (cobj && cobj->Status)
{
for (C4Effect *cfx = cobj->pEffects; cfx; cfx = cfx->pNext)
if (cfx == fx) { obj = cobj; break; }
if (obj) break;
}
return GetModelIndexByItem(obj); // returns root index for obj==NULL, i.e. global effects
}
// Can't happen
// Root item
return QModelIndex();
}
@ -189,10 +193,20 @@ QModelIndex C4ConsoleQtObjectListModel::GetModelIndexByItem(C4PropList *item) co
{
// Deduce position in model list from item pointer
if (!item) return QModelIndex();
C4Object *obj; C4Effect *fx;
int row=0;
if ((obj = item->GetObject()))
// Default position for Global and Scenario object
C4Object *obj;
int row;
if (item == &::ScriptEngine)
{
row = IDX_Global;
}
else if (item == ::GameScript.ScenPropList.getPropList())
{
row = IDX_Scenario;
}
else if ((obj = item->GetObject()))
{
row = IDX_Objects;
const C4ObjectList *list = &::Objects;
if (obj->Contained) list = &(obj->Contained->Contents);
for (C4Object *cobj : *list)
@ -201,32 +215,16 @@ QModelIndex C4ConsoleQtObjectListModel::GetModelIndexByItem(C4PropList *item) co
if (cobj && cobj->Status) ++row;
}
}
else if ((fx = item->GetEffect()))
else
{
// TODO: Effects currently don't keep track of their owners.
// If this ever changes, lookup can be much more efficient...
bool found = false;
for (C4Object *cobj : ::Objects) if (cobj && cobj->Status)
{
row = 0;
for (C4Effect *cfx = cobj->pEffects; cfx; cfx = cfx->pNext)
if (cfx == fx) { obj = cobj; found = true; break; } else ++row;
if (obj) break;
}
// Also search global effect list
if (!found)
{
row = 0;
for (C4Effect *cfx = ::ScriptEngine.pGlobalEffects; cfx; cfx = cfx->pNext) if (cfx->IsActive())
if (cfx == fx) { found = true; break; } else ++row;
if (!found) return QModelIndex();
}
// Add other objects on top of this index
const C4ObjectList *list = &::Objects;
if (obj) list = &obj->Contents;
for (C4Object *cobj : *list)
if (cobj && cobj->Status)
++row;
return QModelIndex();
}
return createIndex(row, 0, item);
return createIndex(row, 0, static_cast<C4PropList *>(item));
}
C4PropList *C4ConsoleQtObjectListModel::GetItemByModelIndex(const QModelIndex &index) const
{
// Get proplist from model index
if (!index.isValid()) return nullptr;
return static_cast<C4PropList *>(index.internalPointer());
}

9
src/editor/C4ConsoleQtObjectListViewer.h
View File

@ -33,6 +33,14 @@ class C4ConsoleQtObjectListModel : public QAbstractItemModel
mutable int32_t last_row_count;
QBrush clr_deleted, clr_effect;
// model indices for static proplists
enum
{
IDX_Global = 0,
IDX_Scenario = 1,
IDX_Objects = 2
};
public:
C4ConsoleQtObjectListModel();
~C4ConsoleQtObjectListModel();
@ -42,6 +50,7 @@ public:
void OnItemRemoved(C4PropList *p);
QModelIndex GetModelIndexByItem(class C4PropList *item) const;
C4PropList *GetItemByModelIndex(const QModelIndex &index) const;
protected:
int rowCount(const QModelIndex & parent = QModelIndex()) const override;

6
src/editor/C4ConsoleQtState.cpp
View File

@ -957,6 +957,8 @@ void C4ConsoleGUIState::PropertyDlgUpdate(C4EditCursorSelection &rSelection, boo
void C4ConsoleGUIState::ReInitDefinitions()
{
if (definition_list_model) definition_list_model->ReInit();
// This also affects the object list
if (object_list_model) object_list_model->Invalidate();
}
void C4ConsoleGUIState::OnCreatorSelectionChanged(const QItemSelection & selected, const QItemSelection & deselected)
@ -988,10 +990,10 @@ void C4ConsoleGUIState::OnObjectListSelectionChanged(const QItemSelection & sele
// Forward to EditCursor
C4PropList *p;
for (const QModelIndex &item : deselected.indexes())
if ((p = static_cast<C4PropList *>(item.internalPointer())))
if ((p = object_list_model->GetItemByModelIndex(item)))
::Console.EditCursor.RemoveFromSelection(p);
for (const QModelIndex &item : selected.indexes())
if ((p = static_cast<C4PropList *>(item.internalPointer())))
if ((p = object_list_model->GetItemByModelIndex(item)))
::Console.EditCursor.AddToSelection(p);
::Console.EditCursor.OnSelectionChanged(true);
// Switching to object/effect selection mode: Remove any non-objects/effects from selection

18
src/editor/C4ObjectListDlg.cpp
View File

@ -71,16 +71,6 @@ void C4ObjectListDlg::OnObjectContainerChanged(C4Object *obj, C4Object *old_cont
if (view_model) view_model->Invalidate();
}
void C4ObjectListDlg::OnEffectAdded(C4Effect *fx)
{
if (view_model) view_model->Invalidate();
}
void C4ObjectListDlg::OnEffectRemoved(C4Effect *fx)
{
if (view_model) view_model->OnItemRemoved(fx);
}
#else
@ -104,14 +94,6 @@ void C4ObjectListDlg::OnObjectContainerChanged(C4Object *obj, C4Object *old_cont
{
}
void C4ObjectListDlg::OnEffectAdded(C4Effect *fx)
{
}
void C4ObjectListDlg::OnEffectRemoved(C4Effect *fx)
{
}
#endif WITH_QT_EDITOR

3
src/editor/C4ObjectListDlg.h
View File

@ -42,9 +42,6 @@ public:
virtual void OnObjectAdded(C4ObjectList * pList, C4ObjectLink * pLnk) override;
virtual void OnObjectRename(C4ObjectList * pList, C4ObjectLink * pLnk) override;
virtual void OnObjectContainerChanged(C4Object *obj, C4Object *old_container, C4Object *new_container) override;
virtual void OnEffectAdded(class C4Effect *fx) override;
virtual void OnEffectRemoved(class C4Effect *fx) override;
};
#endif //INC_C4ObjectListDlg

2
src/object/C4ObjectList.h
View File

@ -36,8 +36,6 @@ public:
virtual void OnObjectAdded(C4ObjectList * pList, C4ObjectLink * pLnk) {};
virtual void OnObjectRename(C4ObjectList * pList, C4ObjectLink * pLnk) {};
virtual void OnObjectContainerChanged(C4Object *obj, C4Object *old_container, C4Object *new_container) {};
virtual void OnEffectAdded(class C4Effect *fx) {};
virtual void OnEffectRemoved(class C4Effect *fx) {};
virtual ~C4ObjectListChangeListener() { }
};

6
src/script/C4Effect.cpp
View File

@ -23,9 +23,6 @@
#include "script/C4Aul.h"
#include "game/C4GameScript.h"
#include "object/C4ObjectList.h"
extern C4ObjectListChangeListener & ObjectListChangeListener;
void C4Effect::AssignCallbackFunctions()
{
@ -153,8 +150,6 @@ C4Effect * C4Effect::Init(C4PropList *pForObj, int32_t iPrio, const C4Value &rVa
// Update OnFire cache
if (!IsDead() && pForObj && WildcardMatch(C4Fx_AnyFire, GetName()))
pForObj->SetOnFire(true);
// Creation callback
if (!IsDead()) ObjectListChangeListener.OnEffectAdded(this);
return this;
}
@ -210,7 +205,6 @@ void C4Effect::ClearPointers(C4PropList *pObj)
void C4Effect::SetDead()
{
iPriority = 0;
ObjectListChangeListener.OnEffectRemoved(this);
}
C4Effect *C4Effect::Get(const char *szName, int32_t iIndex, int32_t iMaxPriority)

2
src/script/C4ScriptStandaloneStubs.cpp
View File

@ -34,8 +34,6 @@ std::vector<C4PropListNumbered *> C4PropListNumbered::ShelvedPropLists;
int32_t C4PropListNumbered::EnumerationIndex = 0;
C4StringTable Strings;
C4AulScriptEngine ScriptEngine;
C4ObjectListChangeListener listener_stub;
class C4ObjectListChangeListener & ObjectListChangeListener = listener_stub;
/* Avoid a C4Object dependency */
C4Effect ** FnGetEffectsFor(C4PropList * pTarget)