summaryrefslogtreecommitdiff
path: root/src/render/RenderModel.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-31 18:49:14 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-31 18:49:14 (GMT)
commit857b0cc1fc58f066acd59404d16ee5e566e20f00 (patch)
tree7607fc43f3bdd63687dff39209f44defa48e6a35 /src/render/RenderModel.cpp
parent1d297cb57a338f2a9e34d0f16642afc6a83c1041 (diff)
downloadpowder-857b0cc1fc58f066acd59404d16ee5e566e20f00.zip
powder-857b0cc1fc58f066acd59404d16ee5e566e20f00.tar.gz
Load user information from preferences, fps display for testing
Diffstat (limited to 'src/render/RenderModel.cpp')
-rw-r--r--src/render/RenderModel.cpp34
1 files changed, 33 insertions, 1 deletions
diff --git a/src/render/RenderModel.cpp b/src/render/RenderModel.cpp
index 52a32ac..56b42a1 100644
--- a/src/render/RenderModel.cpp
+++ b/src/render/RenderModel.cpp
@@ -10,8 +10,40 @@
RenderModel::RenderModel():
renderer(NULL)
{
- // TODO Auto-generated constructor stub
+ try
+ {
+ json::Number tempNumber = Client::Ref().configDocument["Renderer"]["ColourMode"];
+ if(tempNumber.Value())
+ renderer->SetColourMode(tempNumber.Value());
+
+ json::Array tempArray = Client::Ref().configDocument["Renderer"]["DisplayModes"];
+ if(tempArray.Size())
+ {
+ std::vector<unsigned int> displayModes;
+ json::Array::const_iterator itDisplayModes(tempArray.Begin()), itDisplayModesEnd(tempArray.End());
+ for (; itDisplayModes != itDisplayModesEnd; ++itDisplayModes)
+ {
+ json::Number tempNumberI = *itDisplayModes;
+ displayModes.push_back(tempNumberI.Value());
+ }
+ }
+
+ tempArray = Client::Ref().configDocument["Renderer"]["RenderModes"];
+ if(tempArray.Size())
+ {
+ std::vector<unsigned int> renderModes;
+ json::Array::const_iterator itRenderModes(tempArray.Begin()), itRenderModesEnd(tempArray.End());
+ for (; itRenderModes != itRenderModesEnd; ++itRenderModes)
+ {
+ json::Number tempNumberI = *itRenderModes;
+ renderModes.push_back(tempNumberI.Value());
+ }
+ }
+ }
+ catch(json::Exception & e)
+ {
+ }
}
void RenderModel::AddObserver(RenderView * observer)