Added delete functionality

Added button listeners, added some buttons, Made window use HWND rather than SDL

BaseButtonInstance.cpp

@@ -0,0 +1,51 @@
+#include "BaseButtonInstance.h"
+
+bool floatBottom = false;
+bool floatRight = false;
+bool floatCenter = false;
+bool disabled = false;
+bool selected = false;
+ButtonListener* listener = NULL;
+
+BaseButtonInstance::BaseButtonInstance(void)
+{
+	listener = NULL;
+}
+
+BaseButtonInstance::~BaseButtonInstance(void)
+{
+	delete listener;
+}
+
+void BaseButtonInstance::setButtonListener(ButtonListener* buttonListener)
+{
+	listener = buttonListener;
+}
+
+void BaseButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown){}
+
+bool BaseButtonInstance::mouseInButton(float mousex, float mousey, RenderDevice* rd){return false;}
+
+void BaseButtonInstance::onMouseClick()
+{
+	if(listener != NULL)
+	{
+		listener->onButton1MouseClick(this);
+		
+	}
+}
+
+
+bool BaseButtonInstance::mouseInArea(float point1x, float point1y, float point2x, float point2y, float mousex, float mousey)
+{
+	
+
+	if(mousex >= point1x && mousey >= point1y)
+	{
+		if(mousex < point2x && mousey < point2y)
+		{
+			return true;
+		}
+	}
+	return false;
+}

BaseButtonInstance.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "instance.h"
+#pragma once
+#include "ButtonListener.h"
+class ButtonListener;
+class BaseButtonInstance : public Instance
+{
+public:
+	BaseButtonInstance(void);
+	virtual ~BaseButtonInstance(void);
+	virtual void drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown);
+	virtual bool mouseInButton(float, float, RenderDevice* rd);
+	virtual void onMouseClick();
+	void setButtonListener(ButtonListener*);
+	bool floatBottom;
+	bool floatRight;
+	bool floatCenter;
+	bool disabled;
+	bool selected;
+protected:
+	bool mouseInArea(float, float, float, float, float, float);
+	class ButtonListener* listener;
+};

ButtonListener.cpp

@@ -0,0 +1,15 @@
+#include "ButtonListener.h"
+
+
+ButtonListener::ButtonListener(void)
+{
+}
+
+ButtonListener::~ButtonListener(void)
+{
+}
+
+void ButtonListener::onButton1MouseClick(BaseButtonInstance* button)
+{
+}
+

ButtonListener.h

@@ -0,0 +1,18 @@
+#pragma once
+#include "BaseButtonInstance.h"
+class BaseButtonInstance;
+class ButtonListener
+{
+public:
+	ButtonListener(void);
+	~ButtonListener(void);
+	virtual void onButton1MouseClick(BaseButtonInstance*);
+	//virtual void onMouseOver(); //TODO
+	//virtual void onMouseOut(); //TODO
+	//virtual void onButton1MouseDown(); //TODO
+	//virtual void onButton1MouseUp(); //TODO
+	//virtual void onButton2MouseClick(); //TODO
+	//virtual void onButton2MouseDown(); //TODO
+	//virtual void onButton2MouseUp(); //TODO
+	//What to do now...
+};

Dialogs.rc

@@ -46,10 +46,96 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_TOOLBOX DIALOGEX 0, 0, 398, 64
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    CONTROL         "",IDC_TOOLBOX_BROWSER,
+                    "{A8F8E829-06DA-11D2-8D70-00A0C98B28E2}",WS_TABSTOP,0,0,398,64
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
+
+IDD_TOOLBOX DLGINIT
+BEGIN
+    IDC_TOOLBOX_BROWSER, 0x376, 76, 0
+0x0000, 0x0000, 0xb293, 0x0000, 0x0048, 0x0000, 0x0003, 0x0008, 0xf20b, 
+0x4757, 0x0020, 0x0000, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, 
+0x0074, 0x0078, 0x3db4, 0x0000, 0x0003, 0x0008, 0xf20a, 0x4757, 0xffe0, 
+0xffff, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, 0x0074, 0x0079, 
+0x0ac0, 0x0000, 
+    0
+END
+
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
+/////////////////////////////////////////////////////////////////////////////
+// English (Canada) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENC)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUT_DIALOG DIALOGEX 0, 0, 226, 151
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "About"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,169,130,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,112,130,50,14
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_ABOUT_DIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 219
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 144
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "icon1.ico"
+#endif    // English (Canada) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
 
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////

G3DTest.vcproj

@@ -51,7 +51,7 @@
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/G3DTest.pch"
 				AssemblerListingLocation=".\Release/"
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\Release/G3DTest.exe"
+				OutputFile="./G3DTest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/G3DTest.pdb"
@@ -167,7 +167,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\Debug/G3DTest.exe"
+				OutputFile="./G3DTest-Debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -230,10 +230,22 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath=".\BaseButtonInstance.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ButtonListener.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\Dialogs.rc"
 				>
 			</File>
+			<File
+				RelativePath=".\ImageButtonInstance.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\Instance.cpp"
 				>
@@ -262,11 +274,27 @@
 				RelativePath=".\PhysicalInstance.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\TextButtonInstance.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath=".\BaseButtonInstance.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ButtonListener.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ImageButtonInstance.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Instance.h"
 				>
@@ -279,13 +307,25 @@
 				RelativePath=".\resource.h"
 				>
 			</File>
+			<File
+				RelativePath=".\TextButtonInstance.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
+			<File
+				RelativePath=".\icon1.ico"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="Dialogs.rc"
+		/>
 	</Globals>
 </VisualStudioProject>

ImageButtonInstance.cpp

@@ -0,0 +1,144 @@
+#include "ImageButtonInstance.h"
+G3D::TextureRef image = NULL;
+int openGLID = 0;
+G3D::TextureRef image_ovr = NULL;
+int openGLID_ovr = 0;
+G3D::TextureRef image_dn = NULL;
+int openGLID_dn = 0;
+G3D::TextureRef image_ds = NULL;
+int openGLID_ds = 0;
+Vector2 size;
+Vector2 position;
+ImageButtonInstance::ImageButtonInstance(G3D::TextureRef newImage, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
+{
+	
+	image = newImage;
+	openGLID = image->getOpenGLID();
+	image_ovr = overImage;
+	if(!image_ovr.isNull())
+	openGLID_ovr = image_ovr->getOpenGLID();
+	image_dn = downImage;
+	if(!image_dn.isNull())
+		openGLID_dn = image_dn->getOpenGLID();
+	image_ds = disableImage;
+	if(!image_ds.isNull())
+		openGLID_ds = image_ds->getOpenGLID();
+	Vector2 size = Vector2(0,0);
+	Vector2 position = Vector2(0,0);
+	floatCenter = false;
+	floatBottom = false;
+	floatRight = false;
+	disabled = false;
+	className = "ImageButton";
+}
+
+ImageButtonInstance::~ImageButtonInstance(void)
+{
+	//Delete everything on destruction
+	image.~ReferenceCountedPointer();
+	delete image.getPointer();
+	image_ovr.~ReferenceCountedPointer();
+	delete image_ovr.getPointer();
+	image_ds.~ReferenceCountedPointer();
+	delete image_ds.getPointer();
+	image_dn.~ReferenceCountedPointer();
+	delete image_dn.getPointer();
+	image = NULL;
+	image_ovr = NULL;
+	image_ds = NULL;
+	image_dn = NULL;
+	delete listener;
+	listener = NULL;
+	selected = false;
+}
+
+bool ImageButtonInstance::mouseInButton(float mousex, float mousey, RenderDevice* rd)
+{
+	Vector2 positionRelative = position;
+	if(floatRight && floatBottom)
+	{
+	    positionRelative = Vector2(rd->getWidth() + position.x, rd->getHeight() + position.y);
+	}
+	else if(floatBottom)
+	{
+	    positionRelative = Vector2(position.x, rd->getHeight() + position.y);
+	}
+	else if(floatRight)
+	{
+		positionRelative = Vector2(rd->getWidth() + position.x, position.y);
+	}
+	if(mousex >= positionRelative.x && mousey >= positionRelative.y)
+	{
+		if(mousex < positionRelative.x + size.x && mousey < positionRelative.y + size.y)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+void ImageButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown)
+{
+	bool drawDisabledBox = false;
+	Vector2 positionRelative = position;
+	if(floatRight && floatBottom)
+	{
+	    positionRelative = Vector2(rd->getWidth() + position.x, rd->getHeight() + position.y);
+	}
+	else if(floatBottom)
+	{
+	    positionRelative = Vector2(position.x, rd->getHeight() + position.y);
+	}
+	else if(floatRight)
+	{
+		positionRelative = Vector2(rd->getWidth() + position.x, position.y);
+	}
+	int renderimage = openGLID;
+	if(selected == true && !image_dn.isNull())
+	{
+		renderimage = openGLID_dn;
+	}
+	else if(disabled)
+	{
+		if(!image_ds.isNull())
+			renderimage = openGLID_ds;
+		else
+			drawDisabledBox = true;
+	}
+	else if(mouseInArea(positionRelative.x, positionRelative.y, positionRelative.x + size.x, positionRelative.y + size.y, mousePos.x, mousePos.y))
+	{
+		if(mouseDown && !image_dn.isNull())
+		{
+			renderimage = openGLID_dn;
+		}
+		else if(!image_ovr.isNull())
+		{
+			renderimage = openGLID_ovr;
+		}
+	}
+
+
+	rd->pushState();
+		rd->beforePrimitive();
+		glEnable( GL_TEXTURE_2D );
+		glEnable(GL_BLEND);// you enable blending function
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+		glBindTexture( GL_TEXTURE_2D, renderimage);
+		glBegin( GL_QUADS );
+		glTexCoord2d(0.0,0.0);
+		glVertex2f( positionRelative.x, positionRelative.y );
+		glTexCoord2d( 1.0,0.0 );
+		glVertex2f( positionRelative.x + size.x, positionRelative.y );
+		glTexCoord2d( 1.0,1.0 );
+		glVertex2f( positionRelative.x + size.x, positionRelative.y + size.y );
+		glTexCoord2d( 0.0,1.0 );
+		glVertex2f( positionRelative.x, positionRelative.y + size.y );
+		glEnd();
+		glDisable( GL_TEXTURE_2D );
+		rd->afterPrimitive();
+	rd->popState();
+	if(drawDisabledBox)
+	{
+		Draw::box(Box(Vector3(positionRelative.x, positionRelative.y, 0), Vector3(positionRelative.x+size.x, positionRelative.y+size.y, 0)), rd, Color4(0.7F,0.7F,0.7F,0.3F), Color4::clear());
+	}
+}

ImageButtonInstance.h

@@ -0,0 +1,24 @@
+#pragma once
+#include "BaseButtonInstance.h"
+class ImageButtonInstance : public BaseButtonInstance
+{
+public:
+	//ImageButtonInstance(G3D::TextureRef);
+	//ImageButtonInstance(G3D::TextureRef,G3D::TextureRef);
+	//ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef);
+	ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef,G3D::TextureRef);
+	~ImageButtonInstance(void);
+	void drawObj(RenderDevice*, Vector2, bool);
+	Vector2 size;
+	Vector2 position;
+	
+	G3D::TextureRef image;
+	int openGLID;
+	G3D::TextureRef image_ovr;
+	int openGLID_ovr;
+	G3D::TextureRef image_dn;
+	int openGLID_dn;
+	G3D::TextureRef image_ds;
+	int openGLID_ds;
+	bool mouseInButton(float, float, RenderDevice*);
+};

Instance.cpp

@@ -1,14 +1,15 @@
+#define WINVER	0x0400
 #include <G3DAll.h>
 #include "Instance.h"
 
 std::string name;
 Instance* parent;
-static std::string className = "Instance";
+static std::string className = "DataModel";
 
 Instance::Instance(void)
 {
 	name = "Default Game Instance";
-	className = "Part";
+	className = "DataModel";
 }
 
 Instance::~Instance(void)

Instance.h

@@ -1,10 +1,11 @@
+#include <G3DAll.h>
 #pragma once
 
 class Instance
 {
 public:
 	Instance(void);
-	~Instance(void);
+	virtual ~Instance(void);
 	std::string name;
 	Instance* parent;  // Another pointer.
 	std::string className;

PhysicalInstance.cpp

@@ -1,4 +1,3 @@
-#include <G3DAll.h>
 #include "PhysicalInstance.h"
 
 bool canCollide = true;
@@ -7,6 +6,7 @@ Vector3 size;
 Vector3 position;
 Vector3 velocity;
 Vector3 rotVelocity;
+CoordinateFrame cFrame;
 Color3 color;
 
 PhysicalInstance::PhysicalInstance(void)
@@ -17,13 +17,36 @@ PhysicalInstance::PhysicalInstance(void)
 	anchored = true;
 	size = Vector3(2,1,4);
 	position = Vector3(0,0,0);
+	cFrame = CoordinateFrame(position);
 	color = Color3::gray();
 	velocity = Vector3(0,0,0);
 	rotVelocity = Vector3(0,0,0);
 }
 
+Vector3 PhysicalInstance::getPosition()
+{
+	return position;
+}
+void PhysicalInstance::setPosition(Vector3 pos)
+{
+	position = pos;
+	cFrame = CoordinateFrame(pos);
+}
+CoordinateFrame PhysicalInstance::getCFrame()
+{
+	return cFrame;
+}
+void PhysicalInstance::setCFrame(CoordinateFrame coordinateFrame)
+{
+	cFrame = coordinateFrame;
+	position = coordinateFrame.translation;
+}
+
+
 PhysicalInstance::~PhysicalInstance(void)
 {
 }
 
 
+
+

PhysicalInstance.h

@@ -8,8 +8,14 @@ public:
 	PhysicalInstance(void);
 	~PhysicalInstance(void);
 	Vector3 size;
-	Vector3 position;
 	Vector3 velocity;
 	Vector3 rotvelocity;
+	CoordinateFrame cFrame;
 	Color3 color;
+	Vector3 getPosition();
+	void setPosition(Vector3);
+	CoordinateFrame getCFrame();
+	void setCFrame(CoordinateFrame);
+private:
+	Vector3 position;
 };

TextButtonInstance.cpp

@@ -0,0 +1,121 @@
+#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;
+
+bool visible;
+
+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);
+	setAllColorsSame();
+	textSize = 12;
+	floatBottom = false;
+	floatRight = false;
+	floatCenter = false;
+	visible = true;
+	className = "TextButton";
+	disabled = false;
+}
+
+bool TextButtonInstance::mouseInButton(float mousex, float mousey, RenderDevice* rd)
+{
+	Vector3 point1;
+	Vector3 point2;
+	if(floatBottom)
+	{
+		point1 = Vector3(boxBegin.x, rd->getHeight() + boxBegin.y,0);
+		point2 = Vector3(boxEnd.x, rd->getHeight() + boxEnd.y,0);
+		
+	}
+	else
+	{
+		point1 = Vector3(boxBegin.x, boxBegin.y,0);
+		point2 = Vector3(boxEnd.x, boxEnd.y,0);
+	}
+	if(mousex >= point1.x && mousey >= point1.y)
+	{
+		if(mousex < point2.x && mousey < point2.y)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+void TextButtonInstance::setAllColorsSame()
+{
+	textColorOvr = textColor;
+	textOutlineColorOvr = textOutlineColor;
+	boxColorOvr = boxColor;
+	boxOutlineColorOvr = boxOutlineColor;
+	textColorDn = textColor;
+	textOutlineColorDn = textOutlineColor;
+	boxColorDn = boxColor;
+	boxOutlineColorDn = boxOutlineColor;
+}
+
+TextButtonInstance::~TextButtonInstance(void)
+{
+}
+
+void TextButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouseDown)
+{
+	Vector3 point1;
+	Vector3 point2;
+	if(floatBottom)
+	{
+		point1 = Vector3(boxBegin.x, rd->getHeight() + boxBegin.y,0);
+		point2 = Vector3(boxEnd.x, rd->getHeight() + boxEnd.y,0);
+		
+	}
+	else
+	{
+		point1 = Vector3(boxBegin.x, boxBegin.y,0);
+		point2 = Vector3(boxEnd.x, boxEnd.y,0);
+	}
+	Vector2 RelativeTo = Vector2(point1.x + fontLocationRelativeTo.x, point1.y + fontLocationRelativeTo.y);
+	if(mouseInArea(point1.x, point1.y, point2.x, point2.y, mousePos.x, mousePos.y) && mouseDown)
+	{
+		Draw::box(Box(point1, point2), rd, boxColorDn, boxOutlineColorDn);
+		font->draw2D(rd, title, RelativeTo, textSize, textColorDn, textOutlineColorDn);
+	}
+	else if(mouseInArea(point1.x, point1.y, point2.x, point2.y, mousePos.x, mousePos.y))
+	{
+		Draw::box(Box(point1, point2), rd, boxColorOvr, boxOutlineColorOvr);
+		font->draw2D(rd, title, RelativeTo, textSize, textColorOvr, textOutlineColorOvr);
+	}
+	else
+	{
+		Draw::box(Box(point1, point2), rd, boxColor, boxOutlineColor);
+		font->draw2D(rd, title, RelativeTo, textSize, textColor, textOutlineColor);
+	}
+}
+
+void doNullCheck()
+{
+}

TextButtonInstance.h

@@ -0,0 +1,31 @@
+#pragma once
+#include "BaseButtonInstance.h"
+class TextButtonInstance : public BaseButtonInstance
+{
+public:
+	TextButtonInstance(void);
+	~TextButtonInstance(void);
+	void setAllColorsSame();
+	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;
+	bool visible;
+	int textSize;
+	void drawObj(RenderDevice*, Vector2, bool);
+	bool mouseInButton(float, float, RenderDevice*);
+};