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
+48 -48
View File
@@ -30,9 +30,10 @@ void Eclass_InitForSourceDirectory( const char *path );
eclass_t * Eclass_ForName( const char *name, bool has_brushes );
bool Eclass_hasModel(eclass_t *e, idVec3 &vMin, idVec3 &vMax);
typedef struct entity_s {
struct entity_s *prev, *next;
brush_t brushes; // head/tail of list
class idEditorEntity {
public:
idEditorEntity *prev, *next;
idEditorBrush brushes; // head/tail of list
int undoId, redoId, entityId; // used for undo/redo
idVec3 origin;
qhandle_t lightDef;
@@ -46,51 +47,50 @@ typedef struct entity_s {
idMat3 lightRotation; // ''
bool trackLightOrigin;
idCurve<idVec3> *curve;
} entity_t;
const char *ValueForKey(const char *key);
int GetNumKeys();
const char *GetKeyString(int iIndex);
void SetKeyValue(const char *key, const char *value, bool trackAngles = true);
void DeleteKey(const char *key);
float FloatForKey(const char *key);
int IntForKey(const char *key);
bool GetVectorForKey(const char *key, idVec3 &vec);
bool GetVector4ForKey(const char *key, idVec4 &vec);
bool GetFloatForKey(const char *key, float *f);
void SetKeyVec3(const char *key, idVec3 v);
void SetKeyMat3(const char *key, idMat3 m);
bool GetMatrixForKey(const char *key, idMat3 &mat);
void Entity_UpdateSoundEmitter();
idCurve<idVec3> *Entity_MakeCurve();
void Entity_UpdateCurveData();
void Entity_SetCurveData();
static void Entity_Free(idEditorEntity *e);
void Entity_FreeEpairs();
int Entity_MemorySize();
static idEditorEntity *Entity_Parse(bool onlypairs, idEditorBrush* pList = NULL);
idEditorEntity *Entity_PostParse(idEditorBrush *pList);
void Entity_Write(FILE *f, bool use_region);
void Entity_WriteSelected(FILE *f);
void Entity_WriteSelected(CMemFile*);
static idEditorEntity *Entity_Create(eclass_t *c, bool forceFixed = false);
static idEditorEntity *Entity_Clone(idEditorEntity *e);
void Entity_AddToList(idEditorEntity *list);
void Entity_RemoveFromList();
bool EntityHasModel();
void Entity_LinkBrush(idEditorBrush *b);
static void Entity_UnlinkBrush(idEditorBrush *b);
static idEditorEntity *FindEntity(const char *pszKey, const char *pszValue);
static idEditorEntity *FindEntityInt(const char *pszKey, int iValue);
static idEditorEntity *Entity_New();
void Entity_SetName(const char *name);
static int GetUniqueTargetId(int iHint);
void Entity_Name(bool force);
};
void ParseEpair(idDict *dict);
const char *ValueForKey(entity_t *ent, const char *key);
int GetNumKeys(entity_t *ent);
const char *GetKeyString(entity_t *ent, int iIndex);
void SetKeyValue (entity_t *ent, const char *key, const char *value, bool trackAngles = true);
void DeleteKey (entity_t *ent, const char *key);
float FloatForKey (entity_t *ent, const char *key);
int IntForKey (entity_t *ent, const char *key);
bool GetVectorForKey (entity_t *ent, const char *key, idVec3 &vec);
bool GetVector4ForKey (entity_t *ent, const char *key, idVec4 &vec);
bool GetFloatForKey(entity_t *end, const char *key, float *f);
void SetKeyVec3(entity_t *ent, const char *key, idVec3 v);
void SetKeyMat3(entity_t *ent, const char *key, idMat3 m);
bool GetMatrixForKey(entity_t *ent, const char *key, idMat3 &mat);
eclass_t * GetCachedModel(idEditorEntity *pEntity, const char *pName, idVec3 &vMin, idVec3 &vMax);
void Entity_UpdateSoundEmitter( entity_t *ent );
idCurve<idVec3> *Entity_MakeCurve( entity_t *e );
void Entity_UpdateCurveData( entity_t *e );
void Entity_SetCurveData( entity_t *e );
void Entity_Free (entity_t *e);
void Entity_FreeEpairs(entity_t *e);
int Entity_MemorySize(entity_t *e);
entity_t * Entity_Parse (bool onlypairs, brush_t* pList = NULL);
void Entity_Write (entity_t *e, FILE *f, bool use_region);
void Entity_WriteSelected(entity_t *e, FILE *f);
void Entity_WriteSelected(entity_t *e, CMemFile*);
entity_t * Entity_Create (eclass_t *c, bool forceFixed = false);
entity_t * Entity_Clone (entity_t *e);
void Entity_AddToList(entity_t *e, entity_t *list);
void Entity_RemoveFromList(entity_t *e);
bool EntityHasModel(entity_t *ent);
void Entity_LinkBrush (entity_t *e, brush_t *b);
void Entity_UnlinkBrush (brush_t *b);
entity_t * FindEntity(const char *pszKey, const char *pszValue);
entity_t * FindEntityInt(const char *pszKey, int iValue);
entity_t * Entity_New();
void Entity_SetName(entity_t *e, const char *name);
int GetUniqueTargetId(int iHint);
eclass_t * GetCachedModel(entity_t *pEntity, const char *pName, idVec3 &vMin, idVec3 &vMax);
//Timo : used for parsing epairs in brush primitive
void Entity_Name(entity_t *e, bool force);
bool IsBrushSelected(brush_t* bSel);
bool IsBrushSelected(idEditorBrush* bSel);