CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added insert items dialog function

Browse Source
This commit is contained in:
FlareMicrosystems
2022-10-01 11:25:07 -07:00
parent 550962f1e6
commit e50d2674ff
5 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dialogs.rc
View File

@@ -4,8 +4,7 @@
#include <windows.h> #include <windows.h>
#include <commctrl.h> #include <commctrl.h>
#include <richedit.h> #include "resource.h"
#include "resource.h" //Should not have to do this...
@@ -35,9 +34,8 @@ FONT 8, "Ms Shell Dlg"
} }
// //
// Icon resources // Icon resources
// //
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
IDI_ICON1 ICON "FatB3dIcon.ico" IDI_ICON1 ICON "FatB3dIcon.ico"

19
resource.h
View File

@@ -1,10 +1,9 @@
//{{NO_DEPENDENCIES}} #ifndef IDC_STATIC
// Microsoft Visual C++ generated include file. #define IDC_STATIC (-1)
// Used by dialogs.rc #endif
//
#define IDI_ICON1 101 #define IDI_ICON1 101
#define IDB_BITMAP1 102 #define IDB_BITMAP1 102
#define IDD_DIALOG1 103 #define IDD_DIALOG1 103
#define IDC_EDIT1 1001 #define IDD_DIALOG2 104
#define IDC_PROPERTYGRID 2000 #define IDC_EDIT1 1001

17
src/source/Application.cpp
View File

@@ -673,17 +673,18 @@ void Application::onGraphics(RenderDevice* rd) {
renderDevice->setShininess(70); //renderDevice->setShininess(70);
renderDevice->setSpecularCoefficient(Color3(0.1F, 0.1F, 0.1F)); //renderDevice->setSpecularCoefficient(Color3(0.1F, 0.1F, 0.1F));
//float lightAmbient[] = { 0.5F, 0.6F, 0.9F, 1.0F }; float lightAmbient[] = { 0.5F, 0.6F, 0.9F, 1.0F };
//float lightDiffuse[] = { 0.6F, 0.4F, 0.9F, 1.0F }; float lightDiffuse[] = { 0.6F, 0.4F, 0.9F, 1.0F };
float lightSpecular[] = { 0.8F, 0.8F, 0.8F, 1.0F };
//float lightSpecular[] = { 0.8F, 0.6F, 1.0F, 1.0F }; //float lightSpecular[] = { 0.8F, 0.6F, 1.0F, 1.0F };
//glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, lightAmbient); glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, lightAmbient);
//glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, lightDiffuse); glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, lightDiffuse);
//glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, lightSpecular); glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, lightSpecular);
//glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 70); glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 70);
rd->beforePrimitive(); rd->beforePrimitive();

2
src/source/DataModelV2/GuiRootInstance.cpp
View File

@@ -184,6 +184,8 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0)
button->fontLocationRelativeTo = Vector2(10, 0); button->fontLocationRelativeTo = Vector2(10, 0);
button->setAllColorsSame(); button->setAllColorsSame();
button->boxColorOvr = Color4(0.6F,0.6F,0.6F,0.4F); button->boxColorOvr = Color4(0.6F,0.6F,0.6F,0.4F);
button->setName("insert");
button->setButtonListener(menuListener);
button = makeTextButton(); button = makeTextButton();
button->boxBegin = Vector2(500, 0); button->boxBegin = Vector2(500, 0);

36
src/source/Listener/MenuButtonListener.cpp
View File

@@ -2,6 +2,33 @@
#include "DataModelV2/ToggleImageButtonInstance.h" #include "DataModelV2/ToggleImageButtonInstance.h"
#include "Application.h" #include "Application.h"
#include "Globals.h" #include "Globals.h"
#include "../../resource.h"
INT_PTR CALLBACK InsertDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{
switch(Message)
{
case WM_INITDIALOG:
return TRUE;
break;
case WM_COMMAND:
switch(LOWORD(wParam))
{
case IDOK:
//g_dataModel->setMessage("lol u thought");
EndDialog(hwnd, IDOK);
break;
case IDCANCEL:
EndDialog(hwnd, IDCANCEL);
break;
}
break;
default:
return FALSE;
}
return TRUE;
}
void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button) void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button)
{ {
if(button->name == "go") if(button->name == "go")
@@ -20,4 +47,11 @@ void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button)
GetCursorPos(&p); GetCursorPos(&p);
TrackPopupMenu(mainmenu, TPM_LEFTBUTTON, p.x, p.y, 0, Globals::mainHwnd, 0); TrackPopupMenu(mainmenu, TPM_LEFTBUTTON, p.x, p.y, 0, Globals::mainHwnd, 0);
} }
} else if(button->name == "insert")
{
//HWND aDiag = CreateDialog((HINSTANCE) GetWindowLong(Globals::mainHwnd, GWL_HINSTANCE), MAKEINTRESOURCE(IDD_DIALOG1), Globals::mainHwnd, (DLGPROC)InsertDlgProc);
HWND aDiag2 = CreateDialog((HINSTANCE) GetWindowLong(Globals::mainHwnd, GWL_HINSTANCE), MAKEINTRESOURCE(IDD_DIALOG2), Globals::mainHwnd, (DLGPROC)InsertDlgProc);
}
}