Move to object_ptr
This commit is contained in:
@@ -16,17 +16,17 @@ Actor::Actor()
|
||||
std::shared_ptr<SaveMap> Actor::save()
|
||||
{
|
||||
return std::make_shared<SaveMap>("Actor")
|
||||
->SaveObject("loc", &loc)
|
||||
->SaveObject("rot", &rot)
|
||||
->SaveObject("scale", &scale)
|
||||
->SaveObject("loc", static_cast<UType::object_ptr<ISave>>(loc))
|
||||
->SaveObject("rot", static_cast<UType::object_ptr<ISave>>(rot))
|
||||
->SaveObject("scale", UType::object_ptr<ISave>(scale))
|
||||
->SaveListStrings("tags", std::move(tags));
|
||||
}
|
||||
|
||||
void Actor::load(std::shared_ptr<SaveMap> save)
|
||||
{
|
||||
loc = *reinterpret_cast<Vector3D*>(save->GetObject("loc"));
|
||||
rot = *reinterpret_cast<Vector3D*>(save->GetObject("rot"));
|
||||
scale = *reinterpret_cast<Vector3D*>(save->GetObject("scale"));
|
||||
loc = static_cast<UType::object_ptr<Vector3D>>(save->GetObject("loc"));
|
||||
rot = static_cast<UType::object_ptr<Vector3D>>(save->GetObject("rot"));
|
||||
scale = static_cast<UType::object_ptr<Vector3D>>(save->GetObject("scale"));
|
||||
tags = std::move(save->GetListString("tags"));
|
||||
}
|
||||
|
||||
@@ -41,13 +41,13 @@ void Actor::Tick(double delta_time)
|
||||
|
||||
void Actor::SetActorLocate(const Vector3D& loc) noexcept
|
||||
{
|
||||
this->loc = loc;
|
||||
*this->loc = loc;
|
||||
OnSetActorLocate.Call(loc);
|
||||
}
|
||||
|
||||
void Actor::SetActorRotate(const Vector3D& rot) noexcept
|
||||
{
|
||||
this->rot = rot;
|
||||
*this->rot = rot;
|
||||
OnSetActorRotate.Call(rot);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user