entity_t and brush_t now converted to idEditorEntity and idEditorBrush

This commit is contained in:
Justin Marshall
2026-05-24 11:33:16 -07:00
parent d6d01e1faf
commit 3242531044
41 changed files with 1598 additions and 1540 deletions
+29 -30
View File
@@ -27,8 +27,7 @@ along with IceTech Source Code. If not, see <http://www.gnu.org/licenses/>.
#include "afxcmn.h"
#include "afxtempl.h"
struct entity_s;
typedef struct entity_s entity_t;
class idEditorEntity;
class idVec3;
class COutlinerDlg : public CWnd {
@@ -59,9 +58,9 @@ public:
void Refresh(bool force = false);
void RefreshIfNeeded();
void OpenEntityProperties(entity_t* ent);
void MoveToEntity(entity_t* ent);
void SelectEntityInMap(entity_t* ent, bool updateInspector = false);
void OpenEntityProperties(idEditorEntity* ent);
void MoveToEntity(idEditorEntity* ent);
void SelectEntityInMap(idEditorEntity* ent, bool updateInspector = false);
protected:
DECLARE_MESSAGE_MAP()
@@ -84,12 +83,12 @@ protected:
private:
struct outlinerEdge_t {
entity_t* source;
entity_t* target;
idEditorEntity* source;
idEditorEntity* target;
};
struct outlinerItemData_t {
entity_t* entity;
idEditorEntity* entity;
bool cycleRef;
};
@@ -111,45 +110,45 @@ private:
CString m_lastMapName;
int m_lastMapModified;
int m_lastEntityCount;
entity_t* m_lastWorldEntity;
idEditorEntity* m_lastWorldEntity;
void BuildGraph();
void AddEntityNode(entity_t* ent);
void AddEdge(entity_t* source, entity_t* target);
bool HasEdge(entity_t* source, entity_t* target) const;
int FindNode(entity_t* ent) const;
void AddEntityNode(idEditorEntity* ent);
void AddEdge(idEditorEntity* source, idEditorEntity* target);
bool HasEdge(idEditorEntity* source, idEditorEntity* target) const;
int FindNode(idEditorEntity* ent) const;
int FindNodeByName(const char* name) const;
bool IsTargetKey(const char* key) const;
void ClearItemData();
outlinerItemData_t* AllocItemData(entity_t* ent, bool cycleRef);
entity_t* EntityFromItem(HTREEITEM item) const;
entity_t* SelectedEntity() const;
outlinerItemData_t* AllocItemData(idEditorEntity* ent, bool cycleRef);
idEditorEntity* EntityFromItem(HTREEITEM item) const;
idEditorEntity* SelectedEntity() const;
CString EntityDisplayName(entity_t* ent) const;
bool EntityMatchesFilter(entity_t* ent) const;
bool EntityOrDescendantMatches(entity_t* ent, CPtrArray& stack) const;
bool ArrayContains(const CPtrArray& array, entity_t* ent) const;
CString EntityDisplayName(idEditorEntity* ent) const;
bool EntityMatchesFilter(idEditorEntity* ent) const;
bool EntityOrDescendantMatches(idEditorEntity* ent, CPtrArray& stack) const;
bool ArrayContains(const CPtrArray& array, idEditorEntity* ent) const;
HTREEITEM InsertEntityRecursive(entity_t* ent, HTREEITEM parent, CPtrArray& stack);
HTREEITEM FindTreeItemForEntity(entity_t* ent, HTREEITEM start) const;
HTREEITEM InsertEntityRecursive(idEditorEntity* ent, HTREEITEM parent, CPtrArray& stack);
HTREEITEM FindTreeItemForEntity(idEditorEntity* ent, HTREEITEM start) const;
void ExpandAll(HTREEITEM start);
void CollectEntityAndChildren(entity_t* ent, CPtrArray& out, CPtrArray& stack) const;
void SetEntityVisibility(entity_t* ent, bool visible, bool includeChildren);
void ToggleEntityVisibility(entity_t* ent, bool includeChildren);
void ShowOnlyEntityAndChildren(entity_t* ent);
void CollectEntityAndChildren(idEditorEntity* ent, CPtrArray& out, CPtrArray& stack) const;
void SetEntityVisibility(idEditorEntity* ent, bool visible, bool includeChildren);
void ToggleEntityVisibility(idEditorEntity* ent, bool includeChildren);
void ShowOnlyEntityAndChildren(idEditorEntity* ent);
void ShowAllEntities();
void UpdateAllCheckmarks(HTREEITEM start);
void ApplyVisibilityChange();
bool NeedsRefresh() const;
bool GetEntityCenter(entity_t* ent, idVec3& center) const;
bool GetEntityCenter(idEditorEntity* ent, idVec3& center) const;
void ApplyFont();
};
bool Outliner_IsEntityVisible(entity_t* ent);
void Outliner_SetEntityVisible(entity_t* ent, bool visible);
bool Outliner_IsEntityVisible(idEditorEntity* ent);
void Outliner_SetEntityVisible(idEditorEntity* ent, bool visible);
void Outliner_ResetEntityVisibility();
bool Outliner_HasHiddenEntities();
bool Outliner_IsEntityLinkVisible(entity_t* source, entity_t* target);
bool Outliner_IsEntityLinkVisible(idEditorEntity* source, idEditorEntity* target);