Mercurial > LightClone
diff LightClone/Source/GuiElement.cpp @ 51:efd2b1ca5b77
Clean up gui
| author | koryspansel <koryspansel@bendbroadband.com> |
|---|---|
| date | Tue, 27 Sep 2011 09:42:01 -0700 |
| parents | 7ff46a00bcd3 |
| children | b0f642ee22d3 |
line wrap: on
line diff
--- a/LightClone/Source/GuiElement.cpp Fri Sep 23 17:58:17 2011 -0700 +++ b/LightClone/Source/GuiElement.cpp Tue Sep 27 09:42:01 2011 -0700 @@ -12,8 +12,14 @@ /* * GuiElement */ -GuiElement::GuiElement() : pContainer(NULL), kPosition(0.0f, 0.0f), kDimensions(0.0f, 0.0f), kColor(0xFFFFFFFF), nFlags(GuiElementFlag_Visible) +GuiElement::GuiElement() { + pContainer = NULL; + kPosition = D3DXVECTOR2(0.0f, 0.0f); + fDepth = 1.0f; + kDimensions = D3DXVECTOR2(0.0f, 0.0f); + kColor = D3DCOLOR_XRGB(255, 255, 255); + nFlags = GuiElementFlag_Visible; } /* @@ -26,8 +32,11 @@ /* * Initialize */ -ErrorCode GuiElement::Initialize(ResourceManager* pResourceManager) +ErrorCode GuiElement::Initialize(ResourceManager* pManager) { + //ASSERT(pManager != NULL); + pResourceManager = pManager; + return Error_Success; } @@ -52,7 +61,6 @@ /* * Render */ -//void GuiElement::Render(RenderContext& kContext, Camera& kCamera) void GuiElement::Render(GuiRenderContext& kContext) { if(nFlags & GuiElementFlag_Visible) @@ -127,6 +135,22 @@ } /* + * SetDepth + */ +void GuiElement::SetDepth(float fValue) +{ + fDepth = fValue; +} + +/* + * GetDepth + */ +float GuiElement::GetDepth() const +{ + return fDepth; +} + +/* * SetDimensions */ void GuiElement::SetDimensions(float fWidth, float fHeight)