minor refactor

This commit is contained in:
Turanszki Janos
2017-10-12 21:19:43 +01:00
parent eb0871fbf6
commit 91d42ff9aa
6 changed files with 8 additions and 6 deletions
+3 -1
View File
@@ -65,6 +65,8 @@ void Editor::Initialize()
//wiFont::addFontStyle("basic");
wiInputManager::GetInstance()->addXInput(new wiXInput());
wiProfiler::GetInstance().ENABLED = true;
renderComponent = new EditorComponent;
renderComponent->Initialize();
loader = new EditorLoadingScreen;
@@ -785,7 +787,7 @@ void EditorComponent::Load()
clearButton->OnClick([&](wiEventArgs args) {
selected.clear();
EndTranslate();
wiRenderer::CleanUpStaticTemp();
wiRenderer::ClearWorld();
objectWnd->SetObject(nullptr);
meshWnd->SetMesh(nullptr);
lightWnd->SetLight(nullptr);
+1 -1
View File
@@ -52,7 +52,7 @@ TestsRenderer::TestsRenderer()
testSelector->AddItem("Lua Script");
testSelector->OnSelect([=](wiEventArgs args) {
wiRenderer::CleanUpStaticTemp();
wiRenderer::ClearWorld();
this->clearSprites();
wiLua::GetGlobal()->KillProcesses();
+1 -1
View File
@@ -335,7 +335,7 @@ void wiRenderer::CleanUpStatic()
SAFE_DELETE(graphicsDevice);
}
void wiRenderer::CleanUpStaticTemp()
void wiRenderer::ClearWorld()
{
emitterSystems.clear();
+1 -1
View File
@@ -516,7 +516,7 @@ public:
static std::deque<wiSprite*> images;
static std::deque<wiSprite*> waterRipples;
static void CleanUpStaticTemp();
static void ClearWorld();
static wiRenderTarget normalMapRT, imagesRT, imagesRTAdd;
+1 -1
View File
@@ -646,7 +646,7 @@ namespace wiRenderer_BindLua
int ClearWorld(lua_State* L)
{
wiRenderer::CleanUpStaticTemp();
wiRenderer::ClearWorld();
return 0;
}
int ReloadShaders(lua_State* L)
+1 -1
View File
@@ -9,7 +9,7 @@ namespace wiVersion
// minor features, major updates
const int minor = 13;
// minor bug fixes, alterations, refactors, updates
const int revision = 23;
const int revision = 24;
long GetVersion()