AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 01:07:43 +00:00
Code Issues Projects Releases Wiki Activity

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Character/CLayoutDescription.hpp
View File

@@ -1,6 +1,6 @@
#pragma once
#include "optional.hpp"
#include <optional>
#include "CToken.hpp"
#include "zeus/CVector3f.hpp"
@@ -12,22 +12,22 @@ public:
class CScaledLayoutDescription {
TLockedToken<CCharLayoutInfo> x0_layoutToken;
float xc_scale;
rstl::optional<zeus::CVector3f> x10_scaleVec;
std::optional<zeus::CVector3f> x10_scaleVec;
public:
const TLockedToken<CCharLayoutInfo>& ScaledLayout() const { return x0_layoutToken; }
float GlobalScale() const { return xc_scale; }
const rstl::optional<zeus::CVector3f>& GetScaleVec() const { return x10_scaleVec; }
const std::optional<zeus::CVector3f>& GetScaleVec() const { return x10_scaleVec; }
};
private:
TLockedToken<CCharLayoutInfo> x0_layoutToken;
rstl::optional<CScaledLayoutDescription> xc_scaled;
std::optional<CScaledLayoutDescription> xc_scaled;
public:
CLayoutDescription(const TLockedToken<CCharLayoutInfo>& token) : x0_layoutToken(token) {}
const rstl::optional<CScaledLayoutDescription>& GetScaledLayoutDescription() const { return xc_scaled; }
const std::optional<CScaledLayoutDescription>& GetScaledLayoutDescription() const { return xc_scaled; }
const TLockedToken<CCharLayoutInfo>& GetCharLayoutInfo() const { return x0_layoutToken; }
bool UsesScale() const { return bool(xc_scaled); }