summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/camera.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-10-20 21:34:36 +0200
committer ImJezze <jezze@gmx.net>2015-10-20 21:34:36 +0200
commita7b8acbe3eebcf17367baa642375cfa47ae4ea85 (patch)
tree854b859d6176802c0278f4b00de3f7c774e02dda /3rdparty/bgfx/examples/common/camera.cpp
parent4610935e796661874bb4ee7ec6536d9423aeb7be (diff)
parent74aae76c4e3e257f99d139c4febb5d86d1419e50 (diff)
Merge pull request #6 from mamedev/master
Sync to base master
Diffstat (limited to '3rdparty/bgfx/examples/common/camera.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/camera.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/3rdparty/bgfx/examples/common/camera.cpp b/3rdparty/bgfx/examples/common/camera.cpp
index b7a04553fb9..4d0a47166ea 100644
--- a/3rdparty/bgfx/examples/common/camera.cpp
+++ b/3rdparty/bgfx/examples/common/camera.cpp
@@ -53,7 +53,7 @@ static void cmd(const void* _userData)
cmdExec( (const char*)_userData);
}
-static const InputBinding s_camBindings[] =
+static const InputBinding s_camBindings[] =
{
{ entry::Key::KeyW, entry::Modifier::None, 0, cmd, "move forward" },
{ entry::Key::GamepadUp, entry::Modifier::None, 0, cmd, "move forward" },
@@ -258,7 +258,7 @@ struct Camera
bx::mtxLookAt(_viewMtx, m_eye, m_at, m_up);
}
- void setPosition(float* _pos)
+ void setPosition(const float* _pos)
{
memcpy(m_eye, _pos, sizeof(float)*3);
}
@@ -267,7 +267,7 @@ struct Camera
{
m_verticalAngle = _verticalAngle;
}
-
+
void setHorizontalAngle(float _horizontalAngle)
{
m_horizontalAngle = _horizontalAngle;
@@ -303,7 +303,7 @@ void cameraDestroy()
s_camera = NULL;
}
-void cameraSetPosition(float* _pos)
+void cameraSetPosition(const float* _pos)
{
s_camera->setPosition(_pos);
}
@@ -330,12 +330,12 @@ void cameraGetViewMtx(float* _viewMtx)
void cameraGetPosition(float* _pos)
{
- memcpy(_pos, s_camera->m_eye, 3*sizeof(float));
+ memcpy(_pos, s_camera->m_eye, 3*sizeof(float) );
}
void cameraGetAt(float* _at)
{
- memcpy(_at, s_camera->m_at, 3*sizeof(float));
+ memcpy(_at, s_camera->m_at, 3*sizeof(float) );
}
void cameraUpdate(float _deltaTime, const entry::MouseState& _mouseState)