CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

I didn't push that yet?

Browse Source
This commit is contained in:
andreja6
2019-11-04 21:21:49 -08:00
parent 22ed6acc7f
commit bb01d01950
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Application.cpp
View File

@@ -620,7 +620,7 @@ void Application::onGraphics(RenderDevice* rd) {
sky->renderLensFlare(renderDevice, lighting); sky->renderLensFlare(renderDevice, lighting);
} }
renderDevice->push2D(); renderDevice->push2D();
_dataModel->getGuiRoot()->renderGUI(renderDevice); _dataModel->getGuiRoot()->renderGUI(renderDevice, m_graphicsWatch.FPS());
rd->pushState(); rd->pushState();
rd->beforePrimitive(); rd->beforePrimitive();

6
GuiRoot.cpp
View File

@@ -386,7 +386,7 @@ void GuiRoot::setDebugMessage(std::string msg, G3D::RealTime msgTime)
//void GuiRoot::render(G3D::RenderDevice* renderDevice) {} //void GuiRoot::render(G3D::RenderDevice* renderDevice) {}
void GuiRoot::renderGUI(G3D::RenderDevice* rd) void GuiRoot::renderGUI(G3D::RenderDevice* rd, double fps)
{ {
//TODO--Move these to their own instance //TODO--Move these to their own instance
@@ -398,8 +398,8 @@ void GuiRoot::renderGUI(G3D::RenderDevice* rd)
#ifdef _DEBUG #ifdef _DEBUG
stream.str(""); stream.str("");
stream.clear(); stream.clear();
stream << std::fixed << std::setprecision(3) << m_graphicsWatch.FPS(); stream << std::fixed << std::setprecision(3) << fps;
fntdominant->draw2D(rd, "FPS: " + stream.str(), Vector2(120, 25), 10, Color3::fromARGB(0xFFFF00), Color3::black()); g_fntdominant->draw2D(rd, "FPS: " + stream.str(), Vector2(120, 25), 10, Color3::fromARGB(0xFFFF00), Color3::black());
#endif #endif
//GUI Boxes //GUI Boxes
Draw::box(G3D::Box(Vector3(0,25,0),Vector3(80,355,0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0)); Draw::box(G3D::Box(Vector3(0,25,0),Vector3(80,355,0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0));

2
GuiRoot.h
View File

@@ -12,7 +12,7 @@ public:
TextButtonInstance* makeTextButton(); TextButtonInstance* makeTextButton();
void drawButtons(RenderDevice* rd); void drawButtons(RenderDevice* rd);
ImageButtonInstance* makeImageButton(G3D::TextureRef newImage, G3D::TextureRef overImage, G3D::TextureRef downImage, G3D::TextureRef disableImage); ImageButtonInstance* makeImageButton(G3D::TextureRef newImage, G3D::TextureRef overImage, G3D::TextureRef downImage, G3D::TextureRef disableImage);
void renderGUI(G3D::RenderDevice* rd); void renderGUI(G3D::RenderDevice* rd, double fps);
void setDebugMessage(std::string msg, G3D::RealTime msgTime); void setDebugMessage(std::string msg, G3D::RealTime msgTime);
void update(); void update();
bool mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y); bool mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y);