EpicSparrow/SparrowEngine
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed getter for editor in engine

Browse Source
This commit is contained in:
Lendemor 2017-08-29 19:07:11 +02:00
parent c9050f5ea4
commit b2a71429c9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine.h
View File

@ -53,7 +53,7 @@ public:
btDiscreteDynamicsWorld* getPhysics() const {return m_world;} btDiscreteDynamicsWorld* getPhysics() const {return m_world;}
SparrowShell* getShell() const {return m_sparrowshell;} SparrowShell* getShell() const {return m_sparrowshell;}
PhysicsDebugNode* getPhysicsDebug() const {return m_physicsDebugNode;} PhysicsDebugNode* getPhysicsDebug() const {return m_physicsDebugNode;}
Editor* getGuiTools() const {return m_editor;} Editor* getEditor() const {return m_editor;}
LoadingThread* getLoadingThread() const {return m_loadingThread;} LoadingThread* getLoadingThread() const {return m_loadingThread;}
SceneTree* getScene() const; SceneTree* getScene() const;

8
src/sparrowshell/scriptnode.cpp
View File

@ -99,17 +99,17 @@ void ScriptNode::testfunc(int i, float x=0.f,float y=0.f, float z=0.f){
} }
void ScriptNode::picker(){ void ScriptNode::picker(){
this->getEngine().getGuiTools()->togglePicker(); this->getEngine().getEditor()->togglePicker();
} }
void ScriptNode::materialEditor(){ void ScriptNode::materialEditor(){
this->getEngine().getGuiTools()->toggleMaterialEditor(); this->getEngine().getEditor()->toggleMaterialEditor();
} }
void ScriptNode::rendering(){ void ScriptNode::rendering(){
this->getEngine().getGuiTools()->toggleRenderingPipelineGui(); this->getEngine().getEditor()->toggleRenderingPipelineGui();
} }
void ScriptNode::resourcePackEditor(){ void ScriptNode::resourcePackEditor(){
this->getEngine().getGuiTools()->toggleResourcePackGui(); this->getEngine().getEditor()->toggleResourcePackGui();
} }

2
src/tools/scenepicker.cpp
View File

@ -64,7 +64,7 @@ void ScenePicker::update()
ImGui::End(); ImGui::End();
if(!isEnabled) if(!isEnabled)
getEngine().getGuiTools()->togglePicker(); getEngine().getEditor()->togglePicker();
} }
void ScenePicker::pick() void ScenePicker::pick()