Skip to content

Commit

Permalink
Fixed coding style issues (same should be done with speedweight objec…
Browse files Browse the repository at this point in the history 
…ts).
  • Loading branch information
@hiker
hiker committed Jan 25, 2017
1 parent 3edff95 commit 37af3a3
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 35 deletions.
46 changes: 25 additions & 21 deletions src/karts/kart_model.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,17 +273,17 @@ KartModel::~KartModel()
for (size_t i = 0; i < m_headlight_objects.size(); i++)
{
HeadlightObject& obj = m_headlight_objects[i];
obj.m_node = NULL;
if (obj.m_node)
obj.setNode(NULL);
if (obj.getNode())
{
// Master KartModels should never have a speed weighted object attached.
// Master KartModels should never have a headlight attached.
assert(!m_is_master);
obj.m_node->drop();
obj.getNode()->drop();
}
if (m_is_master && obj.m_model)
if (m_is_master && obj.getModel())
{
irr_driver->dropAllTextures(obj.m_model);
irr_driver->removeMeshFromCache(obj.m_model);
irr_driver->dropAllTextures(obj.getModel());
irr_driver->removeMeshFromCache(obj.getModel());
}
}

Expand Down Expand Up @@ -368,8 +368,8 @@ KartModel* KartModel::makeCopy(KartRenderType krt)
km->m_headlight_objects.resize(m_headlight_objects.size());
for (size_t i = 0; i<m_headlight_objects.size(); i++)
{
// Master should not have any speed weighted nodes.
assert(!m_headlight_objects[i].m_node);
// Master should not have any headlight nodes.
assert(!m_headlight_objects[i].getNode());
km->m_headlight_objects[i] = m_headlight_objects[i];
}

Expand Down Expand Up @@ -448,8 +448,8 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool always_anim

for (size_t i = 0; i<m_headlight_objects.size(); i++)
{
if (!m_headlight_objects[i].m_node) continue;
m_headlight_objects[i].m_node->setParent(lod_node);
if (!m_headlight_objects[i].getNode()) continue;
m_headlight_objects[i].getNode()->setParent(lod_node);
}

#ifndef SERVER_ONLY
Expand Down Expand Up @@ -534,16 +534,19 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool always_anim
{
HeadlightObject& obj = m_headlight_objects[i];

obj.m_node = NULL;
if (obj.m_model)
obj.setNode(NULL);
if (obj.getModel())
{
obj.m_node = irr_driver->addMesh(obj.m_model, "kart_headlight", node, getRenderInfo());
obj.m_node->grab();
obj.m_node->setPosition(obj.getPosition());
scene::ISceneNode *new_node =
irr_driver->addMesh(obj.getModel(), "kart_headlight",
node, getRenderInfo() );

new_node->grab();
obj.setNode(new_node);

Track* track = Track::getCurrentTrack();
if (track == NULL || track->getIsDuringDay())
obj.m_node->setVisible(false);
obj.getNode()->setVisible(false);
}
}

Expand Down Expand Up @@ -646,8 +649,8 @@ bool KartModel::loadModels(const KartProperties &kart_properties)
{
HeadlightObject& obj = m_headlight_objects[i];
std::string full_name = kart_properties.getKartDir() + obj.getFilename();
obj.m_model = irr_driver->getMesh(full_name);
irr_driver->grabAllTextures(obj.m_model);
obj.setModel(irr_driver->getMesh(full_name));
irr_driver->grabAllTextures(obj.getModel());
}

Vec3 size = kart_max-kart_min;
Expand Down Expand Up @@ -722,7 +725,8 @@ void KartModel::loadNitroEmitterInfo(const XMLNode &node,
// ----------------------------------------------------------------------------

/** Loads a single speed weighted node. */
void KartModel::loadSpeedWeightedInfo(const XMLNode* speed_weighted_node, const SpeedWeightedObject::Properties& fallback_properties)
void KartModel::loadSpeedWeightedInfo(const XMLNode* speed_weighted_node,
const SpeedWeightedObject::Properties& fallback_properties)
{
SpeedWeightedObject obj;
obj.m_properties = fallback_properties;
Expand Down Expand Up @@ -778,7 +782,7 @@ void KartModel::loadHeadlights(const XMLNode &node)
Log::warn("KartModel", "Unknown XML node in the headlights section");
}
}
}
} // loadHeadlights

// ----------------------------------------------------------------------------
/** Resets the kart model. It stops animation from being played and resets
Expand Down
59 changes: 45 additions & 14 deletions src/karts/kart_model.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,33 +84,64 @@ struct SpeedWeightedObject
};
typedef std::vector<SpeedWeightedObject> SpeedWeightedObjectList;

// ============================================================================
/** A class to store the headlights of a kart.
*/
class HeadlightObject
{
private:
/** The filename of the headlight model. */
std::string m_filename;
/** The position relative to the parent kart scene node where the
* headlight mesh is attached to. */
core::vector3df m_position;

public:

/** The mesh for the headlight. */
scene::IMesh* m_model;
/** The scene node of the headlight. */
scene::ISceneNode* m_node;

public:

HeadlightObject()
{
m_model = NULL;
m_node = NULL;
}

HeadlightObject(const std::string& filename, core::vector3df pos)
m_model = NULL;
m_node = NULL;
m_filename = "";
m_position.set(0, 0, 0);
} // HeadlightObject
// ------------------------------------------------------------------------
HeadlightObject(const std::string& filename, core::vector3df &pos)
{
m_filename = filename;
m_position = pos;
m_model = NULL;
m_node = NULL;
}

m_model = NULL;
m_node = NULL;
} // HeadlightObjects
// ------------------------------------------------------------------------
const std::string& getFilename() const { return m_filename; }
const core::vector3df getPosition() const { return m_position; }
};
// ------------------------------------------------------------------------
/** Sets the mesh for this headlight object. */
void setModel(scene::IMesh *mesh) { m_model = mesh; }
// ------------------------------------------------------------------------
/** Sets the node of the headlight, and (if not NULL) also sets the
* position of this scene node to be the position of the headlight. */
void setNode(scene::ISceneNode *node)
{
m_node = node;
if (m_node) m_node->setPosition(m_position);
} // setNode
// ------------------------------------------------------------------------
const scene::ISceneNode *getNode() const { return m_node; }
// ------------------------------------------------------------------------
scene::ISceneNode *getNode() { return m_node; }
// ------------------------------------------------------------------------
const scene::IMesh *getModel() const { return m_model; }
// ------------------------------------------------------------------------
scene::IMesh *getModel() { return m_model; }
// ------------------------------------------------------------------------
}; // class HeadlightObject

// ============================================================================

/**
* \brief This class stores a 3D kart model.
Expand Down

0 comments on commit 37af3a3

Please sign in to comment.