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

Simplified attachment_plugins by not needing the

Browse Source 
attachment object (which instead is taken from the
kart object). Also m_attachment from AttachmentPlugin
was removed, since this avoids #include kart.hpp
(reducing compile time) - it's not actually
needed (only for the scene node in swatter, which
now is saved separately).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9876 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-09-21 01:04:35 +00:00
parent ef069d50a0
commit 4b3e0c5d9d
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/items/attachment.cpp
View File

@ -97,7 +97,7 @@ void Attachment::set(AttachmentType type, float time, Kart *current_kart)
{
case ATTACH_SWATTER :
m_node->setMesh(attachment_manager->getMesh(type));
m_plugin = new Swatter(this, m_kart, was_bomb, bomb_scene_node);
m_plugin = new Swatter(m_kart, was_bomb, bomb_scene_node);
break;
case ATTACH_BOMB:
m_node->setMesh(attachment_manager->getMesh(type));

10
src/items/attachment_plugin.hpp
View File

@ -37,18 +37,14 @@ class Attachment;
*/
class AttachmentPlugin
{
protected:
/** Parent Attachment of this plugin */
Attachment *m_attachment;
protected:
/** Kart the attachment is attached to. */
Kart *m_kart;
Kart *m_kart;
public:
/** Constructor for a plugin. */
AttachmentPlugin(Attachment *attachment, Kart *kart)
AttachmentPlugin(Kart *kart)
{
m_attachment = attachment;
m_kart = kart;
}

55
src/items/swatter.cpp
View File

@ -51,9 +51,9 @@
* \param bomb_scene_node The scene node of the bomb (i.e. the previous
* attachment scene node).
*/
Swatter::Swatter(Attachment *attachment, Kart *kart, bool was_bomb,
Swatter::Swatter(Kart *kart, bool was_bomb,
scene::ISceneNode* bomb_scene_node)
: AttachmentPlugin(attachment, kart)
: AttachmentPlugin(kart)
{
m_animation_phase = SWATTER_AIMING;
m_target = NULL;
@ -62,20 +62,21 @@ Swatter::Swatter(Attachment *attachment, Kart *kart, bool was_bomb,
m_swat_bomb_frame = 0.0f;
// Setup the node
scene::IAnimatedMeshSceneNode* node = m_attachment->getNode();
node->setPosition(SWAT_POS_OFFSET);
m_scene_node = kart->getAttachment()->getNode();
m_scene_node->setPosition(SWAT_POS_OFFSET);
if (m_removing_bomb)
{
node->setMesh(irr_driver->getAnimatedMesh( file_manager->getModelFile("swatter_anim2.b3d") ));
node->setRotation(core::vector3df(0.0, -180.0, 0.0));
node->setAnimationSpeed(0.9f);
node->setCurrentFrame(0.0f);
node->setLoopMode(false);
m_scene_node->setMesh(irr_driver->getAnimatedMesh(
file_manager->getModelFile("swatter_anim2.b3d") ) );
m_scene_node->setRotation(core::vector3df(0.0, -180.0, 0.0));
m_scene_node->setAnimationSpeed(0.9f);
m_scene_node->setCurrentFrame(0.0f);
m_scene_node->setLoopMode(false);
}
else
{
node->setAnimationSpeed(0);
m_scene_node->setAnimationSpeed(0);
}
m_swat_sound = sfx_manager->createSoundSource("swatter");
} // Swatter
@ -102,10 +103,9 @@ bool Swatter::updateAndTestFinished(float dt)
if (m_removing_bomb)
{
m_swat_bomb_frame += dt*25.0f;
//printf("%f\n", (float)m_attachment->getNode()->getFrameNr() );
m_attachment->getNode()->setRotation(core::vector3df(0.0, -180.0, 0.0));
m_scene_node->setRotation(core::vector3df(0.0, -180.0, 0.0));
m_attachment->getNode()->setCurrentFrame(m_swat_bomb_frame);
m_scene_node->setCurrentFrame(m_swat_bomb_frame);
if (m_swat_bomb_frame >= 32.5f && m_bomb_scene_node != NULL)
{
@ -115,7 +115,7 @@ bool Swatter::updateAndTestFinished(float dt)
core::vector3df(-dt*15.0f, 0.0f, 0.0f) );
}
if (m_swat_bomb_frame >= m_attachment->getNode()->getEndFrame())
if (m_swat_bomb_frame >= m_scene_node->getEndFrame())
{
return true;
}
@ -142,7 +142,9 @@ bool Swatter::updateAndTestFinished(float dt)
break;
// Is the target too near?
float dist_to_target2 = (m_target->getXYZ() - m_attachment->getNode()->getAbsolutePosition()).length2();
float dist_to_target2 =
(m_target->getXYZ()- m_scene_node->getAbsolutePosition())
.length2();
float min_dist2 = m_kart->getKartProperties()->getSwatterDistance2();
if(dist_to_target2 < min_dist2)
{
@ -150,10 +152,9 @@ bool Swatter::updateAndTestFinished(float dt)
m_animation_phase = SWATTER_TO_TARGET;
// Setup the animation
scene::IAnimatedMeshSceneNode* node = m_attachment->getNode();
node->setCurrentFrame(0.0f);
node->setLoopMode(false);
node->setAnimationSpeed(SWATTER_ANIMATION_SPEED);
m_scene_node->setCurrentFrame(0.0f);
m_scene_node->setLoopMode(false);
m_scene_node->setAnimationSpeed(SWATTER_ANIMATION_SPEED);
}
}
break;
@ -161,9 +162,8 @@ bool Swatter::updateAndTestFinished(float dt)
{
pointToTarget();
scene::IAnimatedMeshSceneNode *node = m_attachment->getNode();
const float middle_frame = node->getEndFrame()/2.0f;
float current_frame = node->getFrameNr();
const float middle_frame = m_scene_node->getEndFrame()/2.0f;
float current_frame = m_scene_node->getFrameNr();
// Did we just finish the first part of the movement?
if(current_frame >= middle_frame)
@ -228,18 +228,18 @@ void Swatter::pointToTarget()
{
if(!m_target)
{
m_attachment->getNode()->setRotation(core::vector3df());
m_scene_node->setRotation(core::vector3df());
}
else
{
Vec3 swatter_to_target = m_target->getXYZ()
-m_attachment->getNode()->getAbsolutePosition();
-m_scene_node->getAbsolutePosition();
float dy = -swatter_to_target.getZ();
float dx = swatter_to_target.getX();
float angle = SWAT_ANGLE_OFFSET + (atan2(dy, dx)-m_kart->getHeading())
float angle = SWAT_ANGLE_OFFSET + (atan2(dy, dx)-m_kart->getHeading())
* 180.0f/M_PI;
m_attachment->getNode()->setRotation(core::vector3df(0.0, angle, 0.0));
m_scene_node->setRotation(core::vector3df(0.0, angle, 0.0));
}
}
@ -253,11 +253,10 @@ void Swatter::squashThingsAround()
// Square of the minimum distance
float min_dist2 = kp->getSwatterDistance2();
const World* world = World::getWorld();
scene::IAnimatedMeshSceneNode *node = m_attachment->getNode();
// Get the node corresponding to the joint at the center of the swatter
// (by swatter, I mean the thing hold in the hand, not the whole thing)
scene::ISceneNode* swatter_node = node->getJointNode("Swatter");
scene::ISceneNode* swatter_node = m_scene_node->getJointNode("Swatter");
assert(swatter_node);
Vec3 swatter_pos = swatter_node->getAbsolutePosition();

11
src/items/swatter.hpp
View File

@ -30,7 +30,6 @@
class Kart;
class Item;
class Attachment;
class SFXBase;
/**
@ -53,15 +52,21 @@ private:
SFXBase *m_swat_sound;
/** True if the swatter is removing an attached bomb. */
bool m_removing_bomb;
/** The scene node of the attachment. */
scene::IAnimatedMeshSceneNode *m_scene_node;
/** The scene node where a bomb is saved (in case that the swatter
* replaces a bomb. */
scene::ISceneNode *m_bomb_scene_node;
/** For some reason the built-in animation system doesn't work correctly here?? */
float m_swat_bomb_frame;
public:
Swatter(Attachment *attachment, Kart *kart, bool was_bomb,
Swatter(Kart *kart, bool was_bomb,
scene::ISceneNode* bomb_scene_node);
virtual ~Swatter();
bool updateAndTestFinished(float dt);