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

Make snow follow kart, this should reduce the needed CPU and GPU demand to render snow. Note that the current effect is not perfect, you can 'outrun' snow

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7768 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-02-28 01:49:35 +00:00
parent f7f01c144a
commit 2293fdbe80
6 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/gfx/snow.xml
View File

@ -12,8 +12,8 @@
<material file="snowflake.png"/>
<!-- Amount of particles emitted per second -->
<rate min="900"
max="900" />
<rate min="400"
max="500" />
<!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
<lifetime min="9000"

13
src/graphics/particle_emitter.cpp
View File

@ -115,14 +115,13 @@ public:
for (unsigned int n=0; n<count; n++)
{
scene::SParticle& curr = particlearray[n];
const int i = (curr.pos.X - track_x)/track_x_len*m_height_map.size();
const int j = (curr.pos.Z - track_z)/track_z_len*m_height_map.size();
assert(i < (int)m_height_map.size());
assert(j < (int)m_height_map.size());
assert(i >= 0);
assert(j >= 0);
const int i = (curr.pos.X - track_x)/track_x_len*(HEIGHT_MAP_RESOLUTION);
const int j = (curr.pos.Z - track_z)/track_z_len*(HEIGHT_MAP_RESOLUTION);
if (i >= HEIGHT_MAP_RESOLUTION || j >= HEIGHT_MAP_RESOLUTION) continue;
if (i < 0 || j < 0) continue;
/*
// debug draw
core::vector3df lp = curr.pos;
core::vector3df lp2 = curr.pos;
lp2.Y = m_height_map[i][j] + 0.02f;

27
src/karts/kart.cpp
View File

@ -101,6 +101,7 @@ Kart::Kart (const std::string& ident, Track* track, int position,
m_saved_controller = NULL;
m_flying = false;
m_rain = NULL;
m_sky_particles_emitter= NULL;
m_view_blocked_by_plunger = 0;
@ -334,10 +335,11 @@ Kart::~Kart()
sfx_manager->deleteSFX(m_beep_sound );
if(m_terrain_sound) sfx_manager->deleteSFX(m_terrain_sound);
if(m_previous_terrain_sound) sfx_manager->deleteSFX(m_previous_terrain_sound);
if(m_terrain_particles) delete m_terrain_particles;
if(m_nitro) delete m_nitro;
if(m_slipstream) delete m_slipstream;
if(m_rain) delete m_rain;
if(m_terrain_particles) delete m_terrain_particles;
if(m_nitro) delete m_nitro;
if(m_slipstream) delete m_slipstream;
if(m_rain) delete m_rain;
if(m_sky_particles_emitter) delete m_sky_particles_emitter;
delete m_shadow;
@ -1609,7 +1611,22 @@ void Kart::loadData(RaceManager::KartType type, Track* track, bool animatedModel
}
}
if (UserConfigParams::m_weather_effects && track->getWeatherType() == WEATHER_RAIN && type == RaceManager::KT_PLAYER)
if (type == RaceManager::KT_PLAYER && UserConfigParams::m_weather_effects &&
track->getSkyParticles() != NULL)
{
track->getSkyParticles()->setBoxSizeX(150.0f);
track->getSkyParticles()->setBoxSizeZ(150.0f);
m_sky_particles_emitter = new ParticleEmitter(track->getSkyParticles(), core::vector3df(0, 40.0f, 0),
getNode());
// FIXME: in multiplayer mode, this will result in several instances of the heightmap being calculated
// and kept in memory
m_sky_particles_emitter->addHeightMapAffector(track);
}
if (UserConfigParams::m_weather_effects && track->getWeatherType() == WEATHER_RAIN &&
type == RaceManager::KT_PLAYER)
{
// camera not yet available at this point
m_rain = new Rain(NULL, NULL);

2
src/karts/kart.hpp
View File

@ -138,6 +138,8 @@ private:
/** Particle emitter used for terrain-specific effects (including but not limited too skidding). */
ParticleEmitter *m_terrain_particles;
ParticleEmitter *m_sky_particles_emitter;
/** Graphical effect when using a nitro. */
ParticleEmitter *m_nitro;

23
src/tracks/track.cpp
View File

@ -78,7 +78,6 @@ Track::Track(std::string filename)
m_check_manager = NULL;
m_mini_map = NULL;
m_sky_particles = NULL;
m_sky_particles_emitter = NULL;
m_sky_dx = 0.05f;
m_sky_dy = 0.0f;
m_weather_type = WEATHER_NONE;
@ -92,7 +91,6 @@ Track::~Track()
if(m_quad_graph) delete m_quad_graph;
if(m_check_manager) delete m_check_manager;
if(m_mini_map) irr_driver->removeTexture(m_mini_map);
if(m_sky_particles_emitter) delete m_sky_particles_emitter;
delete m_track_mesh;
delete m_gfx_effect_mesh;
} // ~Track
@ -139,9 +137,6 @@ void Track::cleanup()
m_all_nodes.clear();
m_all_emitters.clearAndDeleteAll();
if (m_sky_particles_emitter) delete m_sky_particles_emitter;
m_sky_particles_emitter = NULL;
// The meshes stored in the scene nodes are dropped now.
// But to really remove all track meshes from memory
@ -1022,20 +1017,6 @@ void Track::loadTrackModel(World* parent, unsigned int mode_id)
createPhysicsModel(main_track_count);
if (UserConfigParams::m_track_debug) m_quad_graph->createDebugMesh();
if (UserConfigParams::m_weather_effects && m_sky_particles != NULL)
{
const float x = (m_aabb_max.getX() + m_aabb_min.getX())/2.0f;
const float z = (m_aabb_max.getZ() + m_aabb_min.getZ())/2.0f;
const float size_x = m_aabb_max.getX() - m_aabb_min.getX();
const float size_z = m_aabb_max.getZ() - m_aabb_min.getZ();
m_sky_particles->setBoxSizeX(size_x*0.5f); // FIXME: don't hardcode size reduction. We need to set the emission area in blender
m_sky_particles->setBoxSizeZ(size_z*0.5f);
// FIXME: don't hardcode height We need to set the emission area in blender
m_sky_particles_emitter = new ParticleEmitter(m_sky_particles, core::vector3df(x, m_aabb_max.getY()*0.75f, z));
m_sky_particles_emitter->addHeightMapAffector(this);
}
// Only print warning if not in battle mode, since battle tracks don't have
// any quads or check lines.
@ -1177,9 +1158,7 @@ bool Track::setTerrainHeight(Vec3 *pos) const
// ----------------------------------------------------------------------------
std::vector< std::vector<float> > Track::buildHeightMap()
{
const int HEIGHT_MAP_RESOLUTION = 128;
{
std::vector< std::vector<float> > out(HEIGHT_MAP_RESOLUTION);
float x = m_aabb_min.getX();

9
src/tracks/track.hpp
View File

@ -48,6 +48,8 @@ class TriangleMesh;
class World;
class XMLNode;
const int HEIGHT_MAP_RESOLUTION = 256;
enum WeatherType
{
WEATHER_NONE,
@ -143,9 +145,7 @@ private:
/** Use a special built-in wheather */
WeatherType m_weather_type;
ParticleEmitter* m_sky_particles_emitter;
/** A simple class to keep information about a track mode. */
class TrackMode
{
@ -314,7 +314,8 @@ public:
unsigned int getNumberOfStartPositions() const
{ return m_start_transforms.size(); }
WeatherType getWeatherType () const { return m_weather_type; }
WeatherType getWeatherType () const { return m_weather_type; }
ParticleKind* getSkyParticles () { return m_sky_particles; }
std::vector< std::vector<float> > buildHeightMap();