Added camera.

This commit is contained in:
Dario Manesku 2013-11-29 23:15:50 +01:00
parent e50f0b11dc
commit c827dad22a
4 changed files with 287 additions and 1 deletions

View file

@ -0,0 +1,228 @@
/*
* Copyright 2013 Dario Manesku. All rights reserved.
* License: http://www.opensource.org/licenses/BSD-2-Clause
*/
#include <bx/timer.h>
#include "../fpumath.h"
#include "camera.h"
struct Camera
{
struct MouseCoords
{
int32_t m_mx;
int32_t m_my;
};
Camera()
{
reset();
}
void reset()
{
m_mouseNow.m_mx = 0;
m_mouseNow.m_my = 0;
m_mouseLast.m_mx = 0;
m_mouseLast.m_my = 0;
m_eye[0] = 0.0f;
m_eye[1] = 0.0f;
m_eye[2] = -35.0f;
m_at[0] = 0.0f;
m_at[1] = 0.0f;
m_at[2] = -1.0f;
m_up[0] = 0.0f;
m_up[1] = 1.0f;
m_up[2] = 0.0f;
m_horizontalAngle = 0.01f;
m_verticalAngle = 0.0f;
m_mouseSpeed = 0.0020f;
m_moveSpeed = 30.0f;
m_keys = 0;
m_mouseDown = false;
}
void setMouseState(uint32_t _mx, uint32_t _my, bool _down, bool _move)
{
if (_down)
{
m_mouseDown = true;
m_mouseLast.m_mx = _mx;
m_mouseLast.m_my = _my;
m_mouseNow.m_mx = _mx;
m_mouseNow.m_my = _my;
}
if (!_down && !_move)
{
m_mouseDown = false;
}
if (m_mouseDown && _move)
{
m_mouseNow.m_mx = _mx;
m_mouseNow.m_my = _my;
}
}
void setKeyState(uint8_t _key, bool _down)
{
m_keys &= ~_key;
m_keys |= _down ? _key : 0;
}
void update(float _deltaTime)
{
if (m_mouseDown)
{
int32_t deltaX = m_mouseNow.m_mx - m_mouseLast.m_mx;
int32_t deltaY = m_mouseNow.m_my - m_mouseLast.m_my;
m_horizontalAngle += m_mouseSpeed * float(deltaX);
m_verticalAngle -= m_mouseSpeed * float(deltaY);
m_mouseLast.m_mx = m_mouseNow.m_mx;
m_mouseLast.m_my = m_mouseNow.m_my;
}
float direction[3] =
{
cosf(m_verticalAngle) * sinf(m_horizontalAngle),
sinf(m_verticalAngle),
cosf(m_verticalAngle) * cosf(m_horizontalAngle),
};
float right[3] =
{
sinf(m_horizontalAngle - float(M_PI)/2.0f),
0,
cosf(m_horizontalAngle - float(M_PI)/2.0f),
};
if (m_keys & CAMERA_KEY_UP)
{
// m_eye += direction * _deltaTime * m_moveSpeed
float tmpRhs[3];
float tmpPos[3];
memcpy(tmpPos, m_eye, sizeof(float)*3);
vec3Mul(tmpRhs, direction, _deltaTime * m_moveSpeed);
vec3Add(m_eye, tmpPos, tmpRhs);
setKeyState(CAMERA_KEY_UP, false);
}
if (m_keys & CAMERA_KEY_DOWN)
{
// m_eye -= direction * _deltaTime * m_moveSpeed
float tmpRhs[3];
float tmpPos[3];
memcpy(tmpPos, m_eye, sizeof(float)*3);
vec3Mul(tmpRhs, direction, _deltaTime * m_moveSpeed);
vec3Sub(m_eye, tmpPos, tmpRhs);
setKeyState(CAMERA_KEY_DOWN, false);
}
if (m_keys & CAMERA_KEY_LEFT)
{
// m_eye += right * _deltaTime * m_moveSpeed
float tmpRhs[3];
float tmpPos[3];
memcpy(tmpPos, m_eye, sizeof(float)*3);
vec3Mul(tmpRhs, right, _deltaTime * m_moveSpeed);
vec3Add(m_eye, tmpPos, tmpRhs);
setKeyState(CAMERA_KEY_LEFT, false);
}
if (m_keys & CAMERA_KEY_RIGHT)
{
// m_eye -= right * _deltaTime * m_moveSpeed
float tmpRhs[3];
float tmpPos[3];
memcpy(tmpPos, m_eye, sizeof(float)*3);
vec3Mul(tmpRhs, right, _deltaTime * m_moveSpeed);
vec3Sub(m_eye, tmpPos, tmpRhs);
setKeyState(CAMERA_KEY_RIGHT, false);
}
vec3Add(m_at, m_eye, direction);
vec3Cross(m_up, right, direction);
}
void getViewMtx(float* _viewMtx)
{
mtxLookAt(_viewMtx, m_eye, m_at, m_up);
}
void setPosition(float* _pos)
{
memcpy(m_eye, _pos, sizeof(float)*3);
}
void setVerticalAngle(float _verticalAngle)
{
m_verticalAngle = _verticalAngle;
}
void setHorizontalAngle(float _horizontalAngle)
{
m_horizontalAngle = _horizontalAngle;
}
MouseCoords m_mouseNow, m_mouseLast;
float m_eye[3];
float m_at[3];
float m_up[3];
float m_horizontalAngle;
float m_verticalAngle;
float m_mouseSpeed;
float m_moveSpeed;
uint8_t m_keys;
bool m_mouseDown;
};
static Camera s_camera;
void cameraSetPosition(float* _pos)
{
s_camera.setPosition(_pos);
}
void cameraSetHorizontalAngle(float _horizontalAngle)
{
s_camera.setHorizontalAngle(_horizontalAngle);
}
void cameraSetVerticalAngle(float _verticalAngle)
{
s_camera.setVerticalAngle(_verticalAngle);
}
void cameraSetMouseState(uint32_t _mx, uint32_t _my, bool _down, bool _move)
{
s_camera.setMouseState(_mx, _my, _down, _move);
}
void cameraSetKeyState(uint8_t _key, bool _down)
{
s_camera.setKeyState(_key, _down);
}
void cameraGetViewMtx(float* _viewMtx)
{
s_camera.getViewMtx(_viewMtx);
}
void cameraGetPosition(float* _pos)
{
memcpy(_pos, s_camera.m_eye, 3*sizeof(float));
}
void cameraGetAt(float* _at)
{
memcpy(_at, s_camera.m_at, 3*sizeof(float));
}
void cameraUpdate(float _deltaTime)
{
s_camera.update(_deltaTime);
}

View file

@ -0,0 +1,36 @@
/*
* Copyright 2013 Dario Manesku. All rights reserved.
* License: http://www.opensource.org/licenses/BSD-2-Clause
*/
static const uint8_t CAMERA_KEY_UP = 1u << 1;
static const uint8_t CAMERA_KEY_DOWN = 1u << 2;
static const uint8_t CAMERA_KEY_LEFT = 1u << 3;
static const uint8_t CAMERA_KEY_RIGHT = 1u << 4;
///
void cameraSetPosition(float* _pos);
///
void cameraSetHorizontalAngle(float _horizontalAngle);
///
void cameraSetVerticalAngle(float _verticalAngle);
///
void cameraSetMouseState(uint32_t _mx, uint32_t _my, bool _down, bool _move);
///
void cameraSetKeyState(uint8_t _key, bool _down);
///
void cameraGetViewMtx(float* _viewMtx);
///
void cameraGetPosition(float* _pos);
///
void cameraGetAt(float* _at);
///
void cameraUpdate(float _deltaTime = 0.0f);

View file

@ -11,6 +11,7 @@
#include "entry_p.h"
#include "cmd.h"
#include "input.h"
#include "camera.h"
extern int _main_(int _argc, char** _argv);
@ -116,6 +117,16 @@ namespace entry
INPUT_BINDING_END
};
static const InputBinding s_camBindings[] =
{
{ entry::Key::KeyW, entry::Modifier::None, 0, cmd, "move forward" },
{ entry::Key::KeyA, entry::Modifier::None, 0, cmd, "move left" },
{ entry::Key::KeyS, entry::Modifier::None, 0, cmd, "move backward" },
{ entry::Key::KeyD, entry::Modifier::None, 0, cmd, "move right" },
INPUT_BINDING_END
};
int main(int _argc, char** _argv)
{
DBG(BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME);
@ -123,8 +134,10 @@ namespace entry
cmdAdd("mouselock", cmdMouseLock);
cmdAdd("graphics", cmdGraphics );
cmdAdd("exit", cmdExit );
cmdAdd("move", cmdMove );
inputAddBindings("bindings", s_bindings);
inputAddBindings("camBindings", s_camBindings);
int32_t result = ::_main_(_argc, _argv);
return result;
@ -154,6 +167,9 @@ namespace entry
{
const MouseEvent* mouse = static_cast<const MouseEvent*>(ev);
//TODO: move this from here.
cameraSetMouseState(mouse->m_mx, mouse->m_my, mouse->m_down, mouse->m_move);
if (mouse->m_move)
{
inputSetMousePos(mouse->m_mx, mouse->m_my);

View file

@ -143,7 +143,7 @@ inline void mtxScale(float* _result, float _x, float _y, float _z)
_result[15] = 1.0f;
}
inline void mtxLookAt(float* __restrict _result, const float* __restrict _eye, const float* __restrict _at)
inline void mtxLookAt(float* __restrict _result, const float* __restrict _eye, const float* __restrict _at, const float* __restrict _up = NULL)
{
float tmp[4];
vec3Sub(tmp, _at, _eye);
@ -152,6 +152,12 @@ inline void mtxLookAt(float* __restrict _result, const float* __restrict _eye, c
vec3Norm(view, tmp);
float up[3] = { 0.0f, 1.0f, 0.0f };
if (NULL != _up)
{
up[0] = _up[0];
up[1] = _up[1];
up[2] = _up[2];
}
vec3Cross(tmp, up, view);
float right[4];