mirror of
https://github.com/jmarshall23/CnC_Remastered_Collection.git
synced 2026-08-18 09:04:12 +02:00
Imgui integration began switching dialogs over to new system, work in progress!
This commit is contained in:
Justin Marshall
@@ -1135,6 +1135,7 @@ void On_Achievement_Event(const HouseClass* player_ptr, const char *achievement_
|
||||
|
||||
extern const int NUM_EDIT_MISSIONS;
|
||||
|
||||
extern void (*Imgui_Dialog_Function)(void);
|
||||
|
||||
|
||||
#endif
|
||||
@@ -42,6 +42,7 @@
|
||||
* MapEditClass::Size_Map -- lets user set size & location of map *
|
||||
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
|
||||
|
||||
#include "imgui.h"
|
||||
#include "function.h"
|
||||
|
||||
#ifdef SCENARIO_EDITOR
|
||||
@@ -390,6 +391,142 @@ int MapEditClass::Save_Scenario(void)
|
||||
return(0);
|
||||
}
|
||||
|
||||
void Imgui_PickScenerio_Dialog(void) {
|
||||
/*
|
||||
** Dialog & button dimensions
|
||||
*/
|
||||
enum {
|
||||
D_DIALOG_W = 200, // dialog width
|
||||
D_DIALOG_H = 290, // dialog height
|
||||
D_DIALOG_X = ((320 - D_DIALOG_W) / 2), // centered x-coord
|
||||
D_DIALOG_Y = 45, // centered y-coord
|
||||
D_DIALOG_CX = D_DIALOG_X + (D_DIALOG_W / 2), // coord of x-center
|
||||
|
||||
D_TXT8_H = 11, // ht of 8-pt text
|
||||
D_MARGIN = 7, // margin width/height
|
||||
|
||||
D_SCEN_W = 45, // Scenario # width
|
||||
D_SCEN_H = 9, // Scenario # height
|
||||
D_SCEN_X = D_DIALOG_CX + 5, // Scenario # x
|
||||
D_SCEN_Y = D_DIALOG_Y + D_MARGIN + D_TXT8_H + D_MARGIN, // Scenario # y
|
||||
|
||||
D_VARA_W = 13, // Version A width
|
||||
D_VARA_H = 9, // Version A height
|
||||
D_VARA_X = D_DIALOG_CX - (D_VARA_W * 5) / 2, // Version A x
|
||||
D_VARA_Y = D_SCEN_Y + D_SCEN_H + D_MARGIN, // Version A y
|
||||
|
||||
D_VARB_W = 13, // Version B width
|
||||
D_VARB_H = 9, // Version B height
|
||||
D_VARB_X = D_VARA_X + D_VARA_W, // Version B x
|
||||
D_VARB_Y = D_SCEN_Y + D_SCEN_H + D_MARGIN, // Version B y
|
||||
|
||||
D_VARC_W = 13, // Version C width
|
||||
D_VARC_H = 9, // Version C height
|
||||
D_VARC_X = D_VARB_X + D_VARB_W, // Version C x
|
||||
D_VARC_Y = D_SCEN_Y + D_SCEN_H + D_MARGIN, // Version C y
|
||||
|
||||
D_VARD_W = 13, // Version D width
|
||||
D_VARD_H = 9, // Version D height
|
||||
D_VARD_X = D_VARC_X + D_VARC_W, // Version D x
|
||||
D_VARD_Y = D_SCEN_Y + D_SCEN_H + D_MARGIN, // Version D y
|
||||
|
||||
D_VARLOSE_W = 13, // Version Lose width
|
||||
D_VARLOSE_H = 9, // Version Lose height
|
||||
D_VARLOSE_X = D_VARD_X + D_VARD_W, // Version Lose x
|
||||
D_VARLOSE_Y = D_SCEN_Y + D_SCEN_H + D_MARGIN, // Version Lose y
|
||||
|
||||
D_EAST_W = 50, // EAST width
|
||||
D_EAST_H = 9, // EAST height
|
||||
D_EAST_X = D_DIALOG_CX - D_EAST_W - 5, // EAST x
|
||||
D_EAST_Y = D_VARLOSE_Y + D_VARLOSE_H + D_MARGIN,// EAST y
|
||||
|
||||
D_WEST_W = 50, // WEST width
|
||||
D_WEST_H = 9, // WEST height
|
||||
D_WEST_X = D_DIALOG_CX + 5, // WEST x
|
||||
D_WEST_Y = D_VARLOSE_Y + D_VARLOSE_H + D_MARGIN,// EAST y
|
||||
|
||||
D_GDI_W = 90, // GDI width
|
||||
D_GDI_H = 9, // GDI height
|
||||
D_GDI_X = D_DIALOG_CX - (D_GDI_W / 2), // GDI x
|
||||
D_GDI_Y = D_EAST_Y + D_EAST_H + D_MARGIN, // GDI y
|
||||
|
||||
D_NOD_W = 90, // NOD width
|
||||
D_NOD_H = 9, // NOD height
|
||||
D_NOD_X = D_DIALOG_CX - (D_NOD_W / 2), // NOD x
|
||||
D_NOD_Y = D_GDI_Y + D_GDI_H, // NOD y
|
||||
|
||||
D_NEU_W = 90, // Neutral width
|
||||
D_NEU_H = 9, // Neutral height
|
||||
D_NEU_X = D_DIALOG_CX - (D_NOD_W / 2), // Neutral x
|
||||
D_NEU_Y = D_NOD_Y + D_NOD_H, // Neutral y
|
||||
|
||||
D_MPLAYER_W = 90, // Multi-Player width
|
||||
D_MPLAYER_H = 9, // Multi-Player height
|
||||
D_MPLAYER_X = D_DIALOG_CX - (D_MPLAYER_W / 2), // Multi-Player x
|
||||
D_MPLAYER_Y = D_NEU_Y + D_NEU_H, // Multi-Player y
|
||||
|
||||
D_OK_W = 45, // OK width
|
||||
D_OK_H = 9, // OK height
|
||||
D_OK_X = D_DIALOG_CX - D_OK_W - 5, // OK x
|
||||
D_OK_Y = D_DIALOG_Y + D_DIALOG_H - D_OK_H - (D_MARGIN + 15), // OK y
|
||||
|
||||
D_CANCEL_W = 45, // Cancel width
|
||||
D_CANCEL_H = 9, // Cancel height
|
||||
D_CANCEL_X = D_DIALOG_CX + 5, // Cancel x
|
||||
D_CANCEL_Y = D_DIALOG_Y + D_DIALOG_H - D_CANCEL_H - (D_MARGIN + 15), // Cancel y
|
||||
|
||||
};
|
||||
|
||||
bool toolActive = false;
|
||||
|
||||
ImGuiStyle& style = ImGui::GetStyle();
|
||||
style.FramePadding = ImVec2(0, 0);
|
||||
ImGui::SetNextWindowSize(ImVec2(D_DIALOG_W, D_DIALOG_H));
|
||||
ImGui::SetNextWindowPos(ImVec2(D_DIALOG_X * 2, D_DIALOG_Y));
|
||||
ImGui::Begin("New Scenario", &toolActive, ImGuiWindowFlags_AlwaysAutoResize);
|
||||
ImGui::Text("Scenario");
|
||||
|
||||
static char scenerioId[512];
|
||||
ImGui::InputText("Scenario", &scenerioId[0], sizeof(scenerioId));
|
||||
|
||||
//ImGui::Text("Version");
|
||||
//
|
||||
//static char verionsId[512];
|
||||
//ImGui::SameLine();
|
||||
//ImGui::InputText("Version", &verionsId[0], sizeof(verionsId));
|
||||
ImGui::Text("Version");
|
||||
{
|
||||
ImGui::Button("A");
|
||||
ImGui::SameLine();
|
||||
ImGui::Button("B");
|
||||
ImGui::SameLine();
|
||||
ImGui::Button("C");
|
||||
ImGui::SameLine();
|
||||
ImGui::Button("D");
|
||||
}
|
||||
|
||||
ImGui::Text("Side");
|
||||
{
|
||||
ImGui::Button("East");
|
||||
ImGui::SameLine();
|
||||
ImGui::Button("West");
|
||||
}
|
||||
|
||||
ImGui::Text("Faction");
|
||||
ImGui::Button("North (Spain)");
|
||||
ImGui::Button("South(Greece)");
|
||||
ImGui::Button("USSR");
|
||||
ImGui::Button("Multiplayer");
|
||||
ImGui::NewLine();
|
||||
|
||||
{
|
||||
ImGui::Button("Ok");
|
||||
ImGui::SameLine();
|
||||
ImGui::Button("Cancel");
|
||||
}
|
||||
|
||||
ImGui::End();
|
||||
}
|
||||
|
||||
/***************************************************************************
|
||||
* MapEditClass::Pick_Scenario -- dialog for choosing scenario *
|
||||
@@ -434,6 +571,7 @@ int MapEditClass::Save_Scenario(void)
|
||||
*=========================================================================*/
|
||||
int MapEditClass::Pick_Scenario(char const * caption, int & scen_nump, ScenarioPlayerType & playerp, ScenarioDirType & dirp, ScenarioVarType & varp)
|
||||
{
|
||||
Imgui_Dialog_Function = Imgui_PickScenerio_Dialog;
|
||||
/*
|
||||
** Dialog & button dimensions
|
||||
*/
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<ConformanceMode>false</ConformanceMode>
|
||||
<AdditionalIncludeDirectories>../external/dxsdk/Include;../external/ffmpeg-win32/include;../external/sdl2/include;./win32lib;../external/openal/include</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>../external/imgui;../external/dxsdk/Include;../external/ffmpeg-win32/include;../external/sdl2/include;./win32lib;../external/openal/include</AdditionalIncludeDirectories>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
<PreprocessorDefinitions>CHEAT_KEYS;SCENARIO_EDITOR;WINDOWS_IGNORE_PACKING_MISMATCH;TRUE_FALSE_DEFINED;ENGLISH;WIN32;NDEBUG;_WINDOWS;_USRDLL;REDALERT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
@@ -121,7 +121,7 @@
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<ConformanceMode>false</ConformanceMode>
|
||||
<AdditionalIncludeDirectories>../external/dxsdk/Include;../external/ffmpeg-win32/include;../external/sdl2/include;./win32lib;../external/openal/include</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>../external/imgui;../external/dxsdk/Include;../external/ffmpeg-win32/include;../external/sdl2/include;./win32lib;../external/openal/include</AdditionalIncludeDirectories>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
@@ -171,6 +171,11 @@
|
||||
<ClCompile Include="..\ddraw\ddrawwrapper\DirectDrawPaletteWrapper.cpp" />
|
||||
<ClCompile Include="..\ddraw\ddrawwrapper\DirectDrawSurfaceWrapper.cpp" />
|
||||
<ClCompile Include="..\ddraw\ddrawwrapper\DirectDrawWrapper.cpp" />
|
||||
<ClCompile Include="..\external\imgui\examples\imgui_impl_dx9.cpp" />
|
||||
<ClCompile Include="..\external\imgui\examples\imgui_impl_win32.cpp" />
|
||||
<ClCompile Include="..\external\imgui\imgui.cpp" />
|
||||
<ClCompile Include="..\external\imgui\imgui_draw.cpp" />
|
||||
<ClCompile Include="..\external\imgui\imgui_widgets.cpp" />
|
||||
<ClCompile Include="..\external\libsmacker\smacker.c" />
|
||||
<ClCompile Include="..\external\libsmacker\smk_bitstream.c" />
|
||||
<ClCompile Include="..\external\libsmacker\smk_hufftree.c" />
|
||||
@@ -482,6 +487,14 @@
|
||||
<ClInclude Include="..\ddraw\ddrawwrapper\ddraw.h" />
|
||||
<ClInclude Include="..\ddraw\ddrawwrapper\DirectDrawWrapper.h" />
|
||||
<ClInclude Include="..\ddraw\ddrawwrapper\resource.h" />
|
||||
<ClInclude Include="..\external\imgui\examples\imgui_impl_dx9.h" />
|
||||
<ClInclude Include="..\external\imgui\examples\imgui_impl_win32.h" />
|
||||
<ClInclude Include="..\external\imgui\imconfig.h" />
|
||||
<ClInclude Include="..\external\imgui\imgui.h" />
|
||||
<ClInclude Include="..\external\imgui\imgui_internal.h" />
|
||||
<ClInclude Include="..\external\imgui\imstb_rectpack.h" />
|
||||
<ClInclude Include="..\external\imgui\imstb_textedit.h" />
|
||||
<ClInclude Include="..\external\imgui\imstb_truetype.h" />
|
||||
<ClInclude Include="..\external\libsmacker\smacker.h" />
|
||||
<ClInclude Include="..\external\libsmacker\smk_bitstream.h" />
|
||||
<ClInclude Include="..\external\libsmacker\smk_hufftree.h" />
|
||||
|
||||
@@ -28,6 +28,9 @@
|
||||
<Filter Include="Source Files\libsmacker">
|
||||
<UniqueIdentifier>{70d28e5f-2ea4-4579-b2b9-b07f5a3b816c}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\imgui">
|
||||
<UniqueIdentifier>{df491552-a4a6-4df3-8a5b-78944d7db696}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="AADATA.CPP">
|
||||
@@ -945,6 +948,21 @@
|
||||
<ClCompile Include="WIN32LIB\MouseShape.cpp">
|
||||
<Filter>Source Files\win32lib</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\external\imgui\examples\imgui_impl_dx9.cpp">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\external\imgui\examples\imgui_impl_win32.cpp">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\external\imgui\imgui.cpp">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\external\imgui\imgui_draw.cpp">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\external\imgui\imgui_widgets.cpp">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="ABSTRACT.H">
|
||||
@@ -1844,6 +1862,30 @@
|
||||
<ClInclude Include="WIN32LIB\MouseShape.h">
|
||||
<Filter>Source Files\win32lib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\external\imgui\examples\imgui_impl_dx9.h">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\external\imgui\examples\imgui_impl_win32.h">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\external\imgui\imconfig.h">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\external\imgui\imgui.h">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\external\imgui\imgui_internal.h">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\external\imgui\imstb_rectpack.h">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\external\imgui\imstb_textedit.h">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\external\imgui\imstb_truetype.h">
|
||||
<Filter>Source Files\imgui</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="COORDA.ASM">
|
||||
|
||||
@@ -34,6 +34,17 @@
|
||||
* main -- Initial startup routine (preps library systems). *
|
||||
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
|
||||
|
||||
|
||||
// jmarshall - imgui
|
||||
#include "imgui.h"
|
||||
#include "examples/imgui_impl_win32.h"
|
||||
#include "examples/imgui_impl_dx9.h"
|
||||
|
||||
#include <d3d9.h>
|
||||
extern LPDIRECT3DDEVICE9 globald3d9Device;
|
||||
// jmarshall end
|
||||
|
||||
|
||||
#include "function.h"
|
||||
#include <conio.h>
|
||||
#include <io.h>
|
||||
@@ -551,6 +562,23 @@ int PASCAL WinMain ( HINSTANCE instance , HINSTANCE , char * command_line , int
|
||||
video_success = TRUE;
|
||||
}
|
||||
}
|
||||
// jmarshall
|
||||
IMGUI_CHECKVERSION();
|
||||
ImGui::CreateContext();
|
||||
ImGuiIO& io = ImGui::GetIO(); (void)io;
|
||||
//io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls
|
||||
//io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; // Enable Gamepad Controls
|
||||
|
||||
// Setup Dear ImGui style
|
||||
ImGui::StyleColorsDark();
|
||||
//ImGui::StyleColorsClassic();
|
||||
|
||||
// Setup Platform/Renderer bindings
|
||||
ImGui_ImplWin32_Init(MainWindow);
|
||||
ImGui_ImplDX9_Init(globald3d9Device);
|
||||
|
||||
io.Fonts->AddFontFromFileTTF("code/fonts/Roboto-Medium.ttf", 16.0f);
|
||||
// jmarshall end
|
||||
|
||||
if (!video_success) {
|
||||
MessageBox(MainWindow, TEXT_VIDEO_ERROR, TEXT_SHORT_TITLE, MB_ICONEXCLAMATION|MB_OK);
|
||||
|
||||
Reference in New Issue
Block a user