Fixed include issues

This commit is contained in:
andreja6
2018-04-12 19:25:17 -07:00
parent fe2f8cf160
commit 5306ec6809
9 changed files with 23 additions and 7 deletions

Binary file not shown.

View File

@@ -52,11 +52,11 @@ END
// Dialog // Dialog
// //
IDD_TOOLBOX DIALOGEX 0, 0, 368, 72 IDD_TOOLBOX DIALOGEX 0, 0, 368, 77
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN 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 END
@@ -73,7 +73,7 @@ BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 361 RIGHTMARGIN, 361
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 65 BOTTOMMARGIN, 70
END END
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
@@ -91,7 +91,7 @@ BEGIN
0x4757, 0x0020, 0x0000, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, 0x4757, 0x0020, 0x0000, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e,
0x0074, 0x0078, 0x36e1, 0x0000, 0x0003, 0x0008, 0xf20a, 0x4757, 0xffe0, 0x0074, 0x0078, 0x36e1, 0x0000, 0x0003, 0x0008, 0xf20a, 0x4757, 0xffe0,
0xffff, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, 0x0074, 0x0079, 0xffff, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, 0x0074, 0x0079,
0x09b7, 0x0000, 0x0a8b, 0x0000,
0 0
END END

Binary file not shown.

View File

@@ -262,6 +262,10 @@
RelativePath=".\PhysicalInstance.cpp" RelativePath=".\PhysicalInstance.cpp"
> >
</File> </File>
<File
RelativePath=".\TextButtonInstance.cpp"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Header Files" Name="Header Files"
@@ -279,6 +283,10 @@
RelativePath=".\resource.h" RelativePath=".\resource.h"
> >
</File> </File>
<File
RelativePath=".\TextButtonInstance.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"
@@ -287,5 +295,9 @@
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>
<Global
Name="RESOURCE_FILE"
Value="Dialogs.rc"
/>
</Globals> </Globals>
</VisualStudioProject> </VisualStudioProject>

View File

@@ -1,3 +1,4 @@
#include <G3DAll.h>
#pragma once #pragma once
class Instance class Instance

View File

@@ -1,4 +1,3 @@
#include <G3DAll.h>
#include "PhysicalInstance.h" #include "PhysicalInstance.h"
bool canCollide = true; bool canCollide = true;

View File

@@ -1,5 +1,7 @@
#include "TextButtonInstance.h" #include "TextButtonInstance.h"
TextButtonInstance::TextButtonInstance(void) TextButtonInstance::TextButtonInstance(void)
{ {
} }

View File

@@ -268,6 +268,8 @@ void Demo::onUserInput(UserInput* ui) {
if(ui->keyPressed(SDLK_LSHIFT)) if(ui->keyPressed(SDLK_LSHIFT))
{ {
app->debugController.setMoveRate(20); app->debugController.setMoveRate(20);
} }
else if(ui->keyReleased(SDLK_LSHIFT)) else if(ui->keyReleased(SDLK_LSHIFT))
{ {

View File

@@ -2,10 +2,10 @@
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by Dialogs.rc // Used by Dialogs.rc
// //
#define IDD_FORMVIEW 101
#define IDD_TOOLBOX 101 #define IDD_TOOLBOX 101
#define IDD_ABOUT_DIALOG 102 #define IDD_ABOUT_DIALOG 102
#define IDC_AXBROWSER1 1001 #define IDC_AXBROWSER1 1001
#define IDC_BUTTON1 1002
// Next default values for new objects // Next default values for new objects
// //
@@ -13,7 +13,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 106 #define _APS_NEXT_RESOURCE_VALUE 106
#define _APS_NEXT_COMMAND_VALUE 40004 #define _APS_NEXT_COMMAND_VALUE 40004
#define _APS_NEXT_CONTROL_VALUE 1002 #define _APS_NEXT_CONTROL_VALUE 1003
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif