diff options
author | 2017-03-29 17:09:40 +0200 | |
---|---|---|
committer | 2017-03-29 17:09:40 +0200 | |
commit | 49f7c99c7786ce257fae28dfeae2f8ee5810424c (patch) | |
tree | 1bbd30dd4dd48596186846c2fc77a8dc748215d2 /3rdparty/bgfx/examples/27-terrain/terrain.cpp | |
parent | 79f22e060b2c012d628d5d1d83288c1bb6e6acef (diff) |
Update BGFX and BX (nw)
Diffstat (limited to '3rdparty/bgfx/examples/27-terrain/terrain.cpp')
-rw-r--r-- | 3rdparty/bgfx/examples/27-terrain/terrain.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/3rdparty/bgfx/examples/27-terrain/terrain.cpp b/3rdparty/bgfx/examples/27-terrain/terrain.cpp index c93dbe195c9..3bcd8491dd6 100644 --- a/3rdparty/bgfx/examples/27-terrain/terrain.cpp +++ b/3rdparty/bgfx/examples/27-terrain/terrain.cpp @@ -12,7 +12,7 @@ #include <bx/debug.h> #include <bx/fpumath.h> -static uint32_t s_terrainSize = 256; +static const uint16_t s_terrainSize = 256; struct PosTexCoord0Vertex { @@ -119,7 +119,7 @@ class ExampleTerrain : public entry::AppI m_terrain.m_heightMap = (uint8_t*)BX_ALLOC(entry::getAllocator(), num); bx::mtxSRT(m_terrain.m_transform, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); - memset(m_terrain.m_heightMap, 0, sizeof(uint8_t) * s_terrainSize * s_terrainSize); + bx::memSet(m_terrain.m_heightMap, 0, sizeof(uint8_t) * s_terrainSize * s_terrainSize); cameraCreate(); @@ -198,10 +198,10 @@ class ExampleTerrain : public entry::AppI } m_terrain.m_indexCount = 0; - for (uint32_t y = 0; y < (s_terrainSize - 1); y++) + for (uint16_t y = 0; y < (s_terrainSize - 1); y++) { - uint32_t y_offset = (y * s_terrainSize); - for (uint32_t x = 0; x < (s_terrainSize - 1); x++) + uint16_t y_offset = (y * s_terrainSize); + for (uint16_t x = 0; x < (s_terrainSize - 1); x++) { m_terrain.m_indices[m_terrain.m_indexCount + 0] = y_offset + x + 1; m_terrain.m_indices[m_terrain.m_indexCount + 1] = y_offset + x + s_terrainSize; @@ -398,8 +398,8 @@ class ExampleTerrain : public entry::AppI | (m_mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) | (m_mouseState.m_buttons[entry::MouseButton::Middle] ? IMGUI_MBUT_MIDDLE : 0) , m_mouseState.m_mz - , m_width - , m_height + , uint16_t(m_width) + , uint16_t(m_height) ); imguiBeginScrollArea("Settings", m_width - m_width / 5 - 10, 10, m_width / 5, m_height / 3, &m_scrollArea); @@ -455,10 +455,10 @@ class ExampleTerrain : public entry::AppI } // Set view 0 default viewport. - bgfx::setViewRect(0, 0, 0, m_width, m_height); + bgfx::setViewRect(0, 0, 0, uint16_t(m_width), uint16_t(m_height) ); cameraGetViewMtx(m_viewMtx); - bx::mtxProj(m_projMtx, 60.0f, float(m_width) / float(m_height), 0.1f, 2000.0f); + bx::mtxProj(m_projMtx, 60.0f, float(m_width) / float(m_height), 0.1f, 2000.0f, bgfx::getCaps()->homogeneousDepth); bgfx::setViewTransform(0, m_viewMtx, m_projMtx); bgfx::setTransform(m_terrain.m_transform); |