From 147a37906776a823b5485963c33fea8b25271594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Fri, 21 Dec 2018 21:05:26 -0800 Subject: [PATCH] Cleanup. --- examples/13-stencil/stencil.cpp | 3 +-- examples/14-shadowvolumes/shadowvolumes.cpp | 3 +-- examples/16-shadowmaps/shadowmaps.cpp | 3 +-- examples/21-deferred/deferred.cpp | 3 +-- examples/24-nbody/nbody.cpp | 3 +-- examples/26-occlusion/occlusion.cpp | 3 +-- examples/27-terrain/terrain.cpp | 8 +++----- examples/29-debugdraw/debugdraw.cpp | 3 +-- examples/31-rsm/reflectiveshadowmap.cpp | 3 +-- examples/32-particles/particles.cpp | 8 +++----- examples/36-sky/sky.cpp | 3 +-- examples/38-bloom/bloom.cpp | 3 +-- examples/39-assao/assao.cpp | 3 +-- examples/common/camera.cpp | 14 +++++++------- examples/common/camera.h | 6 +++--- 15 files changed, 27 insertions(+), 42 deletions(-) diff --git a/examples/13-stencil/stencil.cpp b/examples/13-stencil/stencil.cpp index 721bc89d5..9c535a9f1 100644 --- a/examples/13-stencil/stencil.cpp +++ b/examples/13-stencil/stencil.cpp @@ -862,9 +862,8 @@ public: const bgfx::Caps* caps = bgfx::getCaps(); bx::mtxProj(m_viewState.m_proj, 60.0f, aspect, 0.1f, 100.0f, caps->homogeneousDepth); - float initialPos[3] = { 0.0f, 18.0f, -40.0f }; cameraCreate(); - cameraSetPosition(initialPos); + cameraSetPosition({ 0.0f, 18.0f, -40.0f }); cameraSetVerticalAngle(-0.35f); cameraGetViewMtx(m_viewState.m_view); diff --git a/examples/14-shadowvolumes/shadowvolumes.cpp b/examples/14-shadowvolumes/shadowvolumes.cpp index ba0d95093..169e820e5 100644 --- a/examples/14-shadowvolumes/shadowvolumes.cpp +++ b/examples/14-shadowvolumes/shadowvolumes.cpp @@ -2022,8 +2022,7 @@ public: // Set view matrix cameraCreate(); - float initialPos[3] = { 3.0f, 20.0f, -58.0f }; - cameraSetPosition(initialPos); + cameraSetPosition({ 3.0f, 20.0f, -58.0f }); cameraSetVerticalAngle(-0.25f); cameraGetViewMtx(m_viewState.m_view); } diff --git a/examples/16-shadowmaps/shadowmaps.cpp b/examples/16-shadowmaps/shadowmaps.cpp index 6d208921f..ff87b0273 100644 --- a/examples/16-shadowmaps/shadowmaps.cpp +++ b/examples/16-shadowmaps/shadowmaps.cpp @@ -1901,9 +1901,8 @@ public: s_rtBlur = bgfx::createFrameBuffer(m_currentShadowMapSize, m_currentShadowMapSize, bgfx::TextureFormat::BGRA8); // Setup camera. - float initialPos[3] = { 0.0f, 60.0f, -105.0f }; cameraCreate(); - cameraSetPosition(initialPos); + cameraSetPosition({ 0.0f, 60.0f, -105.0f }); cameraSetVerticalAngle(-0.45f); m_timeAccumulatorLight = 0.0f; diff --git a/examples/21-deferred/deferred.cpp b/examples/21-deferred/deferred.cpp index 00379705b..a1a254434 100644 --- a/examples/21-deferred/deferred.cpp +++ b/examples/21-deferred/deferred.cpp @@ -316,8 +316,7 @@ public: cameraCreate(); - const float initialPos[3] = { 0.0f, 0.0f, -15.0f }; - cameraSetPosition(initialPos); + cameraSetPosition({ 0.0f, 0.0f, -15.0f }); cameraSetVerticalAngle(0.0f); } diff --git a/examples/24-nbody/nbody.cpp b/examples/24-nbody/nbody.cpp index ae675c355..416e19a94 100644 --- a/examples/24-nbody/nbody.cpp +++ b/examples/24-nbody/nbody.cpp @@ -207,9 +207,8 @@ public: bgfx::setBuffer(1, m_currPositionBuffer0, bgfx::Access::Write); bgfx::dispatch(0, m_initInstancesProgram, kMaxParticleCount / kThreadGroupUpdateSize, 1, 1); - float initialPos[3] = { 0.0f, 0.0f, -45.0f }; cameraCreate(); - cameraSetPosition(initialPos); + cameraSetPosition({ 0.0f, 0.0f, -45.0f }); cameraSetVerticalAngle(0.0f); m_useIndirect = false; diff --git a/examples/26-occlusion/occlusion.cpp b/examples/26-occlusion/occlusion.cpp index 55970a401..1b44b6d2e 100644 --- a/examples/26-occlusion/occlusion.cpp +++ b/examples/26-occlusion/occlusion.cpp @@ -137,8 +137,7 @@ public: cameraCreate(); - const float initialPos[3] = { 15.5f, 0.0f, -15.5f }; - cameraSetPosition(initialPos); + cameraSetPosition({ 15.5f, 0.0f, -15.5f }); cameraSetHorizontalAngle(bx::toRad(-45.0f) ); m_timeOffset = bx::getHPCounter(); diff --git a/examples/27-terrain/terrain.cpp b/examples/27-terrain/terrain.cpp index d33c98414..152bc5ec2 100644 --- a/examples/27-terrain/terrain.cpp +++ b/examples/27-terrain/terrain.cpp @@ -135,9 +135,8 @@ public: cameraCreate(); - const float initialPos[3] = { s_terrainSize/2.0f, 100.0f, 0.0f }; - cameraSetPosition(initialPos); - cameraSetVerticalAngle(-bx::kPi/4.0f); + cameraSetPosition({ s_terrainSize/2.0f, 100.0f, 0.0f }); + cameraSetVerticalAngle(-bx::kPiQuarter); } virtual int shutdown() override @@ -359,8 +358,7 @@ public: const bx::Vec3 rayDir = bx::mul(bx::normalize(bx::load(ray_world) ), -1.0f); - bx::Vec3 pos; - cameraGetPosition(&pos.x); + bx::Vec3 pos = cameraGetPosition(); for (int i = 0; i < 1000; ++i) { pos = bx::add(pos, rayDir); diff --git a/examples/29-debugdraw/debugdraw.cpp b/examples/29-debugdraw/debugdraw.cpp index 61388649f..ef743fe5e 100644 --- a/examples/29-debugdraw/debugdraw.cpp +++ b/examples/29-debugdraw/debugdraw.cpp @@ -517,8 +517,7 @@ public: cameraCreate(); - const float initialPos[3] = { 0.0f, 2.0f, -12.0f }; - cameraSetPosition(initialPos); + cameraSetPosition({ 0.0f, 2.0f, -12.0f }); cameraSetVerticalAngle(0.0f); ddInit(); diff --git a/examples/31-rsm/reflectiveshadowmap.cpp b/examples/31-rsm/reflectiveshadowmap.cpp index ec17afd9f..21b2ae7dd 100644 --- a/examples/31-rsm/reflectiveshadowmap.cpp +++ b/examples/31-rsm/reflectiveshadowmap.cpp @@ -364,8 +364,7 @@ public: // Init camera cameraCreate(); - float camPos[] = {0.0f, 1.5f, 0.0f}; - cameraSetPosition(camPos); + cameraSetPosition({0.0f, 1.5f, 0.0f}); cameraSetVerticalAngle(-0.3f); // Init directional light diff --git a/examples/32-particles/particles.cpp b/examples/32-particles/particles.cpp index 32737ca29..b5b699d5b 100644 --- a/examples/32-particles/particles.cpp +++ b/examples/32-particles/particles.cpp @@ -290,8 +290,7 @@ public: cameraCreate(); - const float initialPos[3] = { 0.0f, 2.0f, -12.0f }; - cameraSetPosition(initialPos); + cameraSetPosition({ 0.0f, 2.0f, -12.0f }); cameraSetVerticalAngle(0.0f); m_timeOffset = bx::getHPCounter(); @@ -409,13 +408,12 @@ public: dde.drawGrid(Axis::Y, { 0.0f, 0.0f, 0.0f }); - float eye[3]; - cameraGetPosition(eye); + const bx::Vec3 eye = cameraGetPosition(); m_emitter[currentEmitter].update(); psUpdate(deltaTime * timeScale); - psRender(0, view, bx::load(eye) ); + psRender(0, view, eye); if (showBounds) { diff --git a/examples/36-sky/sky.cpp b/examples/36-sky/sky.cpp index 00187139f..3a43a8e9d 100644 --- a/examples/36-sky/sky.cpp +++ b/examples/36-sky/sky.cpp @@ -463,8 +463,7 @@ namespace cameraCreate(); - const float initialPos[3] = { 5.0f, 3.0, 0.0f }; - cameraSetPosition(initialPos); + cameraSetPosition({ 5.0f, 3.0, 0.0f }); cameraSetVerticalAngle(bx::kPi / 8.0f); cameraSetHorizontalAngle(-bx::kPi / 3.0f); diff --git a/examples/38-bloom/bloom.cpp b/examples/38-bloom/bloom.cpp index 1de0111ca..87cdb9c2d 100644 --- a/examples/38-bloom/bloom.cpp +++ b/examples/38-bloom/bloom.cpp @@ -283,8 +283,7 @@ public: cameraCreate(); - const float initialPos[3] = { 0.0f, 0.0f, -15.0f }; - cameraSetPosition(initialPos); + cameraSetPosition({ 0.0f, 0.0f, -15.0f }); cameraSetVerticalAngle(0.0f); } diff --git a/examples/39-assao/assao.cpp b/examples/39-assao/assao.cpp index 22a54756f..0cf1d0687 100644 --- a/examples/39-assao/assao.cpp +++ b/examples/39-assao/assao.cpp @@ -370,8 +370,7 @@ namespace // Init camera cameraCreate(); - float camPos[] = { 0.0f, 1.5f, 0.0f }; - cameraSetPosition(camPos); + cameraSetPosition({ 0.0f, 1.5f, 0.0f }); cameraSetVerticalAngle(-0.3f); m_fovY = 60.0f; diff --git a/examples/common/camera.cpp b/examples/common/camera.cpp index 5dc140297..2cd5a38d3 100644 --- a/examples/common/camera.cpp +++ b/examples/common/camera.cpp @@ -243,9 +243,9 @@ struct Camera bx::mtxLookAt(_viewMtx, bx::load(&m_eye.x), bx::load(&m_at.x), bx::load(&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) diff --git a/examples/common/camera.h b/examples/common/camera.h index ba1c0cc1f..451546448 100644 --- a/examples/common/camera.h +++ b/examples/common/camera.h @@ -22,7 +22,7 @@ void cameraCreate(); void cameraDestroy(); /// -void cameraSetPosition(const float* _pos); +void cameraSetPosition(const bx::Vec3& _pos); /// void cameraSetHorizontalAngle(float _horizontalAngle); @@ -37,10 +37,10 @@ void cameraSetKeyState(uint8_t _key, bool _down); void cameraGetViewMtx(float* _viewMtx); /// -void cameraGetPosition(float* _pos); +bx::Vec3 cameraGetPosition(); /// -void cameraGetAt(float* _at); +bx::Vec3 cameraGetAt(); /// void cameraUpdate(float _deltaTime, const entry::MouseState& _mouseState);