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

YAY

Browse Source
This commit is contained in:
andreja6
2018-04-24 19:35:53 -07:00
parent a9f91c8a9e
commit a9d533e447
6 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Dialogs.aps
View File

Binary file not shown.

9
Dialogs.rc
View File

@@ -123,6 +123,15 @@ BEGIN
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON1 ICON "icon1.ico"
#endif // English (Canada) resources #endif // English (Canada) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

4
G3DTest.vcproj
View File

@@ -316,6 +316,10 @@
Name="Resource Files" Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
> >
<File
RelativePath=".\icon1.ico"
>
</File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>

BIN
icon1.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

13
main.cpp
View File

@@ -631,7 +631,8 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
if(dataModel->name != title) if(dataModel->name != title)
{ {
title = dataModel->name; title = dataModel->name;
app->renderDevice->setCaption("Game \"" + title + "\""); std::string text = "Game \"" + title + "\"";
SetWindowText(app->getMainHWND(), text.c_str());
} }
CoordinateFrame frame = app->debugCamera.getCoordinateFrame(); CoordinateFrame frame = app->debugCamera.getCoordinateFrame();
@@ -1214,14 +1215,8 @@ int main(int argc, char** argv) {
//_CrtSetBreakAlloc(1279); //_CrtSetBreakAlloc(1279);
GAppSettings settings; GAppSettings settings;
if(getOSVersion() > 5.0)
settings.window.defaultIconFilename = GetFileInPath("/content/images/rico.png");
else
settings.window.defaultIconFilename = GetFileInPath("/content/images/rico256c.png");
settings.window.resizable = true; settings.window.resizable = true;
settings.writeLicenseFile = false; settings.writeLicenseFile = false;
settings.window.width = 841;
settings.window.height = 639;
//Using the damned SDL window now //Using the damned SDL window now
SDLWindow* wnd = new SDLWindow(settings.window); SDLWindow* wnd = new SDLWindow(settings.window);
//wnd->setInputCaptureCount(200); //wnd->setInputCaptureCount(200);
@@ -1290,6 +1285,10 @@ int main(int argc, char** argv) {
//SetWindowLong(hwnd, GWL_STYLE, WS_VISIBLE | WS_CHILD); //SetWindowLong(hwnd, GWL_STYLE, WS_VISIBLE | WS_CHILD);
SetWindowLongPtr(hwndMain, GWL_USERDATA, (LONG)&app); SetWindowLongPtr(hwndMain, GWL_USERDATA, (LONG)&app);
HICON hicon = (HICON)LoadImage(GetModuleHandleW(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE);
SendMessage(hwndMain, WM_SETICON, ICON_BIG, (LPARAM)hicon);
app.run(); app.run();
return 0; return 0;
} }

3
resource.h
View File

@@ -4,13 +4,14 @@
// //
#define IDD_ABOUT_DIALOG 102 #define IDD_ABOUT_DIALOG 102
#define IDD_TOOLBOX 103 #define IDD_TOOLBOX 103
#define IDI_ICON1 106
#define IDC_TOOLBOX_BROWSER 1001 #define IDC_TOOLBOX_BROWSER 1001
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 106 #define _APS_NEXT_RESOURCE_VALUE 107
#define _APS_NEXT_COMMAND_VALUE 40004 #define _APS_NEXT_COMMAND_VALUE 40004
#define _APS_NEXT_CONTROL_VALUE 1002 #define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101