ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added #define to enable slipstreams even if karts are not moving. This allows for

Browse Source 
e.g. easier debugging of the slipstream looks.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5385 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-05-06 05:25:58 +00:00
parent be4079e4c8
commit d13f8c85f6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/karts/kart.cpp
View File

@ -839,7 +839,6 @@ float Kart::handleSlipstream(float dt)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
if(m_slipstream_mode==SS_USE) if(m_slipstream_mode==SS_USE)
{ {
//printf("Using slipstream\n");
m_slipstream_time -= dt; m_slipstream_time -= dt;
if(m_slipstream_time<0) m_slipstream_mode=SS_NONE; if(m_slipstream_time<0) m_slipstream_mode=SS_NONE;
m_slip_stream->setIntensity(2.0f, NULL); m_slip_stream->setIntensity(2.0f, NULL);
@ -848,12 +847,17 @@ float Kart::handleSlipstream(float dt)
// If this kart is too slow for slipstreaming taking effect, do nothing // If this kart is too slow for slipstreaming taking effect, do nothing
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// Define this to get slipstream effect shown even when the karts are
// not moving. This is useful for debugging the graphics of SS-ing.
#undef DISPLAY_SLIPSTREAM_WITH_0_SPEED_FOR_DEBUGGING
#ifndef DISPLAY_SLIPSTREAM_WITH_0_SPEED_FOR_DEBUGGING
if(getSpeed()<m_kart_properties->getSlipstreamMinSpeed()) if(getSpeed()<m_kart_properties->getSlipstreamMinSpeed())
{ {
m_slip_stream->setIntensity(0, NULL); m_slip_stream->setIntensity(0, NULL);
return 0; return 0;
} }
#endif
// Then test if this kart is in the slipstream range of another kart: // Then test if this kart is in the slipstream range of another kart:
// ------------------------------------------------------------------ // ------------------------------------------------------------------
m_slipstream_original_quad->transform(getTrans(), m_slipstream_quad); m_slipstream_original_quad->transform(getTrans(), m_slipstream_quad);
@ -875,8 +879,10 @@ float Kart::handleSlipstream(float dt)
// against the minimum slipstream speed kart of this kart - not // against the minimum slipstream speed kart of this kart - not
// entirely sure if this makes sense, but it makes it easier to // entirely sure if this makes sense, but it makes it easier to
// give karts different slipstream properties. // give karts different slipstream properties.
#ifndef DISPLAY_SLIPSTREAM_WITH_0_SPEED_FOR_DEBUGGING
if(target_kart->getSpeed()<m_kart_properties->getSlipstreamMinSpeed()) if(target_kart->getSpeed()<m_kart_properties->getSlipstreamMinSpeed())
continue; continue;
#endif
// Quick test: the kart must be not more than // Quick test: the kart must be not more than
// slipstream length+kart_length() away from the other kart // slipstream length+kart_length() away from the other kart
Vec3 delta = getXYZ() - target_kart->getXYZ(); Vec3 delta = getXYZ() - target_kart->getXYZ();