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

Rework a bit material panel. For some reason, the flag that tells STK to produce a water splash upon collision was placed in a dropdown among a bunch of shaders... Left old settings in place for backwards compatibility for now, some day we can remove them

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2013-05-13 23:21:57 +00:00
parent 1003e49984
commit 4d6e45ce00
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/graphics/material.cpp
View File

@ -481,6 +481,8 @@ Material::Material(const XMLNode *node, int index, bool deprecated)
node->get("mask", &m_mask );
node->get("water-splash", &m_water_splash );
if (m_collision_reaction != NORMAL)
{
node->get("collision-particles", &m_collision_particles);
@ -541,7 +543,8 @@ Material::Material(const XMLNode *node, int index, bool deprecated)
if (s == "water")
{
m_graphical_effect = GE_WATER;
// For backwards compatibility only, eventually remove
m_water_splash = true;
}
else if (s == "bubble")
{
@ -555,6 +558,12 @@ Material::Material(const XMLNode *node, int index, bool deprecated)
node->get("grass-speed", &m_grass_speed);
node->get("grass-amplitude", &m_grass_amplitude);
}
else if (s == "water_shader")
{
m_graphical_effect = GE_WATER_SHADER;
node->get("water-shader-speed-1", &m_water_shader_speed_1);
node->get("water-shader-speed-2", &m_water_shader_speed_2);
}
else if (s == "none")
{
}
@ -591,9 +600,12 @@ Material::Material(const XMLNode *node, int index, bool deprecated)
node->get("splatting-lightmap", &m_splatting_lightmap);
}
node->get("water-shader", &m_water_shader);
if (m_water_shader)
bool water_shader = false;
node->get("water-shader", &water_shader);
if (water_shader)
{
// BACKWARDS COMPATIBILITY, eventually remove
m_graphical_effect = GE_WATER_SHADER;
node->get("water-shader-speed-1", &m_water_shader_speed_1);
node->get("water-shader-speed-2", &m_water_shader_speed_2);
}
@ -681,7 +693,6 @@ void Material::init(unsigned int index)
m_collision_reaction = NORMAL;
m_add = false;
m_disable_z_write = false;
m_water_shader = false;
m_water_shader_speed_1 = 6.6667f;
m_water_shader_speed_2 = 4.0f;
m_fog = true;
@ -705,6 +716,7 @@ void Material::init(unsigned int index)
m_is_heightmap = false;
m_alpha_to_coverage = false;
m_splatting = false;
m_water_splash = false;
m_shaders.resize(SHADER_COUNT, NULL);
@ -1273,7 +1285,7 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
}
if (m_water_shader)
if (m_graphical_effect == GE_WATER_SHADER)
{
IVideoDriver* video_driver = irr_driver->getVideoDriver();
if (UserConfigParams::m_pixel_shaders &&
@ -1344,7 +1356,6 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
grass_shaders_times_index++;
}
modes++;
}
if (modes > 1)

13
src/graphics/material.hpp
View File

@ -52,12 +52,11 @@ class Material : public NoCopy
{
public:
enum GraphicalEffect {GE_NONE,
/** Water splash effect. This is set on the seabed material. */
GE_WATER,
/** Effect where the UV texture is moved in a wave pattern */
GE_BUBBLE,
/** Effect that makes grass wave as in the wind */
GE_GRASS};
GE_GRASS,
GE_WATER_SHADER};
enum ParticleConditions
{
@ -101,6 +100,8 @@ private:
* up to find the position of the actual water surface. */
bool m_below_surface;
bool m_water_splash;
/** If a kart is falling over a material with this flag set, it
* will trigger the special camera fall effect. */
bool m_falling_effect;
@ -115,15 +116,13 @@ private:
/** If a kart is rescued when driving on this surface. */
bool m_drive_reset;
/** If the water shader (simulating wave effects and reflexions) is enabled */
bool m_water_shader;
/** Speed of the 'main' wave in the water shader. Only used if
m_water_shader is true */
m_graphical_effect == WATER_SHADER */
float m_water_shader_speed_1;
/** Speed of the 'secondary' waves in the water shader. Only used if
m_water_shader is true */
m_graphical_effect == WATER_SHADER */
float m_water_shader_speed_2;
/** If a kart is rescued when crashing into this surface. */