--- a/LightClone/Source/GuiCursor.cpp	Fri Sep 23 17:58:17 2011 -0700
+++ b/LightClone/Source/GuiCursor.cpp	Tue Sep 27 09:42:01 2011 -0700
@@ -8,57 +8,18 @@
 /*
  * GuiCursor
  */
-GuiCursor::GuiCursor() : pEffect(NULL), pVertexBuffer(NULL), pTexture(NULL)
-{
-}
-
-/*
- * Initialize
- */
-ErrorCode GuiCursor::Initialize(ResourceManager* pManager)
-{
-	pResourceManager = pManager;
-
-	ErrorCode eCode = pResourceManager->CreateEffectFromFile("Data\\Shaders\\TexturedQuad.fx", &pEffect);
-	if(eCode == Error_Success)
-	{
-		eCode = pResourceManager->CreateVertexBuffer(6 * sizeof(Vertex::Quad), D3DUSAGE_WRITEONLY, D3DPOOL_MANAGED, &pVertexBuffer);
-		if(eCode == Error_Success)
-		{
-			eCode = SetupVertexBuffer();
-		}
-	}
-
-	return eCode;
-}
-
-/*
- * Terminate
- */
-void GuiCursor::Terminate()
-{
-	if(pVertexBuffer)
-	{
-		pVertexBuffer->Release();
-		pVertexBuffer = NULL;
-	}
-}
-
-/*
- * Update
- */
-void GuiCursor::Update(float fElapsed)
+GuiCursor::GuiCursor() : GuiElement(), pTexture(NULL)
 {
 }
 
 /*
  * Render
  */
-//void GuiCursor::Render(RenderContext& kContext, Camera& kCamera)
 void GuiCursor::Render(GuiRenderContext& kContext)
 {
 	if(pTexture)
 	{
+		/*
 		uint32 nPasses = 0;
 
 		const float fOffsetX = -0.5f * ScreenSizeX;
@@ -90,6 +51,8 @@
 
 		pEffect->EndPass();
 		pEffect->End();
+		*/
+		kContext.Add(pTexture, GetPosition(), GetDepth(), GetDimensions(), kColor);
 	}
 
 	GuiElement::Render(kContext);
@@ -117,28 +80,3 @@
 
 	return eCode;
 }
-
-/*
- * SetupVertexBuffer
- */
-ErrorCode GuiCursor::SetupVertexBuffer()
-{
-	Vertex::Quad* pVertices = NULL;
-
-	HRESULT hResult = pVertexBuffer->Lock(0, 0, (void**)&pVertices, D3DLOCK_DISCARD);
-	if(FAILED(hResult))
-	{
-		return Error_Fail;
-	}
-
-	pVertices[0]	= Vertex::Quad(+0.0f, -1.0f, 1.0f, 0.0f, 1.0f);
-	pVertices[1]	= Vertex::Quad(+0.0f, +0.0f, 1.0f, 0.0f, 0.0f);
-	pVertices[2]	= Vertex::Quad(+1.0f, +0.0f, 1.0f, 1.0f, 0.0f);
-	pVertices[3]	= Vertex::Quad(+0.0f, -1.0f, 1.0f, 0.0f, 1.0f);
-	pVertices[4]	= Vertex::Quad(+1.0f, +0.0f, 1.0f, 1.0f, 0.0f);
-	pVertices[5]	= Vertex::Quad(+1.0f, -1.0f, 1.0f, 1.0f, 1.0f);
-
-	pVertexBuffer->Unlock();
-
-	return Error_Success;
-}