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

Only add RenderInfo if the material has a list of random color

Browse Source
This commit is contained in:
Benau 2018-01-15 15:43:50 +08:00
parent cbd7b3fd84
commit a37b60ac6e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/material.hpp
View File

@ -244,6 +244,8 @@ public:
*/ */
float getColorizationFactor () const { return m_colorization_factor; } float getColorizationFactor () const { return m_colorization_factor; }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
bool hasRandomHue() const { return !m_hue_settings.empty(); }
// ------------------------------------------------------------------------
/** Returns a random hue when colorized. /** Returns a random hue when colorized.
*/ */
float getRandomHue() float getRandomHue()

13
src/tracks/track_object.cpp
View File

@ -76,7 +76,6 @@ TrackObject::TrackObject(const core::vector3df& xyz, const core::vector3df& hpr,
m_animator = NULL; m_animator = NULL;
m_physical_object = NULL; m_physical_object = NULL;
m_parent_library = NULL; m_parent_library = NULL;
m_render_info = NULL;
m_interaction = interaction; m_interaction = interaction;
m_presentation = presentation; m_presentation = presentation;
m_is_driveable = false; m_is_driveable = false;
@ -108,7 +107,6 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
m_init_xyz = core::vector3df(0,0,0); m_init_xyz = core::vector3df(0,0,0);
m_init_hpr = core::vector3df(0,0,0); m_init_hpr = core::vector3df(0,0,0);
m_init_scale = core::vector3df(1,1,1); m_init_scale = core::vector3df(1,1,1);
m_render_info = NULL;
m_enabled = true; m_enabled = true;
m_initially_visible = false; m_initially_visible = false;
m_presentation = NULL; m_presentation = NULL;
@ -214,7 +212,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
std::vector<Material*> mbs = mb->getAllSTKMaterials(); std::vector<Material*> mbs = mb->getAllSTKMaterials();
for (Material* m : mbs) for (Material* m : mbs)
{ {
if (m->isColorizable()) if (m->isColorizable() && m->hasRandomHue())
{ {
colorized = m; colorized = m;
break; break;
@ -242,7 +240,7 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
std::vector<Material*> mbs = mb->getAllSTKMaterials(); std::vector<Material*> mbs = mb->getAllSTKMaterials();
for (Material* m : mbs) for (Material* m : mbs)
{ {
if (m->isColorizable()) if (m->isColorizable() && m->hasRandomHue())
{ {
colorized = m; colorized = m;
break; break;
@ -259,8 +257,11 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
// If at least one material is colorizable, add RenderInfo for it // If at least one material is colorizable, add RenderInfo for it
if (colorized != NULL) if (colorized != NULL)
{ {
m_render_info = std::make_shared<RenderInfo>(); const float hue = colorized->getRandomHue();
m_render_info->setHue(colorized->getRandomHue()); if (hue > 0.0f)
{
m_render_info = std::make_shared<RenderInfo>(hue);
}
} }
} }
#endif #endif