Merge branch 'develop'

.github/workflows/build-debug.yml

@@ -70,7 +70,7 @@ jobs:
           webhook-url: ${{ secrets.WEBHOOK_URL }}
           username: "GitHub Workflow"
           avatar-url: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png"
-          embed-author-icon-url: "https://raw.githubusercontent.com/xoxor4d/xoxor4d.github.io/master/assets/img/iw3xradiant.png"
+          embed-author-icon-url: "https://raw.githubusercontent.com/xoxor4d/xoxor4d.github.io/master/assets/img/iw3xo-radiant.png"
           embed-author-name: "iw3xo-radiant"
           embed-author-url: "https://github.com/xoxor4d/iw3xo-radiant"
           embed-title: "Successful build (debug)"

.github/workflows/build-release.yml

@@ -70,7 +70,7 @@ jobs:
           webhook-url: ${{ secrets.WEBHOOK_URL }}
           username: "GitHub Workflow"
           avatar-url: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png"
-          embed-author-icon-url: "https://raw.githubusercontent.com/xoxor4d/xoxor4d.github.io/master/assets/img/iw3xradiant.png"
+          embed-author-icon-url: "https://raw.githubusercontent.com/xoxor4d/xoxor4d.github.io/master/assets/img/iw3xo-radiant.png"
           embed-author-name: "iw3xo-radiant"
           embed-author-url: "https://github.com/xoxor4d/iw3xo-radiant"
           embed-title: "Successful build (release)"

README.md

@@ -18,16 +18,24 @@ Running IW3xRadiant and IW3xo enables a live-link between CoD4 and Radiant. You
 
 <br>
 
+### Project Page (Guide / In-Depth)
+https://xoxor4d.github.io/projects/iw3xo-radiant
+
+<br>
+
 ### nightly builds - develop branch
 ( download and install the [latest release](https://github.com/xoxor4d/iw3xo-radiant/releases) before using nightly's )
 
 [![build-develop](https://img.shields.io/github/workflow/status/xoxor4d/iw3xo-radiant/Build-Debug/develop?logo=github&label=nightly-develop)](https://nightly.link/xoxor4d/iw3xo-radiant/workflows/build-debug/develop/Debug%20binaries.zip)&ensp;
 [![build-release](https://img.shields.io/github/workflow/status/xoxor4d/iw3xo-radiant/Build-Release/develop?logo=github&label=nightly-release)](https://nightly.link/xoxor4d/iw3xo-radiant/workflows/build-release/develop/Release%20binaries.zip)&ensp;
 
+
+
 <br>
 
-### Project Page (Guide / In-Depth)
-https://xoxor4d.github.io/projects/iw3xo-radiant
+If you want to buy me a coffee:
+
+[![ko-fi](https://xoxor4d.github.io/assets/img/social/kofi.png)](https://ko-fi.com/xoxor4d)
 
 </div>
 
@@ -54,30 +62,43 @@ ___
 - extend functionalities across the board
 
 ### New features not found within the original cod4 radiant:
-- play, edit and export effects as createFx files right from within radiant (makes effectsEd _almost_ obsolete)
-- switch / scale / place the individual windows however you want
-- preview xmodels and drag them directly into the scene using the model previewer
-- custom lighting shader with normal-mapping, specular highlights, reflections and fog
-- ability to limit shadow drawing distance when using stock sunpreview (++FPS)
-- filmtweak support
-- render actual water instead of case-textures 
-- guizmo to manipulate entities and brushes from within the camera window
-- live link (sync. brushes (with collision), camera and worldspawn settings between cod4 and radiant)
-- high poly xmodel's no longer crash radiant
-- realtime viewports
-- better surface / property editor
-- context aware grid and camera context menus with QoL features
-- better vertex edit dialog
-- zoom to cursor
-- editable toolbars, hotkeys, colors (all saved)
-- new file dialogs with working default paths
-- texture window toolbar for quick filtering
-- rope/wire generator
-- sun direction visualizer
-- a proper console with dvar support (incl. dvar suggestions and autocomplete)
-- print parsed entity and brush num on map load making it easier to find issues in map files (off by default) 
-- increased undo limit
-- alot of QOL features
+ + completely revamped user interface with docking, tabs, saved layouts and more (Dear ImGui)
++ [play](https://xoxor4d.github.io/tutorials/iw3xradiant-using-effects/) && [edit / create](https://xoxor4d.github.io/tutorials/iw3xradiant-effects-editor/) && [export effects as CreateFX](https://xoxor4d.github.io/tutorials/iw3xradiant-createfx/) files right from within radiant (__makes effectsEd completely obsolete__)
++ [d3dbsp loading](https://xoxor4d.github.io/tutorials/iw3xradiant-d3dbsp/) and bsp/light compilation from within radiant
++ [automatically generate reflections](https://xoxor4d.github.io/tutorials/iw3xradiant-d3dbsp-reflections/) within radiant when compiling the maps bsp
++ [live link](https://xoxor4d.github.io/tutorials/iw3xradiant-livelink/) (sync. brushes (with collision), camera and worldspawn settings between cod4 and radiant)   
++ 3D guizmo to precisely manipulate entities and brushes from the camera window (ImGuizmo)
++ preview xmodels and drag them directly into the scene using the model browser
++ a prefab browser with the ability to generate thumbnails (no more guess work + prefabs can be dragged into the scene)
++ custom lighting shader with normal-mapping, specular highlights, reflections and fog
++ ability to limit shadow drawing distance when using stock sunpreview (++FPS)
++ filmtweak support
++ render actual water instead of case-textures
++ increased asset limits to allow high poly models
++ realtime viewports
++ context aware grid and camera context menus with QoL features
++ a toolbox featuring all related functions for brushes/patches and more
++ better surface / property editor (can be integrated into the ^ toolbox)
++ better vertex edit dialog
++ better layer dialog
++ zoom to cursor
++ toast notifications
++ editable toolbars, hotkeys, colors
++ new file dialogs with working default paths
++ texture window toolbar for quick filtering
++ custom texture favourite lists that can be created from within radiant (add/remove selected texture to/from the list)
++ rope/wire generator
++ sun direction visualizer
++ a proper console with dvar support (incl. dvar suggestions and autocomplete)
++ increased undo limit
++ missing materials are now using a proper invalid_texture material and are no longer invisible
++ print parsed entity and brush num on map load making it easier to find issues in map files (off by default)
++ bo3 tool textures (optional)
++ [stamp prefabs](https://xoxor4d.github.io/tutorials/iw3xradiant-prefab/) 
++ [create prefab from selection](https://xoxor4d.github.io/tutorials/iw3xradiant-prefab/) 
++ terrain patch thickening
++ [extrude selected brush to other brush faces](https://xoxor4d.github.io/tutorials/iw3xradiant-brush-face-extending/) 
++ ++ alot more QoL features
 
 <br>
 
@@ -156,7 +177,9 @@ https://discord.gg/t5jRGbj
 - [nlohmann - fifo_map](https://github.com/nlohmann/fifo_map)
 - [David Gallardo - imgui_color_gradient](https://gist.github.com/galloscript/8a5d179e432e062550972afcd1ecf112)
 - [nem0 - ImGui CurveEditor](https://github.com/nem0/LumixEngine/blob/39e46c18a58111cc3c8c10a4d5ebbb614f19b1b8/external/imgui/imgui_user.inl#L505-L930)
+- [Limeoats - L2DFileDialog](https://github.com/Limeoats/L2DFileDialog/)
 - [zfedoran - ImGui Spinner](https://github.com/ocornut/imgui/issues/1901)
+- [patrickcjk - imgui-notify](https://github.com/patrickcjk/imgui-notify)
 - [maluoi - tga writer](https://gist.github.com/maluoi/ade07688e741ab188841223b8ffeed22)
 - [Infinity Ward - OG. Radiant and Effects Framework](https://www.infinityward.com)
 - [id-Software - OG. Radiant](https://github.com/id-Software/Quake-III-Arena/tree/master/q3radiant)

assets/bin/iw3r_hotkeys.ini → assets/bin/IW3xRadiant/hotkeys.ini

@@ -92,7 +92,7 @@ ToggleView                 = +shift +ctrl V
 DropVertices               = +shift +alt +ctrl D
 RotateZ                    = +shift D
 ToggleZ                    = 
-SameTargetname             = B
+SameTargetname             = 
 SameTarget                 = +ctrl B
 ConnectSelection           = W
 SetViewToEntity            = F6
@@ -207,4 +207,5 @@ toggle_filter_geo          =
 toggle_filter_ents         = 
 toggle_filter_trigger      = 
 toggle_filter_others       = 
-toggle_filter_all          = 
+toggle_filter_all          = 
+prefab_browser             = B

src/common/afx.hpp

@@ -1493,6 +1493,65 @@ struct CSurfaceDlg : CDialog
 };
 
 
+// actually HTREEITEM (from around 2005?)
+struct clayer_s
+{
+	clayer_s* parent_layer;
+	clayer_s* sibling_layer_same_level;
+	clayer_s* child_layers;
+	char pad_0x000C[4];
+	const WCHAR* layer_string;
+	char pad_0x0014[4];
+	int buf_len;
+	int8_t N0000012C;
+	int8_t enabled;
+	char pad_0x001E[30];
+};
+
+/* ---- only version i could find
+struct _TREEITEM
+ {
+   HTREEITEM parent;       
+   HTREEITEM nextSibling;   
+   HTREEITEM firstChild; 
+   UINT      callbackMask;
+   UINT      state;
+   UINT      stateMask;
+   LPWSTR    pszText;
+   int       cchTextMax;
+   int       iImage;
+   int       iSelectedImage;
+   int       iExpandedImage;
+   int       cChildren;
+   LPARAM    lParam;
+   int       iIntegral; 
+   int       iLevel;    
+   HTREEITEM lastChild;
+   HTREEITEM prevSibling;
+   RECT      rect;
+   LONG      linesOffset;
+   LONG      stateOffset;
+   LONG      imageOffset;
+   LONG      textOffset;
+   LONG      textWidth;
+ }; */
+
+struct CTreeCtrl : CWnd
+{
+};
+
+struct CLayerDlg : CWnd
+{
+	char pad_0x0054[32];
+	CTreeCtrl tree;
+	char pad_0x007A[20];
+	clayer_s* root_node_the_map;
+	clayer_s* active_layer;
+	char pad_0x00E4[112];
+}; STATIC_ASSERT_OFFSET(CLayerDlg, root_node_the_map, 0xDC);
+
+
+
 struct CNoTrackObject;
 
 struct /*VFT*/ CNoTrackObject_vtbl

src/common/camwnd.cpp

@@ -381,17 +381,24 @@ void ccamwnd::register_dvars()
 		/* flags	*/ game::dvar_flags::saved,
 		/* desc		*/ "Guizmo: Enable grid-snapping");
 
-	dvars::guizmo_brush_mode = dvars::register_bool(
-		/* name		*/ "guizmo_brush_mode",
-		/* default	*/ true,
-		/* flags	*/ game::dvar_flags::saved,
-		/* desc		*/ "Guizmo: Enable brush mode");
+	//dvars::guizmo_brush_mode = dvars::register_bool(
+	//	/* name		*/ "guizmo_brush_mode",
+	//	/* default	*/ true,
+	//	/* flags	*/ game::dvar_flags::saved,
+	//	/* desc		*/ "Guizmo: Enable brush mode");
 
 	dvars::gui_camera_toolbar_defaultopen = dvars::register_bool(
 		/* name		*/ "gui_camera_toolbar_defaultopen",
 		/* default	*/ false,
 		/* flags	*/ game::dvar_flags::saved,
 		/* desc		*/ "Open the camera toolbar by default");
+
+
+	dvars::gui_toolbox_integrate_cam_toolbar = dvars::register_bool(
+		/* name		*/ "gui_toolbox_integrate_cam_toolbar",
+		/* default	*/ false,
+		/* flags	*/ game::dvar_flags::saved,
+		/* desc		*/ "integrate camera window toolbar into toolbox");
 }
 
 void ccamwnd::hooks()