Add files via upload

Dialogs.rc

@@ -46,55 +46,6 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-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,63
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_TOOLBOX, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 361
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 70
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_TOOLBOX DLGINIT
-BEGIN
-    IDC_AXBROWSER1, 0x376, 76, 0
-0x0000, 0x0000, 0xb293, 0x0000, 0x0048, 0x0000, 0x0003, 0x0008, 0xf20b, 
-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, 
-0x0a8b, 0x0000, 
-    0
-END
-
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 

G3DTest.vcproj

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

Instance.h

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

PhysicalInstance.cpp

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

TextButtonInstance.cpp

@@ -1,40 +0,0 @@
-#include "TextButtonInstance.h"
-Vector2 boxBegin;
-Vector2 boxEnd;
-Vector2 fontLocationRelativeTo;
-Color4 textColor;
-Color4 textOutlineColor;
-Color4 boxColor;
-Color4 boxOutlineColor;
-Color4 textColorOvr;
-Color4 textOutlineColorOvr;
-Color4 boxColorOvr;
-Color4 boxOutlineColorOvr;
-Color4 textColorDn;
-Color4 textOutlineColorDn;
-Color4 boxColorDn;
-Color4 boxOutlineColorDn;
-bool centeredWithinBox;
-std::string title;
-G3D::GFontRef font;
-int textSize;
-
-
-TextButtonInstance::TextButtonInstance(void)
-{
-	boxBegin = Vector2(0,0);
-	boxEnd = Vector2(0,0);
-	fontLocationRelativeTo = Vector2(0,0);
-	centeredWithinBox = false;
-	title = "TextBox";
-	textColor = Color4(1, 1, 1, 1);
-	textOutlineColor = Color4(0, 0, 0, 0);
-	boxColor = Color4(0.6F,0.6F,0.6F,0.4F);
-	boxOutlineColor = Color4(0, 0, 0, 0);
-	textSize = 12;
-	
-}
-
-TextButtonInstance::~TextButtonInstance(void)
-{
-}

TextButtonInstance.h

@@ -1,28 +0,0 @@
-#pragma once
-#include "instance.h"
-
-class TextButtonInstance :
-	public Instance
-{
-public:
-	TextButtonInstance(void);
-	~TextButtonInstance(void);
-	Vector2 boxBegin;
-	Vector2 boxEnd;
-	Vector2 fontLocationRelativeTo;
-	Color4 textColor;
-	Color4 textOutlineColor;
-	Color4 boxColor;
-	Color4 boxOutlineColor;
-	Color4 textColorOvr;
-	Color4 textOutlineColorOvr;
-	Color4 boxColorOvr;
-	Color4 boxOutlineColorOvr;
-	Color4 textColorDn;
-	Color4 textOutlineColorDn;
-	Color4 boxColorDn;
-	Color4 boxOutlineColorDn;
-	bool centeredWithinBox;
-	std::string title;
-	G3D::GFontRef font;
-};

main.cpp

@@ -235,11 +235,6 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
 }
 
 
-void readMouseGUIInput()
-{
-	
-}
-
 void Demo::onUserInput(UserInput* ui) {
     if (ui->keyPressed(SDLK_ESCAPE)) {
         // Even when we aren't in debug mode, quit on escape.
@@ -273,8 +268,6 @@ void Demo::onUserInput(UserInput* ui) {
 	if(ui->keyPressed(SDLK_LSHIFT))
 	{
 		app->debugController.setMoveRate(20);
-		
-		
 	}
 	else if(ui->keyReleased(SDLK_LSHIFT))
 	{
@@ -304,12 +297,10 @@ void Demo::onUserInput(UserInput* ui) {
 		message = "FPS has been set to " + Convert(FPSVal[index]);
 		setDesiredFrameRate(FPSVal[index]);
 	}
-	readMouseGUIInput();
+
 	// Add other key handling here
 }
 
-
-
 std::string ExePath() {
     char buffer[MAX_PATH];
     GetModuleFileName( NULL, buffer, MAX_PATH );
@@ -462,12 +453,12 @@ void Demo::onGraphics(RenderDevice* rd) {
 
 
 
-	rd->pushState();
+	//rd->pushState();
 	
-	rd->setTexture(0, go);
+	//rd->setTexture(0, go);
 
 
-	rd->enableAlphaWrite();
+	/*rd->enableAlphaWrite();
 	rd->setTexCoord(0, Vector2(0.0F, 0.0F));
 	rd->setTexCoord(0, Vector2(1.0F, 0.0F));
 	rd->setTexCoord(0, Vector2(0.0F, 1.0F));
@@ -480,7 +471,7 @@ void Demo::onGraphics(RenderDevice* rd) {
 	rd->sendVertex(Vector2(10,85));
 	rd->endPrimitive();
 	rd->setTexture(0, NULL);
-	rd->popState();
+	//rd->popState();*/
 
 
 	app->renderDevice->pop2D();

resource.h

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