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

Use correct cached characteristics

Browse Source
This commit is contained in:
Flakebi 2015-10-03 20:14:39 +02:00
parent 37ca28e868
commit abc2ae54ea
7 changed files with 27 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/karts/abstract_kart.cpp
View File

@ -20,6 +20,7 @@
#include "karts/abstract_kart.hpp"
#include "items/powerup.hpp"
#include "karts/cached_characteristic.hpp"
#include "karts/combined_characteristic.hpp"
#include "karts/abstract_kart_animation.hpp"
#include "karts/kart_model.hpp"
@ -60,10 +61,10 @@ AbstractKart::AbstractKart(const std::string& ident,
m_wheel_graphics_position = m_kart_model->getWheelsGraphicsPosition();
// Combine the characteristics for this player
m_characteristic.reset(new CombinedCharacteristic());
m_characteristic->addCharacteristic(kart_properties_manager->
m_combined_characteristic.reset(new CombinedCharacteristic());
m_combined_characteristic->addCharacteristic(kart_properties_manager->
getBaseCharacteristic());
m_characteristic->addCharacteristic(kart_properties_manager->
m_combined_characteristic->addCharacteristic(kart_properties_manager->
getDifficultyCharacteristic(race_manager->getDifficultyAsString(
race_manager->getDifficulty())));
@ -71,12 +72,13 @@ AbstractKart::AbstractKart(const std::string& ident,
const AbstractCharacteristic *characteristic = kart_properties_manager->
getKartTypeCharacteristic(m_kart_properties->getKartType());
if (characteristic)
m_characteristic->addCharacteristic(characteristic);
m_combined_characteristic->addCharacteristic(characteristic);
m_characteristic->addCharacteristic(kart_properties_manager->
m_combined_characteristic->addCharacteristic(kart_properties_manager->
getPlayerCharacteristic(KartProperties::getPerPlayerDifficultyAsString(
m_difficulty)));
m_characteristic->addCharacteristic(m_kart_properties->getCharacteristic());
m_combined_characteristic->addCharacteristic(m_kart_properties->getCharacteristic());
m_characteristic.reset(new CachedCharacteristic(m_combined_characteristic.get()));
} // AbstractKart
// ----------------------------------------------------------------------------

5
src/karts/abstract_kart.hpp
View File

@ -39,6 +39,7 @@ class AbstractKartAnimation;
class Attachment;
class btKart;
class btQuaternion;
class CachedCharacteristic;
class CombinedCharacteristic;
class Controller;
class Item;
@ -78,7 +79,9 @@ protected:
/** The per-player difficulty. */
PerPlayerDifficulty m_difficulty;
/** The combined properties of the kart, the player, etc. */
std::unique_ptr<CombinedCharacteristic> m_characteristic;
std::unique_ptr<CombinedCharacteristic> m_combined_characteristic;
/** The cached combined characteristics. */
std::unique_ptr<CachedCharacteristic> m_characteristic;
/** This stores a copy of the kart model. It has to be a copy
* since otherwise incosistencies can happen if the same kart

2
src/karts/kart.cpp
View File

@ -39,7 +39,7 @@
#include "graphics/stars.hpp"
#include "guiengine/scalable_font.hpp"
#include "karts/abstract_characteristic.hpp"
#include "karts/combined_characteristic.hpp"
#include "karts/cached_characteristic.hpp"
#include "karts/explosion_animation.hpp"
#include "karts/kart_gfx.hpp"
#include "karts/rescue_animation.hpp"

33
src/karts/kart_properties.cpp
View File

@ -73,9 +73,6 @@ KartProperties::KartProperties(const std::string &filename)
m_shadow_scale = 1.0f;
m_shadow_x_offset = 0.0f;
m_shadow_z_offset = 0.0f;
m_characteristic = NULL;
m_combined_characteristic = NULL;
m_cached_characteristic = NULL;
m_groups.clear();
m_custom_sfx_id.resize(SFXManager::NUM_CUSTOMS);
@ -118,12 +115,6 @@ KartProperties::~KartProperties()
delete m_kart_model;
if(m_skidding_properties)
delete m_skidding_properties;
if (m_characteristic)
delete m_characteristic;
if (m_combined_characteristic)
delete m_combined_characteristic;
if (m_cached_characteristic)
delete m_cached_characteristic;
for(unsigned int i=0; i<RaceManager::DIFFICULTY_COUNT; i++)
if(m_ai_properties[i])
delete m_ai_properties[i];
@ -148,8 +139,7 @@ void KartProperties::copyFrom(const KartProperties *source)
if (source->m_characteristic)
{
m_characteristic = new XmlCharacteristic();
assert(m_characteristic);
m_characteristic.reset(new XmlCharacteristic());
*m_characteristic = *source->m_characteristic;
// Combine the characteristics for this object. We can't copy it because
// this object has other pointers (to m_characteristic).
@ -216,9 +206,7 @@ void KartProperties::load(const std::string &filename, const std::string &node)
throw std::runtime_error(msg.str());
}
getAllData(root);
if (m_characteristic)
delete m_characteristic;
m_characteristic = new XmlCharacteristic(root);
m_characteristic.reset(new XmlCharacteristic(root));
combineCharacteristics();
}
catch(std::exception& err)
@ -316,11 +304,7 @@ void KartProperties::load(const std::string &filename, const std::string &node)
//-----------------------------------------------------------------------------
void KartProperties::combineCharacteristics()
{
if (m_combined_characteristic)
delete m_combined_characteristic;
if (m_cached_characteristic)
delete m_cached_characteristic;
m_combined_characteristic = new CombinedCharacteristic();
m_combined_characteristic.reset(new CombinedCharacteristic());
m_combined_characteristic->addCharacteristic(kart_properties_manager->
getBaseCharacteristic());
@ -334,8 +318,7 @@ void KartProperties::combineCharacteristics()
// Kart type found
m_combined_characteristic->addCharacteristic(characteristic);
m_combined_characteristic->addCharacteristic(m_characteristic);
m_cached_characteristic = new CachedCharacteristic(m_combined_characteristic);
m_combined_characteristic->addCharacteristic(m_characteristic.get());
} // combineCharacteristics
//-----------------------------------------------------------------------------
@ -531,13 +514,13 @@ bool KartProperties::operator<(const KartProperties &other) const
// ----------------------------------------------------------------------------
const AbstractCharacteristic* KartProperties::getCharacteristic() const
{
return m_characteristic;
return m_characteristic.get();
} // getCharacteristic
// ----------------------------------------------------------------------------
const AbstractCharacteristic* KartProperties::getCombinedCharacteristic() const
{
return m_cached_characteristic;
return m_combined_characteristic.get();
} // getCombinedCharacteristic
// ----------------------------------------------------------------------------
@ -550,8 +533,8 @@ bool KartProperties::isInGroup(const std::string &group) const
float KartProperties::getAvgPower() const
{
float sum = 0;
std::vector<float> gear_power_increase = m_cached_characteristic->getGearPowerIncrease();
float power = m_cached_characteristic->getEnginePower();
std::vector<float> gear_power_increase = m_combined_characteristic->getGearPowerIncrease();
float power = m_combined_characteristic->getEnginePower();
for (unsigned int i = 0; i < gear_power_increase.size(); ++i)
sum += gear_power_increase[i] * power;
return sum / gear_power_increase.size();

7
src/karts/kart_properties.hpp
View File

@ -39,7 +39,6 @@ using namespace irr;
class AbstractCharacteristic;
class AIProperties;
class CachedCharacteristic;
class CombinedCharacteristic;
class Material;
class SkiddingProperties;
@ -126,11 +125,9 @@ private:
/** The physical, item, etc. characteristics of this kart that are loaded
* from the xml file.
*/
AbstractCharacteristic *m_characteristic;
std::shared_ptr<AbstractCharacteristic> m_characteristic;
/** The base characteristics combined with the characteristics of this kart. */
CombinedCharacteristic *m_combined_characteristic;
/** The cached combined characteristics. */
CachedCharacteristic *m_cached_characteristic;
std::shared_ptr<CombinedCharacteristic> m_combined_characteristic;
// Physic properties
// -----------------

9
src/karts/xml_characteristic.cpp
View File

@ -141,14 +141,6 @@ void XmlCharacteristic::process(CharacteristicType type, Value value,
found = true;
break;
}
if (!*is_set)
{
Log::error("XmlCharacteristic::process",
"Can't process %s",
pair[1].c_str());
value.fv->clear();
break;
}
}
if (!found)
{
@ -168,6 +160,7 @@ void XmlCharacteristic::process(CharacteristicType type, Value value,
if (shouldReplace)
{
value.ia->clear();
// Replace all values
for (const std::string &processor : processors)
{