From 5306ec6809122ff525b2c6bf8b23a650faac78ca Mon Sep 17 00:00:00 2001
From: andreja6 <andrejaandjic@hotmail.com>
Date: Thu, 12 Apr 2018 19:25:17 -0700
Subject: [PATCH] Fixed include issues

---
 Dialogs.aps            | Bin 34384 -> 34384 bytes
 Dialogs.rc             |   8 ++++----
 G3DTest.suo            | Bin 14336 -> 14336 bytes
 G3DTest.vcproj         |  12 ++++++++++++
 Instance.h             |   1 +
 PhysicalInstance.cpp   |   1 -
 TextButtonInstance.cpp |   2 ++
 main.cpp               |   2 ++
 resource.h             |   4 ++--
 9 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/Dialogs.aps b/Dialogs.aps
index b79ce96754075b4c617f09c2415d82ed62337688..499e801f159f1d646f5d3d53aa6a2898b518b14a 100644
GIT binary patch
delta 53
zcmcc6!*rpCX@iX0WE(fB$;^z>%*G51n?u|ptQmbLuWhtswBP)^F_V$eZE|39Ia4>+
J=2OjWOaR&W5*Gjf

delta 53
zcmcc6!*rpCX@iX0WM)QbW+MiM$x?1Io5S3~tQkEfuWhtswA%c<F_V$eadKdDIn#E|
J&8M2%m;leA5)uFa

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 0f65f6c21cfb9f7bd049ca549f9dcc3e8067ff86..540815454e3c9457b2d6f5cac4160a8ef6fdebcd 100644
GIT binary patch
delta 377
zcmZoDXeii_!@_o96I0{4OPh;W0vS0O`571({sY0}3CbFi8w6N3|6pCh$eRHa%>?2s
zApSQoP<`_S_RrjG48lOJ&}4pN?ag0={aM%;n1Osz5Px!s#Cc9eB_J1WR*9tlWM>}3
z&0i$XGeH<KXM`97CO0Z7*2gfUFr+f%GUPK9GsFPtM4)AP47xy^4<y|g92p9LP>&%Q
zOfxXt=0B+mG@F4DL?8i><3VB~Kr8^nGC(W{#2_(wAXWil5C{iinBE8m25+!n6jTtT
zC>kunz>owL0~wMG6{~@Y2?6O^sMs1H4e}`i!{i5o3Y*Uun6OQflVdcPe33<QvV)`v
RYdTQDo5_J3-jiL-Z2&PXOg#Vq

delta 139
zcmZoDXeii_!@|apHbLOt#mz-5fsC9C{0s~X|AAog1Z9oM4FW8if3PlLoET!V`2zcA
zZZ<|?ptR6req-&;UxfWx*ch3Cd{Gd8a*4$G$%lDuCpSnsgXm3ChnXfHW-;9SMdpkU
iGXoRn=I;WWjGNCGn6ORa<CvVlVKe!NxebtZ0nq>l%P#c*

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"
 				>
 			</File>
+			<File
+				RelativePath=".\TextButtonInstance.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -279,6 +283,10 @@
 				RelativePath=".\resource.h"
 				>
 			</File>
+			<File
+				RelativePath=".\TextButtonInstance.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -287,5 +295,9 @@
 		</Filter>
 	</Files>
 	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="Dialogs.rc"
+		/>
 	</Globals>
 </VisualStudioProject>
diff --git a/Instance.h b/Instance.h
index 26cfbce..fe087c0 100644
--- a/Instance.h
+++ b/Instance.h
@@ -1,3 +1,4 @@
+#include <G3DAll.h>
 #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 <G3DAll.h>
 #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