From fb79bce5ab099f318238b152dcfc84a7f4f5e8e1 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sun, 1 May 2011 22:48:44 +0000 Subject: [PATCH] - added new ini entry for totalnoob to try to see if it fixes his stick trees? PerspectiveFarPlane=1000 is what he should try when using this svn version --- source/glest_game/graphics/renderer.cpp | 5 ++++- source/glest_game/graphics/renderer.h | 2 +- source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp | 6 +----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index 6825d206..16bc97df 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -128,7 +128,7 @@ const float Renderer::magicCircleRadius= 1.f; const float Renderer::perspFov= 60.f; const float Renderer::perspNearPlane= 1.f; //const float Renderer::perspFarPlane= 50.f; -const float Renderer::perspFarPlane= 1000000.f; +float Renderer::perspFarPlane= 1000000.f; const float Renderer::ambFactor= 0.7f; const Vec4f Renderer::fowColor= Vec4f(0.0f, 0.0f, 0.0f, 1.0f); @@ -180,9 +180,12 @@ Renderer::Renderer() { FactoryRepository &fr= FactoryRepository::getInstance(); Config &config= Config::getInstance(); + Renderer::perspFarPlane = config.getFloat("PerspectiveFarPlane",floatToStr(Renderer::perspFarPlane).c_str()); this->no2DMouseRendering = config.getBool("No2DMouseRendering","false"); this->maxConsoleLines= config.getInt("ConsoleMaxLines"); + if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] Renderer::perspFarPlane [%f] this->no2DMouseRendering [%d] this->maxConsoleLines [%d]\n",__FILE__,__FUNCTION__,__LINE__,Renderer::perspFarPlane,this->no2DMouseRendering,this->maxConsoleLines); + gi.setFactory(fr.getGraphicsFactory(config.getString("FactoryGraphics"))); GraphicsFactory *graphicsFactory= GraphicsInterface::getInstance().getFactory(); diff --git a/source/glest_game/graphics/renderer.h b/source/glest_game/graphics/renderer.h index cd564cb8..1d3f1bff 100644 --- a/source/glest_game/graphics/renderer.h +++ b/source/glest_game/graphics/renderer.h @@ -173,7 +173,7 @@ public: //perspective values static const float perspFov; static const float perspNearPlane; - static const float perspFarPlane; + static float perspFarPlane; //default values static const float ambFactor; diff --git a/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp b/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp index 4413c81a..fc2a3668 100644 --- a/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp @@ -59,8 +59,6 @@ void ModelRendererGl::begin(bool renderNormals, bool renderTextures, bool render glEnable(GL_BLEND); glEnable(GL_POLYGON_OFFSET_FILL); - //glEnable(GL_POLYGON_OFFSET_LINE); - //glEnable(GL_POLYGON_OFFSET_POINT); glPolygonOffset(0.005f, 0.0f); glEnableClientState(GL_VERTEX_ARRAY); @@ -96,8 +94,6 @@ void ModelRendererGl::end() { glPolygonOffset( 0.0f, 0.0f ); glDisable(GL_POLYGON_OFFSET_FILL); - //glDisable(GL_POLYGON_OFFSET_LINE); - //glDisable(GL_POLYGON_OFFSET_POINT); //pop glPopAttrib(); @@ -147,7 +143,7 @@ void ModelRendererGl::renderMesh(Mesh *mesh) { //assertions assertGl(); - glPolygonOffset(0.05f, 0.0f); + //glPolygonOffset(0.05f, 0.0f); //set cull face if(mesh->getTwoSided()) { glDisable(GL_CULL_FACE);