renamed guitools

src/editor.cpp

@@ -1,4 +1,4 @@
-#include "guitools.h"
+#include "editor.h"
 
 #include "engine.h"
 #include "tools/scenepicker.h"
@@ -13,7 +13,7 @@
 
 #include <glm/ext.hpp>
 
-GuiTools::GuiTools() :
+Editor::Editor() :
     m_pickerNode(new ScenePicker()),
     m_selectedMesh(nullptr),
     m_editedResourcePack(nullptr),
@@ -24,12 +24,12 @@ GuiTools::GuiTools() :
     m_pickerNode->setVisible(false);
 }
 
-GuiTools::~GuiTools()
+Editor::~Editor()
 {
     delete m_pickerNode;
 }
 
-void GuiTools::update()
+void Editor::update()
 {
     // no automatic update of children, we want to update them manually
     // ContainerNode::update();
@@ -44,7 +44,7 @@ void GuiTools::update()
         m_editedResourcePack->gui();
 }
 
-void GuiTools::materialGui()
+void Editor::materialGui()
 {
     static int selectedOption = 0;
 
@@ -87,24 +87,24 @@ void GuiTools::materialGui()
     ImGui::End();
 }
 
-void GuiTools::togglePicker()
+void Editor::togglePicker()
 {
     m_pickerEnabled = !m_pickerEnabled;
     m_pickerNode->setVisible(m_pickerEnabled);
 }
 
-void GuiTools::toggleMaterialEditor()
+void Editor::toggleMaterialEditor()
 {
     m_materialEditorEnabled = !m_materialEditorEnabled;
 }
 
-void GuiTools::toggleRenderingPipelineGui()
+void Editor::toggleRenderingPipelineGui()
 {
     DeferredPipeline* pipeline = dynamic_cast<DeferredPipeline*>(m_scene->getPipeline());
     pipeline->toggleDebugGui();
 }
 
-void GuiTools::toggleResourcePackGui()
+void Editor::toggleResourcePackGui()
 {
     if(m_editedResourcePack == nullptr)
         m_editedResourcePack = new ResourcePack();

src/editor.h

@@ -1,5 +1,5 @@
-#ifndef GUITOOLS_H
+#ifndef EDITOR_H
-#define GUITOOLS_H
+#define EDITOR_H
 
 #include "scene/containernode.h"
 
@@ -8,7 +8,7 @@ class ScenePicker;
 class ResourcePack;
 class Mesh;
 
-class GuiTools : public ContainerNode
+class Editor : public ContainerNode
 {
     ScenePicker* m_pickerNode;
     Mesh* m_selectedMesh;
@@ -16,8 +16,8 @@ class GuiTools : public ContainerNode
     bool m_pickerEnabled;
     bool m_materialEditorEnabled;
 public:
-    GuiTools();
+    Editor();
-    ~GuiTools();
+    ~Editor();
     void update();
     void materialGui();
     void togglePicker();
@@ -26,4 +26,4 @@ public:
     void toggleResourcePackGui();
 };
 
-#endif // GUITOOLS_H
+#endif // EDITOR_H

src/engine.cpp

@@ -13,7 +13,7 @@
 #include "scene/physicsdebugnode.h"
 #include "imgui/imgui.h"
 #include "tools/loader.h"
-#include "guitools.h"
+#include "editor.h"
 #include "tools/loadingthread.h"
 
 Engine::Engine() :
@@ -66,7 +66,7 @@ void Engine::createWindow(std::string title,
     m_input = new Input(m_window);
     m_renderer->initGL(w, h);
     m_sparrowshell = new SparrowShell(m_window);
-    m_guiTools = new GuiTools();
+    m_editor = new Editor();
     m_loadingThread = LoadingThread::init();
 }
 
@@ -179,13 +179,13 @@ void Engine::setScene(std::string scene)
     }
 
     previous_scene->getRootObject()->removeChild(m_sparrowshell);
-    previous_scene->getRootObject()->removeChild(m_guiTools);
+    previous_scene->getRootObject()->removeChild(m_editor);
 
     m_renderer->setScene(new_scene);
     m_renderer->resizeGL(m_window->getSize().x, m_window->getSize().y);
 
     new_scene->getRootObject()->addChild(m_sparrowshell);
-    new_scene->getRootObject()->addChild(m_guiTools);
+    new_scene->getRootObject()->addChild(m_editor);
 }
 
 void Engine::enablePhysicsDebug()

src/engine.h

@@ -8,7 +8,7 @@ class SparrowRenderer;
 class SceneTree;
 class SparrowShell;
 class PhysicsDebugNode;
-class GuiTools;
+class Editor;
 class LoadingThread;
 
 namespace sf
@@ -52,7 +52,7 @@ public:
     SparrowRenderer* getRenderer() const {return m_renderer;}
     btDiscreteDynamicsWorld* getPhysics() const {return m_world;}
     SparrowShell* getShell() const {return m_sparrowshell;}
-    GuiTools* getGuiTools() const {return m_guiTools;}
+    Editor* getGuiTools() const {return m_editor;}
     LoadingThread* getLoadingThread() const {return m_loadingThread;}
     SceneTree* getScene() const;
 
@@ -79,7 +79,7 @@ private:
     btDiscreteDynamicsWorld* m_world;
     PhysicsDebugNode *m_physicsDebugNode;
     SparrowRenderer* m_renderer;
-    GuiTools* m_guiTools;
+    Editor* m_editor;
     LoadingThread* m_loadingThread;
 
     void update();

src/sparrowshell/scriptnode.cpp

@@ -9,7 +9,7 @@
 #include "SparrowRenderer/Version.h"
 #include "SparrowSerializer/Version.h"
 #include "tools/utils.h"
-#include "guitools.h"
+#include "editor.h"
 
 #define LUA_DEFINE(var) S[#var]=var
 #define LUA_SET_FUN(var) m_script.set_function(#var,&ScriptNode::var,this);this->functions_name.push_back(#var);

src/tools/scenepicker.cpp

@@ -1,7 +1,7 @@
 #include "scenepicker.h"
 
 #include "engine.h"
-#include "guitools.h"
+#include "editor.h"
 #include "scene/scenetree.h"
 #include "scene/playercharacternode.h"