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
+9 -9
View File
@@ -58,7 +58,7 @@ static int cursorx, cursory;
*/
void Z_MouseDown(int x, int y, int buttons) {
idVec3 org, dir, vup, vright;
brush_t *b;
idEditorBrush *b;
Sys_GetCursorPos(&cursorx, &cursory);
@@ -220,7 +220,7 @@ void Z_MouseMoved(int x, int y, int buttons) {
/*
=======================================================================================================================
DRAWING £
DRAWING
Z_DrawGrid
=======================================================================================================================
*/
@@ -339,7 +339,7 @@ GLbitfield glbitClear = GL_COLOR_BUFFER_BIT; // HACK
=======================================================================================================================
*/
void Z_Draw(void) {
brush_t *brush;
idEditorBrush *brush;
float w, h;
float top, bottom;
idVec3 org_top, org_bottom, dir_up, dir_down;
@@ -362,10 +362,10 @@ void Z_Draw(void) {
);
/*
* GL Bug £
* GL Bug
* When not using hw acceleration, gl will fault if we clear the depth buffer bit
* on the first pass. The hack fix is to set the GL_DEPTH_BUFFER_BIT only after
* Z_Draw() has been called once. Yeah, right. £
* Z_Draw() has been called once. Yeah, right.
* glClear(glbitClear);
*/
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -418,12 +418,12 @@ void Z_Draw(void) {
continue;
}
if (!Brush_Ray(org_top, dir_down, brush, &top)) {
if (!brush->Brush_Ray(org_top, dir_down, &top)) {
continue;
}
top = org_top[2] - top;
if (!Brush_Ray(org_bottom, dir_up, brush, &bottom)) {
if (!brush->Brush_Ray(org_bottom, dir_up, &bottom)) {
continue;
}
@@ -458,9 +458,9 @@ void Z_Draw(void) {
brush->maxs[1] <= z.origin[1]
)
) {
if (Brush_Ray(org_top, dir_down, brush, &top)) {
if (brush->Brush_Ray(org_top, dir_down, &top)) {
top = org_top[2] - top;
if (Brush_Ray(org_bottom, dir_up, brush, &bottom)) {
if (brush->Brush_Ray(org_bottom, dir_up, &bottom)) {
bottom = org_bottom[2] + bottom;
//q = declManager->FindMaterial(brush->brush_faces->texdef.name);