AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 02:27:42 +00:00
Code Issues Projects Releases Wiki Activity

New code style refactor

Browse Source
This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
Runtime/GuiSys/CGuiCamera.hpp
View File

@@ -2,65 +2,54 @@
#include "CGuiWidget.hpp"
namespace urde
{
namespace urde {
class CSimplePool;
class CGuiCamera : public CGuiWidget
{
class CGuiCamera : public CGuiWidget {
public:
enum class EProjection
{
Perspective,
Orthographic
};
struct SProjection
{
union
{
struct
{
float xbc_left;
float xc0_right;
float xc4_top;
float xc8_bottom;
float xcc_znear;
float xd0_zfar;
};
struct
{
float xbc_fov;
float xc0_aspect;
float xc4_znear;
float xc8_zfar;
};
};
SProjection(float left, float right, float top, float bottom, float znear, float zfar)
: xbc_left(left), xc0_right(right), xc4_top(top), xc8_bottom(bottom), xcc_znear(znear),
xd0_zfar(zfar) {}
SProjection(float fov, float aspect, float znear, float zfar)
: xbc_fov(fov), xc0_aspect(aspect), xc4_znear(znear), xc8_zfar(zfar) {}
enum class EProjection { Perspective, Orthographic };
struct SProjection {
union {
struct {
float xbc_left;
float xc0_right;
float xc4_top;
float xc8_bottom;
float xcc_znear;
float xd0_zfar;
};
struct {
float xbc_fov;
float xc0_aspect;
float xc4_znear;
float xc8_zfar;
};
};
SProjection(float left, float right, float top, float bottom, float znear, float zfar)
: xbc_left(left), xc0_right(right), xc4_top(top), xc8_bottom(bottom), xcc_znear(znear), xd0_zfar(zfar) {}
SProjection(float fov, float aspect, float znear, float zfar)
: xbc_fov(fov), xc0_aspect(aspect), xc4_znear(znear), xc8_zfar(zfar) {}
};
private:
EProjection xb8_projtype;
SProjection m_proj;
EProjection xb8_projtype;
SProjection m_proj;
public:
CGuiCamera(const CGuiWidgetParms& parms, float left, float right,
float top, float bottom,
float znear, float zfar);
CGuiCamera(const CGuiWidgetParms& parms, float fov, float aspect, float znear, float zfar);
FourCC GetWidgetTypeID() const { return FOURCC('CAMR'); }
CGuiCamera(const CGuiWidgetParms& parms, float left, float right, float top, float bottom, float znear, float zfar);
CGuiCamera(const CGuiWidgetParms& parms, float fov, float aspect, float znear, float zfar);
FourCC GetWidgetTypeID() const { return FOURCC('CAMR'); }
static std::shared_ptr<CGuiWidget> Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp);
static std::shared_ptr<CGuiWidget> Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp);
zeus::CVector3f ConvertToScreenSpace(const zeus::CVector3f& vec) const;
const SProjection& GetProjection() const { return m_proj; }
void SetFov(float fov) { m_proj.xbc_fov = fov; }
void Draw(const CGuiWidgetDrawParms& parms) const;
zeus::CVector3f ConvertToScreenSpace(const zeus::CVector3f& vec) const;
const SProjection& GetProjection() const { return m_proj; }
void SetFov(float fov) { m_proj.xbc_fov = fov; }
void Draw(const CGuiWidgetDrawParms& parms) const;
std::shared_ptr<CGuiCamera> shared_from_this()
{ return std::static_pointer_cast<CGuiCamera>(CGuiObject::shared_from_this()); }
std::shared_ptr<CGuiCamera> shared_from_this() {
return std::static_pointer_cast<CGuiCamera>(CGuiObject::shared_from_this());
}
};
}
} // namespace urde