minor updates

This commit is contained in:
Turanszki Janos
2020-04-25 12:41:35 +01:00
parent dc6c068f33
commit 7bdcfc14c6
4 changed files with 8 additions and 9 deletions
+2 -2
View File
@@ -385,8 +385,8 @@ RendererWindow::RendererWindow(EditorComponent* editor) : GUI(&editor->GetGUI())
});
rendererWindow->AddWidget(mipLodBiasSlider);
raytraceBounceCountSlider = new wiSlider(0, 10, 1, 10, "Raytrace Bounces: ");
raytraceBounceCountSlider->SetTooltip("How many indirect light bounces to compute when doing ray tracing.");
raytraceBounceCountSlider = new wiSlider(1, 10, 1, 9, "Raytrace Bounces: ");
raytraceBounceCountSlider->SetTooltip("How many light bounces to compute when doing ray tracing.");
raytraceBounceCountSlider->SetSize(XMFLOAT2(100, sliderheight));
raytraceBounceCountSlider->SetPos(XMFLOAT2(x, y += step));
raytraceBounceCountSlider->SetValue((float)wiRenderer::GetRaytraceBounceCount());
+1 -1
View File
@@ -2944,7 +2944,7 @@ using namespace DX12_Internal;
void GraphicsDevice_DX12::SetName(GPUResource* pResource, const char* name)
{
wchar_t text[128];
wchar_t text[256];
if (wiHelper::StringConvert(name, text) > 0)
{
auto internal_state = to_internal(pResource);
+4 -5
View File
@@ -9,8 +9,9 @@ namespace wiVersion
// minor features, major updates
const int minor = 39;
// minor bug fixes, alterations, refactors, updates
const int revision = 79;
const int revision = 80;
const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);
long GetVersion()
{
@@ -28,11 +29,9 @@ namespace wiVersion
{
return revision;
}
std::string GetVersionString()
const std::string& GetVersionString()
{
std::stringstream ss("");
ss << GetMajor() << "." << GetMinor() << "." << GetRevision();
return ss.str();
return version_string;
}
}
+1 -1
View File
@@ -14,7 +14,7 @@ namespace wiVersion
int GetMinor();
// minor bug fixes, alterations
int GetRevision();
std::string GetVersionString();
const std::string& GetVersionString();
}
#endif // WICKEDENGINE_VERSION_DEFINED