id-software/DoomRTX
1
0
Fork 0
mirror of https://github.com/jmarshall23/DoomRTX.git synced 2026-08-20 04:30:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

entity_t and brush_t now converted to idEditorEntity and idEditorBrush

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
neo/engine/tools/radiant/QE3.H
+7 -9
View File
@@ -162,7 +162,7 @@ typedef struct
int d_num_entities;
entity_t *d_project_entity;
idEditorEntity *d_project_entity;
idVec3 d_new_brush_bottom, d_new_brush_top;
@@ -193,7 +193,7 @@ typedef struct
// connect entities uses the last two brushes selected
int d_select_count;
brush_t *d_select_order[MAX_MAP_ENTITIES];
idEditorBrush *d_select_order[MAX_MAP_ENTITIES];
idVec3 d_select_translate; // for dragging w/o making new display lists
select_t d_select_mode;
idPointListInterface *selectObject; //
@@ -206,7 +206,7 @@ typedef struct
// Timo
// tells if we are internally using brush primitive (texture coordinates and map format)
// this is a shortcut for IntForKey( g_qeglobals.d_project_entity, "brush_primit" )
// this is a shortcut for g_qeglobals.d_project_entity->IntForKey("brush_primit" )
// NOTE: must keep the two ones in sync
BOOL m_bBrushPrimitMode;
@@ -374,7 +374,6 @@ extern int g_axialAnchor;
extern int g_axialDest;
extern void Face_FlipTexture_BrushPrimit(face_t *face, bool y);
extern void Brush_FlipTexture_BrushPrimit(brush_t *b, bool y);
// Timo
// new brush primitive stuff
@@ -383,7 +382,6 @@ void FaceToBrushPrimitFace(face_t *f);
void EmitBrushPrimitTextureCoordinates(face_t *, idWinding *, patchMesh_t *patch = NULL);
// EmitTextureCoordinates, is old code used for brush to brush primitive conversion
void EmitTextureCoordinates ( idVec5 &xyzst, const idMaterial *q, face_t *f, bool force = false);
void BrushPrimit_Parse(brush_t *, bool newFormat, const idVec3 origin);
// compute a fake shift scale rot representation from the texture matrix
void TexMatToFakeTexCoords( float texMat[2][3], float shift[2], float *rot, float scale[2] );
void FakeTexCoordsToTexMat( float shift[2], float rot, float scale[2], float texMat[2][3] );
@@ -472,11 +470,11 @@ extern void Map_ImportFile (char *filename);
extern void Map_SaveSelected(char* pFilename);
extern bool g_bNewFace;
extern bool g_bSwitch;
extern brush_t g_brFrontSplits;
extern brush_t g_brBackSplits;
extern idEditorBrush g_brFrontSplits;
extern idEditorBrush g_brBackSplits;
extern CClipPoint g_Clip1;
extern CClipPoint g_Clip2;
extern brush_t* g_pSplitList;
extern idEditorBrush* g_pSplitList;
extern CClipPoint g_PathPoints[256];
extern void AcquirePath(int nCount, PFNPathCallback* pFunc);
extern bool g_bScreenUpdates;
@@ -501,7 +499,7 @@ extern void DoPatchInspector();
void UpdatePatchInspector();
extern int g_nSmartX;
extern int g_nSmartY;
extern brush_t* CreateEntityBrush(int x, int y, CXYWnd* pWnd);
extern idEditorBrush* CreateEntityBrush(int x, int y, CXYWnd* pWnd);
int PointInMoveList( idVec3 *pf );
extern bool ByeByeSurfaceDialog();