summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/camera.cpp
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/bgfx/examples/common/camera.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/camera.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/3rdparty/bgfx/examples/common/camera.cpp b/3rdparty/bgfx/examples/common/camera.cpp
index 3e48e57d4f7..2cd5a38d369 100644
--- a/3rdparty/bgfx/examples/common/camera.cpp
+++ b/3rdparty/bgfx/examples/common/camera.cpp
@@ -240,12 +240,12 @@ struct Camera
void getViewMtx(float* _viewMtx)
{
- bx::mtxLookAt(_viewMtx, bx::load(&m_eye.x), bx::load(&m_at.x), bx::load(&m_up.x) );
+ bx::mtxLookAt(_viewMtx, bx::load<bx::Vec3>(&m_eye.x), bx::load<bx::Vec3>(&m_at.x), bx::load<bx::Vec3>(&m_up.x) );
}
- void setPosition(const float* _pos)
+ void setPosition(const bx::Vec3& _pos)
{
- bx::memCopy(&m_eye.x, _pos, sizeof(float)*3);
+ m_eye = _pos;
}
void setVerticalAngle(float _verticalAngle)
@@ -288,7 +288,7 @@ void cameraDestroy()
s_camera = NULL;
}
-void cameraSetPosition(const float* _pos)
+void cameraSetPosition(const bx::Vec3& _pos)
{
s_camera->setPosition(_pos);
}
@@ -313,14 +313,14 @@ void cameraGetViewMtx(float* _viewMtx)
s_camera->getViewMtx(_viewMtx);
}
-void cameraGetPosition(float* _pos)
+bx::Vec3 cameraGetPosition()
{
- bx::memCopy(_pos, &s_camera->m_eye.x, 3*sizeof(float) );
+ return s_camera->m_eye;
}
-void cameraGetAt(float* _at)
+bx::Vec3 cameraGetAt()
{
- bx::memCopy(_at, &s_camera->m_at.x, 3*sizeof(float) );
+ return s_camera->m_at;
}
void cameraUpdate(float _deltaTime, const entry::MouseState& _mouseState)