• R/O
  • SSH
  • HTTPS

vima19: Commit


Commit MetaInfo

Revisión2541 (tree)
Tiempo2023-09-15 00:13:46
Autorhgtterry

Log Message

GameDirectorSB 14-09-23 [v1.26] World Editor Environment

Cambiar Resumen

Diferencia incremental

--- WorldEditor/WorldEditor/AB_App.cpp (revision 2540)
+++ WorldEditor/WorldEditor/AB_App.cpp (revision 2541)
@@ -95,6 +95,7 @@
9595 CLSB_Project = nullptr;
9696 CLSB_Objects_Create = nullptr;
9797 CLSB_Physics = nullptr;
98+ CLSB_Environment = nullptr;
9899
99100 AppBackground = NULL;
100101 BlackBrush = NULL;
@@ -295,7 +296,7 @@
295296 CLSB_Project = new SB_Project();
296297 CLSB_Objects_Create = new SB_Objects_Create();
297298 CLSB_Physics = new SB_Physics();
298-
299+ CLSB_Environment = new SB_Environment();
299300
300301 InitCommonControls();
301302
--- WorldEditor/WorldEditor/AB_App.h (revision 2540)
+++ WorldEditor/WorldEditor/AB_App.h (revision 2541)
@@ -97,6 +97,7 @@
9797 #include "SB_Project.h"
9898 #include "SB_Objects_Create.h"
9999 #include "SB_Physics.h"
100+#include "SB_Environment.h"
100101
101102 class SB_App
102103 {
@@ -172,6 +173,7 @@
172173 SB_Project* CLSB_Project;
173174 SB_Objects_Create* CLSB_Objects_Create;
174175 SB_Physics* CLSB_Physics;
176+ SB_Environment* CLSB_Environment;
175177
176178 bool InitApp(void);
177179 void InitMFC(void);
--- WorldEditor/WorldEditor/A_Brush.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_Brush.cpp (revision 2541)
@@ -237,7 +237,7 @@
237237
238238 Brush_SetName(pBrush, "Test");
239239
240- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
240+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
241241 App->m_pDoc->SetModifiedFlag();
242242
243243 App->Say("Added New");
--- WorldEditor/WorldEditor/A_Camera.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_Camera.cpp (revision 2541)
@@ -342,7 +342,7 @@
342342 App->CLSB_Camera_WE->pCameraEntity->SetAngles(&App->CLSB_Camera_WE->Angles, Level_GetEntityDefs (App->CLSB_Doc->pLevel) );
343343
344344 App->m_pDoc->SetRenderedViewCamera( &(App->CLSB_Camera_WE->pCameraEntity->mOrigin), &App->CLSB_Camera_WE->Angles) ;
345- App->m_pDoc->UpdateAllViews( UAV_ALLVIEWS, NULL );
345+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
346346
347347 EndDialog(hDlg, LOWORD(wParam));
348348 return TRUE;
@@ -469,7 +469,7 @@
469469 App->CLSB_Camera_WE->pCameraEntity->SetOrigin(App->CLSB_Camera_WE->CameraPosition.X, App->CLSB_Camera_WE->CameraPosition.Y, App->CLSB_Camera_WE->CameraPosition.Z, Level_GetEntityDefs(App->CLSB_Doc->pLevel));
470470
471471 App->m_pDoc->SetRenderedViewCamera(&(App->CLSB_Camera_WE->pCameraEntity->mOrigin), &App->CLSB_Camera_WE->Angles);
472- App->m_pDoc->UpdateAllViews(UAV_ALLVIEWS, NULL);
472+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS, NULL);
473473
474474 }
475475
@@ -536,7 +536,7 @@
536536 App->CLSB_Camera_WE->pCameraEntity->SetAngles(&App->CLSB_Camera_WE->Angles, Level_GetEntityDefs(App->CLSB_Doc->pLevel));
537537
538538 App->m_pDoc->SetRenderedViewCamera(&(App->CLSB_Camera_WE->pCameraEntity->mOrigin), &App->CLSB_Camera_WE->Angles);
539- App->m_pDoc->UpdateAllViews(UAV_ALLVIEWS, NULL);
539+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS, NULL);
540540
541541 }
542542
@@ -571,7 +571,7 @@
571571
572572 App->m_pDoc->SetRenderedViewCamera(&(pCameraEntity->mOrigin), &Angles);
573573
574- App->m_pDoc->UpdateAllViews(UAV_ALLVIEWS, NULL);
574+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS, NULL);
575575 }
576576
577577 }
@@ -607,7 +607,7 @@
607607 geVec3d_Copy(&(TransformOrigin.Translation), &(pCameraEntity->mOrigin));
608608
609609 App->m_pDoc->SetRenderedViewCamera(&(pCameraEntity->mOrigin), &Angles);
610- App->m_pDoc->UpdateAllViews(UAV_ALLVIEWS, NULL);
610+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS, NULL);
611611 }
612612 }
613613
@@ -642,7 +642,7 @@
642642 geVec3d_Copy(&(TransformOrigin.Translation), &(pCameraEntity->mOrigin));
643643
644644 App->m_pDoc->SetRenderedViewCamera(&(pCameraEntity->mOrigin), &Angles);
645- App->m_pDoc->UpdateAllViews(UAV_ALLVIEWS, NULL);
645+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS, NULL);
646646 }
647647 }
648648
@@ -677,7 +677,7 @@
677677 geVec3d_Copy(&(TransformOrigin.Translation), &(pCameraEntity->mOrigin));
678678
679679 App->m_pDoc->SetRenderedViewCamera(&(pCameraEntity->mOrigin), &Angles);
680- App->m_pDoc->UpdateAllViews(UAV_ALLVIEWS, NULL);
680+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS, NULL);
681681 }
682682 }
683683
@@ -712,7 +712,7 @@
712712 geVec3d_Copy(&(TransformOrigin.Translation), &(pCameraEntity->mOrigin));
713713
714714 App->m_pDoc->SetRenderedViewCamera(&(pCameraEntity->mOrigin), &Angles);
715- App->m_pDoc->UpdateAllViews(UAV_ALLVIEWS, NULL);
715+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS, NULL);
716716 }
717717 }
718718
@@ -747,7 +747,7 @@
747747 geVec3d_Copy(&(TransformOrigin.Translation), &(pCameraEntity->mOrigin));
748748
749749 App->m_pDoc->SetRenderedViewCamera(&(pCameraEntity->mOrigin), &Angles);
750- App->m_pDoc->UpdateAllViews(UAV_ALLVIEWS, NULL);
750+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS, NULL);
751751 }
752752 }
753753
@@ -782,6 +782,6 @@
782782 geVec3d_Copy(&(TransformOrigin.Translation), &(pCameraEntity->mOrigin));
783783
784784 App->m_pDoc->SetRenderedViewCamera(&(pCameraEntity->mOrigin), &Angles);
785- App->m_pDoc->UpdateAllViews(UAV_ALLVIEWS, NULL);
785+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS, NULL);
786786 }
787787 }
--- WorldEditor/WorldEditor/A_CreateArchDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_CreateArchDialog.cpp (revision 2541)
@@ -611,7 +611,7 @@
611611
612612 Brush_Move (m_pDoc->CurBrush, &MoveVec);
613613
614- m_pDoc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
614+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
615615 m_pDoc->SetModifiedFlag ();
616616 }
617617
--- WorldEditor/WorldEditor/A_CreateBoxDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_CreateBoxDialog.cpp (revision 2541)
@@ -497,7 +497,7 @@
497497
498498 Brush_Move (App->m_pDoc->CurBrush, &MoveVec);
499499
500- App->m_pDoc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
500+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
501501 App->m_pDoc->SetModifiedFlag ();
502502 }
503503
--- WorldEditor/WorldEditor/A_CreateConeDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_CreateConeDialog.cpp (revision 2541)
@@ -389,7 +389,7 @@
389389
390390 Brush_Move (m_pDoc->CurBrush, &MoveVec);
391391
392- m_pDoc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
392+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
393393 m_pDoc->SetModifiedFlag ();
394394 }
395395
--- WorldEditor/WorldEditor/A_CreateCylDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_CreateCylDialog.cpp (revision 2541)
@@ -472,7 +472,7 @@
472472
473473 Brush_Move (m_pDoc->CurBrush, &MoveVec);
474474
475- m_pDoc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
475+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
476476 m_pDoc->SetModifiedFlag ();
477477 }
478478
--- WorldEditor/WorldEditor/A_CreateSpheroidDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_CreateSpheroidDialog.cpp (revision 2541)
@@ -382,7 +382,7 @@
382382
383383 Brush_Move (m_pDoc->CurBrush, &MoveVec);
384384
385- m_pDoc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
385+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
386386 m_pDoc->SetModifiedFlag ();
387387 }
388388
--- WorldEditor/WorldEditor/A_CreateStaircaseDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_CreateStaircaseDialog.cpp (revision 2541)
@@ -362,7 +362,7 @@
362362
363363 Brush_Move (m_pDoc->CurBrush, &MoveVec);
364364
365- m_pDoc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
365+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
366366 m_pDoc->SetModifiedFlag ();
367367 }
368368
--- WorldEditor/WorldEditor/A_Dialogs.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_Dialogs.cpp (revision 2541)
@@ -352,7 +352,7 @@
352352 CFusionDoc* pDoc = (CFusionDoc*)App->m_pMainFrame->GetCurrentDoc();
353353
354354 App->CLSB_Doc->SelectAll();
355- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
355+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
356356
357357
358358
@@ -364,7 +364,7 @@
364364 ShellExecute(App->MainHwnd, "open", Path, "WorldEditor",App->WorldEditor_Directory, SW_SHOW);
365365
366366 App->CLSB_Doc->ResetAllSelections();
367- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
367+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
368368
369369 }
370370
@@ -396,10 +396,8 @@
396396 // Wired Framed
397397 if (LOWORD(wParam) == IDC_BTSELECTALL)
398398 {
399- CFusionDoc* pDoc = (CFusionDoc*)App->m_pMainFrame->GetCurrentDoc();
400-
401399 App->CLSB_Doc->SelectAll() ;
402- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
400+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
403401
404402 return TRUE;
405403 }
@@ -406,11 +404,9 @@
406404
407405 if (LOWORD(wParam) == IDC_BTDESELECTALL)
408406 {
409- CFusionDoc* pDoc = (CFusionDoc*)App->m_pMainFrame->GetCurrentDoc();
410-
411407 App->CLSB_Doc->ResetAllSelections() ;
412408 App->CLSB_Doc->UpdateSelected();
413- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
409+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
414410
415411 return TRUE;
416412 }
@@ -539,11 +535,8 @@
539535 // *************************************************************************
540536 bool A_Dialogs::Start_Move_Brush_Dlg()
541537 {
538+ CenterOfSelection = App->CLSB_Doc->SelectedGeoCenter;
542539
543- m_pDoc = (CFusionDoc*)App->m_pMainFrame->GetCurrentDoc();
544-
545- CenterOfSelection = m_pDoc->SelectedGeoCenter;
546-
547540 DialogBox(App->hInst, (LPCTSTR)IDD_SB_MOVEBRUSH, App->MainHwnd, (DLGPROC)Move_Brush_Proc);
548541
549542 return 1;
@@ -687,7 +680,7 @@
687680 sprintf(buf, "%f", App->CL_Dialogs->CenterOfSelection.Z);
688681 SetDlgItemText(hDlg, IDC_EDCAMZ,buf);
689682
690- geVec3d_Subtract(&App->CL_Dialogs->CenterOfSelection, &App->CL_Dialogs->m_pDoc->SelectedGeoCenter, &App->CL_Dialogs->CenterOfSelection);
683+ geVec3d_Subtract(&App->CL_Dialogs->CenterOfSelection, &App->CLSB_Doc->SelectedGeoCenter, &App->CL_Dialogs->CenterOfSelection);
691684 if (App->CL_Dialogs->m_pDoc->mModeTool == ID_TOOLS_TEMPLATE)
692685 {
693686 App->CL_Dialogs->m_pDoc->MoveTemplateBrush(&App->CL_Dialogs->CenterOfSelection);
@@ -694,10 +687,10 @@
694687 }
695688 else
696689 {
697- App->CL_Dialogs->m_pDoc->MoveSelectedBrushList(App->CL_Dialogs->m_pDoc->pSelBrushes, &App->CL_Dialogs->CenterOfSelection);
690+ App->CLSB_Doc->MoveSelectedBrushList(App->CL_Dialogs->m_pDoc->pSelBrushes, &App->CL_Dialogs->CenterOfSelection);
698691 }
699692
700- App->CL_Dialogs->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
693+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
701694
702695 return TRUE;
703696 }
@@ -715,7 +708,7 @@
715708 GetDlgItemText(hDlg,IDC_EDCAMZ,(LPTSTR)buff,MAX_PATH);
716709 App->CL_Dialogs->CenterOfSelection.Z = (float)atof(buff);
717710
718- geVec3d_Subtract(&App->CL_Dialogs->CenterOfSelection, &App->CL_Dialogs->m_pDoc->SelectedGeoCenter, &App->CL_Dialogs->CenterOfSelection);
711+ geVec3d_Subtract(&App->CL_Dialogs->CenterOfSelection, &App->CLSB_Doc->SelectedGeoCenter, &App->CL_Dialogs->CenterOfSelection);
719712 if (App->CL_Dialogs->m_pDoc->mModeTool == ID_TOOLS_TEMPLATE)
720713 {
721714 App->CL_Dialogs->m_pDoc->MoveTemplateBrush(&App->CL_Dialogs->CenterOfSelection);
@@ -722,10 +715,10 @@
722715 }
723716 else
724717 {
725- App->CL_Dialogs->m_pDoc->MoveSelectedBrushList(App->CL_Dialogs->m_pDoc->pSelBrushes, &App->CL_Dialogs->CenterOfSelection);
718+ App->CLSB_Doc->MoveSelectedBrushList(App->CL_Dialogs->m_pDoc->pSelBrushes, &App->CL_Dialogs->CenterOfSelection);
726719 }
727720
728- App->CL_Dialogs->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
721+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
729722
730723 EndDialog(hDlg, LOWORD(wParam));
731724 return TRUE;
--- WorldEditor/WorldEditor/A_FaceDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_FaceDialog.cpp (revision 2541)
@@ -361,7 +361,7 @@
361361 Face_SetTextureLock(pFace,true);
362362 }
363363
364- App->m_pDoc->UpdateAllViews(UAV_RENDER_ONLY, NULL);
364+ App->CLSB_Doc->UpdateAllViews(UAV_RENDER_ONLY, NULL);
365365
366366 return 1;
367367 }
@@ -375,7 +375,7 @@
375375 Face_SetTextureLock(pFace, false);
376376 }
377377
378- App->m_pDoc->UpdateAllViews(UAV_RENDER_ONLY, NULL);
378+ App->CLSB_Doc->UpdateAllViews(UAV_RENDER_ONLY, NULL);
379379 return 1;
380380 }
381381 return TRUE;
@@ -871,6 +871,6 @@
871871 Brush_UpdateChildFaces (pBrush);
872872 }
873873
874- App->m_pDoc->UpdateAllViews(UAV_RENDER_ONLY, NULL);
874+ App->CLSB_Doc->UpdateAllViews(UAV_RENDER_ONLY, NULL);
875875 }
876876 }
--- WorldEditor/WorldEditor/A_File.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_File.cpp (revision 2541)
@@ -176,7 +176,7 @@
176176
177177 // Select All
178178 App->CLSB_Doc->SelectAll();
179- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
179+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
180180 App->CL_TabsGroups_Dlg->Update_Dlg_SelectedBrushesCount();
181181
182182 // Delete All Bruses and Faces
@@ -380,7 +380,7 @@
380380 geVec3d_Subtract (pTemplatePos, &BrushPos, &MoveVec);
381381 Brush_Move (App->m_pDoc->CurBrush, &MoveVec);
382382
383- App->m_pDoc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
383+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
384384 App->m_pDoc->SetModifiedFlag ();
385385 }
386386
@@ -1080,7 +1080,7 @@
10801080 App->Get_Current_Document();
10811081
10821082 App->CLSB_Doc->SelectAll();
1083- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1083+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
10841084 App->CL_TabsGroups_Dlg->Update_Dlg_SelectedBrushesCount();
10851085
10861086 // Delete All Bruses and Faces
@@ -1113,7 +1113,7 @@
11131113
11141114
11151115 App->m_pDoc->pSelBrushes = SelBrushList_Create();
1116- App->m_pDoc->pTempSelBrushes = SelBrushList_Create();
1116+ App->CLSB_Doc->pTempSelBrushes = SelBrushList_Create();
11171117 App->m_pDoc->pSelFaces = SelFaceList_Create();
11181118
11191119 App->m_pDoc->SetLockAxis(0); // Start with no axis locked
@@ -1128,7 +1128,7 @@
11281128 Brush_Bound(App->m_pDoc->BTemplate);
11291129 App->m_pDoc->CurBrush = App->m_pDoc->BTemplate;
11301130
1131- geVec3d_Clear(&App->m_pDoc->SelectedGeoCenter);
1131+ geVec3d_Clear(&App->CLSB_Doc->SelectedGeoCenter);
11321132
11331133 char PathAndFile[MAX_PATH];
11341134 strcpy(PathAndFile, App->m_pDoc->LastPath);
--- WorldEditor/WorldEditor/A_Render_App.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_Render_App.cpp (revision 2541)
@@ -37,7 +37,7 @@
3737 if (Level_RebuildBspAlways (App->CLSB_Doc->pLevel))
3838 {
3939 pDoc->RebuildTrees();
40- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
40+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
4141 }
4242
4343 }
--- WorldEditor/WorldEditor/A_TabsGroups_Dlg.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_TabsGroups_Dlg.cpp (revision 2541)
@@ -344,7 +344,7 @@
344344 if( bChanged )
345345 {
346346 App->CLSB_Doc->UpdateSelected() ;
347- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
347+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
348348 }
349349 }
350350
--- WorldEditor/WorldEditor/A_TabsTemplates_Dlg.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_TabsTemplates_Dlg.cpp (revision 2541)
@@ -277,6 +277,6 @@
277277 geVec3d_Subtract (pTemplatePos, &BrushPos, &MoveVec);
278278 Brush_Move (App->m_pDoc->CurBrush, &MoveVec);
279279
280- App->m_pDoc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
280+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
281281 App->m_pDoc->SetModifiedFlag ();
282282 }
--- WorldEditor/WorldEditor/A_TextureDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_TextureDialog.cpp (revision 2541)
@@ -466,7 +466,7 @@
466466 return;
467467 }
468468
469- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
469+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
470470 }
471471
472472 // *************************************************************************
--- WorldEditor/WorldEditor/A_TopTabs.cpp (revision 2540)
+++ WorldEditor/WorldEditor/A_TopTabs.cpp (revision 2541)
@@ -312,10 +312,8 @@
312312
313313 if (LOWORD(wParam) == IDC_BT_TB_SELECTALL)
314314 {
315- CFusionDoc* pDoc = (CFusionDoc*)App->m_pMainFrame->GetCurrentDoc();
316-
317315 App->CLSB_Doc->SelectAll();
318- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
316+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
319317
320318 App->CL_TabsGroups_Dlg->Update_Dlg_SelectedBrushesCount();
321319 App->CL_TabsGroups_Dlg->Update_Dlg_Controls();
@@ -326,11 +324,9 @@
326324
327325 if (LOWORD(wParam) == IDC_BT_TB_DESELECTALL)
328326 {
329- CFusionDoc* pDoc = (CFusionDoc*)App->m_pMainFrame->GetCurrentDoc();
330-
331327 App->CLSB_Doc->ResetAllSelections();
332328 App->CLSB_Doc->UpdateSelected();
333- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
329+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
334330
335331 App->CL_TabsGroups_Dlg->Update_Dlg_SelectedBrushesCount();
336332 App->CL_TabsGroups_Dlg->Update_Dlg_Controls();
@@ -913,7 +909,7 @@
913909 App->Get_Current_Document();
914910
915911 App->m_pDoc->SelectAllFacesInBrushes();
916- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
912+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
917913 return TRUE;
918914 }
919915
@@ -1013,11 +1009,8 @@
10131009 {
10141010 if (LOWORD(wParam) == IDC_BT_TT_ZEROCAMRA)
10151011 {
1016- App->Get_Current_Document();
1017-
10181012 App->CLSB_Camera_WE->Zero_Camera();
1019-
1020- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1013+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
10211014 return TRUE;
10221015 }
10231016
--- WorldEditor/WorldEditor/Base_Environment.cpp (nonexistent)
+++ WorldEditor/WorldEditor/Base_Environment.cpp (revision 2541)
@@ -0,0 +1,88 @@
1+/*
2+Copyright (c) 2022 GameDirectorSB and EquityME -- HGTInflanite Software W.T.Flanigan H.C.Flanigan
3+
4+This software is provided 'as-is', without any express or implied
5+warranty. In no event will the authors be held liable for any damages
6+arising from the use of this software.
7+
8+Permission is granted to anyone to use this software for any purpose,
9+including commercial applications, and to alter it and redistribute it
10+freely, subject to the following restrictions:
11+
12+1. The origin of this software must not be misrepresented; you must not
13+claim that you wrote the original software. If you use this software
14+in a product, an acknowledgment in the product documentation would be
15+appreciated but is not required.
16+
17+2. Altered source versions must be plainly marked as such, and must not be
18+misrepresented as being the original software.
19+
20+3. This notice may not be removed or altered from any source
21+distribution.
22+*/
23+
24+#include "stdafx.h"
25+#include "AB_App.h"
26+#include "Base_Environment.h"
27+
28+Base_Environment::Base_Environment()
29+{
30+ Set_Environment_Defaults();
31+}
32+
33+Base_Environment::~Base_Environment()
34+{
35+}
36+
37+// *************************************************************************
38+// * Set_Environment_Defaults:- Terry and Hazel Flanigan 2022 *
39+// *************************************************************************
40+void Base_Environment::Set_Environment_Defaults()
41+{
42+ Deleted = 0;
43+ Altered = 0;
44+
45+ FileViewItem = nullptr;
46+ This_Object_UniqueID = 0;
47+ strcpy(Name, "Not_Set");
48+
49+ //----------------------- Sound
50+ strcpy(Sound_File, "The_Sun.ogg");
51+ //SndFile = NULL;
52+ Play = 0;
53+ Loop = 1;
54+ SndVolume = 0.5;
55+
56+ //----------------------- Light
57+ AmbientColour.x = 1;
58+ AmbientColour.y = 1;
59+ AmbientColour.z = 1;
60+
61+ DiffuseColour.x = 0;
62+ DiffuseColour.y = 0;
63+ DiffuseColour.z = 0;
64+
65+ SpecularColour.x = 0;
66+ SpecularColour.y = 0;
67+ SpecularColour.z = 0;
68+
69+ Light_Position.x = 0;
70+ Light_Position.y = 0;
71+ Light_Position.z = 0;
72+
73+ // Sky
74+ Curvature = 15;
75+ Distance = 4000;
76+ Enabled = 0;
77+ strcpy(Material, "Examples/CloudySky");
78+ Tiling = 15;
79+ type = 1;
80+
81+ // Fog
82+ Fog_On = 0;
83+ Fog_Mode = FOG_LINEAR;
84+ Fog_Density = 0.001000;
85+ Fog_Start = 50;
86+ Fog_End = 300;
87+ Fog_Colour = Ogre::Vector3(1, 1, 1);
88+}
--- WorldEditor/WorldEditor/Base_Environment.h (nonexistent)
+++ WorldEditor/WorldEditor/Base_Environment.h (revision 2541)
@@ -0,0 +1,69 @@
1+/*
2+Copyright (c) 2022 GameDirectorSB and EquityME -- HGTInflanite Software W.T.Flanigan H.C.Flanigan
3+
4+This software is provided 'as-is', without any express or implied
5+warranty. In no event will the authors be held liable for any damages
6+arising from the use of this software.
7+
8+Permission is granted to anyone to use this software for any purpose,
9+including commercial applications, and to alter it and redistribute it
10+freely, subject to the following restrictions:
11+
12+1. The origin of this software must not be misrepresented; you must not
13+claim that you wrote the original software. If you use this software
14+in a product, an acknowledgment in the product documentation would be
15+appreciated but is not required.
16+
17+2. Altered source versions must be plainly marked as such, and must not be
18+misrepresented as being the original software.
19+
20+3. This notice may not be removed or altered from any source
21+distribution.
22+*/
23+
24+#pragma once
25+class Base_Environment
26+{
27+public:
28+ Base_Environment();
29+ ~Base_Environment();
30+
31+ void Set_Environment_Defaults();
32+
33+ bool Deleted;
34+ bool Altered;
35+
36+ int This_Object_UniqueID; // Unique Number
37+ char Name[MAX_PATH];
38+ HTREEITEM FileViewItem;
39+
40+ //--------------- Sound
41+ //irrklang::ISound* SndFile;
42+ Ogre::Real SndVolume;
43+ char Sound_File[MAX_PATH];
44+ bool Play;
45+ bool Loop;
46+
47+ //--------------- Light
48+ Ogre::Vector3 AmbientColour;
49+ Ogre::Vector3 DiffuseColour;
50+ Ogre::Vector3 SpecularColour;
51+ Ogre::Vector3 Light_Position;
52+
53+ //--------------- Sky
54+ bool Enabled;
55+ int type;
56+ char Material[MAX_PATH];
57+ float Curvature;
58+ float Tiling;
59+ float Distance;
60+
61+ //--------------- Fog
62+ int Fog_On;
63+ int Fog_Mode;
64+ Ogre::Vector3 Fog_Colour;
65+ float Fog_Start;
66+ float Fog_End;
67+ float Fog_Density;
68+};
69+
--- WorldEditor/WorldEditor/BrushAttributesDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/BrushAttributesDialog.cpp (revision 2541)
@@ -319,11 +319,7 @@
319319
320320 void CBrushAttributesDialog::AssignCurrentToViews()
321321 {
322- CFusionDoc *pDoc = m_pMainFrame->GetCurrentDoc();
323- if (pDoc)
324- {
325- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
326- }
322+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
327323 }
328324
329325 void CBrushAttributesDialog::SetDialogFields (void)
--- WorldEditor/WorldEditor/BrushTemplate.cpp (revision 2540)
+++ WorldEditor/WorldEditor/BrushTemplate.cpp (revision 2541)
@@ -831,10 +831,10 @@
831831 geVec3d_Set(&Verts[6], (float)(pTemplate->XSizeBot / 2), (float)-(pTemplate->YSize / 2), (float)(pTemplate->ZSizeBot / 2));
832832 geVec3d_Set(&Verts[7], (float)-(pTemplate->XSizeBot / 2), (float)-(pTemplate->YSize / 2), (float)(pTemplate->ZSizeBot / 2));
833833
834+ FaceVerts[3] = Verts[3];
835+ FaceVerts[2] = Verts[2];
836+ FaceVerts[1] = Verts[1];
834837 FaceVerts[0] = Verts[0];
835- FaceVerts[1] = Verts[1];
836- FaceVerts[2] = Verts[2];
837- FaceVerts[3] = Verts[3];
838838
839839 f = Face_Create(4, FaceVerts, 0);
840840 if (f)
@@ -842,10 +842,10 @@
842842 FaceList_AddFace(fl, f);
843843 }
844844
845+ FaceVerts[3] = Verts[7];
846+ FaceVerts[2] = Verts[6];
847+ FaceVerts[1] = Verts[5];
845848 FaceVerts[0] = Verts[4];
846- FaceVerts[1] = Verts[5];
847- FaceVerts[2] = Verts[6];
848- FaceVerts[3] = Verts[7];
849849
850850 f = Face_Create(4, FaceVerts, 0);
851851 if (f)
@@ -853,10 +853,10 @@
853853 FaceList_AddFace(fl, f);
854854 }
855855
856+ FaceVerts[3] = Verts[2];
857+ FaceVerts[2] = Verts[6];
858+ FaceVerts[1] = Verts[7];
856859 FaceVerts[0] = Verts[1];
857- FaceVerts[1] = Verts[7];
858- FaceVerts[2] = Verts[6];
859- FaceVerts[3] = Verts[2];
860860
861861 f = Face_Create(4, FaceVerts, 0);
862862 if (f)
@@ -864,10 +864,10 @@
864864 FaceList_AddFace(fl, f);
865865 }
866866
867+ FaceVerts[3] = Verts[4];
868+ FaceVerts[2] = Verts[5];
869+ FaceVerts[1] = Verts[3];
867870 FaceVerts[0] = Verts[0];
868- FaceVerts[1] = Verts[3];
869- FaceVerts[2] = Verts[5];
870- FaceVerts[3] = Verts[4];
871871
872872 f = Face_Create(4, FaceVerts, 0);
873873 if (f)
@@ -875,10 +875,10 @@
875875 FaceList_AddFace(fl, f);
876876 }
877877
878+ FaceVerts[3] = Verts[1];
879+ FaceVerts[2] = Verts[7];
880+ FaceVerts[1] = Verts[4];
878881 FaceVerts[0] = Verts[0];
879- FaceVerts[1] = Verts[4];
880- FaceVerts[2] = Verts[7];
881- FaceVerts[3] = Verts[1];
882882
883883 f = Face_Create(4, FaceVerts, 0);
884884 if (f)
@@ -886,10 +886,10 @@
886886 FaceList_AddFace(fl, f);
887887 }
888888
889+ FaceVerts[3] = Verts[5];
890+ FaceVerts[2] = Verts[6];
891+ FaceVerts[1] = Verts[2];
889892 FaceVerts[0] = Verts[3];
890- FaceVerts[1] = Verts[2];
891- FaceVerts[2] = Verts[6];
892- FaceVerts[3] = Verts[5];
893893
894894 f = Face_Create(4, FaceVerts, 0);
895895 if (f)
@@ -902,8 +902,9 @@
902902 b = Brush_Create(BRUSH_LEAF, fl, 0);
903903 if (b)
904904 {
905- Brush_SetSubtract(b, pTemplate->TCut);
906- Brush_SetSheet(b, pTemplate->TSheet);
905+ //Brush_SetSubtract(b, pTemplate->TCut);
906+ //Brush_SetSheet(b, pTemplate->TSheet);
907+
907908 }
908909 return b;
909910 }
@@ -910,7 +911,8 @@
910911 else
911912 {
912913 // hollow brush
913- BrushList* bl = BrushList_Create();
914+
915+ /*BrushList* bl = BrushList_Create();
914916 Brush* bh, * bm;
915917
916918 b = Brush_Create(BRUSH_LEAF, fl, 0);
@@ -943,7 +945,7 @@
943945 else
944946 {
945947 BrushList_Destroy(&bl);
946- }
948+ }*/
947949 }
948950
949951 return 0;
@@ -977,11 +979,6 @@
977979 FaceVerts[1] =Verts[2];
978980 FaceVerts[0] =Verts[3];
979981
980- /*FaceVerts[0] = Verts[0];
981- FaceVerts[1] = Verts[1];
982- FaceVerts[2] = Verts[2];
983- FaceVerts[3] = Verts[3];*/
984-
985982 f =Face_Create(4, FaceVerts, 0);
986983 if(f)
987984 {
--- WorldEditor/WorldEditor/EntitiesDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/EntitiesDialog.cpp (revision 2541)
@@ -487,7 +487,7 @@
487487 mCurrentEntity = m_EntityCombo.GetItemData( CurrentSelection );
488488 // Set this as the current entity...
489489 pDoc->SetSelectedEntity( mCurrentEntity ) ;
490- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
490+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
491491 }
492492
493493 FillInKeyValuePairs (0);
--- WorldEditor/WorldEditor/FUSION.cpp (revision 2540)
+++ WorldEditor/WorldEditor/FUSION.cpp (revision 2541)
@@ -716,7 +716,7 @@
716716 CFusionDoc* pDoc = GetActiveFusionDoc() ;
717717 if( pDoc != NULL )
718718 {
719- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
719+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
720720 }
721721 if (OldObjectsDir != PrefsDlg.m_ObjectsDir)
722722 {
--- WorldEditor/WorldEditor/FUSIONDoc.cpp (revision 2540)
+++ WorldEditor/WorldEditor/FUSIONDoc.cpp (revision 2541)
@@ -292,7 +292,7 @@
292292 mCurrentTool (ID_TOOLS_BRUSH_MOVEROTATEBRUSH), mShowBrush (TRUE), mConstrainHollows (GE_TRUE),
293293 mCurrentBitmap (0), NumSelEntities (0), //mTextureBrowserOpen (0),
294294 mCurrentGroup (0), TempShearTemplate (NULL), PlaceObjectFlag (FALSE),
295- pSelFaces (NULL), pSelBrushes (NULL), pTempSelBrushes (NULL) //, pCameraEntity (NULL)
295+ pSelFaces (NULL), pSelBrushes (NULL)//, pCameraEntity (NULL)
296296 {
297297
298298 const char *DefaultWadName;
@@ -334,7 +334,7 @@
334334 App->hMenu_WE = GetMenu(App->MainHwnd);
335335
336336 pSelBrushes = SelBrushList_Create ();
337- pTempSelBrushes = SelBrushList_Create ();
337+ App->CLSB_Doc->pTempSelBrushes = SelBrushList_Create ();
338338 pSelFaces = SelFaceList_Create ();
339339
340340 SetLockAxis( 0 ) ; // Start with no axis locked
@@ -350,7 +350,7 @@
350350 Brush_Bound(BTemplate);
351351 CurBrush =BTemplate;
352352
353- geVec3d_Clear(&SelectedGeoCenter);
353+ geVec3d_Clear(&App->CLSB_Doc->SelectedGeoCenter);
354354
355355 //AddCameraEntityToLevel ();
356356
@@ -389,8 +389,8 @@
389389 pUndoStack = NULL;
390390 if (pSelBrushes != NULL) SelBrushList_Destroy (&pSelBrushes);
391391 pSelBrushes = NULL;
392- if (pTempSelBrushes != NULL)SelBrushList_Destroy (&pTempSelBrushes);
393- pTempSelBrushes = NULL;
392+ if (App->CLSB_Doc->pTempSelBrushes != NULL)SelBrushList_Destroy (&App->CLSB_Doc->pTempSelBrushes);
393+ App->CLSB_Doc->pTempSelBrushes = NULL;
394394 if (LeakPoints != NULL) geRam_Free(LeakPoints);
395395 LeakPoints = NULL;
396396 if (pSelFaces != NULL) SelFaceList_Destroy (&pSelFaces);
@@ -839,7 +839,7 @@
839839
840840 UpdateGridInformation();
841841
842- UpdateAllViews( UAV_ALL3DVIEWS, NULL );
842+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
843843 return TRUE;
844844 }
845845
@@ -1050,11 +1050,11 @@
10501050 if(!Brush_IsHollow(nb) && !Brush_IsMulti(nb))
10511051 {
10521052 mWorldBsp =Node_AddBrushToTree(mWorldBsp, nb);
1053- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1053+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
10541054 }
10551055 else
10561056 {
1057- UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL, TRUE);
1057+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL, TRUE);
10581058 }
10591059
10601060 Placed = GE_TRUE;
@@ -1119,7 +1119,7 @@
11191119 BrushList_Append (BList, nb);
11201120 }
11211121 App->CLSB_Doc->UpdateSelected();
1122- UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL, TRUE);
1122+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL, TRUE);
11231123 }
11241124
11251125 void CFusionDoc::CopySelectedBrushes(void)
@@ -1195,7 +1195,7 @@
11951195 // mpMainFrame->m_wndTabControls->GrpTab->UpdateTabDisplay( this ) ;
11961196 App->CL_TabsGroups_Dlg->Fill_ListBox(); // hgtterry App->CL_TabsGroups_Dlg->Fill_ListBox()
11971197 App->CLSB_Doc->UpdateSelected();
1198- UpdateAllViews( UAV_ALL3DVIEWS, NULL );
1198+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
11991199 }
12001200
12011201 void CFusionDoc::MakeSelectedBrushNewest(void)
@@ -1215,7 +1215,7 @@
12151215
12161216 NumSelBrushes = SelBrushList_GetSize (pSelBrushes);
12171217
1218- SelBrushList_RemoveAll (pTempSelBrushes);
1218+ SelBrushList_RemoveAll (App->CLSB_Doc->pTempSelBrushes);
12191219
12201220 // make copies of selected brushes
12211221 for(i=0;i < NumSelBrushes;i++)
@@ -1225,7 +1225,7 @@
12251225 pBrush = SelBrushList_GetBrush (pSelBrushes, i);
12261226 pClone = Brush_Clone (pBrush);
12271227 Level_AppendBrush (App->CLSB_Doc->pLevel, pClone);
1228- SelBrushList_Add (pTempSelBrushes, pClone);
1228+ SelBrushList_Add (App->CLSB_Doc->pTempSelBrushes, pClone);
12291229 }
12301230 }
12311231
@@ -1378,7 +1378,7 @@
13781378 geVec3d_Subtract (pTemplatePos, &BrushPos, &MoveVec);
13791379 Brush_Move (CurBrush, &MoveVec);
13801380
1381- UpdateAllViews (UAV_ALL3DVIEWS, NULL);
1381+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
13821382 SetModifiedFlag ();
13831383 }
13841384
@@ -1485,7 +1485,7 @@
14851485 pGridInfo->UseGrid = !(pGridInfo->UseGrid);
14861486
14871487 UpdateGridInformation();
1488- UpdateAllViews(UAV_GRID_ONLY, NULL);
1488+ App->CLSB_Doc->UpdateAllViews(UAV_GRID_ONLY, NULL);
14891489 }
14901490
14911491 void CFusionDoc::OnUpdateToolsUsegrid(CCmdUI* pCmdUI)
@@ -1570,7 +1570,7 @@
15701570 pGridInfo->UseGrid = dlg.m_UseSnap;
15711571 pGridInfo->RotationSnap = (int)(dlg.m_SnapDegrees);
15721572 UpdateGridInformation();
1573- UpdateAllViews(UAV_GRID_ONLY, NULL);
1573+ App->CLSB_Doc->UpdateAllViews(UAV_GRID_ONLY, NULL);
15741574 }// DoModal OK
15751575 }/* CFusionDoc::OnToolsGridsettings */
15761576
@@ -1660,7 +1660,7 @@
16601660 UpdateEntityOrigins();
16611661 // changed QD Actors
16621662 UpdateEntityActors();
1663- UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
1663+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
16641664 // UpdateAllViews(UAV_ALL3DVIEWS, NULL);
16651665 // end change
16661666 SetModifiedFlag();
@@ -1714,7 +1714,7 @@
17141714 mCurrentTool=ID_TOOLS_BRUSH_MOVEROTATEBRUSH;
17151715 ConfigureCurrentTool();
17161716
1717- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1717+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
17181718 SetModifiedFlag();
17191719 }
17201720 }
@@ -1742,7 +1742,7 @@
17421742 mCurrentTool=ID_TOOLS_BRUSH_MOVEROTATEBRUSH;
17431743 ConfigureCurrentTool();
17441744
1745- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1745+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
17461746 SetModifiedFlag();
17471747 }
17481748 }
@@ -1750,7 +1750,7 @@
17501750 void CFusionDoc::OnEntitiesShow(void)
17511751 {
17521752 mShowEntities = !mShowEntities;
1753- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1753+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
17541754 }
17551755
17561756 void CFusionDoc::OnUpdateEntitiesShow(CCmdUI* pCmdUI)
@@ -1763,7 +1763,7 @@
17631763 CurBrush =BTemplate;
17641764 Level_SetGroupVisibility (App->CLSB_Doc->pLevel, Group_ShowAll);
17651765
1766- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1766+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
17671767 }
17681768
17691769
@@ -1772,7 +1772,7 @@
17721772 CurBrush = BTemplate;
17731773 Level_SetGroupVisibility (App->CLSB_Doc->pLevel, Group_ShowCurrent);
17741774
1775- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1775+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
17761776 }
17771777
17781778 void CFusionDoc::OnViewShowVisibleGroups()
@@ -1780,7 +1780,7 @@
17801780 CurBrush =BTemplate;
17811781 Level_SetGroupVisibility (App->CLSB_Doc->pLevel, Group_ShowVisible);
17821782
1783- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1783+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
17841784 }
17851785
17861786 void CFusionDoc::OnUpdateViewShowVisibleGroups(CCmdUI* pCmdUI)
@@ -2655,7 +2655,7 @@
26552655
26562656 void CFusionDoc::ResizeSelected(float dx, float dy, int sides, int inidx)
26572657 {
2658- mLastOp =BRUSH_SCALE;
2658+ App->CLSB_Doc->mLastOp =BRUSH_SCALE;
26592659
26602660 if(mModeTool == ID_TOOLS_TEMPLATE)
26612661 {
@@ -2671,13 +2671,13 @@
26712671 int i;
26722672 int NumBrushes;
26732673
2674- NumBrushes = SelBrushList_GetSize (pTempSelBrushes);
2674+ NumBrushes = SelBrushList_GetSize (App->CLSB_Doc->pTempSelBrushes);
26752675
26762676 for (i = 0; i < NumBrushes; ++i)
26772677 {
26782678 Brush *pBrush;
26792679
2680- pBrush = SelBrushList_GetBrush (pTempSelBrushes, i);
2680+ pBrush = SelBrushList_GetBrush (App->CLSB_Doc->pTempSelBrushes, i);
26812681
26822682 Brush_Resize (pBrush, dx, dy, sides, inidx, &FinalScale, &ScaleNum);
26832683 if (Brush_IsMulti(pBrush))
@@ -2691,14 +2691,14 @@
26912691
26922692 void CFusionDoc::ScaleSelectedBrushes(geVec3d *ScaleVector)
26932693 {
2694- mLastOp =BRUSH_SCALE;
2694+ App->CLSB_Doc->mLastOp =BRUSH_SCALE;
26952695
26962696 geVec3d VecOrigin ={ 0.0f, 0.0f, 0.0f };
26972697
26982698 geVec3d MoveTo;
26992699 geVec3d MoveBack;
2700- geVec3d_Subtract(&VecOrigin, &SelectedGeoCenter, &MoveTo);
2701- geVec3d_Subtract(&SelectedGeoCenter, &VecOrigin, &MoveBack);
2700+ geVec3d_Subtract(&VecOrigin, &App->CLSB_Doc->SelectedGeoCenter, &MoveTo);
2701+ geVec3d_Subtract(&App->CLSB_Doc->SelectedGeoCenter, &VecOrigin, &MoveBack);
27022702
27032703 if(mModeTool == ID_TOOLS_TEMPLATE)
27042704 {
@@ -2822,7 +2822,7 @@
28222822
28232823 geVec3d_Inverse (&ClickPosWorld);
28242824 mRegularEntity.mOrigin = ClickPosWorld;
2825- UpdateAllViews( UAV_ALL3DVIEWS, NULL );
2825+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
28262826 }
28272827 }
28282828 }
@@ -3209,7 +3209,7 @@
32093209 pEnt->SetOrigin( Vec.X, Vec.Y, Vec.Z, Level_GetEntityDefs (App->CLSB_Doc->pLevel) ) ;
32103210 Render_GetPitchRollYaw( v, &Vec ) ;
32113211 pEnt->SetAngles( &Vec, Level_GetEntityDefs (App->CLSB_Doc->pLevel) ) ;
3212- UpdateAllViews( UAV_ALL3DVIEWS, NULL );
3212+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
32133213 }
32143214
32153215 }/* CFusionDoc::MoveCamera */
@@ -3359,16 +3359,16 @@
33593359 {
33603360 BOOL ret;
33613361 int i;
3362- int NumTSelBrushes = SelBrushList_GetSize (pTempSelBrushes);
3362+ int NumTSelBrushes = SelBrushList_GetSize (App->CLSB_Doc->pTempSelBrushes);
33633363
33643364 for(ret=FALSE, i=0;i < NumTSelBrushes;i++)
33653365 {
33663366 Brush *pBrush;
33673367
3368- pBrush = SelBrushList_GetBrush (pTempSelBrushes, 0);
3368+ pBrush = SelBrushList_GetBrush (App->CLSB_Doc->pTempSelBrushes, 0);
33693369
33703370 Level_RemoveBrush (App->CLSB_Doc->pLevel, pBrush);
3371- SelBrushList_Remove (pTempSelBrushes, pBrush);
3371+ SelBrushList_Remove (App->CLSB_Doc->pTempSelBrushes, pBrush);
33723372 Brush_Destroy(&pBrush);
33733373 ret =TRUE;
33743374 }
@@ -3595,7 +3595,7 @@
35953595 void CFusionDoc::OnGbspnowater()
35963596 {
35973597 RebuildTrees();
3598- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
3598+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
35993599 }
36003600
36013601 //===============================================
@@ -3830,60 +3830,18 @@
38303830 }
38313831 }
38323832
3833-void CFusionDoc::MoveSelectedBrushList
3834- (
3835- SelBrushList *pList,
3836- geVec3d const *v
3837- )
3838-{
3839- int i;
3840- int NumBrushes;
38413833
3842- mLastOp =BRUSH_MOVE;
3843-
3844- geVec3d_Add (&SelectedGeoCenter, v, &SelectedGeoCenter);
3845- geVec3d_Add(v, &FinalPos, &FinalPos);
3846-
3847- NumBrushes = SelBrushList_GetSize (pList);
3848- for(i=0;i < NumBrushes;i++)
3849- {
3850- Brush *pBrush;
3851-
3852- pBrush = SelBrushList_GetBrush (pList, i);
3853-// changed QD Actors
3854- if(strstr(App->CL_Brush->Brush_GetName(pBrush),".act")!=NULL)
3855- continue;
3856-// end change
3857- Brush_Move (pBrush, v);
3858- }
3859-
3860- CEntityArray *Entities = Level_GetEntities (App->CLSB_Doc->pLevel);
3861- int NumEntities = Entities->GetSize();
3862- for(i=0;i < NumEntities;i++)
3863- {
3864- if ((*Entities)[i].IsSelected ())
3865- {
3866- (*Entities)[i].Move (v);
3867- }
3868- }
3869-}
3870-
3871-void CFusionDoc::MoveSelectedBrushes(geVec3d const *v)
3872-{
3873- MoveSelectedBrushList (pTempSelBrushes, v);
3874-}
3875-
38763834 void CFusionDoc::MoveSelectedClone(geVec3d const *v)
38773835 {
3878- MoveSelectedBrushList (pSelBrushes, v);
3836+ App->CLSB_Doc->MoveSelectedBrushList (pSelBrushes, v);
38793837 }
38803838
38813839 void CFusionDoc::MoveTemplateBrush(geVec3d *v)
38823840 {
3883- mLastOp =BRUSH_MOVE;
3841+ App->CLSB_Doc->mLastOp =BRUSH_MOVE;
38843842
3885- geVec3d_Add (&SelectedGeoCenter, v, &SelectedGeoCenter);
3886- geVec3d_Add (v, &FinalPos, &FinalPos);
3843+ geVec3d_Add (&App->CLSB_Doc->SelectedGeoCenter, v, &App->CLSB_Doc->SelectedGeoCenter);
3844+ geVec3d_Add (v, &App->CLSB_Doc->FinalPos, &App->CLSB_Doc->FinalPos);
38873845
38883846 if(TempEnt)
38893847 {
@@ -3903,11 +3861,11 @@
39033861 {
39043862 geXForm3d rm;
39053863
3906- mLastOp =BRUSH_ROTATE;
3864+ App->CLSB_Doc->mLastOp =BRUSH_ROTATE;
39073865
39083866 geVec3d_Add(v, &FinalRot, &FinalRot);
39093867 geXForm3d_SetEulerAngles(&rm, v);
3910- Brush_Rotate (CurBrush, &rm, &SelectedGeoCenter);
3868+ Brush_Rotate (CurBrush, &rm, &App->CLSB_Doc->SelectedGeoCenter);
39113869 }
39123870
39133871 void CFusionDoc::GetRotationPoint
@@ -3940,7 +3898,7 @@
39403898 }
39413899 else
39423900 {
3943- *pVec = SelectedGeoCenter;
3901+ *pVec = App->CLSB_Doc->SelectedGeoCenter;
39443902 }
39453903 }
39463904
@@ -3955,7 +3913,7 @@
39553913 geVec3d RotationPoint;
39563914 int NumBrushes = SelBrushList_GetSize (pList);
39573915
3958- mLastOp = BRUSH_ROTATE;
3916+ App->CLSB_Doc->mLastOp = BRUSH_ROTATE;
39593917
39603918 // if we're animating a model, we want to rotate about the
39613919 // model's current rotation origin--taking into account any
@@ -3991,7 +3949,7 @@
39913949
39923950 void CFusionDoc::RotateSelectedBrushes(geVec3d const *v)
39933951 {
3994- RotateSelectedBrushList (pTempSelBrushes, v);
3952+ RotateSelectedBrushList (App->CLSB_Doc->pTempSelBrushes, v);
39953953 }
39963954
39973955 void CFusionDoc::RotateSelectedBrushesDirect(geVec3d const *v)
@@ -4018,7 +3976,7 @@
40183976 if (Level_RebuildBspAlways (App->CLSB_Doc->pLevel))
40193977 {
40203978 RebuildTrees();
4021- UpdateAllViews (UAV_ALL3DVIEWS, NULL);
3979+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
40223980 }
40233981 }
40243982 }
@@ -4033,7 +3991,7 @@
40333991
40343992 TemplateReversalRot = FinalRot;
40353993
4036- mLastOp =BRUSH_ROTATE;
3994+ App->CLSB_Doc->mLastOp =BRUSH_ROTATE;
40373995
40383996 TempDeleteSelected();
40393997 TempCopySelectedBrushes();
@@ -4071,7 +4029,7 @@
40714029 {
40724030 Brush *pBrush;
40734031
4074- pBrush = SelBrushList_GetBrush (pTempSelBrushes, i);
4032+ pBrush = SelBrushList_GetBrush (App->CLSB_Doc->pTempSelBrushes, i);
40754033 // changed QD Actors
40764034 // don't rotate ActorBrushes
40774035 if(strstr(App->CL_Brush->Brush_GetName(pBrush),".act")!=NULL)
@@ -4092,13 +4050,13 @@
40924050 // Replace the sel list brushes with the TSelList brushes
40934051 Brush *TempBrush, *OldBrush;
40944052
4095- TempBrush = SelBrushList_GetBrush (pTempSelBrushes, 0);
4053+ TempBrush = SelBrushList_GetBrush (App->CLSB_Doc->pTempSelBrushes, 0);
40964054 OldBrush = SelBrushList_GetBrush (pSelBrushes, 0);
40974055 // changed QD Actors
40984056 if(strstr(App->CL_Brush->Brush_GetName(OldBrush),".act")!=NULL)
40994057 {
41004058 BrushList_Remove (BList, TempBrush);
4101- SelBrushList_Remove (pTempSelBrushes, TempBrush);
4059+ SelBrushList_Remove (App->CLSB_Doc->pTempSelBrushes, TempBrush);
41024060 continue;
41034061 }
41044062 // end change
@@ -4108,7 +4066,7 @@
41084066 BrushList_Remove (BList, OldBrush);
41094067
41104068 SelBrushList_Remove (pSelBrushes, OldBrush);
4111- SelBrushList_Remove (pTempSelBrushes, TempBrush);
4069+ SelBrushList_Remove (App->CLSB_Doc->pTempSelBrushes, TempBrush);
41124070
41134071 SelBrushList_Add (pSelBrushes, TempBrush);
41144072
@@ -4197,7 +4155,7 @@
41974155
41984156 pEnt->GetAngles( &PitchRollYaw, Level_GetEntityDefs (App->CLSB_Doc->pLevel) ) ;
41994157 SetRenderedViewCamera( &(pEnt->mOrigin), &PitchRollYaw ) ;
4200- UpdateAllViews(UAV_RENDER_ONLY, NULL);
4158+ App->CLSB_Doc->UpdateAllViews(UAV_RENDER_ONLY, NULL);
42014159 }// Camera entity, update camera
42024160 }// Entity Selected
42034161 }// Loop thru Entities
@@ -4223,117 +4181,117 @@
42234181 SetModifiedFlag();
42244182 }/* CFusionDoc::DoneMoveEntity */
42254183
4184+// ME Terry
4185+//void CFusionDoc::UpdateAllViews(int Mode, CView* pSender, BOOL Override)
4186+//{
4187+// //App->Say("UpdateAllViews");
4188+// if(IsModified() && ((Mode & REBUILD_QUICK ) && (Level_RebuildBspAlways (App->CLSB_Doc->pLevel)))||(Override))
4189+// {
4190+// RebuildTrees();
4191+// }
4192+// else if((Mode & REBUILD_QUICK) && (!Level_RebuildBspAlways (App->CLSB_Doc->pLevel)))
4193+// {
4194+// InvalidateDrawTreeOriginalFaces();
4195+// }
4196+//
4197+// if(Mode & REBUILD_QUICK)
4198+// Mode &= ~REBUILD_QUICK;
4199+//
4200+// // Do we want to redraw everything?
4201+// if (Mode & UAV_ALLVIEWS)
4202+// {
4203+// CDocument::UpdateAllViews(pSender);
4204+// return;
4205+// }
4206+//
4207+// POSITION pos = GetFirstViewPosition();
4208+//
4209+// while (pos != NULL)
4210+// {
4211+// CView* pView = GetNextView(pos);
4212+//
4213+// if ( pView->IsKindOf( RUNTIME_CLASS (CFusionView)) )
4214+// {
4215+// CFusionView* pFusionView = (CFusionView*) pView;
4216+// CDC* pDC = pFusionView->GetDC();
4217+//
4218+// switch(Mode)
4219+// {
4220+// case UAV_ACTIVE3DVIEW_ONLY:
4221+//
4222+// if( pFusionView->GetParentFrame() == mpActiveViewFrame )
4223+// pFusionView->Invalidate( TRUE );
4224+// break;
4225+//
4226+// case UAV_NONACTIVE3DVIEWS_ONLY:
4227+//
4228+// if( pFusionView->GetParentFrame() != mpActiveViewFrame )
4229+// pFusionView->Invalidate( TRUE );
4230+// break;
4231+//
4232+// case UAV_TEXTUREVIEW_ONLY:
4233+//
4234+// if (pFusionView->mViewType == ID_VIEW_TEXTUREVIEW)
4235+// pFusionView->Invalidate(TRUE);
4236+// break;
4237+//
4238+// case UAV_RENDER_ONLY:
4239+//
4240+// switch(pFusionView->mViewType)
4241+// {
4242+// case ID_VIEW_3DWIREFRAME:
4243+// case ID_VIEW_TEXTUREVIEW:
4244+//
4245+// pFusionView->Invalidate(TRUE);
4246+// break;
4247+//
4248+// default:
4249+// break;
4250+// }
4251+// break;
4252+//
4253+// case UAV_GRID_ONLY:
4254+//
4255+// switch(pFusionView->mViewType)
4256+// {
4257+// case ID_VIEW_TOPVIEW:
4258+// case ID_VIEW_SIDEVIEW:
4259+// case ID_VIEW_FRONTVIEW:
4260+//
4261+// pFusionView->Invalidate(TRUE);
4262+// break;
4263+// }
4264+// break;
4265+//
4266+//
4267+// case UAV_THIS_GRID_ONLY:
4268+// if( pFusionView == pSender )
4269+// {
4270+// switch(pFusionView->mViewType)
4271+// {
4272+// case ID_VIEW_TOPVIEW:
4273+// case ID_VIEW_SIDEVIEW:
4274+// case ID_VIEW_FRONTVIEW:
4275+// pFusionView->Invalidate(TRUE);
4276+// break;
4277+// }
4278+// }
4279+// break;
4280+//
4281+// case UAV_ALL3DVIEWS:
4282+//
4283+// pFusionView->Invalidate(TRUE);
4284+// break;
4285+//
4286+// default:
4287+// break;
4288+// }
4289+//
4290+// pFusionView->ReleaseDC(pDC);
4291+// }
4292+// }
4293+//}
42264294
4227-void CFusionDoc::UpdateAllViews(int Mode, CView* pSender, BOOL Override)
4228-{
4229- //App->Say("UpdateAllViews");
4230- if(IsModified() && ((Mode & REBUILD_QUICK ) && (Level_RebuildBspAlways (App->CLSB_Doc->pLevel)))||(Override))
4231- {
4232- RebuildTrees();
4233- }
4234- else if((Mode & REBUILD_QUICK) && (!Level_RebuildBspAlways (App->CLSB_Doc->pLevel)))
4235- {
4236- InvalidateDrawTreeOriginalFaces();
4237- }
4238-
4239- if(Mode & REBUILD_QUICK)
4240- Mode &= ~REBUILD_QUICK;
4241-
4242- // Do we want to redraw everything?
4243- if (Mode & UAV_ALLVIEWS)
4244- {
4245- CDocument::UpdateAllViews(pSender);
4246- return;
4247- }
4248-
4249- POSITION pos = GetFirstViewPosition();
4250-
4251- while (pos != NULL)
4252- {
4253- CView* pView = GetNextView(pos);
4254-
4255- if ( pView->IsKindOf( RUNTIME_CLASS (CFusionView)) )
4256- {
4257- CFusionView* pFusionView = (CFusionView*) pView;
4258- CDC* pDC = pFusionView->GetDC();
4259-
4260- switch(Mode)
4261- {
4262- case UAV_ACTIVE3DVIEW_ONLY:
4263-
4264- if( pFusionView->GetParentFrame() == mpActiveViewFrame )
4265- pFusionView->Invalidate( TRUE );
4266- break;
4267-
4268- case UAV_NONACTIVE3DVIEWS_ONLY:
4269-
4270- if( pFusionView->GetParentFrame() != mpActiveViewFrame )
4271- pFusionView->Invalidate( TRUE );
4272- break;
4273-
4274- case UAV_TEXTUREVIEW_ONLY:
4275-
4276- if (pFusionView->mViewType == ID_VIEW_TEXTUREVIEW)
4277- pFusionView->Invalidate(TRUE);
4278- break;
4279-
4280- case UAV_RENDER_ONLY:
4281-
4282- switch(pFusionView->mViewType)
4283- {
4284- case ID_VIEW_3DWIREFRAME:
4285- case ID_VIEW_TEXTUREVIEW:
4286-
4287- pFusionView->Invalidate(TRUE);
4288- break;
4289-
4290- default:
4291- break;
4292- }
4293- break;
4294-
4295- case UAV_GRID_ONLY:
4296-
4297- switch(pFusionView->mViewType)
4298- {
4299- case ID_VIEW_TOPVIEW:
4300- case ID_VIEW_SIDEVIEW:
4301- case ID_VIEW_FRONTVIEW:
4302-
4303- pFusionView->Invalidate(TRUE);
4304- break;
4305- }
4306- break;
4307-
4308-
4309- case UAV_THIS_GRID_ONLY:
4310- if( pFusionView == pSender )
4311- {
4312- switch(pFusionView->mViewType)
4313- {
4314- case ID_VIEW_TOPVIEW:
4315- case ID_VIEW_SIDEVIEW:
4316- case ID_VIEW_FRONTVIEW:
4317- pFusionView->Invalidate(TRUE);
4318- break;
4319- }
4320- }
4321- break;
4322-
4323- case UAV_ALL3DVIEWS:
4324-
4325- pFusionView->Invalidate(TRUE);
4326- break;
4327-
4328- default:
4329- break;
4330- }
4331-
4332- pFusionView->ReleaseDC(pDC);
4333- }
4334- }
4335-}
4336-
43374295 /*
43384296 void CFusionDoc::FaceAttributesDialog ()
43394297 {
@@ -4364,7 +4322,7 @@
43644322 mCurrentTool =CURTOOL_NONE;
43654323 mShowSelectedBrushes=(mAdjustMode==ADJUST_MODE_BRUSH);
43664324 mShowSelectedFaces =(mAdjustMode==ADJUST_MODE_FACE);
4367- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
4325+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
43684326 return;
43694327 }
43704328
@@ -4427,7 +4385,7 @@
44274385
44284386 Redraw =TRUE;
44294387 if(Redraw)
4430- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
4388+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
44314389 }
44324390
44334391 //void CFusionDoc::NullBrushAttributes(void){ mpBrushAttributes=NULL; }
@@ -4643,9 +4601,9 @@
46434601 App->CLSB_Doc->DeleteSelectedBrushes();
46444602
46454603 if( Flag )
4646- UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
4604+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
46474605 else
4648- UpdateAllViews( UAV_ALL3DVIEWS, NULL );
4606+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
46494607
46504608 SetModifiedFlag();
46514609 }
@@ -4808,7 +4766,7 @@
48084766 // mpMainFrame->m_wndTabControls->GrpTab->UpdateTabDisplay( this ) ;
48094767 App->CL_TabsGroups_Dlg->Fill_ListBox(); // hgtterry App->CL_TabsGroups_Dlg->Fill_ListBox()
48104768 App->CLSB_Doc->UpdateSelected();
4811- UpdateAllViews( UAV_ALL3DVIEWS, NULL );
4769+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
48124770
48134771 SetModifiedFlag();
48144772 }
@@ -4815,7 +4773,7 @@
48154773
48164774 void CFusionDoc::ShearSelected(float dx, float dy, int sides, int inidx)
48174775 {
4818- mLastOp =BRUSH_SHEAR;
4776+ App->CLSB_Doc->mLastOp =BRUSH_SHEAR;
48194777
48204778 if(mModeTool == ID_TOOLS_TEMPLATE)
48214779 {
@@ -4830,12 +4788,12 @@
48304788
48314789 TempDeleteSelected();
48324790 TempCopySelectedBrushes();
4833- NumSelBrushes = SelBrushList_GetSize (pTempSelBrushes);
4791+ NumSelBrushes = SelBrushList_GetSize (App->CLSB_Doc->pTempSelBrushes);
48344792 for (i = 0; i < NumSelBrushes; ++i)
48354793 {
48364794 Brush *pBrush;
48374795
4838- pBrush = SelBrushList_GetBrush (pTempSelBrushes, i);
4796+ pBrush = SelBrushList_GetBrush (App->CLSB_Doc->pTempSelBrushes, i);
48394797 Brush_ShearFixed(pBrush, dx, dy, sides, inidx, &FinalScale, &ScaleNum);
48404798 }
48414799 }
@@ -4852,7 +4810,7 @@
48524810
48534811 SetModifiedFlag();
48544812
4855- mLastOp =BRUSH_SHEAR;
4813+ App->CLSB_Doc->mLastOp =BRUSH_SHEAR;
48564814
48574815 bsnap = 1.0f;
48584816 if(Level_UseGrid (App->CLSB_Doc->pLevel))
@@ -4897,7 +4855,7 @@
48974855 Brush *tBrush;
48984856
48994857 pBrush = SelBrushList_GetBrush (pSelBrushes, i);
4900- tBrush = SelBrushList_GetBrush (pTempSelBrushes, i);
4858+ tBrush = SelBrushList_GetBrush (App->CLSB_Doc->pTempSelBrushes, i);
49014859 // changed QD Actors
49024860 // don't shear ActorBrushes
49034861 if(strstr(App->CL_Brush->Brush_GetName(pBrush),".act")!=NULL)
@@ -5655,7 +5613,7 @@
56555613 {
56565614 geVec3d VecXlate;
56575615
5658- geVec3d_Scale (&SelectedGeoCenter, -1.0f, &VecXlate);
5616+ geVec3d_Scale (&App->CLSB_Doc->SelectedGeoCenter, -1.0f, &VecXlate);
56595617 Level_TranslateAll (NewLevel, &VecXlate);
56605618 }
56615619
@@ -5776,7 +5734,7 @@
57765734
57775735 SetModifiedFlag();
57785736
5779- mLastOp =BRUSH_SCALE;
5737+ App->CLSB_Doc->mLastOp =BRUSH_SCALE;
57805738
57815739 bsnap = 1.0f ;
57825740 if (Level_UseGrid (App->CLSB_Doc->pLevel))
@@ -5791,11 +5749,11 @@
57915749 else
57925750 {
57935751 int i;
5794- int NumBrushes = SelBrushList_GetSize (pTempSelBrushes);
5752+ int NumBrushes = SelBrushList_GetSize (App->CLSB_Doc->pTempSelBrushes);
57955753
57965754 for (i = 0; i < NumBrushes; ++i)
57975755 {
5798- Brush *pBrush = SelBrushList_GetBrush (pTempSelBrushes, i);
5756+ Brush *pBrush = SelBrushList_GetBrush (App->CLSB_Doc->pTempSelBrushes, i);
57995757 Brush_SnapScaleNearest(pBrush, bsnap, sides, inidx, &FinalScale, &ScaleNum);
58005758 }
58015759 }
@@ -5944,7 +5902,7 @@
59445902
59455903 SetModifiedFlag();
59465904
5947- UpdateAllViews(UAV_ALLVIEWS | REBUILD_QUICK, FALSE);
5905+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS | REBUILD_QUICK, FALSE);
59485906
59495907 // mpMainFrame->m_wndTabControls->GrpTab->UpdateAfterAddBrush();
59505908
@@ -6535,7 +6493,7 @@
65356493 void CFusionDoc::OnViewShowClip()
65366494 {
65376495 bShowClipBrushes =!(bShowClipBrushes);
6538- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
6496+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
65396497 }
65406498
65416499 void CFusionDoc::OnUpdateViewShowClip(CCmdUI* pCmdUI)
@@ -6546,7 +6504,7 @@
65466504 void CFusionDoc::OnViewShowDetail()
65476505 {
65486506 bShowDetailBrushes =!(bShowDetailBrushes);
6549- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
6507+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
65506508 }
65516509
65526510 void CFusionDoc::OnUpdateViewShowDetail(CCmdUI* pCmdUI)
@@ -6557,7 +6515,7 @@
65576515 void CFusionDoc::OnViewShowHint()
65586516 {
65596517 bShowHintBrushes =!(bShowHintBrushes);
6560- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
6518+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
65616519 }
65626520
65636521 void CFusionDoc::OnUpdateViewShowHint(CCmdUI* pCmdUI)
@@ -6657,7 +6615,7 @@
66576615 // redraw views if any changes made
66586616 if (Changed)
66596617 {
6660- UpdateAllViews (UAV_ALL3DVIEWS, NULL);
6618+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
66616619 }
66626620 }
66636621 }
@@ -6671,7 +6629,7 @@
66716629 if (Level_RebuildBspAlways (App->CLSB_Doc->pLevel))
66726630 {
66736631 RebuildTrees();
6674- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
6632+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
66756633 }
66766634 }
66776635
@@ -6751,13 +6709,13 @@
67516709 {
67526710 Level_SetActorsDir(App->CLSB_Doc->pLevel, Dlg.m_ActorsDir);
67536711 UpdateEntityActors();
6754- UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
6712+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
67556713 }
67566714 if (Dlg.m_PawnIniChanged)
67576715 {
67586716 Level_SetPawnIniPath (App->CLSB_Doc->pLevel, Dlg.m_PawnIni);
67596717 UpdateEntityActors();
6760- UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
6718+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
67616719 }
67626720 // end change
67636721
@@ -6802,7 +6760,7 @@
68026760 if (Level_RebuildBspAlways (App->CLSB_Doc->pLevel))
68036761 {
68046762 RebuildTrees();
6805- UpdateAllViews (UAV_ALL3DVIEWS, NULL);
6763+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
68066764 }
68076765
68086766 }
@@ -6835,7 +6793,7 @@
68356793 geVec3d_Copy(&(TransformOrigin.Translation), &(pCameraEntity->mOrigin));
68366794
68376795 SetRenderedViewCamera( &(pCameraEntity->mOrigin), &Angles) ;
6838- UpdateAllViews( UAV_ALLVIEWS, NULL );
6796+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
68396797 }
68406798 }
68416799
@@ -6867,7 +6825,7 @@
68676825 geVec3d_Copy(&(TransformOrigin.Translation), &(pCameraEntity->mOrigin));
68686826
68696827 SetRenderedViewCamera( &(pCameraEntity->mOrigin), &Angles) ;
6870- UpdateAllViews( UAV_ALLVIEWS, NULL );
6828+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
68716829 }
68726830 }
68736831
@@ -6884,7 +6842,7 @@
68846842 Angles.Y = Render_NormalizeAngle(Angles.Y - CAMERA_MOVEMENT_ANGLE);
68856843 pCameraEntity->SetAngles( &Angles, Level_GetEntityDefs (App->CLSB_Doc->pLevel) ) ;
68866844 SetRenderedViewCamera( &(pCameraEntity->mOrigin), &Angles) ;
6887- UpdateAllViews( UAV_ALLVIEWS, NULL );
6845+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
68886846 }
68896847 }
68906848
@@ -6901,7 +6859,7 @@
69016859 Angles.Y = Render_NormalizeAngle(Angles.Y + CAMERA_MOVEMENT_ANGLE);
69026860 pCameraEntity->SetAngles( &Angles, Level_GetEntityDefs (App->CLSB_Doc->pLevel) ) ;
69036861 SetRenderedViewCamera( &(pCameraEntity->mOrigin), &Angles) ;
6904- UpdateAllViews( UAV_ALLVIEWS, NULL );
6862+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
69056863 }
69066864 }
69076865
@@ -6921,7 +6879,7 @@
69216879 Render_NormalizeAngle(Angles.X);
69226880 pCameraEntity->SetAngles( &Angles, Level_GetEntityDefs (App->CLSB_Doc->pLevel) ) ;
69236881 SetRenderedViewCamera( &(pCameraEntity->mOrigin), &Angles) ;
6924- UpdateAllViews( UAV_ALLVIEWS, NULL );
6882+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
69256883 }
69266884 }
69276885
@@ -6941,7 +6899,7 @@
69416899 Render_NormalizeAngle(Angles.X);
69426900 pCameraEntity->SetAngles( &Angles, Level_GetEntityDefs (App->CLSB_Doc->pLevel) ) ;
69436901 SetRenderedViewCamera( &(pCameraEntity->mOrigin), &Angles) ;
6944- UpdateAllViews( UAV_ALLVIEWS, NULL );
6902+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
69456903 }
69466904 }
69476905
@@ -6957,7 +6915,7 @@
69576915 pCameraEntity->GetAngles( &Angles, Level_GetEntityDefs (App->CLSB_Doc->pLevel) );
69586916 pCameraEntity->mOrigin.Y = pCameraEntity->mOrigin.Y + CAMERA_MOVEMENT_DISTANCE;
69596917 SetRenderedViewCamera( &(pCameraEntity->mOrigin), &Angles) ;
6960- UpdateAllViews( UAV_ALLVIEWS, NULL );
6918+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
69616919 }
69626920 }
69636921
@@ -6973,7 +6931,7 @@
69736931 pCameraEntity->GetAngles( &Angles, Level_GetEntityDefs (App->CLSB_Doc->pLevel) );
69746932 pCameraEntity->mOrigin.Y = pCameraEntity->mOrigin.Y - CAMERA_MOVEMENT_DISTANCE;
69756933 SetRenderedViewCamera( &(pCameraEntity->mOrigin), &Angles) ;
6976- UpdateAllViews( UAV_ALLVIEWS, NULL );
6934+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
69776935 }
69786936 }
69796937
@@ -8099,7 +8057,7 @@
80998057 pCameraEntity->SetAngles( &Angles, Level_GetEntityDefs (App->CLSB_Doc->pLevel) ) ;
81008058
81018059 SetRenderedViewCamera( &(pCameraEntity->mOrigin), &Angles) ;
8102- UpdateAllViews( UAV_ALLVIEWS, NULL );
8060+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
81038061 }
81048062 }
81058063
@@ -8199,7 +8157,7 @@
81998157 {
82008158 ScaleSelectedBrushes(&ScaleVector);
82018159
8202- UpdateAllViews(UAV_ALL3DVIEWS, NULL);
8160+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
82038161
82048162 if (App->CLSB_Brushes->Dimensions_Dlg_Running == 1)
82058163 {
@@ -8337,7 +8295,7 @@
83378295 }
83388296 }
83398297
8340- UpdateAllViews(UAV_GRID_ONLY, NULL, FALSE);
8298+ App->CLSB_Doc->UpdateAllViews(UAV_GRID_ONLY, NULL, FALSE);
83418299 }
83428300
83438301 void CFusionDoc::OnLinkviewports()
@@ -8399,7 +8357,7 @@
83998357 }
84008358 }
84018359 }
8402- UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
8360+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
84038361 }
84048362
84058363 void CFusionDoc::OnUpdateViewShowActors(CCmdUI* pCmdUI)
--- WorldEditor/WorldEditor/FUSIONDoc.h (revision 2540)
+++ WorldEditor/WorldEditor/FUSIONDoc.h (revision 2541)
@@ -119,7 +119,7 @@
119119 int mShowSelectedFaces;
120120 int mCurrentTool, mCurrentBitmap, mShowBrush, mModeTool;
121121 int mShowEntities, mCurrentGroup, mCurTextureSelection;
122- int IsNewDocument, mActiveView, mLastOp;
122+ int IsNewDocument, mActiveView;
123123 fdocAdjustEnum mAdjustMode;
124124 int mShowSelectedBrushes;
125125 int mLockAxis;
@@ -132,13 +132,13 @@
132132 //list related
133133 Brush *BTemplate, *CurBrush, *TempShearTemplate;
134134 SelBrushList *pSelBrushes;
135- SelBrushList *pTempSelBrushes;
135+
136136 SelFaceList *pSelFaces;
137137
138138 GNode *mWorldBsp;
139139 CEntity mRegularEntity;
140140 int mCurrentEntity, ScaleNum;
141- geVec3d SelectedGeoCenter, FinalRot, FinalScale, FinalPos;
141+ geVec3d FinalRot, FinalScale;
142142
143143 //dialogs / controls
144144 CFrameWnd *mpActiveViewFrame;
@@ -210,12 +210,12 @@
210210 geBoolean GetCursorInfo(char *info, int MaxSize);
211211 void NullFaceAttributes();
212212 void FaceAttributesDialog ();
213- void UpdateAllViews(int Mode, CView* pSender, BOOL Override = FALSE );
213+// void UpdateAllViews(int Mode, CView* pSender, BOOL Override = FALSE );
214214 int SubtractBrushFromList(Brush& Brush);
215215 void ResetSelectedFaceAttributes ();
216216 void ResizeSelected(float dx, float dy, int sides, int inidx);
217217 void ShearSelected(float dx, float dy, int sides, int inidx);
218- void MoveSelectedBrushes (geVec3d const *v);
218+
219219 void MoveSelectedClone (geVec3d const *v);
220220 void MoveTemplateBrush (geVec3d *);
221221 // void ChangeGridSize(geFloat Increment, CView* pSender );
@@ -306,8 +306,7 @@
306306
307307 CString LastTemplateTypeName;
308308
309- void MoveSelectedBrushList (SelBrushList *pList, geVec3d const *v);
310-
309+
311310 void ScaleSelectedBrushes(geVec3d *ScaleVector);
312311
313312
--- WorldEditor/WorldEditor/FUSIONView.cpp (revision 2540)
+++ WorldEditor/WorldEditor/FUSIONView.cpp (revision 2541)
@@ -183,7 +183,7 @@
183183 // One dimension won't be changed (i.e. in the top view, the Y won't be modified)
184184 geVec3d MoveDelta;
185185
186- geVec3d_Subtract (&NewWorldPos, &pDoc->SelectedGeoCenter, &MoveDelta);
186+ geVec3d_Subtract (&NewWorldPos, &App->CLSB_Doc->SelectedGeoCenter, &MoveDelta);
187187
188188 switch (mViewType)
189189 {
@@ -208,9 +208,9 @@
208208 if (pDoc->mModeTool == ID_TOOLS_TEMPLATE)
209209 pDoc->MoveTemplateBrush (&MoveDelta);
210210 else
211- pDoc->MoveSelectedBrushList(pDoc->pSelBrushes, &MoveDelta);
211+ App->CLSB_Doc->MoveSelectedBrushList(pDoc->pSelBrushes, &MoveDelta);
212212
213- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
213+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
214214 }
215215
216216 geBoolean CFusionView::IsKeyDown (int Key)
@@ -289,12 +289,12 @@
289289 {
290290 pDoc->RotateTemplateBrush(&rp);
291291 App->CLSB_Doc->UpdateSelected();
292- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
292+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
293293 }
294294 else
295295 {
296296 pDoc->RotateSelectedBrushesDirect (&rp);
297- pDoc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
297+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
298298 }
299299 }
300300
@@ -768,7 +768,7 @@
768768 if (LButtonIsDown)
769769 {
770770 LockAxis( &dv );
771- pDoc->MoveSelectedBrushes(&dv);
771+ App->CLSB_Doc->MoveSelectedBrushes(&dv);
772772 }// LButtonDown
773773 if (RButtonIsDown)
774774 {
@@ -943,32 +943,32 @@
943943 clear the delta before computing the snap, we have to save these
944944 flags.
945945 */
946- SnapX = (pDoc->FinalPos.X != 0.0f);
947- SnapY = (pDoc->FinalPos.Y != 0.0f);
948- SnapZ = (pDoc->FinalPos.Z != 0.0f);
946+ SnapX = (App->CLSB_Doc->FinalPos.X != 0.0f);
947+ SnapY = (App->CLSB_Doc->FinalPos.Y != 0.0f);
948+ SnapZ = (App->CLSB_Doc->FinalPos.Z != 0.0f);
949949 if ((ModeTool == ID_TOOLS_TEMPLATE) || IsCopying)
950950 {
951- geVec3d_Clear (&pDoc->FinalPos);
951+ geVec3d_Clear (&App->CLSB_Doc->FinalPos);
952952 }
953953 if (SnapX)
954954 {
955- SnapDelta.X = ::SnapSide (vMin->X, vMax->X, pDoc->FinalPos.X, fSnapSize);
955+ SnapDelta.X = ::SnapSide (vMin->X, vMax->X, App->CLSB_Doc->FinalPos.X, fSnapSize);
956956 }
957957 if (SnapY)
958958 {
959- SnapDelta.Y = ::SnapSide (vMin->Y, vMax->Y, pDoc->FinalPos.Y, fSnapSize);
959+ SnapDelta.Y = ::SnapSide (vMin->Y, vMax->Y, App->CLSB_Doc->FinalPos.Y, fSnapSize);
960960 }
961961 if (SnapZ)
962962 {
963- SnapDelta.Z = ::SnapSide (vMin->Z, vMax->Z, pDoc->FinalPos.Z, fSnapSize);
963+ SnapDelta.Z = ::SnapSide (vMin->Z, vMax->Z, App->CLSB_Doc->FinalPos.Z, fSnapSize);
964964 }
965965 if (ModeTool == ID_TOOLS_TEMPLATE)
966966 {
967- pDoc->FinalPos = SnapDelta;
967+ App->CLSB_Doc->FinalPos = SnapDelta;
968968 }
969969 else
970970 {
971- geVec3d_Add (&pDoc->FinalPos, &SnapDelta, &pDoc->FinalPos);
971+ geVec3d_Add (&App->CLSB_Doc->FinalPos, &SnapDelta, &App->CLSB_Doc->FinalPos);
972972 }
973973 }
974974
@@ -979,11 +979,11 @@
979979 if ((ModeTool == ID_TOOLS_TEMPLATE) ||
980980 ((pDoc->GetSelState() & ANYENTITY) && (!(pDoc->GetSelState() & ANYBRUSH))) )
981981 {
982- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
982+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
983983 }
984984 else
985985 {
986- pDoc->UpdateAllViews( UAV_ALL3DVIEWS | REBUILD_QUICK, NULL );
986+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS | REBUILD_QUICK, NULL );
987987 }
988988 }
989989
@@ -1068,7 +1068,7 @@
10681068 if( IsDragging )
10691069 {
10701070 pDoc->SelectOrthoRect( mDragStartPoint, mDragCurrentPoint, VCam );
1071- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1071+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
10721072 IsDragging = FALSE ;
10731073 Drag(DRAG_END);
10741074 }
@@ -1092,7 +1092,7 @@
10921092 case ADJUST_MODE_BRUSH :
10931093 case ADJUST_MODE_FACE :
10941094 pDoc->SelectRay (point, VCam);
1095- pDoc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
1095+ App->CLSB_Doc->UpdateAllViews (UAV_ALL3DVIEWS, NULL);
10961096 break;
10971097
10981098 default :
@@ -1110,7 +1110,7 @@
11101110 if( IsDragging )
11111111 {
11121112 pDoc->SelectOrthoRect( mDragStartPoint, mDragCurrentPoint, VCam );
1113- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1113+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
11141114 IsDragging = FALSE ;
11151115 Drag(DRAG_END);
11161116 }
@@ -1123,7 +1123,7 @@
11231123 else
11241124 {
11251125 App->CLSB_Doc->SelectOrtho(point, VCam);
1126- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
1126+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
11271127 }
11281128 }
11291129 /*
@@ -1150,7 +1150,7 @@
11501150 pDoc->SetModifiedFlag();
11511151 SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
11521152 pDoc->SnapScaleNearest(sides, Render_GetInidx(VCam), VCam);
1153- if(pDoc->mLastOp == BRUSH_SCALE)
1153+ if(App->CLSB_Doc->mLastOp == BRUSH_SCALE)
11541154 {
11551155 App->CLSB_Doc->DoneResize(sides, Render_GetInidx(VCam));
11561156
@@ -1164,11 +1164,11 @@
11641164 if((ModeTool == ID_TOOLS_TEMPLATE) ||
11651165 ((pDoc->GetSelState() & ANYENTITY) && (!(pDoc->GetSelState() & ANYBRUSH))) )
11661166 {
1167- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
1167+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
11681168 }
11691169 else
11701170 {
1171- pDoc->UpdateAllViews( UAV_ALL3DVIEWS | REBUILD_QUICK, NULL );
1171+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS | REBUILD_QUICK, NULL );
11721172 }
11731173 break;
11741174
@@ -1175,7 +1175,7 @@
11751175 case ID_TOOLS_BRUSH_SHEARBRUSH :
11761176 pDoc->SetModifiedFlag();
11771177 SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
1178- if(pDoc->mLastOp==BRUSH_SHEAR)
1178+ if(App->CLSB_Doc->mLastOp==BRUSH_SHEAR)
11791179 pDoc->DoneShear(sides, Render_GetInidx(VCam));
11801180
11811181 App->CLSB_Doc->UpdateSelected();
@@ -1182,11 +1182,11 @@
11821182 if((ModeTool == ID_TOOLS_TEMPLATE) ||
11831183 ((pDoc->GetSelState() & ANYENTITY) && (!(pDoc->GetSelState() & ANYBRUSH))) )
11841184 {
1185- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
1185+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL );
11861186 }
11871187 else
11881188 {
1189- pDoc->UpdateAllViews( UAV_ALL3DVIEWS | REBUILD_QUICK, NULL );
1189+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS | REBUILD_QUICK, NULL );
11901190 }
11911191 break;
11921192
@@ -1320,7 +1320,7 @@
13201320 }
13211321 else if ((Tool == ID_TOOLS_BRUSH_MOVEROTATEBRUSH) || (Tool == ID_TOOLS_BRUSH_MOVESELECTEDBRUSHES))
13221322 {
1323- geVec3d_Clear (&pDoc->FinalPos);
1323+ geVec3d_Clear (&App->CLSB_Doc->FinalPos);
13241324 pDoc->TempCopySelectedBrushes();
13251325 }
13261326 }// Not Drag-select
@@ -1428,7 +1428,7 @@
14281428 if( IsDragging )
14291429 {
14301430 pDoc->SelectOrthoRect( mDragStartPoint, mDragCurrentPoint, VCam );
1431- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1431+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
14321432 IsDragging = FALSE ;
14331433 Drag(DRAG_END);
14341434 }
@@ -1441,7 +1441,7 @@
14411441 {
14421442 ShowTheCursor ();
14431443 pDoc->SelectOrthoRect( mDragStartPoint, mDragCurrentPoint, VCam );
1444- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1444+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
14451445 IsDragging = FALSE ;
14461446 Drag(DRAG_END);
14471447 return;
@@ -1461,9 +1461,9 @@
14611461 }
14621462
14631463 if (SelBrushList_GetSize (pDoc->pSelBrushes) != 0)
1464- pDoc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
1464+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
14651465 else
1466- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1466+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
14671467 }
14681468 }
14691469
@@ -1839,7 +1839,7 @@
18391839 pDoc->mShowBrush ^= 1;
18401840
18411841 // redraw the screen
1842- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1842+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
18431843 }
18441844
18451845 void CFusionView::OnUpdateToolsBrushShowbrush(CCmdUI* pCmdUI)
@@ -2245,11 +2245,9 @@
22452245
22462246 void CFusionView::OnDeselectall()
22472247 {
2248- CFusionDoc* pDoc = GetDocument();
2249-
22502248 App->CLSB_Doc->ResetAllSelections() ;
22512249 App->CLSB_Doc->UpdateSelected();
2252- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
2250+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
22532251 }
22542252
22552253 void CFusionView::OnUpdateDeselectall(CCmdUI* pCmdUI)
@@ -2263,10 +2261,8 @@
22632261
22642262 void CFusionView::OnSelectall()
22652263 {
2266- CFusionDoc* pDoc = GetDocument();
2267-
22682264 App->CLSB_Doc->SelectAll () ;
2269- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
2265+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
22702266 }
22712267
22722268 void CFusionView::OnUpdateSelectall(CCmdUI* pCmdUI)
@@ -2283,7 +2279,7 @@
22832279 App->CLSB_Doc->ResetAllSelections() ;
22842280
22852281 pDoc->SelectAllBrushes () ;
2286- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
2282+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
22872283 }
22882284
22892285 void CFusionView::OnUpdateSelectAllBrushes(CCmdUI* pCmdUI)
@@ -2377,7 +2373,7 @@
23772373
23782374 //update the brush attributes dialog...
23792375 // pDoc->UpdateBrushAttributesDlg ();
2380- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
2376+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
23812377 }
23822378 else if(!(pDoc->GetSelState() & ANYBRUSH))
23832379 {
@@ -2389,7 +2385,7 @@
23892385 {
23902386 SelBrushList_Add (pDoc->pSelBrushes, pBrush);
23912387 App->CLSB_Doc->UpdateSelected();
2392- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
2388+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
23932389 }
23942390 }
23952391 }
@@ -2411,7 +2407,7 @@
24112407
24122408 //update the brush attributes dialog...
24132409 // pDoc->UpdateBrushAttributesDlg ();
2414- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
2410+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
24152411 }
24162412 else if(!(pDoc->GetSelState() & ANYBRUSH))
24172413 {
@@ -2423,7 +2419,7 @@
24232419 {
24242420 SelBrushList_Add (pDoc->pSelBrushes, pBrush);
24252421 App->CLSB_Doc->UpdateSelected();
2426- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
2422+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
24272423 }
24282424 }
24292425 }
@@ -2585,7 +2581,7 @@
25852581 App->CLSB_Doc->UpdateSelected ();
25862582
25872583 //pDoc->UpdateFaceAttributesDlg ();
2588- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
2584+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
25892585 }
25902586 }
25912587
@@ -2639,7 +2635,7 @@
26392635 App->CLSB_Doc->UpdateSelected ();
26402636
26412637 //pDoc->UpdateFaceAttributesDlg ();
2642- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
2638+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
26432639 }
26442640
26452641 }
@@ -2650,7 +2646,7 @@
26502646 CFusionDoc* pDoc = GetDocument();
26512647
26522648 pDoc->SelectAllFacesInBrushes() ;
2653- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
2649+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
26542650 }
26552651
26562652 void CFusionView::OnEditSelectEntitiesAll()
@@ -2661,7 +2657,7 @@
26612657 App->CLSB_Doc->ResetAllSelections() ;
26622658
26632659 pDoc->SelectAllEntities () ;
2664- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
2660+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
26652661 }
26662662
26672663
@@ -2683,7 +2679,7 @@
26832679 {
26842680 pDoc->SelectEntity(&(*Entities)[0]);
26852681 App->CLSB_Doc->UpdateSelected ();
2686- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
2682+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
26872683 }
26882684 else
26892685 {
@@ -2726,7 +2722,7 @@
27262722
27272723 pDoc->SelectEntity(NextEntity);
27282724 App->CLSB_Doc->UpdateSelected ();
2729- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
2725+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
27302726 }
27312727 }
27322728 }
@@ -2751,7 +2747,7 @@
27512747 {
27522748 pDoc->SelectEntity(&(*Entities)[0]);
27532749 App->CLSB_Doc->UpdateSelected ();
2754- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
2750+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
27552751 }
27562752 else
27572753 {
@@ -2794,7 +2790,7 @@
27942790
27952791 pDoc->SelectEntity(NextEntity);
27962792 App->CLSB_Doc->UpdateSelected ();
2797- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
2793+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
27982794 }
27992795 }
28002796 }
@@ -2807,7 +2803,7 @@
28072803
28082804 App->CLSB_Doc->ResetAllSelectedBrushes() ;
28092805 App->CLSB_Doc->UpdateSelected();
2810- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
2806+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
28112807 }
28122808
28132809 void CFusionView::OnEditDeselectEntities()
@@ -2816,7 +2812,7 @@
28162812
28172813 App->CLSB_Doc->ResetAllSelectedEntities() ;
28182814 App->CLSB_Doc->UpdateSelected();
2819- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
2815+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
28202816 }
28212817
28222818 void CFusionView::OnEditDeselectFaces()
@@ -2825,7 +2821,7 @@
28252821
28262822 App->CLSB_Doc->ResetAllSelectedFaces() ;
28272823 App->CLSB_Doc->UpdateSelected();
2828- pDoc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
2824+ App->CLSB_Doc->UpdateAllViews( UAV_ALL3DVIEWS, NULL ) ;
28292825 }
28302826
28312827 void CFusionView::OnUpdateEditDeselectBrushes(CCmdUI* pCmdUI)
@@ -2966,7 +2962,7 @@
29662962 if(!pDoc)
29672963 return;
29682964
2969- Render_SetCameraPos(VCam, &pDoc->SelectedGeoCenter);
2965+ Render_SetCameraPos(VCam, &App->CLSB_Doc->SelectedGeoCenter);
29702966
29712967 pDoc->LinkViewports();
29722968 pDoc->SetModifiedFlag();
@@ -3034,7 +3030,7 @@
30343030
30353031 pDoc->SetRenderedViewCamera( &(pCameraEntity->mOrigin), &Angles) ;
30363032 pDoc->SetModifiedFlag();
3037- pDoc->UpdateAllViews( UAV_ALLVIEWS, NULL );
3033+ App->CLSB_Doc->UpdateAllViews( UAV_ALLVIEWS, NULL );
30383034 }
30393035 }
30403036
@@ -3157,13 +3153,13 @@
31573153 {
31583154 pDoc->RotateTemplateBrush(&RotateVector);
31593155 App->CLSB_Doc->UpdateSelected();
3160- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
3156+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
31613157 }
31623158 else
31633159 {
31643160 pDoc->RotateSelectedBrushesDirect (&RotateVector);
31653161 pDoc->SetModifiedFlag();
3166- pDoc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
3162+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
31673163 }
31683164 }
31693165 }
--- WorldEditor/WorldEditor/FaceAttributesDialog.cpp (revision 2540)
+++ WorldEditor/WorldEditor/FaceAttributesDialog.cpp (revision 2541)
@@ -453,7 +453,7 @@
453453 Brush *pBrush = SelBrushList_GetBrush (pDoc->pSelBrushes, i);
454454 Brush_UpdateChildFaces (pBrush);
455455 }
456- pDoc->UpdateAllViews(UAV_RENDER_ONLY, NULL);
456+ App->CLSB_Doc->UpdateAllViews(UAV_RENDER_ONLY, NULL);
457457 }
458458 }
459459
--- WorldEditor/WorldEditor/MainFrm.cpp (revision 2540)
+++ WorldEditor/WorldEditor/MainFrm.cpp (revision 2541)
@@ -1038,7 +1038,7 @@
10381038 if(pDoc != NULL)
10391039 {
10401040 pDoc->SetShowLeakFinder(!pDoc->bShowLeakFinder());
1041- pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
1041+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
10421042 }
10431043 }
10441044
--- WorldEditor/WorldEditor/SB_Brushes.cpp (revision 2540)
+++ WorldEditor/WorldEditor/SB_Brushes.cpp (revision 2541)
@@ -73,9 +73,9 @@
7373
7474 //Lock_Textures(true);
7575
76- SelBrushList_Center(m_pDoc->pSelBrushes, &m_pDoc->SelectedGeoCenter);
76+ SelBrushList_Center(m_pDoc->pSelBrushes, &App->CLSB_Doc->SelectedGeoCenter);
7777
78- CenterOfSelection = m_pDoc->SelectedGeoCenter;
78+ CenterOfSelection = App->CLSB_Doc->SelectedGeoCenter;
7979
8080 Get_Brush();
8181
@@ -743,11 +743,11 @@
743743 // *************************************************************************
744744 void SB_Brushes::Move_Brush()
745745 {
746- geVec3d_Subtract(&App->CLSB_Brushes->CenterOfSelection, &App->CLSB_Brushes->m_pDoc->SelectedGeoCenter, &App->CLSB_Brushes->CenterOfSelection);
746+ geVec3d_Subtract(&App->CLSB_Brushes->CenterOfSelection, &App->CLSB_Doc->SelectedGeoCenter, &App->CLSB_Brushes->CenterOfSelection);
747747
748- App->CLSB_Brushes->m_pDoc->MoveSelectedBrushList(App->CLSB_Brushes->m_pDoc->pSelBrushes, &App->CLSB_Brushes->CenterOfSelection);
748+ App->CLSB_Doc->MoveSelectedBrushList(App->CLSB_Brushes->m_pDoc->pSelBrushes, &App->CLSB_Brushes->CenterOfSelection);
749749
750- App->CLSB_Brushes->m_pDoc->UpdateAllViews(UAV_ALLVIEWS | REBUILD_QUICK, NULL);
750+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS | REBUILD_QUICK, NULL);
751751 }
752752
753753 // *************************************************************************
@@ -763,7 +763,7 @@
763763
764764 App->m_pDoc->RotateSelectedBrushList(App->CLSB_Brushes->m_pDoc->pSelBrushes, &FinalScale);
765765
766- App->CLSB_Brushes->m_pDoc->UpdateAllViews(UAV_ALLVIEWS | UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
766+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS | UAV_ALL3DVIEWS | REBUILD_QUICK, NULL);
767767 }
768768
769769 // *************************************************************************
@@ -779,7 +779,7 @@
779779
780780 App->m_pDoc->ScaleSelectedBrushes(&FinalScale);
781781
782- App->CLSB_Brushes->m_pDoc->UpdateAllViews(UAV_ALLVIEWS | REBUILD_QUICK, NULL);
782+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS | REBUILD_QUICK, NULL);
783783 }
784784
785785 // *************************************************************************
@@ -812,7 +812,7 @@
812812
813813 App->m_pDoc->ScaleSelectedBrushes(&FinalScale);
814814
815- App->CLSB_Brushes->m_pDoc->UpdateAllViews(UAV_ALLVIEWS | REBUILD_QUICK, NULL);
815+ App->CLSB_Doc->UpdateAllViews(UAV_ALLVIEWS | REBUILD_QUICK, NULL);
816816 }
817817
818818 // *************************************************************************
@@ -878,8 +878,8 @@
878878 //Lock_Textures(true);
879879
880880 Get_Brush();
881- SelBrushList_Center(m_pDoc->pSelBrushes, &m_pDoc->SelectedGeoCenter);
882- CenterOfSelection = m_pDoc->SelectedGeoCenter;
881+ SelBrushList_Center(m_pDoc->pSelBrushes, &App->CLSB_Doc->SelectedGeoCenter);
882+ CenterOfSelection = App->CLSB_Doc->SelectedGeoCenter;
883883
884884 char buf[255];
885885
@@ -1015,6 +1015,6 @@
10151015 Centre.Z = 0;
10161016
10171017 SelBrushList_Add(App->m_pDoc->pSelBrushes, Selected_Brush);
1018- App->m_pDoc->MoveSelectedBrushList(App->m_pDoc->pSelBrushes, &Centre);
1018+ App->CLSB_Doc->MoveSelectedBrushList(App->m_pDoc->pSelBrushes, &Centre);
10191019 }
10201020 }
--- WorldEditor/WorldEditor/SB_Doc.cpp (revision 2540)
+++ WorldEditor/WorldEditor/SB_Doc.cpp (revision 2541)
@@ -9,6 +9,7 @@
99
1010 SB_Doc::SB_Doc(void)
1111 {
12+ pTempSelBrushes = NULL;
1213 }
1314
1415 SB_Doc::~SB_Doc(void)
@@ -55,11 +56,11 @@
5556
5657 if (ReBuild && Level_RebuildBspAlways(pLevel))
5758 {
58- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL, TRUE);
59+ UpdateAllViews(UAV_ALL3DVIEWS | REBUILD_QUICK, NULL, TRUE);
5960 }
6061 else
6162 {
62- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
63+ UpdateAllViews(UAV_ALL3DVIEWS, NULL);
6364 }
6465
6566 // put cursor back
@@ -276,7 +277,7 @@
276277 {
277278 App->Get_Current_Document();
278279
279- App->m_pDoc->mLastOp = BRUSH_SCALE;
280+ mLastOp = BRUSH_SCALE;
280281
281282 App->m_pDoc->TempDeleteSelected();
282283
@@ -319,7 +320,7 @@
319320 int i;
320321 // BrushList *BList = Level_GetBrushes (pLevel);
321322
322- App->m_pDoc->mLastOp = BRUSH_MOVE;
323+ mLastOp = BRUSH_MOVE;
323324
324325 App->m_pDoc->TempDeleteSelected();
325326
@@ -331,7 +332,7 @@
331332 }
332333 else
333334 {
334- Brush_Move(App->m_pDoc->CurBrush, &App->m_pDoc->FinalPos);
335+ Brush_Move(App->m_pDoc->CurBrush, &FinalPos);
335336 }
336337 return;
337338 }
@@ -347,7 +348,7 @@
347348 if (strstr(App->CL_Brush->Brush_GetName(pBrush), ".act") != NULL)
348349 continue;
349350
350- Brush_Move(pBrush, &App->m_pDoc->FinalPos);
351+ Brush_Move(pBrush, &FinalPos);
351352 }
352353
353354 if (App->m_pDoc->GetSelState() & ANYENTITY)
@@ -357,10 +358,10 @@
357358
358359 UpdateSelected();
359360
360- App->m_pDoc->UpdateSelectedModel(BRUSH_MOVE, &App->m_pDoc->FinalPos);
361+ App->m_pDoc->UpdateSelectedModel(BRUSH_MOVE, &FinalPos);
361362 }
362363
363- geVec3d_Clear(&App->m_pDoc->FinalPos);
364+ geVec3d_Clear(&FinalPos);
364365
365366 }
366367
@@ -374,7 +375,7 @@
374375 App->Get_Current_Document();
375376
376377 SelectAll();
377- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
378+ UpdateAllViews(UAV_ALL3DVIEWS, NULL);
378379
379380 Face* pFace;
380381 int NumberOfFaces;
@@ -389,7 +390,7 @@
389390
390391 ResetAllSelections();
391392 UpdateSelected();
392- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
393+ UpdateAllViews(UAV_ALL3DVIEWS, NULL);
393394
394395 }
395396
@@ -487,17 +488,17 @@
487488 App->m_pDoc->CurBrush = App->m_pDoc->BTemplate;
488489 }
489490
490- geVec3d_Clear(&App->m_pDoc->SelectedGeoCenter);
491+ geVec3d_Clear(&SelectedGeoCenter);
491492
492493 if (App->m_pDoc->mModeTool == ID_TOOLS_TEMPLATE)
493494 {
494495 if (App->m_pDoc->TempEnt)
495496 {
496- App->m_pDoc->SelectedGeoCenter = App->m_pDoc->mRegularEntity.mOrigin;
497+ SelectedGeoCenter = App->m_pDoc->mRegularEntity.mOrigin;
497498 }
498499 else
499500 {
500- Brush_Center(App->m_pDoc->CurBrush, &App->m_pDoc->SelectedGeoCenter);
501+ Brush_Center(App->m_pDoc->CurBrush, &SelectedGeoCenter);
501502 }
502503 }
503504 else if (App->m_pDoc->SelState != NOSELECTIONS)
@@ -509,13 +510,13 @@
509510 if (pModel != NULL)
510511 {
511512 // we're animating a model, so use its current position
512- Model_GetCurrentPos(pModel, &App->m_pDoc->SelectedGeoCenter);
513+ Model_GetCurrentPos(pModel, &SelectedGeoCenter);
513514 }
514515 else
515516 {
516517 if (NumSelBrushes)
517518 {
518- SelBrushList_Center(App->m_pDoc->pSelBrushes, &App->m_pDoc->SelectedGeoCenter);
519+ SelBrushList_Center(App->m_pDoc->pSelBrushes, &SelectedGeoCenter);
519520 }
520521 else if (App->m_pDoc->NumSelEntities)
521522 {
@@ -536,7 +537,7 @@
536537 }
537538 }
538539
539- geVec3d_Scale(&EntitySelectionCenter, 1 / (float)(App->m_pDoc->NumSelEntities), &App->m_pDoc->SelectedGeoCenter);
540+ geVec3d_Scale(&EntitySelectionCenter, 1 / (float)(App->m_pDoc->NumSelEntities), &SelectedGeoCenter);
540541 }
541542 }
542543 }
@@ -630,3 +631,161 @@
630631
631632 Level_EnumEntities(pLevel, this, fdocDeselectEntity);
632633 }
634+
635+// *************************************************************************
636+// * UpdateAllViews:- Terry and Hazel Flanigan 2023 *
637+// *************************************************************************
638+void SB_Doc::UpdateAllViews(int Mode, CView* pSender, BOOL Override)
639+{
640+ App->Get_Current_Document();
641+
642+ if (App->m_pDoc->IsModified() && ((Mode & REBUILD_QUICK) && (Level_RebuildBspAlways(App->CLSB_Doc->pLevel))) || (Override))
643+ {
644+ App->m_pDoc->RebuildTrees();
645+ }
646+ else if ((Mode & REBUILD_QUICK) && (!Level_RebuildBspAlways(App->CLSB_Doc->pLevel)))
647+ {
648+ App->m_pDoc->InvalidateDrawTreeOriginalFaces();
649+ }
650+
651+ if (Mode & REBUILD_QUICK)
652+ Mode &= ~REBUILD_QUICK;
653+
654+ // Do we want to redraw everything?
655+ if (Mode & UAV_ALLVIEWS)
656+ {
657+ App->m_pDoc->CDocument::UpdateAllViews(pSender);
658+ return;
659+ }
660+
661+ POSITION pos = App->m_pDoc->GetFirstViewPosition();
662+
663+ while (pos != NULL)
664+ {
665+ CView* pView = App->m_pDoc->GetNextView(pos);
666+
667+ if (pView->IsKindOf(RUNTIME_CLASS(CFusionView)))
668+ {
669+ CFusionView* pFusionView = (CFusionView*)pView;
670+ CDC* pDC = pFusionView->GetDC();
671+
672+ switch (Mode)
673+ {
674+ case UAV_ACTIVE3DVIEW_ONLY:
675+
676+ if (pFusionView->GetParentFrame() == App->m_pDoc->mpActiveViewFrame)
677+ pFusionView->Invalidate(TRUE);
678+ break;
679+
680+ case UAV_NONACTIVE3DVIEWS_ONLY:
681+
682+ if (pFusionView->GetParentFrame() != App->m_pDoc->mpActiveViewFrame)
683+ pFusionView->Invalidate(TRUE);
684+ break;
685+
686+ case UAV_TEXTUREVIEW_ONLY:
687+
688+ if (pFusionView->mViewType == ID_VIEW_TEXTUREVIEW)
689+ pFusionView->Invalidate(TRUE);
690+ break;
691+
692+ case UAV_RENDER_ONLY:
693+
694+ switch (pFusionView->mViewType)
695+ {
696+ case ID_VIEW_3DWIREFRAME:
697+ case ID_VIEW_TEXTUREVIEW:
698+
699+ pFusionView->Invalidate(TRUE);
700+ break;
701+
702+ default:
703+ break;
704+ }
705+ break;
706+
707+ case UAV_GRID_ONLY:
708+
709+ switch (pFusionView->mViewType)
710+ {
711+ case ID_VIEW_TOPVIEW:
712+ case ID_VIEW_SIDEVIEW:
713+ case ID_VIEW_FRONTVIEW:
714+
715+ pFusionView->Invalidate(TRUE);
716+ break;
717+ }
718+ break;
719+
720+
721+ case UAV_THIS_GRID_ONLY:
722+ if (pFusionView == pSender)
723+ {
724+ switch (pFusionView->mViewType)
725+ {
726+ case ID_VIEW_TOPVIEW:
727+ case ID_VIEW_SIDEVIEW:
728+ case ID_VIEW_FRONTVIEW:
729+ pFusionView->Invalidate(TRUE);
730+ break;
731+ }
732+ }
733+ break;
734+
735+ case UAV_ALL3DVIEWS:
736+
737+ pFusionView->Invalidate(TRUE);
738+ break;
739+
740+ default:
741+ break;
742+ }
743+
744+ pFusionView->ReleaseDC(pDC);
745+ }
746+ }
747+}
748+
749+// *************************************************************************
750+// * MoveSelectedBrushes:- Terry and Hazel Flanigan 2023 *
751+// *************************************************************************
752+void SB_Doc::MoveSelectedBrushes(geVec3d const* v)
753+{
754+ MoveSelectedBrushList(pTempSelBrushes, v);
755+}
756+
757+// *************************************************************************
758+// * MoveSelectedBrushList:- Terry and Hazel Flanigan 2023 *
759+// *************************************************************************
760+void SB_Doc::MoveSelectedBrushList(SelBrushList* pList,geVec3d const* v)
761+{
762+ int i;
763+ int NumBrushes;
764+ mLastOp = BRUSH_MOVE;
765+
766+ geVec3d_Add(&SelectedGeoCenter, v, &SelectedGeoCenter);
767+ geVec3d_Add(v, &FinalPos, &FinalPos);
768+
769+ NumBrushes = SelBrushList_GetSize(pList);
770+ for (i = 0; i < NumBrushes; i++)
771+ {
772+ Brush* pBrush;
773+
774+ pBrush = SelBrushList_GetBrush(pList, i);
775+ // changed QD Actors
776+ if (strstr(App->CL_Brush->Brush_GetName(pBrush), ".act") != NULL)
777+ continue;
778+ // end change
779+ Brush_Move(pBrush, v);
780+ }
781+
782+ CEntityArray* Entities = Level_GetEntities(pLevel);
783+ int NumEntities = Entities->GetSize();
784+ for (i = 0; i < NumEntities; i++)
785+ {
786+ if ((*Entities)[i].IsSelected())
787+ {
788+ (*Entities)[i].Move(v);
789+ }
790+ }
791+}
--- WorldEditor/WorldEditor/SB_Doc.h (revision 2540)
+++ WorldEditor/WorldEditor/SB_Doc.h (revision 2541)
@@ -28,7 +28,16 @@
2828 void ResetAllSelectedFaces(void);
2929 void ResetAllSelectedBrushes(void);
3030 void ResetAllSelectedEntities();
31+ void UpdateAllViews(int Mode, CView* pSender, BOOL Override = FALSE);
3132
33+ void MoveSelectedBrushes(geVec3d const* v);
34+ void MoveSelectedBrushList(SelBrushList* pList, geVec3d const* v);
35+
36+ int mLastOp;
37+ geVec3d SelectedGeoCenter, FinalPos;
38+
39+ SelBrushList* pTempSelBrushes;
40+
3241 Level* pLevel;
3342 };
3443
--- WorldEditor/WorldEditor/SB_Environment.cpp (nonexistent)
+++ WorldEditor/WorldEditor/SB_Environment.cpp (revision 2541)
@@ -0,0 +1,34 @@
1+/*
2+Copyright (c) 2023 World Editor -- HGT Software W.T.Flanigan H.C.Flanigan
3+
4+This software is provided 'as-is', without any express or implied
5+warranty. In no event will the authors be held liable for any damages
6+arising from the use of this software.
7+
8+Permission is granted to anyone to use this software for any purpose,
9+including commercial applications, and to alter it and redistribute it
10+freely, subject to the following restrictions:
11+
12+1. The origin of this software must not be misrepresented; you must not
13+claim that you wrote the original software. If you use this software
14+in a product, an acknowledgment in the product documentation would be
15+appreciated but is not required.
16+
17+2. Altered source versions must be plainly marked as such, and must not be
18+misrepresented as being the original software.
19+
20+3. This notice may not be removed or altered from any source
21+distribution.
22+*/
23+
24+#include "stdafx.h"
25+#include "AB_App.h"
26+#include "SB_Environment.h"
27+
28+SB_Environment::SB_Environment(void)
29+{
30+}
31+
32+SB_Environment::~SB_Environment(void)
33+{
34+}
--- WorldEditor/WorldEditor/SB_Environment.h (nonexistent)
+++ WorldEditor/WorldEditor/SB_Environment.h (revision 2541)
@@ -0,0 +1,32 @@
1+#pragma once
2+
3+/*
4+Copyright (c) 2023 World Editor -- HGT Software W.T.Flanigan H.C.Flanigan
5+
6+This software is provided 'as-is', without any express or implied
7+warranty. In no event will the authors be held liable for any damages
8+arising from the use of this software.
9+
10+Permission is granted to anyone to use this software for any purpose,
11+including commercial applications, and to alter it and redistribute it
12+freely, subject to the following restrictions:
13+
14+1. The origin of this software must not be misrepresented; you must not
15+claim that you wrote the original software. If you use this software
16+in a product, an acknowledgment in the product documentation would be
17+appreciated but is not required.
18+
19+2. Altered source versions must be plainly marked as such, and must not be
20+misrepresented as being the original software.
21+
22+3. This notice may not be removed or altered from any source
23+distribution.
24+*/
25+
26+class SB_Environment
27+{
28+public:
29+ SB_Environment(void);
30+ ~SB_Environment(void);
31+};
32+
--- WorldEditor/WorldEditor/SB_Equity.cpp (revision 2540)
+++ WorldEditor/WorldEditor/SB_Equity.cpp (revision 2541)
@@ -1244,6 +1244,8 @@
12441244
12451245 App->CLSB_Object->Do_Basketball();
12461246
1247+ App->CLSB_Ogre->mSceneMgr->setSkyDome(true, "Examples/CloudySky", 5, 8);
1248+
12471249 App->CLSB_Equity->Show_Equity_Dialog(true);
12481250 App->CLSB_TopTabs->Update_Dlg_Controls();
12491251
--- WorldEditor/WorldEditor/SB_FileView.cpp (revision 2540)
+++ WorldEditor/WorldEditor/SB_FileView.cpp (revision 2541)
@@ -37,6 +37,9 @@
3737 FV_LevelFolder = nullptr;
3838 FV_Cameras_Folder = nullptr;
3939 FV_Objects_Folder = nullptr;
40+
41+ FileView_Folder[0] = 0;
42+ FileView_File[0] = 0;
4043 }
4144
4245 SB_FileView::~SB_FileView(void)
@@ -90,7 +93,7 @@
9093 case WM_NOTIFY:
9194 {
9295 LPNMHDR nmhdr = (LPNMHDR)lParam;
93- /*if (nmhdr->idFrom == IDC_TREE1)
96+ if (nmhdr->idFrom == IDC_TREE1)
9497 {
9598 switch (nmhdr->code)
9699 {
@@ -97,13 +100,13 @@
97100
98101 case TVN_SELCHANGED:
99102 {
100- App->SBC_FileView->Get_Selection((LPNMHDR)lParam);
103+ App->CLSB_FileView->Get_Selection((LPNMHDR)lParam);
101104 }
102105
103106 }
104107 }
105108
106- LPNMHDR some_item = (LPNMHDR)lParam;
109+ /*LPNMHDR some_item = (LPNMHDR)lParam;
107110
108111 if (some_item->idFrom == IDC_LEVELS && some_item->code == NM_CUSTOMDRAW)
109112 {
@@ -344,6 +347,191 @@
344347 }
345348
346349 // *************************************************************************
350+// * Get_Selection Terry:- Terry and Hazel Flanigan 2022 *
351+// *************************************************************************
352+void SB_FileView::Get_Selection(LPNMHDR lParam)
353+{
354+
355+ strcpy(FileView_Folder, "");
356+ strcpy(FileView_File, "");
357+
358+ int Index = 0;
359+ HWND Temp = GetDlgItem(App->ListPanel, IDC_TREE1);
360+ HTREEITEM i = TreeView_GetSelection(Temp);
361+
362+ TVITEM item;
363+ item.hItem = i;
364+ item.pszText = FileView_Folder;
365+ item.cchTextMax = sizeof(FileView_Folder);
366+ item.mask = TVIF_TEXT | TVIF_PARAM;
367+ TreeView_GetItem(((LPNMHDR)lParam)->hwndFrom, &item);
368+ Index = item.lParam;
369+
370+ HTREEITEM p = TreeView_GetParent(Temp, i);
371+
372+ TVITEM item1;
373+ item1.hItem = p;
374+ item1.pszText = FileView_File;
375+ item1.cchTextMax = sizeof(FileView_File);
376+ item1.mask = TVIF_TEXT;
377+ TreeView_GetItem(((LPNMHDR)lParam)->hwndFrom, &item1);
378+
379+
380+ //--------------------------------------------------------------------------
381+
382+ //if (!strcmp(FileView_Folder, App->SBC_Project->m_Level_Name)) // Level Folder
383+ //{
384+ // HideRightPanes();
385+ // ShowWindow(App->GD_Properties_Hwnd, 1);
386+
387+ // App->SBC_Properties->Edit_Category = Enums::FV_Edit_Level;
388+ // App->SBC_Properties->Update_ListView_Level();
389+ //}
390+
391+ // ------------------------------------------------------------ Areas
392+ if (!strcmp(FileView_Folder, "Area")) // Folder
393+ {
394+ //App->SBC_FileView->Context_Selection = Enums::FileView_Areas_Folder;
395+
396+ return;
397+ }
398+
399+ if (!strcmp(FileView_File, "Area"))
400+ {
401+ //App->SBC_FileView->Context_Selection = Enums::FileView_Areas_File;
402+ //App->SBC_Properties->Edit_Category = Enums::Edit_Area;
403+ //App->SBC_Properties->Current_Selected_Object = Index;
404+
405+ //HideRightPanes();
406+ //ShowWindow(App->GD_Properties_Hwnd, 1);
407+
408+ //App->SBC_Props_Dialog->Hide_Area_Dlg(1);
409+ //App->SBC_Props_Dialog->Hide_Debug_Dlg(1);
410+ //App->SBC_Props_Dialog->Hide_Dimensions_Dlg(1, 1);
411+ //App->SBC_Props_Dialog->Hide_Details_Goto_Dlg(1);
412+ //App->SBC_Props_Dialog->Hide_Material_Dlg(1);
413+
414+ ////----------------------------------------------------------------------------
415+ ////App->SBC_Properties->Current_Selected_Object = Index;
416+ ////App->SBC_Properties->Reset_Last_Selected_Object(App->SBC_Properties->Last_Selected_Object);
417+ ////App->SBC_Properties->Last_Selected_Object = Index;
418+ ////----------------------------------------------------------------------------
419+
420+ //App->SBC_Properties->Update_ListView_Area();
421+
422+
423+ //if (App->SBC_Dimensions->Show_Dimensions == 1)
424+ //{
425+ // App->SBC_Dimensions->Prepare_Dimensions();
426+ //}
427+
428+ return;
429+
430+ }
431+
432+ // ------------------------------------------------------------ Objects
433+ if (!strcmp(FileView_Folder, "Objects")) // Folder
434+ {
435+ //App->SBC_FileView->Context_Selection = Enums::FileView_Objects_Folder;
436+ return;
437+ }
438+ if (!strcmp(FileView_File, "Objects"))
439+ {
440+ //App->SBC_FileView->Context_Selection = Enums::FileView_Objects_File;
441+
442+ /*HideRightPanes();
443+ ShowWindow(App->SBC_Properties->Properties_Dlg_hWnd, 1);
444+
445+ App->SBC_Props_Dialog->Hide_Details_Goto_Dlg(1);
446+ App->SBC_Props_Dialog->Hide_Dimensions_Dlg(1, App->SBC_Scene->V_Object[Index]->Dimensions_Locked);
447+ App->SBC_Props_Dialog->Hide_Debug_Dlg(1);
448+ App->SBC_Props_Dialog->Hide_Material_Dlg(1);*/
449+
450+
451+ App->CLSB_Properties->Edit_Category = Enums::FV_Edit_Object;
452+
453+ //----------------------------------------------------------------------------
454+ App->CLSB_Properties->Current_Selected_Object = Index;
455+ //App->SBC_Properties->Reset_Last_Selected_Object(App->SBC_Properties->Last_Selected_Object);
456+ //App->SBC_Properties->Last_Selected_Object = Index;
457+ //----------------------------------------------------------------------------
458+
459+ //App->SBC_LookUps->Update_Types();
460+
461+ //App->SBC_Markers->MarkerBB_Addjust(Index);
462+
463+ App->CLSB_Properties->Update_ListView_Objects();
464+
465+
466+ /*if (App->SBC_Dimensions->Show_Dimensions == 1)
467+ {
468+ App->SBC_Dimensions->Prepare_Dimensions();
469+ }*/
470+
471+ return;
472+ }
473+
474+ // ------------------------------------------------------------ Players
475+ if (!strcmp(FileView_Folder, "Player")) // Folder
476+ {
477+ // App->SBC_FileView->Context_Selection = Enums::FileView_Player_Folder;
478+ // return;
479+ }
480+ if (!strcmp(FileView_File, "Player"))
481+ {
482+ // App->SBC_FileView->Context_Selection = Enums::FileView_Player_File;
483+
484+ // HideRightPanes();
485+ ShowWindow(App->CLSB_Properties->Properties_Dlg_hWnd, 1);
486+ // App->SBC_Player->Hide_Player_Dlg(1);
487+
488+ App->CLSB_Properties->Edit_Category = Enums::Edit_Player;
489+
490+ // //----------------------------------------------------------------------------
491+ App->CLSB_Properties->Current_Selected_Object = Index;
492+ // App->SBC_Properties->Reset_Last_Selected_Object(App->SBC_Properties->Last_Selected_Object);
493+ // App->SBC_Properties->Last_Selected_Object = Index;
494+ // //----------------------------------------------------------------------------
495+
496+ // if (App->SBC_Properties->Edit_Physics == 0)
497+ // {
498+ App->CLSB_Properties->Update_ListView_Player();
499+ // }
500+ // else
501+ // {
502+ // App->SBC_Properties->Update_ListView_Player_Physics();
503+ // }
504+ return;
505+ }
506+
507+ // ------------------------------------------------------------ Cameras
508+ /*if (!strcmp(FileView_Folder, "Camera"))
509+ {
510+ App->SBC_FileView->Context_Selection = Enums::FileView_Cameras_Folder;
511+
512+ return;
513+ }
514+
515+ if (!strcmp(FileView_File, "Camera"))
516+ {
517+ App->SBC_FileView->Context_Selection = Enums::FileView_Cameras_File;
518+
519+ HideRightPanes();
520+ ShowWindow(App->GD_Properties_Hwnd, 0);
521+ App->SBC_Com_Camera->Hide_Cam_Dlg(1);
522+
523+ App->SBC_Properties->Edit_Category = Enums::Edit_Camera;
524+
525+ App->SBC_Properties->Current_Selected_Object = Index;
526+
527+ App->SBC_Properties->Update_ListView_Camera();
528+
529+ return;
530+ }*/
531+
532+}
533+
534+// *************************************************************************
347535 // * Add_Item:- Terry and Hazel Flanigan 2022 *
348536 // *************************************************************************
349537 HTREEITEM SB_FileView::Add_Item(HTREEITEM Folder, char* SFileName, int Index, bool NewItem)
--- WorldEditor/WorldEditor/SB_FileView.h (revision 2540)
+++ WorldEditor/WorldEditor/SB_FileView.h (revision 2541)
@@ -45,8 +45,11 @@
4545
4646 void AddRootFolder(void);
4747 void MoreFoldersD(void);
48-
48+ void Get_Selection(LPNMHDR lParam);
4949
50+ char FileView_Folder[255];
51+ char FileView_File[255];
52+
5053 TV_INSERTSTRUCT tvinsert;
5154
5255 HTREEITEM Root;
--- WorldEditor/WorldEditor/SB_Level.cpp (revision 2540)
+++ WorldEditor/WorldEditor/SB_Level.cpp (revision 2541)
@@ -173,7 +173,7 @@
173173
174174 App->m_pDoc->SelectAllFacesInBrushes();
175175
176- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
176+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
177177
178178 const int NumFaces = Brush_GetNumFaces(Selected_Brush);
179179
@@ -201,7 +201,7 @@
201201
202202 Brush_UpdateChildFaces(Selected_Brush);
203203 Brush_SetFaceListDirty(Selected_Brush);
204- App->m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
204+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
205205 App->m_pDoc->SetModifiedFlag();
206206
207207 return 1;
--- WorldEditor/WorldEditor/SB_Loader.cpp (revision 2540)
+++ WorldEditor/WorldEditor/SB_Loader.cpp (revision 2541)
@@ -969,7 +969,7 @@
969969
970970 Brush_SetName(mActorBrush, "Test");
971971
972- m_pDoc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
972+ App->CLSB_Doc->UpdateAllViews(UAV_ALL3DVIEWS, NULL);
973973 m_pDoc->SetModifiedFlag();
974974
975975 App->Say("Added");
--- WorldEditor/WorldEditor/SB_Ogre.cpp (revision 2540)
+++ WorldEditor/WorldEditor/SB_Ogre.cpp (revision 2541)
@@ -172,8 +172,8 @@
172172 char Copy[1024];
173173
174174 strcpy(Copy, App->WorldEditor_Directory);
175- //App->Cl_Utilities->ReverseBackSlash(Copy);
176- //File = App->Cl_Utilities->Return_Chr;
175+ ReverseBackSlash(Copy);
176+ File = Return_Chr;
177177
178178 Ogre::ResourceGroupManager::getSingleton().createResourceGroup(App_Resource_Group);
179179
@@ -188,6 +188,41 @@
188188 }
189189
190190 // *************************************************************************
191+// * ReverseBackSlash Terry Bernie *
192+// *************************************************************************
193+bool SB_Ogre::ReverseBackSlash(char* buf)
194+{
195+ strcpy(Return_Chr, "");
196+ char bufnew[256];
197+ strcpy(bufnew, "");
198+ char seps[] = "\\";
199+ char* token;
200+ bool tt = 0;
201+
202+ token = strtok(buf, seps);
203+ while (token != NULL)
204+ {
205+ tt = 1;
206+ strcat(bufnew, token);
207+ strcat(bufnew, "/");
208+ token = strtok(NULL, seps);
209+ }
210+
211+ if (tt == 1)
212+ {
213+ int len = strlen(bufnew);
214+ bufnew[len - 1] = 0;
215+ strcpy(Return_Chr, bufnew);
216+ }
217+ else
218+ {
219+ tt = 0;
220+ strcpy(Return_Chr, buf);
221+ }
222+ return 1;
223+}
224+
225+// *************************************************************************
191226 // * Initialise_Resources:- Terry and Hazel Flanigan 2022 *
192227 // *************************************************************************
193228 bool SB_Ogre::Initialise_Resources(void)
--- WorldEditor/WorldEditor/SB_Ogre.h (revision 2540)
+++ WorldEditor/WorldEditor/SB_Ogre.h (revision 2541)
@@ -62,9 +62,11 @@
6262 void GetVersion_OpenGL(char* buff);
6363
6464 bool ExitFullScreen();
65+ bool ReverseBackSlash(char* buf);
6566
6667 bool Block_RenderingQueued;
6768
69+ char Return_Chr[255];
6870
6971 HWND RenderHwnd;
7072
--- WorldEditor/WorldEditor/SB_Properties.cpp (revision 2540)
+++ WorldEditor/WorldEditor/SB_Properties.cpp (revision 2541)
@@ -31,6 +31,8 @@
3131 Properties_hLV = nullptr;
3232
3333 Edit_Category = 3; // Player Enums::FV_Edit_Object;
34+
35+ Current_Selected_Object = 0;
3436 }
3537
3638 SB_Properties::~SB_Properties()
@@ -431,7 +433,7 @@
431433 // *************************************************************************
432434 bool SB_Properties::Edit_Player_Onclick(LPARAM lParam)
433435 {
434- //int Index = App->SBC_Properties->Current_Selected_Object;
436+ int Index = Current_Selected_Object;
435437 int result = 1;
436438 int test;
437439
@@ -758,3 +760,57 @@
758760
759761 return 1;
760762 }
763+
764+// *************************************************************************
765+// * Update_ListView_Objects Terry Bernie *
766+// *************************************************************************
767+bool SB_Properties::Update_ListView_Objects()
768+{
769+ int index = Current_Selected_Object;
770+
771+ char Num[10];
772+ char chr_ID[50];
773+ char IndexNum[10];
774+ _itoa(App->CLSB_Scene->V_Object[index]->This_Object_UniqueID, Num, 10);
775+ _itoa(index, IndexNum, 10);
776+ strcpy(chr_ID, "Unique ID ");
777+ strcat(chr_ID, Num);
778+ strcat(chr_ID, " Object Index ");
779+ strcat(chr_ID, IndexNum);
780+
781+
782+ //SetWindowText(Properties_Dlg_hWnd, chr_ID);
783+ //SetDlgItemText(Properties_Dlg_hWnd, IDC_STOBJECTNAME, (LPCTSTR)App->SBC_Scene->V_Object[index]->Mesh_Name);
784+
785+
786+ const int NUM_ITEMS = 4;
787+ const int NUM_COLS = 2;
788+ std::string grid[NUM_COLS][NUM_ITEMS]; // string table
789+ LV_ITEM pitem;
790+ memset(&pitem, 0, sizeof(LV_ITEM));
791+ pitem.mask = LVIF_TEXT;
792+
793+ grid[0][0] = "Name", grid[1][0] = App->CLSB_Scene->V_Object[index]->Mesh_Name;
794+ grid[0][1] = "Mesh File", grid[1][1] = App->CLSB_Scene->V_Object[index]->Mesh_FileName;
795+ grid[0][2] = "Materials", grid[1][2] = App->CLSB_Scene->V_Object[index]->Material_File;
796+ grid[0][3] = " ", grid[1][3] = " ";
797+
798+ ListView_DeleteAllItems(Properties_hLV);
799+
800+ for (DWORD row = 0; row < NUM_ITEMS; row++)
801+ {
802+ pitem.iItem = row;
803+ pitem.pszText = const_cast<char*>(grid[0][row].c_str());
804+ ListView_InsertItem(Properties_hLV, &pitem);
805+
806+ //ListView_SetItemText
807+
808+ for (DWORD col = 1; col < NUM_COLS; col++)
809+ {
810+ ListView_SetItemText(Properties_hLV, row, col,
811+ const_cast<char*>(grid[col][row].c_str()));
812+ }
813+ }
814+
815+ return 1;
816+}
--- WorldEditor/WorldEditor/SB_Properties.h (revision 2540)
+++ WorldEditor/WorldEditor/SB_Properties.h (revision 2541)
@@ -33,8 +33,10 @@
3333
3434
3535 void Update_ListView_Player();
36+ bool Update_ListView_Objects();
3637
3738 int Edit_Category;
39+ int Current_Selected_Object;
3840
3941 HWND Properties_Dlg_hWnd;
4042
--- WorldEditor/WorldEditor/StdAfx.h (revision 2540)
+++ WorldEditor/WorldEditor/StdAfx.h (revision 2541)
@@ -158,6 +158,30 @@
158158 Type_JustOgre = 5,
159159 Bullet_Type_Volume = 6
160160 };
161+
162+ enum Edit_Type
163+ {
164+ Edit_None = 0,
165+ FV_Edit_Object = 1,
166+ Edit_Physics_Object = 2,
167+ Edit_Player = 3,
168+ Edit_Message = 4,
169+ Edit_Move_Entity = 5,
170+ Edit_Sounds = 6,
171+ Edit_Collectable = 7,
172+ Edit_Teleport = 8,
173+ Edit_Environment = 9,
174+ Edit_Area_Change = 10,
175+ Edit_Change_Level = 11,
176+ Edit_Particles = 12,
177+ Edit_Camera = 13,
178+ Edit_Area = 14,
179+ FV_Edit_Level = 15,
180+ Edit_Counters = 16,
181+ Edit_Environs = 17,
182+ Edit_Lights = 18,
183+ Edit_UserObjects = 19
184+ };
161185 }
162186 // re-enable warnings except 4514
163187 #pragma warning(default : 4201 4214 4115)
Show on old repository browser