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

New XML syntax for the speed-weighted objects: now we can have several speed-weighted objects with different parameter values in a single kart.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14361 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
funto66
2013-11-02 00:20:48 +00:00
parent 7f854b4729
commit 550302488e
5 changed files with 88 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/stk_config.xml
View File

@@ -487,7 +487,7 @@
<!-- Parameters for the speed-weighted objects:
a bigger value for strength-factor leads to the speed of the kart more quickly affecting
the strength of the animation (up to a maximum value that corresponds to the original animation) -->
<speed-weighted strength-factor="0.05" speed-factor="1.0" texture-speed-x="0.0" texture-speed-y="0.0"/>
<speed-weighted-objects strength-factor="0.05" speed-factor="1.0" texture-speed-x="0.0" texture-speed-y="0.0"/>
<!-- friction: slip used for bullet skidding. A high value
(like 10000000) disables bullet skidding. -->

65
src/karts/kart_model.cpp
View File

@@ -38,6 +38,37 @@
float KartModel::UNDEFINED = -99.9f;
// ------------------------------------------------------------
// SpeedWeightedObject implementation
#define SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED -99.f
SpeedWeightedObject::Properties::Properties()
{
m_strength_factor = m_speed_factor = m_texture_speed.X = m_texture_speed.Y = SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED;
}
void SpeedWeightedObject::Properties::loadFromXMLNode(const XMLNode* xml_node)
{
xml_node->get("strength-factor", &m_strength_factor);
xml_node->get("speed-factor", &m_speed_factor);
xml_node->get("texture-speed-x", &m_texture_speed.X);
xml_node->get("texture-speed-y", &m_texture_speed.Y);
}
void SpeedWeightedObject::Properties::checkAllSet()
{
#define CHECK_NEG( a,strA) if(a<=SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED) { \
Log::fatal("SpeedWeightedObject", "Missing default value for '%s'.", \
strA); \
}
CHECK_NEG(m_strength_factor, "speed-weighted strength-factor" );
CHECK_NEG(m_speed_factor, "speed-weighted speed-factor" );
CHECK_NEG(m_texture_speed.X, "speed-weighted texture speed X" );
CHECK_NEG(m_texture_speed.Y, "speed-weighted texture speed Y" );
#undef CHECK_NEG
}
/** Default constructor which initialises all variables with defaults.
* Note that the KartModel is copied, so make sure to update makeCopy
* if any more variables are added to this object.
@@ -148,12 +179,15 @@ void KartModel::loadInfo(const XMLNode &node)
m_has_nitro_emitter = true;
}
if(const XMLNode *speedWeighted_node=node.getNode("speed-weighted"))
if(const XMLNode *speed_weighted_objects_node=node.getNode("speed-weighted-objects"))
{
for(unsigned int i=0 ; i < speedWeighted_node->getNumNodes() ; i++)
{
loadSpeedWeightedInfo(speedWeighted_node->getNode(i));
}
SpeedWeightedObject::Properties fallback_properties;
fallback_properties.loadFromXMLNode(speed_weighted_objects_node);
for(unsigned int i=0 ; i < speed_weighted_objects_node->getNumNodes() ; i++)
{
loadSpeedWeightedInfo(speed_weighted_objects_node->getNode(i), fallback_properties);
}
}
if(const XMLNode *hat_node=node.getNode("hat"))
@@ -279,11 +313,9 @@ KartModel* KartModel::makeCopy()
km->m_speed_weighted_objects.resize(m_speed_weighted_objects.size());
for(size_t i=0; i<m_speed_weighted_objects.size(); i++)
{
km->m_speed_weighted_objects[i].m_model = m_speed_weighted_objects[i].m_model;
// Master should not have any speed weighted nodes.
assert(!m_speed_weighted_objects[i].m_node);
km->m_speed_weighted_objects[i].m_name = m_speed_weighted_objects[i].m_name;
km->m_speed_weighted_objects[i].m_position = m_speed_weighted_objects[i].m_position;
km->m_speed_weighted_objects[i] = m_speed_weighted_objects[i];
}
for(unsigned int i=AF_BEGIN; i<=AF_END; i++)
@@ -511,9 +543,11 @@ void KartModel::loadNitroEmitterInfo(const XMLNode &node,
} // loadNitroEmitterInfo
/** Loads a single speed weighted node. */
void KartModel::loadSpeedWeightedInfo(const XMLNode* speed_weighted_node)
void KartModel::loadSpeedWeightedInfo(const XMLNode* speed_weighted_node, const SpeedWeightedObject::Properties& fallback_properties)
{
SpeedWeightedObject obj;
obj.m_properties = fallback_properties;
obj.m_properties.loadFromXMLNode(speed_weighted_node);
speed_weighted_node->get("position", &obj.m_position);
speed_weighted_node->get("model", &obj.m_name);
@@ -767,9 +801,13 @@ void KartModel::update(float dt, float rotation_dt, float steer, const float sus
{
SpeedWeightedObject& obj = m_speed_weighted_objects[i];
#define GET_VALUE(obj, value_name) \
obj.m_properties.value_name > SPEED_WEIGHTED_OBJECT_PROPERTY_UNDEFINED ? obj.m_properties.value_name : \
m_kart->getKartProperties()->getSpeedWeightedObjectProperties().value_name
// Animation strength
float strength = 1.0f;
const float strength_factor = m_kart->getKartProperties()->getSpeedWeightedStrengthFactor();
const float strength_factor = GET_VALUE(obj, m_strength_factor);
if(strength_factor >= 0.0f)
{
strength = speed * strength_factor;
@@ -778,7 +816,7 @@ void KartModel::update(float dt, float rotation_dt, float steer, const float sus
obj.m_node->setAnimationStrength(strength);
// Animation speed
const float speed_factor = m_kart->getKartProperties()->getSpeedWeightedSpeedFactor();
const float speed_factor = GET_VALUE(obj, m_speed_factor);
if(speed_factor >= 0.0f)
{
float anim_speed = speed * speed_factor;
@@ -786,7 +824,9 @@ void KartModel::update(float dt, float rotation_dt, float steer, const float sus
}
// Texture animation
const core::vector2df& tex_speed = m_kart->getKartProperties()->getSpeedWeightedTextureSpeed();
core::vector2df tex_speed;
tex_speed.X = GET_VALUE(obj, m_texture_speed.X);
tex_speed.Y = GET_VALUE(obj, m_texture_speed.Y);
if(tex_speed != core::vector2df(0.0f, 0.0f))
{
obj.m_texture_cur_offset += speed * tex_speed * dt;
@@ -805,6 +845,7 @@ void KartModel::update(float dt, float rotation_dt, float steer, const float sus
} // for j<MATERIAL_MAX_TEXTURES
} // for i<getMaterialCount
}
#undef GET_VALUE
}
// Check if the end animation is being played, if so, don't

26
src/karts/kart_model.hpp
View File

@@ -37,8 +37,28 @@ class AbstractKart;
class KartProperties;
class XMLNode;
/** A speed-weighted object is an object whose characteristics are influenced by the kart's speed */
struct SpeedWeightedObject
{
/** Parameters for a speed-weighted object */
struct Properties
{
Properties();
/** Strength factor: how much the kart speed affects the animation's distance from a static pose (-1 to disable) */
float m_strength_factor;
/** Speed factor: how much the kart speed affects the animation's speed (-1 to disable) */
float m_speed_factor;
/** Texture speed, in UV coordinates */
core::vector2df m_texture_speed;
void loadFromXMLNode(const XMLNode* xml_node);
void checkAllSet();
};
SpeedWeightedObject() : m_model(NULL), m_node(NULL), m_position(), m_name() {}
/** Model */
scene::IAnimatedMesh * m_model;
@@ -54,6 +74,10 @@ struct SpeedWeightedObject
/** Current uv translation in the texture matrix for speed-weighted texture animations */
core::vector2df m_texture_cur_offset;
/** Specific properties for this given speed-weighted object,
* otherwise just a copy of the values from the kart's properties */
Properties m_properties;
};
typedef std::vector<SpeedWeightedObject> SpeedWeightedObjectList;
@@ -181,7 +205,7 @@ private:
void loadNitroEmitterInfo(const XMLNode &node,
const std::string &emitter_name, int index);
void loadSpeedWeightedInfo(const XMLNode* speed_weighted_node);
void loadSpeedWeightedInfo(const XMLNode* speed_weighted_node, const SpeedWeightedObject::Properties& fallback_properties);
void OnAnimationEnd(scene::IAnimatedMeshSceneNode *node);

15
src/karts/kart_properties.cpp
View File

@@ -68,9 +68,7 @@ KartProperties::KartProperties(const std::string &filename)
m_nitro_max_speed_increase = m_nitro_duration = m_nitro_fade_out_time =
m_suspension_stiffness = m_wheel_damping_relaxation = m_wheel_base =
m_wheel_damping_compression = m_friction_slip = m_roll_influence =
m_wheel_radius = m_speed_weighted_strength_factor = m_speed_weighted_speed_factor =
m_speed_weighted_texture_speed.X = m_speed_weighted_texture_speed.Y =
m_chassis_linear_damping = m_max_suspension_force =
m_wheel_radius = m_chassis_linear_damping = m_max_suspension_force =
m_chassis_angular_damping = m_suspension_rest =
m_max_speed_reverse_ratio = m_rescue_vert_offset =
m_upright_tolerance = m_collision_terrain_impulse =
@@ -428,12 +426,9 @@ void KartProperties::getAllData(const XMLNode * root)
wheels_node->get("radius", &m_wheel_radius );
}
if(const XMLNode *speed_weighted_node = root->getNode("speed-weighted"))
if(const XMLNode *speed_weighted_objects_node = root->getNode("speed-weighted-objects"))
{
speed_weighted_node->get("strength-factor", &m_speed_weighted_strength_factor);
speed_weighted_node->get("speed-factor", &m_speed_weighted_speed_factor);
speed_weighted_node->get("texture-speed-x", &m_speed_weighted_texture_speed.X);
speed_weighted_node->get("texture-speed-y", &m_speed_weighted_texture_speed.Y);
m_speed_weighted_object_properties.loadFromXMLNode(speed_weighted_objects_node);
}
if(const XMLNode *friction_node = root->getNode("friction"))
@@ -636,8 +631,6 @@ void KartProperties::checkAllSet(const std::string &filename)
CHECK_NEG(m_time_reset_steer, "turn time-reset-steer" );
CHECK_NEG(m_wheel_damping_relaxation, "wheels damping-relaxation" );
CHECK_NEG(m_wheel_damping_compression, "wheels damping-compression" );
CHECK_NEG(m_speed_weighted_strength_factor, "speed-weighted strength-factor" );
CHECK_NEG(m_speed_weighted_speed_factor, "speed-weighted speed-factor" );
CHECK_NEG(m_wheel_radius, "wheels radius" );
CHECK_NEG(m_friction_slip, "friction slip" );
CHECK_NEG(m_roll_influence, "stability roll-influence" );
@@ -719,6 +712,8 @@ void KartProperties::checkAllSet(const std::string &filename)
CHECK_NEG(m_plunger_in_face_duration[i],"plunger in-face-time");
}
m_speed_weighted_object_properties.checkAllSet();
m_skidding_properties->checkAllSet(filename);
for(unsigned int i=0; i<RaceManager::DIFFICULTY_COUNT; i++)
m_ai_properties[i]->checkAllSet(filename);

16
src/karts/kart_properties.hpp
View File

@@ -264,10 +264,8 @@ private:
float m_roll_influence;
float m_wheel_radius;
// Parameters for speed-weighted objects
float m_speed_weighted_strength_factor;
float m_speed_weighted_speed_factor;
core::vector2df m_speed_weighted_texture_speed;
/** Parameters for the speed-weighted objects */
SpeedWeightedObject::Properties m_speed_weighted_object_properties;
/** An impulse pushing the kart down which is proportional to speed. So
* the actual impulse is speed * m_downward_impulse_factor. Set it to
@@ -534,14 +532,8 @@ public:
float getWheelRadius () const {return m_wheel_radius; }
// ------------------------------------------------------------------------
/** Returns animation strength factor for speed-weighted objects */
float getSpeedWeightedStrengthFactor() const {return m_speed_weighted_strength_factor;}
// ------------------------------------------------------------------------
/** Returns animation speed factor for speed-weighted objects */
float getSpeedWeightedSpeedFactor() const {return m_speed_weighted_speed_factor;}
const core::vector2df& getSpeedWeightedTextureSpeed() const {return m_speed_weighted_texture_speed;}
/** Returns parameters for the speed-weighted objects */
const SpeedWeightedObject::Properties& getSpeedWeightedObjectProperties() const {return m_speed_weighted_object_properties;}
// ------------------------------------------------------------------------
/** Returns the wheel base (distance front to rear axis). */