IceStudio: XY Window tabs are now on top, and the XY Window tab now d…

…isplays the map name, the editor window title no longer displays the map name.
jmarshall23 · Apr 4, 2020 · a035832 · a035832
1 parent 8e9368f
commit a035832
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 73 deletions.
diff --git a/code/framework/Licensee.h b/code/framework/Licensee.h
@@ -92,7 +92,7 @@ If you have questions concerning this license or the applicable additional terms
 // editor info
 #define EDITOR_DEFAULT_PROJECT			"doom.qe4"
 #define EDITOR_REGISTRY_KEY				"DOOMRadiant"
-#define EDITOR_WINDOWTEXT				"iceStudio"
+#define EDITOR_WINDOWTEXT				"iceStudio64"
 
 // win32 info
 #define WIN32_CONSOLE_CLASS				"DOOM 3 WinConsole"

diff --git a/code/tools/radiant.net/Editor.cs b/code/tools/radiant.net/Editor.cs
@@ -47,6 +47,12 @@ public static void InitRadiant(IntPtr ParentWindow)
             //   inspectorDialog.Show(nativeWindow);
         }
 
+        [DllExport(CallingConvention = CallingConvention.Cdecl)]
+        public unsafe static void SetMapName(string mapName)
+        {
+            xyWndDialog.SetMapName(mapName);
+        }
+
         [DllExport(CallingConvention = CallingConvention.Cdecl)]
         public unsafe static IntPtr GetTexWndHandle()
         {

diff --git a/code/tools/radiant.net/Forms/XYWndDialog.Designer.cs b/code/tools/radiant.net/Forms/XYWndDialog.Designer.cs
diff --git a/code/tools/radiant.net/Forms/XYWndDialog.cs b/code/tools/radiant.net/Forms/XYWndDialog.cs
@@ -119,5 +119,15 @@ public IntPtr GetTexWndHWND()
         {
             return texWndPanel.Handle;
         }
+
+        private void fileToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        public void SetMapName(string mapName)
+        {
+            xyWndTab.Text = "World Edit: " + mapName;
+        }
     }
 }
diff --git a/code/tools/radiant.net/Forms/XYWndDialog.resx b/code/tools/radiant.net/Forms/XYWndDialog.resx
@@ -120,4 +120,7 @@
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
diff --git a/code/tools/radiant.net/Radiant.Net.csproj b/code/tools/radiant.net/Radiant.Net.csproj
@@ -42,13 +42,14 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
+    <OutputPath>..\..\..\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/code/tools/radiant.net/obj/Release/Radiant.Net.csprojAssemblyReference.cache b/code/tools/radiant.net/obj/Release/Radiant.Net.csprojAssemblyReference.cache
diff --git a/code/tools/radiant/QE3.H b/code/tools/radiant/QE3.H
@@ -80,6 +80,8 @@ const float	HUGE_DISTANCE = 100000;
 struct RadiantNetInterface_t {
 	void(__cdecl *InitRadiant)(void *hwnd);
 	void(__cdecl *ShowEntitySelection)(const char *list);
+	void(__cdecl* SetMapName)(const char* list);
+
 	void(__cdecl *ToggleProgressDialog)(bool showDialog, const char *mapName, const char * workString, float completedPercent);
 	bool(__cdecl *ProgressBarUserCancaled)(void);
 	void(__cdecl *RedrawCameraWindow)();
@@ -90,6 +92,8 @@ struct RadiantNetInterface_t {
 	HWND(__cdecl *GetXYDialogHandle)();
 
 	HDC(__cdecl *GetTexWndHandle)();
+
+
 };
 
 extern RadiantNetInterface_t radiantNetInterface;

diff --git a/code/tools/radiant/Radiant.cpp b/code/tools/radiant/Radiant.cpp
@@ -347,6 +347,7 @@ void RadiantDotNetInit(void) {
 	radiantNetInterface.GetXYDialogHandle = (HWND(__cdecl *)(void))sys->DLL_GetProcAddress(g_radiant_net_dll, "GetXYDialogHandle");
 
 	radiantNetInterface.GetTexWndHandle = (HDC(__cdecl *)(void))sys->DLL_GetProcAddress(g_radiant_net_dll, "GetTexWndHandle");
+	radiantNetInterface.SetMapName = (void(__cdecl*)(const char *))sys->DLL_GetProcAddress(g_radiant_net_dll, "SetMapName");
 
 	HWND hwnd = g_pParentWnd->GetSafeHwnd();
 	radiantNetInterface.InitRadiant((void *)hwnd);

diff --git a/code/tools/radiant/WIN_QE3.CPP b/code/tools/radiant/WIN_QE3.CPP
@@ -61,7 +61,16 @@ void Sys_MarkMapModified(void) {
  =======================================================================================================================
  */
 void Sys_SetTitle(const char *text) {
-	g_pParentWnd->SetWindowText(va("%s: %s", EDITOR_WINDOWTEXT, text));
+	idStr mapName = text;
+
+	g_pParentWnd->SetWindowText(EDITOR_WINDOWTEXT);	
+
+	if(mapName == "unnamed.map") {
+		radiantNetInterface.SetMapName("unnamed.map");
+	}
+	else {
+		radiantNetInterface.SetMapName(fileSystem->OSPathToRelativePath(text));
+	}
 }
 
 /*

diff --git a/radiant.net.dll b/radiant.net.dll