From 0f609662bbc6b1db1f861c8518aba04203306246 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 2 May 2018 19:12:41 -0700 Subject: [PATCH 1/5] Literally nothing changed --- Dialogs.aps | Bin 35196 -> 23228 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Dialogs.aps b/Dialogs.aps index 88ed17ca41767131de2d86db3ca39e21df317d99..f9d2af7745f591b597913b2fa98b789f2c1a5c71 100644 GIT binary patch delta 4830 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 N0BY+BLAQ73{|8SUzjgos From c38ede1bd1ca4ba2ef71951c3b669424d961ecfa Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 2 May 2018 19:59:49 -0700 Subject: [PATCH 2/5] Added message functions to DataModel --- DataModelInstance.cpp | 29 +++++++++++++++++++++++++++++ DataModelInstance.h | 4 ++++ main.cpp | 3 ++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/DataModelInstance.cpp b/DataModelInstance.cpp index 26bdcb2..bdcda30 100644 --- a/DataModelInstance.cpp +++ b/DataModelInstance.cpp @@ -6,6 +6,9 @@ Instance* guiRoot; float mousex; float mousey; bool mouseButton1Down; +std::string message; +bool showMessage; +G3D::GFontRef font; DataModelInstance::DataModelInstance(void) @@ -17,12 +20,38 @@ DataModelInstance::DataModelInstance(void) mousex = 0; mousey = 0; mouseButton1Down = false; + showMessage = false; } DataModelInstance::~DataModelInstance(void) { } +void DataModelInstance::setMessage(std::string msg) +{ + message = msg; + showMessage = true; +} + +void DataModelInstance::clearMessage() +{ + showMessage = false; + message = ""; +} + +void DataModelInstance::drawMessage(RenderDevice* rd) +{ + if(showMessage && !font.isNull()) + { + int x = rd->getWidth()/2; + int y = rd->getHeight()/2; + int width = rd->getWidth()/2 + 100; + int height = width / 3; + Draw::box(Box(Vector3(x-(width/2), y-(height/2), 0), Vector3(x+(width/2), y+(height/2), 0)), rd, Color4::fromARGB(0x55B2B2B2), Color3::fromARGB(0xB2B2B2)); + font->draw2D(rd, message, Vector2(x,y), height/8, Color3::white(), Color4::clear(), GFont::XALIGN_CENTER, GFont::YALIGN_CENTER); + } +} + WorkspaceInstance* DataModelInstance::getWorkspace() { return workspace; diff --git a/DataModelInstance.h b/DataModelInstance.h index 5c6f887..b009ae2 100644 --- a/DataModelInstance.h +++ b/DataModelInstance.h @@ -8,6 +8,10 @@ class DataModelInstance : public: DataModelInstance(void); ~DataModelInstance(void); + void setMessage(std::string); + void clearMessage(); + void drawMessage(RenderDevice*); + GFontRef font; WorkspaceInstance* getWorkspace(); Instance* getGuiRoot(); float mousex; diff --git a/main.cpp b/main.cpp index 878d934..740a878 100644 --- a/main.cpp +++ b/main.cpp @@ -688,7 +688,7 @@ void Demo::onInit() { dataModel = new DataModelInstance(); dataModel->setParent(NULL); dataModel->name = "undefined"; - + dataModel->font = fntdominant; Globals::dataModel = dataModel; initGUI(); @@ -1376,6 +1376,7 @@ void Demo::onGraphics(RenderDevice* rd) { drawButtons(rd); + dataModel->drawMessage(rd); rd->pushState(); rd->beforePrimitive(); From c84a2173c8beba48df1a4950b79283d07540ac28 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 3 May 2018 11:09:45 -0700 Subject: [PATCH 3/5] Removed repeat function --- main.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main.cpp b/main.cpp index 740a878..4f36661 100644 --- a/main.cpp +++ b/main.cpp @@ -1294,6 +1294,7 @@ void Demo::onGraphics(RenderDevice* rd) { rd->window()->setInputCaptureCount(1); } + LightingParameters lighting(G3D::toSeconds(11, 00, 00, AM)); app->renderDevice->setProjectionAndCameraMatrix(app->debugCamera); @@ -1547,7 +1548,7 @@ int main(int argc, char** argv) { wc.hInstance = hInstance; wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "containerHWND"; wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); @@ -1555,7 +1556,6 @@ int main(int argc, char** argv) { if (!RegisterClassEx (&wc)) return false; - HMODULE hThisInstance = GetModuleHandle(NULL); HWND hwnd = wnd->win32HWND(); HWND hwndMain = CreateWindowEx( WS_EX_ACCEPTFILES | WS_EX_CLIENTEDGE, @@ -1568,10 +1568,10 @@ int main(int argc, char** argv) { 600, NULL, // parent NULL, // menu - hThisInstance, + hInstance, NULL ); - ShowWindow(hwndMain, SW_SHOW); + if(hwndMain == NULL) { MessageBox(NULL, "Failed to create HWND","Dynamica Crash", MB_OK); @@ -1608,6 +1608,7 @@ int main(int argc, char** argv) { height = rect.bottom - rect.top; } SetWindowPos(hwnd, NULL, 0, 0, width, height, NULL); + ShowWindow(hwndMain, SW_SHOW); app.run(); } catch(...) From 1de2fb68114f39b4e48c662f75b94a68ce66c54b Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 3 May 2018 11:41:08 -0700 Subject: [PATCH 4/5] Set controls to UHJK --- main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.cpp b/main.cpp index 4f36661..3687c53 100644 --- a/main.cpp +++ b/main.cpp @@ -1012,19 +1012,19 @@ void Demo::onUserInput(UserInput* ui) { dataModel->mousex = ui->getMouseX(); dataModel->mousey = ui->getMouseY(); dataModel->mouseButton1Down = ui->keyDown(SDL_LEFT_MOUSE_KEY); - if(ui->keyDown(SDLK_UP)) + if(ui->keyDown('u')) { forwards = true; } - else if(ui->keyDown(SDLK_DOWN)) + else if(ui->keyDown('j')) { backwards = true; } - if(ui->keyDown(SDLK_LEFT)) + if(ui->keyDown('h')) { left = true; } - else if(ui->keyDown(SDLK_RIGHT)) + else if(ui->keyDown('k')) { right = true; From 2607fc8551e173c92d1ae4c01f295fcb0fe05693 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 3 May 2018 12:13:14 -0700 Subject: [PATCH 5/5] Exit on alt+f4 rather than ESC --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 3687c53..a5b86e3 100644 --- a/main.cpp +++ b/main.cpp @@ -940,7 +940,7 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) { //User Input void Demo::onUserInput(UserInput* ui) { - if (ui->keyPressed(SDLK_ESCAPE)) { + if (ui->keyPressed(SDLK_F4) && ui->keyDown(SDLK_LALT)) { // Even when we aren't in debug mode, quit on escape. endApplet = true; app->endProgram = true;