• R/O
  • SSH
  • HTTPS

gdx64: Commit


Commit MetaInfo

Revision269 (tree)
Time2020-01-15 01:53:50
Authorhgtterry

Log Message

Basic Shapes 1.9 Export 140120

Change Summary

Incremental Difference

--- Basic_Shapes/Ogre_Basic/Ogre_Basic/GD19_App.cpp (revision 268)
+++ Basic_Shapes/Ogre_Basic/Ogre_Basic/GD19_App.cpp (revision 269)
@@ -244,7 +244,7 @@
244244 {
245245 char text[1024];
246246 strcpy(text, Message);
247-// App->Cl_Dialogs->Message(text);
247+ App->Cl_Dialogs->Message(text);
248248 }
249249
250250 // *************************************************************************
--- Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_Dialogs.cpp (revision 268)
+++ Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_Dialogs.cpp (revision 269)
@@ -6,6 +6,7 @@
66
77 GD_Dialogs::GD_Dialogs()
88 {
9+ Canceled = 0;
910 }
1011
1112
@@ -12,3 +13,88 @@
1213 GD_Dialogs::~GD_Dialogs()
1314 {
1415 }
16+
17+// *************************************************************************
18+// * Message Terry Bernie *
19+// *************************************************************************
20+void GD_Dialogs::Message(char *pString)
21+{
22+ strcpy(Message_Text, pString);
23+ DialogBox(App->hInst, (LPCTSTR)IDD_MESSAGE, App->Fdlg, (DLGPROC)Message_Proc);
24+}
25+// *************************************************************************
26+// * Message_Proc Terry Bernie *
27+// *************************************************************************
28+LRESULT CALLBACK GD_Dialogs::Message_Proc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
29+{
30+
31+ switch (message)
32+ {
33+ case WM_INITDIALOG:
34+ {
35+ App->SetTitleBar(hDlg);
36+
37+ HFONT Font;
38+ Font = CreateFont(-20, 0, 0, 0, FW_BOLD, 0, 0, 0, 0, OUT_TT_ONLY_PRECIS, 0, 0, 0, "Courier Black");
39+ SendDlgItemMessage(hDlg, IDC_STTEXT, WM_SETFONT, (WPARAM)Font, MAKELPARAM(TRUE, 0));
40+ SendDlgItemMessage(hDlg, IDC_BANNER, WM_SETFONT, (WPARAM)Font, MAKELPARAM(TRUE, 0));
41+
42+ SetDlgItemText(hDlg, IDC_STTEXT, App->Cl_Dialogs->Message_Text);
43+
44+ return TRUE;
45+ }
46+ case WM_CTLCOLORSTATIC:
47+ {
48+ if (GetDlgItem(hDlg, IDC_BANNER) == (HWND)lParam)
49+ {
50+ SetBkColor((HDC)wParam, RGB(0, 255, 0));
51+ SetTextColor((HDC)wParam, RGB(0, 0, 255));
52+ SetBkMode((HDC)wParam, TRANSPARENT);
53+ return (UINT)App->AppBackground;
54+ }
55+ if (GetDlgItem(hDlg, IDC_STTEXT) == (HWND)lParam)
56+ {
57+ SetBkColor((HDC)wParam, RGB(0, 255, 0));
58+ SetTextColor((HDC)wParam, RGB(0, 0, 0));
59+ SetBkMode((HDC)wParam, TRANSPARENT);
60+ return (UINT)App->AppBackground;
61+ }
62+ return FALSE;
63+ }
64+
65+ case WM_CTLCOLORDLG:
66+ {
67+ return (LONG)App->AppBackground;
68+ }
69+
70+ case WM_NOTIFY:
71+ {
72+ LPNMHDR some_item = (LPNMHDR)lParam;
73+
74+ if (some_item->idFrom == IDOK && some_item->code == NM_CUSTOMDRAW)
75+ {
76+ LPNMCUSTOMDRAW item = (LPNMCUSTOMDRAW)some_item;
77+ App->Custom_Button_Normal(item);
78+ return CDRF_DODEFAULT;
79+ }
80+ return CDRF_DODEFAULT;
81+ }
82+ case WM_COMMAND:
83+ if (LOWORD(wParam) == IDOK)
84+ {
85+ App->Cl_Dialogs->Canceled = 0;
86+ EndDialog(hDlg, LOWORD(wParam));
87+ return TRUE;
88+ }
89+
90+ if (LOWORD(wParam) == IDCANCEL)
91+ {
92+ App->Cl_Dialogs->Canceled = 1;
93+ EndDialog(hDlg, LOWORD(wParam));
94+ return TRUE;
95+ }
96+
97+ break;
98+ }
99+ return FALSE;
100+}
--- Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_Dialogs.h (revision 268)
+++ Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_Dialogs.h (revision 269)
@@ -4,5 +4,15 @@
44 public:
55 GD_Dialogs();
66 ~GD_Dialogs();
7+
8+ void Message(char *pString);
9+
10+ char Message_Text[255];
11+
12+ bool Canceled;
13+
14+protected:
15+
16+ static LRESULT CALLBACK Message_Proc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
717 };
818
--- Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_Exporter.cpp (revision 268)
+++ Basic_Shapes/Ogre_Basic/Ogre_Basic/GD_Exporter.cpp (revision 269)
@@ -204,6 +204,6 @@
204204 //else
205205 {
206206 App->Cl_Export_Ogre3D->Export_AssimpToOgre();
207- App->CL_Dialogs->Message("Ogre3D Model Saved successfully");
207+ App->Say("Ogre3D Model Saved successfully");
208208 }
209209 }
--- Basic_Shapes/Ogre_Basic/Ogre_Basic/Ogre_Basic.cpp (revision 268)
+++ Basic_Shapes/Ogre_Basic/Ogre_Basic/Ogre_Basic.cpp (revision 269)
@@ -220,14 +220,13 @@
220220 return 1;
221221 }
222222
223-
224-
225223 case IDM_ABOUT:
226224 DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About);
227225 break;
226+
228227 case IDM_EXIT:
229228 {
230- App->Say("Out1");
229+
231230 /*App->CL64_Dialogs->YesNo("Close GameDirector", "Are you sure");
232231 if (App->GDCL_Dialogs->Canceled == 1)
233232 {
@@ -274,7 +273,6 @@
274273
275274 case WM_CLOSE:
276275 {
277- App->Say("out");
278276 if (App->Cl19_Ogre->OgreListener->StopOgre == 0)
279277 {
280278 App->Cl19_Ogre->OgreListener->StopOgre = 1;
@@ -534,8 +532,6 @@
534532
535533 App->Cl19_Ogre->mRoot->startRendering();
536534
537- App->Say("out");
538-
539535 Close_App();
540536
541537 SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, TRUE);
@@ -547,8 +543,7 @@
547543 // *************************************************************************
548544 void Close_App()
549545 {
550- App->Say("out");
551-
546+
552547 delete App->Cl_ToOgre;
553548
554549 if (App->Cl19_Ogre->mRoot)
@@ -557,7 +552,7 @@
557552 App->Cl19_Ogre->mRoot = NULL;
558553 }
559554
560- App->Say("out");
555+ ImGui::DestroyContext();
561556
562- ImGui::DestroyContext();
557+ App->Say("All Done");
563558 }
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Show on old repository browser