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

Allow karts to have custom shader

Browse Source 
Also implement proper cleaning for textures (mainly addons)
This commit is contained in:
Benau 2018-01-21 16:31:49 +08:00
parent a39977d550
commit f8c6de316a
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/karts/kart_properties.cpp
View File

@ -21,8 +21,11 @@
#include "addons/addon.hpp"
#include "config/stk_config.hpp"
#include "config/player_manager.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/material_manager.hpp"
#include "graphics/stk_tex_manager.hpp"
#include "graphics/sp/sp_shader_manager.hpp"
#include "graphics/sp/sp_texture_manager.hpp"
#include "io/file_manager.hpp"
#include "karts/cached_characteristic.hpp"
#include "karts/combined_characteristic.hpp"
@ -97,7 +100,10 @@ KartProperties::KartProperties(const std::string &filename)
else
{
for (unsigned int i = 0; i < RaceManager::DIFFICULTY_COUNT; i++)
m_ai_properties[i].reset(new AIProperties((RaceManager::Difficulty) i));
{
m_ai_properties[i] =
std::make_shared<AIProperties>((RaceManager::Difficulty) i);
}
}
} // KartProperties
@ -105,6 +111,14 @@ KartProperties::KartProperties(const std::string &filename)
/** Destructor, dereferences the kart model. */
KartProperties::~KartProperties()
{
#ifndef SERVER_ONLY
m_kart_model = nullptr;
if (CVS->isGLSL())
{
SP::SPShaderManager::get()->removeUnusedShaders();
SP::SPTextureManager::get()->removeUnusedTextures();
}
#endif
} // ~KartProperties
//-----------------------------------------------------------------------------
@ -125,7 +139,7 @@ void KartProperties::copyForPlayer(const KartProperties *source)
if (source->m_characteristic)
{
// Remove the shared reference by creating a new pointer
m_characteristic.reset(new XmlCharacteristic());
m_characteristic = std::make_shared<XmlCharacteristic>();
m_characteristic->copyFrom(source->getCharacteristic());
// Combine the characteristics for this object. We can't copy it because
@ -149,7 +163,8 @@ void KartProperties::copyFrom(const KartProperties *source)
// (but not for each player).
for (unsigned int i = 0; i < RaceManager::DIFFICULTY_COUNT; i++)
{
m_ai_properties[i].reset(new AIProperties((RaceManager::Difficulty) i));
m_ai_properties[i] =
std::make_shared<AIProperties>((RaceManager::Difficulty) i);
assert(m_ai_properties);
*m_ai_properties[i] = *source->m_ai_properties[i];
}
@ -186,7 +201,7 @@ void KartProperties::load(const std::string &filename, const std::string &node)
// m_kart_model must be initialised after assigning the default
// values from stk_config (otherwise all kart_properties will
// share the same KartModel
m_kart_model.reset(new KartModel(/*is_master*/true));
m_kart_model = std::make_shared<KartModel>(/*is_master*/true);
m_root = StringUtils::getPath(filename)+"/";
m_ident = StringUtils::getBasename(StringUtils::getPath(filename));
@ -206,7 +221,7 @@ void KartProperties::load(const std::string &filename, const std::string &node)
throw std::runtime_error(msg.str());
}
getAllData(root);
m_characteristic.reset(new XmlCharacteristic(root));
m_characteristic = std::make_shared<XmlCharacteristic>(root);
combineCharacteristics();
}
catch(std::exception& err)
@ -227,6 +242,12 @@ void KartProperties::load(const std::string &filename, const std::string &node)
std::string unique_id = StringUtils::insertValues("karts/%s", m_ident.c_str());
file_manager->pushModelSearchPath(m_root);
file_manager->pushTextureSearchPath(m_root, unique_id);
#ifndef SERVER_ONLY
if (CVS->isGLSL())
{
SP::SPShaderManager::get()->loadSPShaders(m_root);
}
#endif
STKTexManager::getInstance()
->setTextureErrorMessage("Error while loading kart '%s':", m_name);
@ -322,7 +343,7 @@ void KartProperties::setHatMeshName(const std::string &hat_name)
//-----------------------------------------------------------------------------
void KartProperties::combineCharacteristics()
{
m_combined_characteristic.reset(new CombinedCharacteristic());
m_combined_characteristic = std::make_shared<CombinedCharacteristic>();
m_combined_characteristic->addCharacteristic(kart_properties_manager->
getBaseCharacteristic());
m_combined_characteristic->addCharacteristic(kart_properties_manager->
@ -340,7 +361,8 @@ void KartProperties::combineCharacteristics()
m_combined_characteristic->addCharacteristic(characteristic);
m_combined_characteristic->addCharacteristic(m_characteristic.get());
m_cached_characteristic.reset(new CachedCharacteristic(m_combined_characteristic.get()));
m_cached_characteristic = std::make_shared<CachedCharacteristic>
(m_combined_characteristic.get());
} // combineCharacteristics
//-----------------------------------------------------------------------------