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

1) Improved positioning of karts.

Browse Source 
2) Added new wheels to dinokart.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2439 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-11-10 04:34:22 +00:00
parent 1edc7ff4b6
commit 0c1280ad39
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/karts/kart.cpp
View File

@ -200,10 +200,10 @@ void Kart::createPhysics()
for(unsigned int i=0; i<4; i++)
{
bool is_front_wheel = i<2;
m_vehicle->addWheel(m_kart_properties->getKartModel()->getWheelPhysicsPosition(i),
btWheelInfo& wheel = m_vehicle->addWheel(
m_kart_properties->getKartModel()->getWheelPhysicsPosition(i),
wheel_direction, wheel_axle, suspension_rest,
wheel_radius, *m_tuning, is_front_wheel);
btWheelInfo& wheel = m_vehicle->getWheelInfo(i);
wheel.m_suspensionStiffness = m_kart_properties->getSuspensionStiffness();
wheel.m_wheelsDampingRelaxation = m_kart_properties->getWheelDampingRelaxation();
wheel.m_wheelsDampingCompression = m_kart_properties->getWheelDampingCompression();
@ -967,25 +967,21 @@ void Kart::updateGraphics(const Vec3& off_xyz, const Vec3& off_hpr)
KartModel *kart_model = m_kart_properties->getKartModel();
for(unsigned int i=0; i<4; i++)
{
// The wheel z-position has to be set relative to the center of mass
// of the kart! Center of mass plus connection point is where the
// suspension is attached, subtracting from this the current extension
// of the suspension gives the location of the center of the wheel,
// which is then adjusted by the difference of physical wheel radius
// and graphical wheel radius to give the center of the graphical wheel
wheel_z_axis[i] = m_vehicle->getWheelInfo(i).m_chassisConnectionPointCS.getZ()
- (m_vehicle->getWheelInfo(i).m_raycastInfo.m_suspensionLength
- m_default_suspension_length[i])
- (m_vehicle->getWheelInfo(i).m_wheelsRadius
- kart_model->getWheelGraphicsRadius(i));
// Set the suspension length
wheel_z_axis[i] = m_default_suspension_length[i]
- m_vehicle->getWheelInfo(i).m_raycastInfo.m_suspensionLength;
}
kart_model->adjustWheels(m_wheel_rotation, m_controls.lr*30.0f,
wheel_z_axis);
Vec3 center_shift = getGravityCenterShift();
center_shift.setZ(center_shift.getZ()-getKartHeight()*0.5f
- kart_model->getZOffset()
+ 0.3f*fabs(sin(DEGREE_TO_RAD(m_wheelie_angle))) );
float X = m_vehicle->getWheelInfo(0).m_chassisConnectionPointCS.getZ()
- m_default_suspension_length[0]
- m_vehicle->getWheelInfo(0).m_wheelsRadius
- (kart_model->getWheelGraphicsRadius(0)
-kart_model->getWheelGraphicsPosition(0).getZ() )
+ getKartLength()*0.5f*fabs(sin(DEGREE_TO_RAD(m_wheelie_angle)));
center_shift.setZ(X);
const float offset_pitch = DEGREE_TO_RAD(m_wheelie_angle);
Moveable::updateGraphics(center_shift, Vec3(0, offset_pitch, 0));
} // updateGraphics

6
src/karts/kart_model.cpp
View File

@ -37,6 +37,7 @@ KartModel::KartModel()
{
m_wheel_graphics_position[i] = Vec3(UNDEFINED);
m_wheel_physics_position[i] = Vec3(UNDEFINED);
m_wheel_graphics_radius[i] = 0.0f; // for kart without separate wheels
m_wheel_model[i] = NULL;
}
m_wheel_filename[0] = "wheel-front-right.ac";
@ -93,6 +94,9 @@ void KartModel::loadModels()
m_kart_width = max.getX()-min.getX();
m_kart_length = max.getY()-min.getY();
m_kart_height = max.getZ()-min.getZ();
sgVec3 move_kart_to_0_z;
sgSetVec3(move_kart_to_0_z, 0, 0, m_z_offset);
m_root->setTransform(move_kart_to_0_z);
// Now set default some default parameters (if not defined) that
// depend on the size of the kart model (wheel position, center
@ -129,7 +133,7 @@ void KartModel::loadModels()
Vec3 min_wheel, max_wheel;
SSGHelp::MinMax(m_wheel_model[i], &min_wheel, &max_wheel);
m_wheel_graphics_radius[i] = max_wheel.getZ()-min_wheel.getZ();
m_wheel_graphics_radius[i] = (max_wheel.getZ()-min_wheel.getZ())*0.5f;
sgMat4 wheel_loc;
sgVec3 hpr;
sgZeroVec3(hpr);