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

Allow the camera to be set to NULL, and minor cosmetic

Browse Source 
changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9962 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2011-10-10 04:28:20 +00:00
parent 0ff8f8ab8b
commit d44275bb45
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/karts/kart.cpp
View File

@@ -305,7 +305,9 @@ void Kart::createPhysics()
wheel.m_wheelsDampingCompression = m_kart_properties->getWheelDampingCompression();
wheel.m_frictionSlip = m_kart_properties->getFrictionSlip();
wheel.m_rollInfluence = m_kart_properties->getRollInfluence();
wheel.m_rotation = btScalar(float(m_kart_properties->hasRandomWheels()) * (rand() % 360));
wheel.m_rotation =
btScalar(float(m_kart_properties->hasRandomWheels())
* (rand() % 360));
}
// Obviously these allocs have to be properly managed/freed
btTransform t;
@@ -1263,13 +1265,20 @@ void Kart::handleMaterialGFX()
} // handleMaterialGFX
//-----------------------------------------------------------------------------
/** Sets or reset the camera attached to a kart. In profile mode even AI karts
* can have a camera attached.
* \params camera The camera to attach to this kart (or NULL if no camera
* is to be used
*/
void Kart::setCamera(Camera *camera)
{
m_camera = camera;
if(!camera)
return;
#ifdef DEBUG
m_camera->getCameraSceneNode()->setName((m_kart_properties->getIdent() + "'s camera").c_str());
m_camera->getCameraSceneNode()
->setName((m_kart_properties->getIdent() + "'s camera").c_str());
#endif
// Handle camera-specific nodes for now if in multiplayer
@@ -1416,7 +1425,8 @@ void Kart::crashed(Kart *k, const Material *m)
}
else
{
fprintf(stderr, "Unknown particles kind <%s> in material crash-reset properties\n", particles.c_str());
fprintf(stderr, "Unknown particles kind <%s> in material "
"crash-reset properties\n", particles.c_str());
}
}
@@ -1502,7 +1512,9 @@ bool Kart::playCustomSFX(unsigned int type)
if (m_custom_sounds[type] != NULL)
{
ret = true;
//printf("Kart SFX: playing %s for %s.\n", sfx_manager->getCustomTagName(type), m_kart_properties->getIdent().c_str());
//printf("Kart SFX: playing %s for %s.\n",
// sfx_manager->getCustomTagName(type),
// m_kart_properties->getIdent().c_str());
// If it's already playing, let it finish
if (m_custom_sounds[type]->getStatus() != SFXManager::SFX_PLAYING)
{
@@ -1891,8 +1903,9 @@ void Kart::loadData(RaceManager::KartType type, bool is_first_kart,
track->getSkyParticles()->setBoxSizeX(150.0f);
track->getSkyParticles()->setBoxSizeZ(150.0f);
m_sky_particles_emitter = new ParticleEmitter(track->getSkyParticles(), core::vector3df(0.0f, 40.0f, 100.0f),
getNode());
m_sky_particles_emitter = new ParticleEmitter(track->getSkyParticles(),
core::vector3df(0.0f, 40.0f, 100.0f),
getNode());
// FIXME: in multiplayer mode, this will result in several instances of the heightmap being calculated
// and kept in memory
@@ -2061,7 +2074,8 @@ void Kart::updateGraphics(float dt, const Vec3& offset_xyz,
core::vector3df rot = m_node->getRotation();
float ratio = float(m_zipper_fire->getCreationRate())/float(m_zipper_fire->getParticlesInfo()->getMaxRate());
float ratio = float(m_zipper_fire->getCreationRate())
/float(m_zipper_fire->getParticlesInfo()->getMaxRate());
const float a = (13.4f - ratio*13.0f);
float dst = -45.0f*sin((a*a)/180.f*M_PI);