Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-10-06 09:07:19 +02:00
Code Issues Projects Releases Activity

Use ClumpPtr for clone

Browse Source
This commit is contained in:
Filip Gawin 2018-08-25 17:31:22 +02:00
parent 7d894b2da5
commit d4061540d0
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rwcore/data/Clump.cpp
View File

@ -113,10 +113,10 @@ void Clump::recalculateMetrics() {
} }
} }
Clump* Clump::clone() const { ClumpPtr Clump::clone() const {
// Clone frame hierarchy // Clone frame hierarchy
auto newroot = rootframe_->cloneHierarchy(); auto newroot = rootframe_->cloneHierarchy();
auto clump = new Clump; auto clump = std::make_shared<Clump>();
clump->setFrame(newroot); clump->setFrame(newroot);
// This isn't the most optimal implementation, but this code is likely // This isn't the most optimal implementation, but this code is likely

2
rwcore/data/Clump.hpp
View File

@ -278,7 +278,7 @@ public:
/** /**
* @return A Copy of the frames and atomics in this clump * @return A Copy of the frames and atomics in this clump
*/ */
Clump* clone() const; ClumpPtr clone() const;
private: private:
float boundingRadius; float boundingRadius;

2
rwengine/src/objects/CharacterObject.cpp
View File

@ -32,7 +32,7 @@ CharacterObject::CharacterObject(GameWorld* engine, const glm::vec3& pos,
: GameObject(engine, pos, rot, modelinfo) : GameObject(engine, pos, rot, modelinfo)
, controller(controller) { , controller(controller) {
auto info = getModelInfo<PedModelInfo>(); auto info = getModelInfo<PedModelInfo>();
setClump(ClumpPtr(info->getModel()->clone())); setClump(info->getModel()->clone());
if (info->getModel()) { if (info->getModel()) {
setModel(info->getModel()); setModel(info->getModel());
animator = new Animator(getClump()); animator = new Animator(getClump());

2
rwengine/src/objects/CutsceneObject.cpp
View File

@ -15,7 +15,7 @@ CutsceneObject::CutsceneObject(GameWorld *engine, const glm::vec3 &pos,
else { else {
setModel(getModelInfo<ClumpModelInfo>()->getModel()); setModel(getModelInfo<ClumpModelInfo>()->getModel());
} }
setClump(ClumpPtr(getModel()->clone())); setClump(getModel()->clone());
animator = new Animator(getClump()); animator = new Animator(getClump());
} }

2
rwengine/src/objects/VehicleObject.cpp
View File

@ -166,7 +166,7 @@ VehicleObject::VehicleObject(GameWorld* engine, const glm::vec3& pos,
} }
setModel(getVehicle()->getModel()); setModel(getVehicle()->getModel());
setClump(ClumpPtr(getModelInfo<VehicleModelInfo>()->getModel()->clone())); setClump(getModelInfo<VehicleModelInfo>()->getModel()->clone());
setupModel(); setupModel();
} }