mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

This commit is contained in:
Branimir Karadžić 2014-04-16 19:51:25 -07:00
parent 903b186110
commit 27f12fb738
6 changed files with 331 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/13-stencil/stencil.cpp
View File

@ -12,7 +12,7 @@
#include <bx/timer.h>
#include <bx/readerwriter.h>
#include "entry/entry.h"
#include "entry/camera.h"
#include "camera.h"
#include "fpumath.h"
#include "imgui/imgui.h"
@ -1018,9 +1018,9 @@ int _main_(int /*_argc*/, char** /*_argv*/)
mtxProj(viewState.m_proj, 60.0f, aspect, 0.1f, 100.0f);
float initialPos[3] = { 0.0f, 18.0f, -40.0f };
cameraCreate();
cameraSetPosition(initialPos);
cameraSetVerticalAngle(-0.35f);
cameraUpdate(0.0f);
cameraGetViewMtx(viewState.m_view);
int64_t timeOffset = bx::getHPCounter();
@ -1117,7 +1117,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
bgfx::dbgTextPrintf(0, 3, 0x0f, "Frame: % 7.3f[ms]", double(frameTime)*toMs);
// Update camera.
cameraUpdate(deltaTime);
cameraUpdate(deltaTime, mouseState.m_mx, mouseState.m_my, !!mouseState.m_buttons[entry::MouseButton::Right]);
cameraGetViewMtx(viewState.m_view);
static float lightTimeAccumulator = 0.0f;
@ -1506,6 +1506,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
s_uniforms.destroy();
cameraDestroy();
imguiDestroy();
// Shutdown bgfx.

7
examples/14-shadowvolumes/shadowvolumes.cpp
View File

@ -23,7 +23,7 @@ using namespace std::tr1;
#include <bx/hash.h>
#include <bx/float4_t.h>
#include "entry/entry.h"
#include "entry/camera.h"
#include "camera.h"
#include "fpumath.h"
#include "imgui/imgui.h"
@ -2175,9 +2175,9 @@ int _main_(int /*_argc*/, char** /*_argv*/)
mtxProj(viewState.m_proj, fov, aspect, nearPlane, farPlane);
float initialPos[3] = { 3.0f, 20.0f, -58.0f };
cameraCreate();
cameraSetPosition(initialPos);
cameraSetVerticalAngle(-0.25f);
cameraUpdate(0.0f);
cameraGetViewMtx(viewState.m_view);
entry::MouseState mouseState;
@ -2209,7 +2209,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
s_uniforms.m_time = time;
// Update camera.
cameraUpdate(deltaTime);
cameraUpdate(deltaTime, mouseState.m_mx, mouseState.m_my, !!mouseState.m_buttons[entry::MouseButton::Right]);
cameraGetViewMtx(viewState.m_view);
imguiBeginFrame(mouseState.m_mx
@ -2957,6 +2957,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
bgfx::destroyProgram(programFrontTex1);
bgfx::destroyProgram(programFrontTex2);
cameraDestroy();
imguiDestroy();
// Shutdown bgfx.

7
examples/16-shadowmaps/shadowmaps.cpp
View File

@ -13,7 +13,7 @@
#include <bx/timer.h>
#include <bx/readerwriter.h>
#include "entry/entry.h"
#include "entry/camera.h"
#include "camera.h"
#include "fpumath.h"
#include "imgui/imgui.h"
@ -2100,9 +2100,9 @@ int _main_(int /*_argc*/, char** /*_argv*/)
// Setup camera.
float initialPos[3] = { 0.0f, 60.0f, -105.0f };
cameraCreate();
cameraSetPosition(initialPos);
cameraSetVerticalAngle(-0.45f);
cameraUpdate(0.0f);
// Set view and projection matrices.
const float camFovy = 60.0f;
@ -2302,7 +2302,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
bgfx::dbgTextPrintf(0, 3, 0x0f, "Frame: % 7.3f[ms]", double(frameTime)*toMs);
// Update camera.
cameraUpdate(deltaTime);
cameraUpdate(deltaTime, mouseState.m_mx, mouseState.m_my, !!mouseState.m_buttons[entry::MouseButton::Right]);
// Update view mtx.
cameraGetViewMtx(viewState.m_view);
@ -3308,6 +3308,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
s_uniforms.destroy();
cameraDestroy();
imguiDestroy();
// Shutdown bgfx.

280
examples/common/camera.cpp Normal file
View File

@ -0,0 +1,280 @@
/*
* 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"
#include "entry/cmd.h"
#include "entry/input.h"
int cmdMove(CmdContext* /*_context*/, void* /*_userData*/, int _argc, char const* const* _argv)
{
if (_argc > 1)
{
if (0 == strcmp(_argv[1], "forward") )
{
cameraSetKeyState(CAMERA_KEY_UP, true);
return 0;
}
else if (0 == strcmp(_argv[1], "left") )
{
cameraSetKeyState(CAMERA_KEY_LEFT, true);
return 0;
}
else if (0 == strcmp(_argv[1], "right") )
{
cameraSetKeyState(CAMERA_KEY_RIGHT, true);
return 0;
}
else if (0 == strcmp(_argv[1], "backward") )
{
cameraSetKeyState(CAMERA_KEY_DOWN, true);
return 0;
}
}
return 1;
}
static void cmd(const void* _userData)
{
cmdExec( (const char*)_userData);
}
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
};
struct Camera
{
struct MouseCoords
{
int32_t m_mx;
int32_t m_my;
};
Camera()
{
reset();
update(0.0f, 0, 0, false);
cmdAdd("move", cmdMove);
inputAddBindings("camBindings", s_camBindings);
}
~Camera()
{
inputRemoveBindings("camBindings");
}
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 setKeyState(uint8_t _key, bool _down)
{
m_keys &= ~_key;
m_keys |= _down ? _key : 0;
}
void update(float _deltaTime, uint32_t _mx, uint32_t _my, bool _move)
{
if (!m_mouseDown)
{
m_mouseLast.m_mx = _mx;
m_mouseLast.m_my = _my;
}
m_mouseDown = _move;
if (_move)
{
m_mouseNow.m_mx = _mx;
m_mouseNow.m_my = _my;
}
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 = NULL;
void cameraCreate()
{
s_camera = new Camera;
}
void cameraDestroy()
{
delete s_camera;
s_camera = NULL;
}
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 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, uint32_t _mx, uint32_t _my, bool _move)
{
s_camera->update(_deltaTime, _mx, _my, _move);
}

39
examples/common/camera.h Normal file
View File

@ -0,0 +1,39 @@
/*
* Copyright 2013 Dario Manesku. All rights reserved.
* License: http://www.opensource.org/licenses/BSD-2-Clause
*/
#define CAMERA_KEY_UP UINT8_C(0x1)
#define CAMERA_KEY_DOWN UINT8_C(0x2)
#define CAMERA_KEY_LEFT UINT8_C(0x4)
#define CAMERA_KEY_RIGHT UINT8_C(0x8)
///
void cameraCreate();
///
void cameraDestroy();
///
void cameraSetPosition(float* _pos);
///
void cameraSetHorizontalAngle(float _horizontalAngle);
///
void cameraSetVerticalAngle(float _verticalAngle);
///
void cameraSetKeyState(uint8_t _key, bool _down);
///
void cameraGetViewMtx(float* _viewMtx);
///
void cameraGetPosition(float* _pos);
///
void cameraGetAt(float* _at);
///
void cameraUpdate(float _deltaTime, uint32_t _mx, uint32_t _my, bool _move);

45
examples/common/entry/entry.cpp
View File

@ -11,7 +11,6 @@
#include "entry_p.h"
#include "cmd.h"
#include "input.h"
#include "camera.h"
extern int _main_(int _argc, char** _argv);
@ -104,35 +103,6 @@ namespace entry
return 0;
}
int cmdMove(CmdContext* /*_context*/, void* /*_userData*/, int _argc, char const* const* _argv)
{
if (_argc > 1)
{
if (0 == strcmp(_argv[1], "forward") )
{
cameraSetKeyState(CAMERA_KEY_UP, true);
return 0;
}
else if (0 == strcmp(_argv[1], "left") )
{
cameraSetKeyState(CAMERA_KEY_LEFT, true);
return 0;
}
else if (0 == strcmp(_argv[1], "right") )
{
cameraSetKeyState(CAMERA_KEY_RIGHT, true);
return 0;
}
else if (0 == strcmp(_argv[1], "backward") )
{
cameraSetKeyState(CAMERA_KEY_DOWN, true);
return 0;
}
}
return 1;
}
static const InputBinding s_bindings[] =
{
{ entry::Key::KeyQ, entry::Modifier::LeftCtrl, 1, cmd, "exit" },
@ -146,16 +116,6 @@ 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);
@ -163,10 +123,8 @@ 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;
@ -196,9 +154,6 @@ 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 && MouseButton::Right == mouse->m_button, mouse->m_move);
if (mouse->m_move)
{
inputSetMousePos(mouse->m_mx, mouse->m_my);