id-software/DoomRTX
1
0
Fork 0
mirror of https://github.com/jmarshall23/DoomRTX.git synced 2026-08-19 12:14:35 +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/PMESH.CPP
+84 -83
View File
@@ -813,7 +813,8 @@ void Patch_CalcBounds( patchMesh_t *p,idVec3 &vMin,idVec3 &vMax ) {
Brush_RebuildBrush
==================
*/
void Brush_RebuildBrush( brush_t *b,idVec3 vMins,idVec3 vMaxs,bool patch ) {
void idEditorBrush::Brush_RebuildBrush(idVec3 vMins,idVec3 vMaxs,bool patch ) {
idEditorBrush *b = this;
//
// Total hack job
// Rebuilds a brush
@@ -898,13 +899,13 @@ void Brush_RebuildBrush( brush_t *b,idVec3 vMins,idVec3 vMaxs,bool patch ) {
VectorCopy(pts[1][0], f->planepts[1]);
VectorCopy(pts[0][0], f->planepts[2]);
Brush_Build(b);
b->Brush_Build();
}
void WINAPI Patch_Rebuild( patchMesh_t *p ) {
idVec3 vMin, vMax;
Patch_CalcBounds(p, vMin, vMax);
Brush_RebuildBrush(p->pSymbiot, vMin, vMax);
p->pSymbiot->Brush_RebuildBrush(vMin, vMax);
Patch_MakeDirty(p);
}
@@ -914,7 +915,7 @@ AddBrushForPatch
==================
adds a patch brush and ties it to this patch id
*/
brush_t * AddBrushForPatch( patchMesh_t *pm,bool bLinkToWorld ) {
idEditorBrush * AddBrushForPatch( patchMesh_t *pm,bool bLinkToWorld ) {
// find the farthest points in x,y,z
idVec3 vMin, vMax;
Patch_CalcBounds(pm, vMin, vMax);
@@ -928,8 +929,8 @@ brush_t * AddBrushForPatch( patchMesh_t *pm,bool bLinkToWorld ) {
texdef_t td;
//td.SetName(pm->d_texture->getName());
brush_t *b = Brush_Create(vMin, vMax, &td);
//brush_t *b = Brush_Create(vMin, vMax, &g_qeglobals.d_texturewin.texdef);
idEditorBrush *b = Brush_Create(vMin, vMax, &td);
//idEditorBrush *b = Brush_Create(vMin, vMax, &g_qeglobals.d_texturewin.texdef);
// FIXME: this entire type of linkage needs to be fixed
b->pPatch = pm;
@@ -940,9 +941,9 @@ brush_t * AddBrushForPatch( patchMesh_t *pm,bool bLinkToWorld ) {
pm->nListIDCam = -1;
if ( bLinkToWorld ) {
Brush_AddToList(b, &active_brushes);
Entity_LinkBrush(world_entity, b);
Brush_Build(b);
b->Brush_AddToList(&active_brushes);
world_entity->Entity_LinkBrush(b);
b->Brush_Build();
}
return b;
@@ -1119,7 +1120,7 @@ int Interior5ByCount = sizeof(Interior5By) / sizeof(int[2]);
face_t * Patch_GetAxisFace( patchMesh_t *p ) {
face_t *f = NULL;
idVec3 vTemp;
brush_t *b = p->pSymbiot;
idEditorBrush *b = p->pSymbiot;
for ( f = b->brush_faces ; f ; f = f->next ) {
vTemp = (*f->face_winding)[1].ToVec3() - (*f->face_winding)[0].ToVec3();
@@ -1146,7 +1147,7 @@ face_t * Patch_GetAxisFace( patchMesh_t *p ) {
int g_nFaceCycle = 0;
face_t * nextFace( patchMesh_t *p ) {
brush_t *b = p->pSymbiot;
idEditorBrush *b = p->pSymbiot;
face_t *f = NULL;
int n = 0;
for ( f = b->brush_faces ; f && n <= g_nFaceCycle; f = f->next ) {
@@ -1215,8 +1216,8 @@ void FillPatch( patchMesh_t *p,idVec3 v ) {
}
}
brush_t * Cap( patchMesh_t *pParent,bool bByColumn,bool bFirst ) {
brush_t *b;
idEditorBrush * Cap( patchMesh_t *pParent,bool bByColumn,bool bFirst ) {
idEditorBrush *b;
patchMesh_t *p;
idVec3 vMin, vMax;
int i, j;
@@ -1302,8 +1303,8 @@ brush_t * Cap( patchMesh_t *pParent,bool bByColumn,bool bFirst ) {
return p->pSymbiot;
}
brush_t * CapSpecial( patchMesh_t *pParent,int nType,bool bFirst ) {
brush_t *b;
idEditorBrush * CapSpecial( patchMesh_t *pParent,int nType,bool bFirst ) {
idEditorBrush *b;
patchMesh_t *p;
idVec3 vMin, vMax, vTemp;
int i, j;
@@ -1422,7 +1423,7 @@ brush_t * CapSpecial( patchMesh_t *pParent,int nType,bool bFirst ) {
}
//--Patch_CalcBounds(p, vMin, vMax);
//--Brush_RebuildBrush(p->pSymbiot, vMin, vMax);
//--p->pSymbiot->Brush_RebuildBrush(vMin, vMax);
Patch_Rebuild(p);
Patch_CapTexture(p);
return p->pSymbiot;
@@ -1431,8 +1432,8 @@ brush_t * CapSpecial( patchMesh_t *pParent,int nType,bool bFirst ) {
void Patch_CapCurrent( bool bInvertedBevel,bool bInvertedEndcap ) {
patchMesh_t *pParent = NULL;
brush_t *b[4];
brush_t *pCap = NULL;
idEditorBrush *b[4];
idEditorBrush *pCap = NULL;
b[0] = b[1] = b[2] = b[3] = NULL;
int nIndex = 0;
@@ -1442,7 +1443,7 @@ void Patch_CapCurrent( bool bInvertedBevel,bool bInvertedEndcap ) {
}
for ( brush_t*pb = selected_brushes.next ; pb != NULL && pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != NULL && pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
pParent = pb->pPatch;
// decide which if any ends we are going to cap
@@ -1495,8 +1496,8 @@ void Patch_CapCurrent( bool bInvertedBevel,bool bInvertedEndcap ) {
}
eclass_t*pecNew = Eclass_ForName("func_static", false);
if ( pecNew ) {
entity_t*e = Entity_Create(pecNew);
SetKeyValue(e, "type", "patchCapped");
idEditorEntity*e = idEditorEntity::Entity_Create(pecNew);
e->SetKeyValue("type", "patchCapped");
}
}
}
@@ -1505,8 +1506,8 @@ void Patch_CapCurrent( bool bInvertedBevel,bool bInvertedEndcap ) {
//FIXME: Table drive all this crap
//
void GenerateEndCaps( brush_t *brushParent,bool bBevel,bool bEndcap,bool bInverted ) {
brush_t *b, *b2;
void GenerateEndCaps( idEditorBrush *brushParent,bool bBevel,bool bEndcap,bool bInverted ) {
idEditorBrush *b, *b2;
patchMesh_t *p, *p2, *pParent;
idVec3 vTemp, vMin, vMax;
int i, j;
@@ -1545,7 +1546,7 @@ void GenerateEndCaps( brush_t *brushParent,bool bBevel,bool bEndcap,bool bInvert
}
Patch_CalcBounds(p, vMin, vMax);
Brush_RebuildBrush(p->pSymbiot, vMin, vMax);
p->pSymbiot->Brush_RebuildBrush(vMin, vMax);
Select_Brush(p->pSymbiot);
return;
@@ -1703,9 +1704,9 @@ void GenerateEndCaps( brush_t *brushParent,bool bBevel,bool bEndcap,bool bInvert
//Select_Delete();
Patch_CalcBounds(p, vMin, vMax);
Brush_RebuildBrush(p->pSymbiot, vMin, vMax);
p->pSymbiot->Brush_RebuildBrush(vMin, vMax);
Patch_CalcBounds(p2, vMin, vMax);
Brush_RebuildBrush(p2->pSymbiot, vMin, vMax);
p2->pSymbiot->Brush_RebuildBrush(vMin, vMax);
Select_Brush(p->pSymbiot);
Select_Brush(p2->pSymbiot);
} else {
@@ -1722,7 +1723,7 @@ BrushToPatchMesh
===============
*/
void Patch_BrushToMesh( bool bCone,bool bBevel,bool bEndcap,bool bSquare,int nHeight ) {
brush_t *b;
idEditorBrush *b;
patchMesh_t *p;
int i, j;
@@ -1900,7 +1901,7 @@ patchMesh_t * Patch_GenerateGeneric( int width,int height,int orientation,const
Patch_GenericMesh
==================
*/
brush_t * Patch_GenericMesh( int width,int height,int orientation,bool bDeleteSource,bool bOverride,patchMesh_t *parent ) {
idEditorBrush * Patch_GenericMesh( int width,int height,int orientation,bool bDeleteSource,bool bOverride,patchMesh_t *parent ) {
if ( height < 3 || height> 15 || width < 3 || width> 15 ) {
Sys_Status("Invalid patch width or height.\n");
return NULL;
@@ -1911,7 +1912,7 @@ brush_t * Patch_GenericMesh( int width,int height,int orientation,bool bDeleteSo
return NULL;
}
brush_t *b = selected_brushes.next;
idEditorBrush *b = selected_brushes.next;
patchMesh_t *p = Patch_GenerateGeneric(width, height, orientation, b->mins, b->maxs);
@@ -2107,7 +2108,7 @@ void AddPatchMovePoint( idVec3 v,bool bMulti,bool bFull ) {
return;
}
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
for ( int i = 0 ; i < p->width ; i++ ) {
@@ -2159,7 +2160,7 @@ void Patch_UpdateSelected( idVec3 vMove ) {
}
//--patchMesh_t* p = &patchMeshes[g_nSelectedPatch];
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
@@ -2176,7 +2177,7 @@ void Patch_UpdateSelected( idVec3 vMove ) {
idVec3 vMin, vMax;
Patch_CalcBounds(p, vMin, vMax);
Brush_RebuildBrush(p->pSymbiot, vMin, vMax);
p->pSymbiot->Brush_RebuildBrush(vMin, vMax);
}
}
//Brush_Free(p->pSymbiot);
@@ -2185,7 +2186,7 @@ void Patch_UpdateSelected( idVec3 vMove ) {
void Patch_AdjustSubdivisions( float hadj,float vadj ) {
brush_t *pb;
idEditorBrush *pb;
for ( pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
@@ -2599,7 +2600,7 @@ void Patch_Move( patchMesh_t *pm,const idVec3 vMove,bool bRebuild ) {
if ( bRebuild ) {
idVec3 vMin, vMax;
Patch_CalcBounds(pm, vMin, vMax);
//Brush_RebuildBrush(patchMeshes[n].pSymbiot, vMin, vMax);
//patchMeshes[n].pSymbiot->Brush_RebuildBrush(vMin, vMax);
}
UpdatePatchInspector();
}
@@ -2624,7 +2625,7 @@ void Patch_ApplyMatrix( patchMesh_t *p,const idVec3 vOrigin,const idMat3 matrix,
}
idVec3 vMin, vMax;
Patch_CalcBounds(p, vMin, vMax);
Brush_RebuildBrush(p->pSymbiot, vMin, vMax);
p->pSymbiot->Brush_RebuildBrush(vMin, vMax);
}
/*
@@ -2637,7 +2638,7 @@ void Patch_EditPatch() {
g_qeglobals.d_numpoints = 0;
g_qeglobals.d_num_move_points = 0;
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
for ( int i = 0 ; i < p->width ; i++ ) {
@@ -2666,7 +2667,7 @@ void Patch_Deselect() {
//--g_nSelectedPatch = -1;
g_qeglobals.d_select_mode = sel_brush;
for ( brush_t*b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) {
for ( idEditorBrush*b = selected_brushes.next ; b != &selected_brushes ; b = b->next ) {
if ( b->pPatch ) {
b->pPatch->bSelected = false;
}
@@ -2747,7 +2748,7 @@ void Patch_Scale( patchMesh_t *p,const idVec3 vOrigin,const idVec3 vAmt,bool bRe
if ( bRebuild ) {
idVec3 vMin, vMax;
Patch_CalcBounds(p, vMin, vMax);
Brush_RebuildBrush(p->pSymbiot, vMin, vMax);
p->pSymbiot->Brush_RebuildBrush(vMin, vMax);
}
UpdatePatchInspector();
}
@@ -3022,7 +3023,7 @@ void Patch_DisperseRows() {
int i, w, h;
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
Patch_Rebuild(p);
@@ -3064,7 +3065,7 @@ void Patch_DisperseColumns() {
idVec3 vTemp, vTemp2;
int i, w, h;
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
Patch_Rebuild(p);
@@ -3101,7 +3102,7 @@ Patch_AdjustSelected
*/
void Patch_AdjustSelected( bool bInsert,bool bColumn,bool bFlag ) {
bool bUpdate = false;
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
if ( bInsert ) {
if ( bColumn ) {
@@ -3120,7 +3121,7 @@ void Patch_AdjustSelected( bool bInsert,bool bColumn,bool bFlag ) {
idVec3 vMin, vMax;
patchMesh_t *p = pb->pPatch;
Patch_CalcBounds(p, vMin, vMax);
Brush_RebuildBrush(p->pSymbiot, vMin, vMax);
p->pSymbiot->Brush_RebuildBrush(vMin, vMax);
}
}
if ( bUpdate ) {
@@ -3154,7 +3155,7 @@ void Parse3DMatrix( int z,int y,int x,float *p ) {
}
// parses a patch
brush_t * Patch_Parse( bool bOld ) {
idEditorBrush * Patch_Parse( bool bOld ) {
const idMaterial *tex = declManager->FindMaterial(NULL);
GetToken(true);
@@ -3166,7 +3167,7 @@ brush_t * Patch_Parse( bool bOld ) {
if ( g_qeglobals.bSurfacePropertiesPlugin ) {
assert(true);
//GETPLUGINTEXDEF(pm)->ParsePatchTexdef();
//GETPLUGINTEXDEFpm->ParsePatchTexdef();
} else {
// texture def
GetToken(true);
@@ -3256,7 +3257,7 @@ brush_t * Patch_Parse( bool bOld ) {
return NULL;
}
brush_t *b = AddBrushForPatch(pm, false);
idEditorBrush *b = AddBrushForPatch(pm, false);
return b;
}
@@ -3450,7 +3451,7 @@ Patch_ToggleInverted
void Patch_ToggleInverted() {
bool bUpdate = false;
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
bUpdate = true;
patchInvert(pb->pPatch);
@@ -3493,7 +3494,7 @@ Patch_ToggleInverted
*/
void Patch_InvertTexture( bool bY ) {
bool bUpdate = false;
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
bUpdate = true;
Patch_FlipTexture(pb->pPatch, bY);
@@ -3555,7 +3556,7 @@ void Patch_FitTexture( patchMesh_t *p,float fx,float fy ) {
}
void Patch_ResetTexturing( float fx,float fy ) {
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
Patch_MakeDirty(p);
@@ -3571,7 +3572,7 @@ void Patch_ResetTexturing( float fx,float fy ) {
void Patch_FitTexturing() {
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
Patch_MakeDirty(p);
@@ -3586,7 +3587,7 @@ void Patch_FitTexturing() {
}
void Patch_SetTextureInfo( texdef_t *pt ) {
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
if ( pt->rotate )
Patch_RotateTexture(pb->pPatch, pt->rotate);
@@ -3607,7 +3608,7 @@ bool WINAPI OnlyPatchesSelected() {
if ( g_ptrSelectedFaces.GetSize() > 0 || selected_brushes.next == &selected_brushes ) {
return false;
}
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( !pb->pPatch ) {
return false;
}
@@ -3619,7 +3620,7 @@ bool WINAPI AnyPatchesSelected() {
if ( g_ptrSelectedFaces.GetSize() > 0 || selected_brushes.next == &selected_brushes ) {
return false;
}
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
return true;
}
@@ -3642,7 +3643,7 @@ void Patch_BendToggle() {
return;
}
brush_t *b = selected_brushes.next;
idEditorBrush *b = selected_brushes.next;
if ( !QE_SingleBrush() || !b->pPatch ) {
Sys_Status("Must bend a single patch");
@@ -3662,7 +3663,7 @@ void Patch_BendHandleTAB() {
return;
}
brush_t *b = selected_brushes.next;
idEditorBrush *b = selected_brushes.next;
if ( !QE_SingleBrush() || !b->pPatch ) {
Patch_BendToggle();
Sys_Status("No patch to bend!");
@@ -3744,7 +3745,7 @@ void Patch_BendHandleESC() {
return;
}
Patch_BendToggle();
brush_t *b = selected_brushes.next;
idEditorBrush *b = selected_brushes.next;
if ( QE_SingleBrush() && b->pPatch ) {
Patch_Restore(b->pPatch);
}
@@ -3761,7 +3762,7 @@ void Patch_SetBendRotateOrigin( patchMesh_t *p ) {
// also sets the rotational origin
void Patch_SelectBendAxis() {
brush_t *b = selected_brushes.next;
idEditorBrush *b = selected_brushes.next;
if ( !QE_SingleBrush() || !b->pPatch ) {
// should not ever happen
Patch_BendToggle();
@@ -3779,7 +3780,7 @@ void Patch_SelectBendAxis() {
}
void Patch_SelectBendNormal() {
brush_t *b = selected_brushes.next;
idEditorBrush *b = selected_brushes.next;
if ( !QE_SingleBrush() || !b->pPatch ) {
// should not ever happen
Patch_BendToggle();
@@ -3819,7 +3820,7 @@ void Patch_InsDelToggle() {
return;
}
brush_t *b = selected_brushes.next;
idEditorBrush *b = selected_brushes.next;
if ( !QE_SingleBrush() || !b->pPatch ) {
Sys_Status("Must work with a single patch");
@@ -3852,7 +3853,7 @@ void Patch_InsDelHandleTAB() {
return;
}
brush_t *b = selected_brushes.next;
idEditorBrush *b = selected_brushes.next;
if ( !QE_SingleBrush() || !b->pPatch ) {
Patch_BendToggle();
common->Printf("No patch to bend!");
@@ -3952,7 +3953,7 @@ void _Write3DMatrix( CMemFile *f,int z,int y,int x,float *m ) {
void Patch_NaturalizeSelected( bool bCap,bool bCycleCap,bool alt ) {
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
if ( bCap ) {
Patch_CapTexture(pb->pPatch, bCycleCap, alt);
@@ -3964,7 +3965,7 @@ void Patch_NaturalizeSelected( bool bCap,bool bCycleCap,bool alt ) {
}
void Patch_SubdivideSelected( bool subdivide,int horz,int vert ) {
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
pb->pPatch->explicitSubdivisions = subdivide;
if ( horz <= 0 ) {
@@ -3999,7 +4000,7 @@ void Patch_SelectAreaPoints() {
//g_qeglobals.d_num_move_points = 0;
g_nPatchClickedView = -1;
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
for ( int i = 0; i < p->width; i++ ) {
@@ -4014,7 +4015,7 @@ void Patch_SelectAreaPoints() {
}
const char * Patch_GetTextureName() {
brush_t *b = selected_brushes.next;
idEditorBrush *b = selected_brushes.next;
if ( b->pPatch ) {
patchMesh_t *p = b->pPatch;
if ( p->d_texture->GetName() )
@@ -4044,7 +4045,7 @@ patchMesh_t * Patch_Duplicate( patchMesh_t *pFrom ) {
void Patch_Thicken( int nAmount,bool bSeam ) {
int i, j, h, w;
brush_t *b;
idEditorBrush *b;
patchMesh_t *pSeam;
idVec3 vMin, vMax;
CPtrArray brushes;
@@ -4057,7 +4058,7 @@ void Patch_Thicken( int nAmount,bool bSeam ) {
return;
}
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( !pb->pPatch ) {
return;
}
@@ -4091,7 +4092,7 @@ void Patch_Thicken( int nAmount,bool bSeam ) {
Patch_CalcBounds(pSeam, vMin, vMax);
Brush_RebuildBrush(pSeam->pSymbiot, vMin, vMax);
pSeam->pSymbiot->Brush_RebuildBrush(vMin, vMax);
//--Patch_CapTexture(pSeam);
Patch_Naturalize(pSeam);
patchInvert(pSeam);
@@ -4108,7 +4109,7 @@ void Patch_Thicken( int nAmount,bool bSeam ) {
VectorScale(pSeam->ctrl(1, i).xyz, 0.5, pSeam->ctrl(1, i).xyz);
}
Patch_CalcBounds(pSeam, vMin, vMax);
Brush_RebuildBrush(pSeam->pSymbiot, vMin, vMax);
pSeam->pSymbiot->Brush_RebuildBrush(vMin, vMax);
//--Patch_CapTexture(pSeam);
Patch_Naturalize(pSeam);
brushes.Add(b);
@@ -4128,7 +4129,7 @@ void Patch_Thicken( int nAmount,bool bSeam ) {
Patch_CalcBounds(pSeam, vMin, vMax);
Brush_RebuildBrush(pSeam->pSymbiot, vMin, vMax);
pSeam->pSymbiot->Brush_RebuildBrush(vMin, vMax);
//--Patch_CapTexture(pSeam);
Patch_Naturalize(pSeam);
patchInvert(pSeam);
@@ -4145,7 +4146,7 @@ void Patch_Thicken( int nAmount,bool bSeam ) {
VectorScale(pSeam->ctrl(i, 1).xyz, 0.5, pSeam->ctrl(i, 1).xyz);
}
Patch_CalcBounds(pSeam, vMin, vMax);
Brush_RebuildBrush(pSeam->pSymbiot, vMin, vMax);
pSeam->pSymbiot->Brush_RebuildBrush(vMin, vMax);
//--Patch_CapTexture(pSeam);
Patch_Naturalize(pSeam);
brushes.Add(b);
@@ -4155,14 +4156,14 @@ void Patch_Thicken( int nAmount,bool bSeam ) {
}
for ( i = 0; i < brushes.GetSize(); i++ ) {
Select_Brush(reinterpret_cast< brush_t*>(brushes.GetAt(i)));
Select_Brush(reinterpret_cast< idEditorBrush*>(brushes.GetAt(i)));
}
if ( brushes.GetSize() > 0 ) {
eclass_t*pecNew = Eclass_ForName("func_static", false);
if ( pecNew ) {
entity_t*e = Entity_Create(pecNew);
SetKeyValue(e, "type", "patchThick");
idEditorEntity*e = idEditorEntity::Entity_Create(pecNew);
e->SetKeyValue("type", "patchThick");
}
}
@@ -4190,7 +4191,7 @@ clear clipboard
*/
void Patch_SetOverlays() {
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
pb->pPatch->bOverlay = true;
}
@@ -4200,7 +4201,7 @@ void Patch_SetOverlays() {
void Patch_ClearOverlays() {
brush_t *pb;
idEditorBrush *pb;
for ( pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
pb->pPatch->bOverlay = false;
@@ -4216,7 +4217,7 @@ void Patch_ClearOverlays() {
// freezes selected vertices
void Patch_Freeze() {
brush_t *pb;
idEditorBrush *pb;
for ( pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
pb->pPatch->bOverlay = false;
@@ -4237,7 +4238,7 @@ void Patch_UnFreeze( bool bAll ) {
void Patch_Transpose() {
int i, j, w;
idDrawVert dv;
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
@@ -4284,7 +4285,7 @@ void Patch_Transpose() {
void Select_SnapToGrid() {
int i, j, k;
for ( brush_t*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
for ( idEditorBrush*pb = selected_brushes.next ; pb != &selected_brushes ; pb = pb->next ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
for ( i = 0; i < p->width; i++ ) {
@@ -4296,15 +4297,15 @@ void Select_SnapToGrid() {
}
idVec3 vMin, vMax;
Patch_CalcBounds(p, vMin, vMax);
Brush_RebuildBrush(p->pSymbiot, vMin, vMax);
p->pSymbiot->Brush_RebuildBrush(vMin, vMax);
} else {
Brush_SnapToGrid(pb);
pb->Brush_SnapToGrid();
}
}
}
void Patch_FindReplaceTexture( brush_t *pb,const char *pFind,const char *pReplace,bool bForce ) {
void Patch_FindReplaceTexture( idEditorBrush *pb,const char *pFind,const char *pReplace,bool bForce ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
if ( bForce || idStr::Icmp(p->d_texture->GetName(), pFind) == 0 ) {
@@ -4314,7 +4315,7 @@ void Patch_FindReplaceTexture( brush_t *pb,const char *pFind,const char *pReplac
}
}
void Patch_ReplaceQTexture( brush_t *pb,idMaterial *pOld,idMaterial *pNew ) {
void Patch_ReplaceQTexture( idEditorBrush *pb,idMaterial *pOld,idMaterial *pNew ) {
if ( pb->pPatch ) {
patchMesh_t *p = pb->pPatch;
if ( p->d_texture == pOld ) {
@@ -4323,7 +4324,7 @@ void Patch_ReplaceQTexture( brush_t *pb,idMaterial *pOld,idMaterial *pNew ) {
}
}
void Patch_Clone( patchMesh_t *p,brush_t *pNewOwner ) {
void Patch_Clone( patchMesh_t *p,idEditorBrush *pNewOwner ) {
}
void Patch_FromTriangle( idVec5 vx,idVec5 vy,idVec5 vz ) {
@@ -4385,7 +4386,7 @@ void Patch_FromTriangle( idVec5 vx,idVec5 vy,idVec5 vz ) {
//Patch_Naturalize(p);
brush_t *b = AddBrushForPatch(p);
idEditorBrush *b = AddBrushForPatch(p);
}