mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić 2017-06-18 17:06:07 -07:00
parent f84a53c071
commit 8bcd09a67f
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/11-fontsdf/fontsdf.cpp
View File

@ -129,8 +129,8 @@ class ExampleFontSDF : public entry::AppI
, uint16_t(m_height) , uint16_t(m_height)
); );
const int32_t guiPanelWidth = 325; const float guiPanelWidth = 325.0f;
const int32_t guiPanelHeight = 200; const float guiPanelHeight = 200.0f;
ImGui::SetNextWindowPos(ImVec2(m_width - guiPanelWidth - 10.0f, 10.0f) ); ImGui::SetNextWindowPos(ImVec2(m_width - guiPanelWidth - 10.0f, 10.0f) );
ImGui::Begin("Text Area" ImGui::Begin("Text Area"

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

@ -958,7 +958,7 @@ public:
uint8_t numLights = (uint8_t)m_numLights; uint8_t numLights = (uint8_t)m_numLights;
s_uniforms.m_params.m_ambientPass = 1.0f; s_uniforms.m_params.m_ambientPass = 1.0f;
s_uniforms.m_params.m_lightingPass = 1.0f; s_uniforms.m_params.m_lightingPass = 1.0f;
s_uniforms.m_params.m_lightCount = m_numLights; s_uniforms.m_params.m_lightCount = float(m_numLights);
s_uniforms.m_params.m_lightIndex = 0.0f; s_uniforms.m_params.m_lightIndex = 0.0f;
s_uniforms.m_color[3] = m_reflectionValue; s_uniforms.m_color[3] = m_reflectionValue;

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

@ -1971,10 +1971,10 @@ class ExampleShadowmaps : public entry::AppI
, m_viewState.m_height , m_viewState.m_height
); );
ImGui::SetNextWindowPos(ImVec2(m_viewState.m_width - 300 - 10, 10) ); ImGui::SetNextWindowPos(ImVec2(float(m_viewState.m_width) - 300.0f - 10.0f, 10.0f) );
ImGui::Begin("Settings" ImGui::Begin("Settings"
, NULL , NULL
, ImVec2(300, 660) , ImVec2(300.0f, 660.0f)
, ImGuiWindowFlags_AlwaysAutoResize , ImGuiWindowFlags_AlwaysAutoResize
); );
@ -2414,7 +2414,12 @@ if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
BX_CHECK(maxNumSplits >= settings.m_numSplits, "Error! Max num splits."); BX_CHECK(maxNumSplits >= settings.m_numSplits, "Error! Max num splits.");
float splitSlices[maxNumSplits*2]; float splitSlices[maxNumSplits*2];
splitFrustum(splitSlices, m_settings.m_numSplits, currentSmSettings->m_near, currentSmSettings->m_far, m_settings.m_splitDistribution); splitFrustum(splitSlices
, uint8_t(m_settings.m_numSplits)
, currentSmSettings->m_near
, currentSmSettings->m_far
, m_settings.m_splitDistribution
);
// Update uniforms. // Update uniforms.
for (uint8_t ii = 0, ff = 1; ii < m_settings.m_numSplits; ++ii, ff+=2) for (uint8_t ii = 0, ff = 1; ii < m_settings.m_numSplits; ++ii, ff+=2)
@ -2808,7 +2813,7 @@ if ( ImGui::RadioButton(_name, _var == _val )) _var = _val;
} }
else //LightType::DirectionalLight == settings.m_lightType) else //LightType::DirectionalLight == settings.m_lightType)
{ {
drawNum = m_settings.m_numSplits; drawNum = uint8_t(m_settings.m_numSplits);
} }
for (uint8_t ii = 0; ii < drawNum; ++ii) for (uint8_t ii = 0; ii < drawNum; ++ii)