From 426da1ed04e346e7ea4aec382a3fb27e5992d6d5 Mon Sep 17 00:00:00 2001 From: auria Date: Wed, 18 May 2011 01:14:33 +0000 Subject: [PATCH] Apply fog settings to skid marks git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8635 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/graphics/skid_marks.cpp | 6 ++++++ src/graphics/skid_marks.hpp | 3 +++ src/karts/kart.cpp | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/graphics/skid_marks.cpp b/src/graphics/skid_marks.cpp index d6d54394f..21eddbd4b 100644 --- a/src/graphics/skid_marks.cpp +++ b/src/graphics/skid_marks.cpp @@ -292,3 +292,9 @@ void SkidMarks::SkidMarkQuads::fade(float f) } } // fade +// ---------------------------------------------------------------------------- + +void SkidMarks::adjustFog(bool enabled) +{ + m_material->FogEnable = enabled; +} diff --git a/src/graphics/skid_marks.hpp b/src/graphics/skid_marks.hpp index e1f9c3e97..9a7195b1a 100644 --- a/src/graphics/skid_marks.hpp +++ b/src/graphics/skid_marks.hpp @@ -88,6 +88,9 @@ public: ~SkidMarks(); void update (float dt); void reset(); + + void adjustFog(bool enabled); + }; // SkidMarks #endif diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp index 81d8751da..79caf5dc5 100644 --- a/src/karts/kart.cpp +++ b/src/karts/kart.cpp @@ -52,6 +52,7 @@ #include "physics/physics.hpp" #include "race/history.hpp" #include "tracks/track.hpp" +#include "tracks/track_manager.hpp" #include "utils/constants.hpp" #if defined(WIN32) && !defined(__CYGWIN__) @@ -543,6 +544,7 @@ void Kart::reset() } TerrainInfo::update(getXYZ()); + m_skidmarks->adjustFog( track_manager->getTrack( race_manager->getTrackName() )->isFogEnabled() ); // Reset is also called when the kart is created, at which time // m_controller is not yet defined, so this has to be tested here. @@ -1764,8 +1766,11 @@ void Kart::loadData(RaceManager::KartType type, bool is_first_kart, Track* track m_slipstream = new SlipStream(this); if(m_kart_properties->hasSkidmarks()) + { m_skidmarks = new SkidMarks(*this); - + m_skidmarks->adjustFog( track_manager->getTrack( race_manager->getTrackName() )->isFogEnabled() ); + } + m_shadow = new Shadow(m_kart_properties->getShadowTexture(), m_node); } // loadData