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

Make z-offset after rescue a configurable parameter (z-rescue-offset)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3888 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
davemk 2009-08-19 14:07:15 +00:00
parent 329124a3ba
commit 779003befe
4 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/stk_config.data
View File

@ -140,6 +140,9 @@
;; and will be in the air longer ;; and will be in the air longer
(jump-velocity 3.0 ) (jump-velocity 3.0 )
;; z-axis offset when kart is being put back on track after being rescued
(z-rescue-offset 0.0 ) ;; fraction of kart height
;; The following two vectors define at what ratio of the maximum speed what ;; The following two vectors define at what ratio of the maximum speed what
;; gear is selected, e.g. 0.25 means: if speed <=0.25*maxSpeed --> gear 1, ;; gear is selected, e.g. 0.25 means: if speed <=0.25*maxSpeed --> gear 1,
;; 0.5 means: if speed <=0.5 *maxSpeed --> gear 2 ;; 0.5 means: if speed <=0.5 *maxSpeed --> gear 2

37
src/karts/kart_properties.cpp
View File

@ -48,24 +48,25 @@ KartProperties::KartProperties() : m_icon_material(0)
// Set all other values to undefined, so that it can later be tested // Set all other values to undefined, so that it can later be tested
// if everything is defined properly. // if everything is defined properly.
m_mass = m_min_speed_turn = m_angle_at_min = m_mass = m_min_speed_turn = m_angle_at_min =
m_max_speed_turn = m_angle_at_max = m_brake_factor = m_max_speed_turn = m_angle_at_max = m_brake_factor =
m_engine_power[0] = m_engine_power[1] = m_engine_power[2] = m_engine_power[0] = m_engine_power[1] = m_engine_power[2] =
m_max_speed[0] = m_max_speed[1] = m_max_speed[2] = m_max_speed[0] = m_max_speed[1] = m_max_speed[2] =
m_time_full_steer = m_time_full_steer_ai = m_nitro_power_boost = m_time_full_steer = m_time_full_steer_ai = m_nitro_power_boost =
m_suspension_stiffness = m_wheel_damping_relaxation = m_wheel_base = m_suspension_stiffness = m_wheel_damping_relaxation = m_wheel_base =
m_wheel_damping_compression = m_friction_slip = m_roll_influence = m_wheel_damping_compression = m_friction_slip = m_roll_influence =
m_wheel_radius = m_chassis_linear_damping = m_wheel_radius = m_chassis_linear_damping =
m_chassis_angular_damping = m_suspension_rest = m_chassis_angular_damping = m_suspension_rest =
m_max_speed_reverse_ratio = m_jump_velocity = m_upright_tolerance = m_max_speed_reverse_ratio = m_jump_velocity =
m_upright_max_force = m_suspension_travel_cm = m_z_rescue_offset = m_upright_tolerance =
m_track_connection_accel = m_min_speed_turn = m_angle_at_min = m_upright_max_force = m_suspension_travel_cm =
m_track_connection_accel = m_min_speed_turn = m_angle_at_min =
m_max_speed_turn = m_angle_at_max = m_max_speed_turn = m_angle_at_max =
m_rubber_band_max_length = m_rubber_band_force = m_rubber_band_max_length = m_rubber_band_force =
m_rubber_band_duration = m_time_till_max_skid = m_rubber_band_duration = m_time_till_max_skid =
m_skid_decrease = m_skid_increase = m_skid_visual = m_skid_max = m_skid_decrease = m_skid_increase = m_skid_visual = m_skid_max =
m_camera_max_accel = m_camera_max_brake = m_camera_max_accel = m_camera_max_brake =
m_slipstream_length = m_slipstream_time = m_slipstream_add_power = m_slipstream_length = m_slipstream_time = m_slipstream_add_power =
m_camera_distance = UNDEFINED; m_camera_distance = UNDEFINED;
m_gravity_center_shift = Vec3(UNDEFINED); m_gravity_center_shift = Vec3(UNDEFINED);
m_has_skidmarks = true; m_has_skidmarks = true;
@ -84,7 +85,7 @@ KartProperties::~KartProperties()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** Loads the kart properties from a file. /** Loads the kart properties from a file.
* \param filename Filename to load. * \param filename Filename to load.
* \param node Name of the lisp node to load the data from * \param node Name of the lisp node to load the data from
* (default: tuxkart-kart) * (default: tuxkart-kart)
* \param dont_load_models If set does not load the actual kart models, used * \param dont_load_models If set does not load the actual kart models, used
* when only printing kart information to stdout. * when only printing kart information to stdout.
@ -115,7 +116,7 @@ void KartProperties::load(const std::string &filename, const std::string &node,
} }
catch(std::exception& err) catch(std::exception& err)
{ {
fprintf(stderr, "Error while parsing KartProperties '%s':\n", fprintf(stderr, "Error while parsing KartProperties '%s':\n",
filename.c_str()); filename.c_str());
fprintf(stderr, "%s\n", err.what()); fprintf(stderr, "%s\n", err.what());
} }
@ -164,7 +165,7 @@ void KartProperties::load(const std::string &filename, const std::string &node,
// Useful when tweaking kart parameters // Useful when tweaking kart parameters
if(UserConfigParams::m_print_kart_sizes) if(UserConfigParams::m_print_kart_sizes)
printf("%s:\twidth: %f\tlength: %f\theight: %f\n",getIdent().c_str(), printf("%s:\twidth: %f\tlength: %f\theight: %f\n",getIdent().c_str(),
m_kart_model.getWidth(), m_kart_model.getLength(), m_kart_model.getWidth(), m_kart_model.getLength(),
m_kart_model.getHeight()); m_kart_model.getHeight());
@ -230,7 +231,7 @@ void KartProperties::getAllData(const lisp::Lisp* lisp)
m_min_radius = v[1]; m_min_radius = v[1];
} }
} }
lisp->get("nitro-power-boost", m_nitro_power_boost ); lisp->get("nitro-power-boost", m_nitro_power_boost );
//bullet physics data //bullet physics data
@ -248,6 +249,7 @@ void KartProperties::getAllData(const lisp::Lisp* lisp)
lisp->get("suspension-rest", m_suspension_rest ); lisp->get("suspension-rest", m_suspension_rest );
lisp->get("suspension-travel-cm", m_suspension_travel_cm ); lisp->get("suspension-travel-cm", m_suspension_travel_cm );
lisp->get("jump-velocity", m_jump_velocity ); lisp->get("jump-velocity", m_jump_velocity );
lisp->get("z-rescue-offset", m_z_rescue_offset );
lisp->get("upright-tolerance", m_upright_tolerance ); lisp->get("upright-tolerance", m_upright_tolerance );
lisp->get("upright-max-force", m_upright_max_force ); lisp->get("upright-max-force", m_upright_max_force );
lisp->get("track-connection-accel", m_track_connection_accel ); lisp->get("track-connection-accel", m_track_connection_accel );
@ -274,7 +276,7 @@ void KartProperties::getAllData(const lisp::Lisp* lisp)
temp.clear(); temp.clear();
lisp->getVector("gear-power-increase", temp); lisp->getVector("gear-power-increase", temp);
if(temp.size()>0) m_gear_power_increase = temp; if(temp.size()>0) m_gear_power_increase = temp;
// Camera // Camera
lisp->get("camera-max-accel", m_camera_max_accel); lisp->get("camera-max-accel", m_camera_max_accel);
lisp->get("camera-max-brake", m_camera_max_brake); lisp->get("camera-max-brake", m_camera_max_brake);
@ -341,6 +343,7 @@ void KartProperties::checkAllSet(const std::string &filename)
CHECK_NEG(m_suspension_rest, "suspension-rest" ); CHECK_NEG(m_suspension_rest, "suspension-rest" );
CHECK_NEG(m_suspension_travel_cm, "suspension-travel-cm" ); CHECK_NEG(m_suspension_travel_cm, "suspension-travel-cm" );
CHECK_NEG(m_jump_velocity, "jump-velocity" ); CHECK_NEG(m_jump_velocity, "jump-velocity" );
CHECK_NEG(m_z_rescue_offset, "z-rescue-offset" );
CHECK_NEG(m_upright_tolerance, "upright-tolerance" ); CHECK_NEG(m_upright_tolerance, "upright-tolerance" );
CHECK_NEG(m_upright_max_force, "upright-max-force" ); CHECK_NEG(m_upright_max_force, "upright-max-force" );
CHECK_NEG(m_track_connection_accel, "track-connection-accel" ); CHECK_NEG(m_track_connection_accel, "track-connection-accel" );

52
src/karts/kart_properties.hpp
View File

@ -34,7 +34,7 @@ using namespace irr;
class Material; class Material;
/** This class stores the properties of a kart. This includes size, name, /** This class stores the properties of a kart. This includes size, name,
* identifier, physical properties etc. It is atm also the base class for * identifier, physical properties etc. It is atm also the base class for
* STKConfig, which stores the default values for all physics constants. * STKConfig, which stores the default values for all physics constants.
*/ */
@ -44,7 +44,7 @@ private:
Material *m_icon_material; /**< The icon texture to use. */ Material *m_icon_material; /**< The icon texture to use. */
/** The kart model and wheels. It is mutable since the wheels of the /** The kart model and wheels. It is mutable since the wheels of the
* KartModel can rotate and turn, but otherwise the kart_properties * KartModel can rotate and turn, but otherwise the kart_properties
* object is const. */ * object is const. */
mutable KartModel m_kart_model; mutable KartModel m_kart_model;
std::vector<std::string> m_groups; /**< List of all groups the kart std::vector<std::string> m_groups; /**< List of all groups the kart
@ -54,26 +54,26 @@ private:
int m_version; /**< Version of the .kart file. */ int m_version; /**< Version of the .kart file. */
// Display and gui // Display and gui
// --------------- // ---------------
std::string m_name; /**< The human readable Name of the kart std::string m_name; /**< The human readable Name of the kart
* driver. */ * driver. */
std::string m_ident; /**< The computer readable-name of the std::string m_ident; /**< The computer readable-name of the
* kart driver. */ * kart driver. */
std::string m_icon_file; /**< Filename of icon that represents the std::string m_icon_file; /**< Filename of icon that represents the
* kart in the statusbar and the * kart in the statusbar and the
* character select screen. */ * character select screen. */
std::string m_shadow_file; /**< Filename of the image file that std::string m_shadow_file; /**< Filename of the image file that
* contains the shadow for this kart.*/ * contains the shadow for this kart.*/
video::SColor m_color; /**< Color the represents the kart in the video::SColor m_color; /**< Color the represents the kart in the
* status bar and on the track-view. */ * status bar and on the track-view. */
int m_shape; /**< Number of vertices in polygon when int m_shape; /**< Number of vertices in polygon when
* drawing the dot on the mini map. */ * drawing the dot on the mini map. */
// Physic properties // Physic properties
// ----------------- // -----------------
float m_mass; /**< Weight of kart. */ float m_mass; /**< Weight of kart. */
float m_engine_power[3]; /**< Maximum force from engine for each float m_engine_power[3]; /**< Maximum force from engine for each
* difficulty. */ * difficulty. */
float m_brake_factor; /**< Braking factor * engine_power = float m_brake_factor; /**< Braking factor * engine_power =
* braking force. */ * braking force. */
float m_time_full_steer; /**< Time for player karts to reach full float m_time_full_steer; /**< Time for player karts to reach full
* steer angle. */ * steer angle. */
@ -81,28 +81,28 @@ private:
* steer angle (used to reduce shaking * steer angle (used to reduce shaking
* of karts). */ * of karts). */
float m_min_speed_turn, /**< Speed for smallest turn radius. */ float m_min_speed_turn, /**< Speed for smallest turn radius. */
m_angle_at_min, /**< Steering angle for minimal turn m_angle_at_min, /**< Steering angle for minimal turn
radius. Computed from radius and radius. Computed from radius and
kart length. */ kart length. */
m_min_radius; /**< Smallest turn radius. */ m_min_radius; /**< Smallest turn radius. */
float m_max_speed_turn, /**< Speed for largest turn radius. */ float m_max_speed_turn, /**< Speed for largest turn radius. */
m_angle_at_max, /**< Steering angle for maximum turn m_angle_at_max, /**< Steering angle for maximum turn
radius. Computed from radius and radius. Computed from radius and
kart length. */ kart length. */
m_max_radius; /**< Largest turn radius. */ m_max_radius; /**< Largest turn radius. */
std::string m_wheel_filename[4]; /**< Filename of the wheel models. */ std::string m_wheel_filename[4]; /**< Filename of the wheel models. */
/** Radius of the graphical wheels. */ /** Radius of the graphical wheels. */
float m_wheel_graphics_radius[4]; float m_wheel_graphics_radius[4];
float m_rubber_band_max_length;/**< Max. length of plunger rubber band.*/ float m_rubber_band_max_length;/**< Max. length of plunger rubber band.*/
float m_rubber_band_force; /**< Force of an attached rubber band.*/ float m_rubber_band_force; /**< Force of an attached rubber band.*/
float m_rubber_band_duration;/**< Duration a rubber band works. */ float m_rubber_band_duration;/**< Duration a rubber band works. */
float m_wheel_base; /**< Wheel base of the kart. */ float m_wheel_base; /**< Wheel base of the kart. */
float m_nitro_power_boost; /**< Nitro power boost. */ float m_nitro_power_boost; /**< Nitro power boost. */
SFXManager::SFXType SFXManager::SFXType
m_engine_sfx_type; /**< Engine sound effect. */ m_engine_sfx_type; /**< Engine sound effect. */
// bullet physics data // bullet physics data
// ------------------- // -------------------
float m_suspension_stiffness; float m_suspension_stiffness;
float m_wheel_damping_relaxation; float m_wheel_damping_relaxation;
@ -115,12 +115,13 @@ private:
float m_max_speed[3]; float m_max_speed[3];
float m_max_speed_reverse_ratio; float m_max_speed_reverse_ratio;
Vec3 m_gravity_center_shift; /**< Shift of center of gravity. */ Vec3 m_gravity_center_shift; /**< Shift of center of gravity. */
float m_track_connection_accel; /**< Artifical acceleration that pulls a float m_track_connection_accel; /**< Artifical acceleration that pulls a
* kart down onto the track if one axis * kart down onto the track if one axis
* loses contact with the track. */ * loses contact with the track. */
float m_suspension_rest; float m_suspension_rest;
float m_suspension_travel_cm; float m_suspension_travel_cm;
float m_jump_velocity; // z velocity set when jumping float m_jump_velocity; // z velocity set when jumping
float m_z_rescue_offset; // z offset after rescue
float m_upright_tolerance; float m_upright_tolerance;
float m_upright_max_force; float m_upright_max_force;
@ -134,11 +135,11 @@ private:
float m_skid_max; /**< Maximal increase of steering when float m_skid_max; /**< Maximal increase of steering when
* skidding. */ * skidding. */
float m_skid_increase; /**< Skidding is multiplied by this when float m_skid_increase; /**< Skidding is multiplied by this when
* skidding to increase to * skidding to increase to
* m_skid_increase. */ * m_skid_increase. */
float m_skid_decrease; /**< Skidding is multiplied by this when float m_skid_decrease; /**< Skidding is multiplied by this when
* not skidding to decrease to 1.0. */ * not skidding to decrease to 1.0. */
float m_time_till_max_skid; /**< Time till maximum skidding is float m_time_till_max_skid; /**< Time till maximum skidding is
* reached. */ * reached. */
bool m_has_skidmarks; /**< Kart leaves skid marks. */ bool m_has_skidmarks; /**< Kart leaves skid marks. */
@ -147,7 +148,7 @@ private:
float m_camera_max_accel; // maximum acceleration of camera float m_camera_max_accel; // maximum acceleration of camera
float m_camera_max_brake; // maximum braking of camera float m_camera_max_brake; // maximum braking of camera
float m_camera_distance; // distance of normal camera from kart float m_camera_distance; // distance of normal camera from kart
/** The following two vectors define at what ratio of the maximum speed what /** The following two vectors define at what ratio of the maximum speed what
* gear is selected. E.g. 0.25 means: if speed <=0.25*maxSpeed --> gear 1, * gear is selected. E.g. 0.25 means: if speed <=0.25*maxSpeed --> gear 1,
* 0.5 means: if speed <=0.5 *maxSpeed --> gear 2 * 0.5 means: if speed <=0.5 *maxSpeed --> gear 2
@ -178,7 +179,7 @@ public:
int getVersion () const {return m_version; } int getVersion () const {return m_version; }
/** Returns the dot color to use for this kart in the race gui. */ /** Returns the dot color to use for this kart in the race gui. */
const video::SColor &getColor () const {return m_color; } const video::SColor &getColor () const {return m_color; }
/** Returns the number of edges for the polygon used to draw the dot of /** Returns the number of edges for the polygon used to draw the dot of
* this kart on the mini map of the race gui. */ * this kart on the mini map of the race gui. */
int getShape () const {return m_shape; } int getShape () const {return m_shape; }
const std::vector<std::string>& const std::vector<std::string>&
@ -189,7 +190,7 @@ public:
float getTimeFullSteerAI () const {return m_time_full_steer_ai; } float getTimeFullSteerAI () const {return m_time_full_steer_ai; }
float getBrakeFactor () const {return m_brake_factor; } float getBrakeFactor () const {return m_brake_factor; }
float getMaxSpeedReverseRatio () const {return m_max_speed_reverse_ratio; } float getMaxSpeedReverseRatio () const {return m_max_speed_reverse_ratio; }
SFXManager::SFXType getEngineSfxType() SFXManager::SFXType getEngineSfxType()
const {return m_engine_sfx_type; } const {return m_engine_sfx_type; }
//bullet physics get functions //bullet physics get functions
@ -203,7 +204,7 @@ public:
float getChassisLinearDamping () const {return m_chassis_linear_damping; } float getChassisLinearDamping () const {return m_chassis_linear_damping; }
float getChassisAngularDamping () const {return m_chassis_angular_damping; } float getChassisAngularDamping () const {return m_chassis_angular_damping; }
/** Returns the maximum speed dependent on the difficult level. */ /** Returns the maximum speed dependent on the difficult level. */
float getMaxSpeed () const {return float getMaxSpeed () const {return
m_max_speed[race_manager->getDifficulty()];} m_max_speed[race_manager->getDifficulty()];}
/** Returns the nitro power boost. */ /** Returns the nitro power boost. */
float getNitroPowerBoost () const {return m_nitro_power_boost; } float getNitroPowerBoost () const {return m_nitro_power_boost; }
@ -211,6 +212,7 @@ public:
float getSuspensionRest () const {return m_suspension_rest; } float getSuspensionRest () const {return m_suspension_rest; }
float getSuspensionTravelCM () const {return m_suspension_travel_cm; } float getSuspensionTravelCM () const {return m_suspension_travel_cm; }
float getJumpVelocity () const {return m_jump_velocity; } float getJumpVelocity () const {return m_jump_velocity; }
float getZRescueOffset () const {return m_z_rescue_offset; }
float getUprightTolerance () const {return m_upright_tolerance; } float getUprightTolerance () const {return m_upright_tolerance; }
float getUprightMaxForce () const {return m_upright_max_force; } float getUprightMaxForce () const {return m_upright_max_force; }
float getTrackConnectionAccel () const {return m_track_connection_accel; } float getTrackConnectionAccel () const {return m_track_connection_accel; }
@ -230,10 +232,10 @@ public:
float getSlipstreamAddPower () const {return m_slipstream_add_power; } float getSlipstreamAddPower () const {return m_slipstream_add_power; }
/** Returns the maximum factor by which the steering angle can be increased. */ /** Returns the maximum factor by which the steering angle can be increased. */
float getMaxSkid () const {return m_skid_max; } float getMaxSkid () const {return m_skid_max; }
/** Returns the factor by which m_skidding is multiplied when the kart is /** Returns the factor by which m_skidding is multiplied when the kart is
* skidding to increase it to the maximum. */ * skidding to increase it to the maximum. */
float getSkidIncrease () const {return m_skid_increase; } float getSkidIncrease () const {return m_skid_increase; }
/** Returns the factor by which m_skidding is multiplied when the kart is /** Returns the factor by which m_skidding is multiplied when the kart is
* not skidding to decrease it back to 1.0f . */ * not skidding to decrease it back to 1.0f . */
float getSkidDecrease () const {return m_skid_decrease; } float getSkidDecrease () const {return m_skid_decrease; }
/** Returns the time (in seconds) of drifting till the maximum skidding /** Returns the time (in seconds) of drifting till the maximum skidding
@ -241,9 +243,9 @@ public:
float getTimeTillMaxSkid () const {return m_time_till_max_skid; } float getTimeTillMaxSkid () const {return m_time_till_max_skid; }
/** Returns if the kart leaves skidmarks or not. */ /** Returns if the kart leaves skidmarks or not. */
bool hasSkidmarks () const {return m_has_skidmarks; } bool hasSkidmarks () const {return m_has_skidmarks; }
const std::vector<float>& const std::vector<float>&
getGearSwitchRatio () const {return m_gear_switch_ratio; } getGearSwitchRatio () const {return m_gear_switch_ratio; }
const std::vector<float>& const std::vector<float>&
getGearPowerIncrease () const {return m_gear_power_increase; } getGearPowerIncrease () const {return m_gear_power_increase; }
float getCameraMaxAccel () const {return m_camera_max_accel; } float getCameraMaxAccel () const {return m_camera_max_accel; }
float getCameraMaxBrake () const {return m_camera_max_brake; } float getCameraMaxBrake () const {return m_camera_max_brake; }

9
src/modes/linear_world.cpp
View File

@ -497,11 +497,10 @@ void LinearWorld::moveKartAfterRescue(Kart* kart, btRigidBody* body)
if (kart_over_ground) if (kart_over_ground)
{ {
//add vertical offset so that the kart starts off above track //add vertical offset so that the kart starts off above the track
float vertical_offset = kart->getKartProperties()->getZRescueOffset() *
//TODO - offset needs to be a configurable parameter kart->getKartHeight();
//float vertical_offset = 0.5f * kart->getKartHeight(); body->translate(btVector3(0, 0, vertical_offset));
//body->translate(btVector3(0, 0, vertical_offset));
} }
else else
{ {