diff --git a/Dialogs.aps b/Dialogs.aps index b79ce96..499e801 100644 Binary files a/Dialogs.aps and b/Dialogs.aps differ diff --git a/Dialogs.rc b/Dialogs.rc index d43a6b4..43ccb1a 100644 --- a/Dialogs.rc +++ b/Dialogs.rc @@ -52,11 +52,11 @@ END // Dialog // -IDD_TOOLBOX DIALOGEX 0, 0, 368, 72 +IDD_TOOLBOX DIALOGEX 0, 0, 368, 77 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "",IDC_AXBROWSER1,"{A8F8E829-06DA-11D2-8D70-00A0C98B28E2}",WS_TABSTOP,7,7,354,58 + CONTROL "",IDC_AXBROWSER1,"{A8F8E829-06DA-11D2-8D70-00A0C98B28E2}",WS_TABSTOP,7,7,354,63 END @@ -73,7 +73,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 361 TOPMARGIN, 7 - BOTTOMMARGIN, 65 + BOTTOMMARGIN, 70 END END #endif // APSTUDIO_INVOKED @@ -91,7 +91,7 @@ BEGIN 0x4757, 0x0020, 0x0000, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, 0x0074, 0x0078, 0x36e1, 0x0000, 0x0003, 0x0008, 0xf20a, 0x4757, 0xffe0, 0xffff, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, 0x0074, 0x0079, -0x09b7, 0x0000, +0x0a8b, 0x0000, 0 END diff --git a/G3DTest.suo b/G3DTest.suo index 0f65f6c..5408154 100644 Binary files a/G3DTest.suo and b/G3DTest.suo differ diff --git a/G3DTest.vcproj b/G3DTest.vcproj index ecfb7d7..f73501d 100644 --- a/G3DTest.vcproj +++ b/G3DTest.vcproj @@ -262,6 +262,10 @@ RelativePath=".\PhysicalInstance.cpp" > + + + + + diff --git a/Instance.h b/Instance.h index 26cfbce..fe087c0 100644 --- a/Instance.h +++ b/Instance.h @@ -1,3 +1,4 @@ +#include #pragma once class Instance diff --git a/PhysicalInstance.cpp b/PhysicalInstance.cpp index e08b6e5..ba022a0 100644 --- a/PhysicalInstance.cpp +++ b/PhysicalInstance.cpp @@ -1,4 +1,3 @@ -#include #include "PhysicalInstance.h" bool canCollide = true; diff --git a/TextButtonInstance.cpp b/TextButtonInstance.cpp index 5361714..13249ab 100644 --- a/TextButtonInstance.cpp +++ b/TextButtonInstance.cpp @@ -1,5 +1,7 @@ #include "TextButtonInstance.h" + + TextButtonInstance::TextButtonInstance(void) { } diff --git a/main.cpp b/main.cpp index 8fea3d3..dab0cf3 100644 --- a/main.cpp +++ b/main.cpp @@ -268,6 +268,8 @@ void Demo::onUserInput(UserInput* ui) { if(ui->keyPressed(SDLK_LSHIFT)) { app->debugController.setMoveRate(20); + + } else if(ui->keyReleased(SDLK_LSHIFT)) { diff --git a/resource.h b/resource.h index 1ba2fe9..edbb9ef 100644 --- a/resource.h +++ b/resource.h @@ -2,10 +2,10 @@ // Microsoft Visual C++ generated include file. // Used by Dialogs.rc // -#define IDD_FORMVIEW 101 #define IDD_TOOLBOX 101 #define IDD_ABOUT_DIALOG 102 #define IDC_AXBROWSER1 1001 +#define IDC_BUTTON1 1002 // Next default values for new objects // @@ -13,7 +13,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 106 #define _APS_NEXT_COMMAND_VALUE 40004 -#define _APS_NEXT_CONTROL_VALUE 1002 +#define _APS_NEXT_CONTROL_VALUE 1003 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif