From 6df86551eba131a6dffed5a4fee60ac68a8b2351 Mon Sep 17 00:00:00 2001 From: Marianne Gagnon Date: Tue, 23 Sep 2014 18:40:07 -0400 Subject: [PATCH] Remove unused code --- src/graphics/render.cpp | 2 -- src/tracks/track.cpp | 2 -- src/tracks/track.hpp | 7 +------ 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp index 49c1a9d5a..545695739 100644 --- a/src/graphics/render.cpp +++ b/src/graphics/render.cpp @@ -539,12 +539,10 @@ void IrrDriver::renderFixed(float dt) void IrrDriver::computeSunVisibility() { // Is the lens flare enabled & visible? Check last frame's query. - bool hasflare = false; bool hasgodrays = false; if (World::getWorld() != NULL) { - hasflare = World::getWorld()->getTrack()->hasLensFlare(); hasgodrays = World::getWorld()->getTrack()->hasGodRays(); } diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 64734ebd4..bf734a488 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -123,7 +123,6 @@ Track::Track(const std::string &filename) m_color_inlevel = core::vector3df(0.0,1.0, 255.0); m_color_outlevel = core::vector2df(0.0, 255.0); m_clouds = false; - m_lensflare = false; m_godrays = false; m_displacement_speed = 1.0f; m_caustics_speed = 1.0f; @@ -484,7 +483,6 @@ void Track::loadTrackInfo() root->get("clouds", &m_clouds); root->get("bloom", &m_bloom); root->get("bloom-threshold", &m_bloom_threshold); - root->get("lens-flare", &m_lensflare); root->get("shadows", &m_shadows); root->get("displacement-speed", &m_displacement_speed); root->get("caustics-speed", &m_caustics_speed); diff --git a/src/tracks/track.hpp b/src/tracks/track.hpp index 4ffb8d9d1..0e6381fe1 100644 --- a/src/tracks/track.hpp +++ b/src/tracks/track.hpp @@ -377,8 +377,6 @@ private: bool m_bloom; float m_bloom_threshold; - bool m_lensflare; - bool m_godrays; core::vector3df m_godrays_position; float m_godrays_opacity; @@ -623,7 +621,7 @@ public: bool hasClouds() const { return m_clouds; } // ------------------------------------------------------------------------ - bool getBloom() const { return m_bloom; } + bool hasBloom() const { return m_bloom; } // ------------------------------------------------------------------------ float getBloomThreshold() const { return m_bloom_threshold; } @@ -633,9 +631,6 @@ public: core::vector3df getColorLevelIn() const { return m_color_inlevel; } // ------------------------------------------------------------------------ core::vector2df getColorLevelOut() const { return m_color_outlevel; } - - // ------------------------------------------------------------------------ - bool hasLensFlare() const { return m_lensflare; } // ------------------------------------------------------------------------ bool hasGodRays() const { return m_godrays; } // ------------------------------------------------------------------------