From b2a71429c9c402a62039cc0510870eaed5fd74c9 Mon Sep 17 00:00:00 2001
From: Lendemor <thomas.brandeho@gmail.com>
Date: Tue, 29 Aug 2017 19:07:11 +0200
Subject: [PATCH] renamed getter for editor in engine
---
src/engine.h | 2 +-
src/sparrowshell/scriptnode.cpp | 8 ++++----
src/tools/scenepicker.cpp | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/engine.h b/src/engine.h
index d05f8a8..992fac6 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -53,7 +53,7 @@ public:
btDiscreteDynamicsWorld* getPhysics() const {return m_world;}
SparrowShell* getShell() const {return m_sparrowshell;}
PhysicsDebugNode* getPhysicsDebug() const {return m_physicsDebugNode;}
- Editor* getGuiTools() const {return m_editor;}
+ Editor* getEditor() const {return m_editor;}
LoadingThread* getLoadingThread() const {return m_loadingThread;}
SceneTree* getScene() const;
diff --git a/src/sparrowshell/scriptnode.cpp b/src/sparrowshell/scriptnode.cpp
index 017624e..7cbcfd1 100644
--- a/src/sparrowshell/scriptnode.cpp
+++ b/src/sparrowshell/scriptnode.cpp
@@ -99,17 +99,17 @@ void ScriptNode::testfunc(int i, float x=0.f,float y=0.f, float z=0.f){
}
void ScriptNode::picker(){
- this->getEngine().getGuiTools()->togglePicker();
+ this->getEngine().getEditor()->togglePicker();
}
void ScriptNode::materialEditor(){
- this->getEngine().getGuiTools()->toggleMaterialEditor();
+ this->getEngine().getEditor()->toggleMaterialEditor();
}
void ScriptNode::rendering(){
- this->getEngine().getGuiTools()->toggleRenderingPipelineGui();
+ this->getEngine().getEditor()->toggleRenderingPipelineGui();
}
void ScriptNode::resourcePackEditor(){
- this->getEngine().getGuiTools()->toggleResourcePackGui();
+ this->getEngine().getEditor()->toggleResourcePackGui();
}
diff --git a/src/tools/scenepicker.cpp b/src/tools/scenepicker.cpp
index 6f78c3c..adca975 100644
--- a/src/tools/scenepicker.cpp
+++ b/src/tools/scenepicker.cpp
@@ -64,7 +64,7 @@ void ScenePicker::update()
ImGui::End();
if(!isEnabled)
- getEngine().getGuiTools()->togglePicker();
+ getEngine().getEditor()->togglePicker();
}
void ScenePicker::pick()