Skip to content

Commit

Permalink
[editor] restructured the imgui directory
Browse files Browse the repository at this point in the history
  • Loading branch information
@PanosK92
PanosK92 committed Dec 19, 2024
1 parent 0634d81 commit 4e1ac33
Show file tree
Hide file tree
Showing 19 changed files with 49 additions and 80 deletions.
2 changes: 1 addition & 1 deletion editor/Editor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "MenuBar.h"
#include "Core/Engine.h"
#include "Core/Settings.h"
#include "ImGui/ImGuiExtension.h"
#include "ImGui/ImGui_Extension.h"
#include "ImGui/Implementation/ImGui_RHI.h"
#include "ImGui/Implementation/imgui_impl_sdl2.h"
#include "Widgets/AssetBrowser.h"
Expand Down
6 changes: 3 additions & 3 deletions editor/EditorWindows.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

//= INLUCDES ====================
//= INLUCDES =====================
#include "EditorWindows.h"
#include "ImGui/Source/imgui.h"
#include "ImGui/ImGuiExtension.h"
#include "ImGui/ImGui_Extension.h"
#include "Core/FileSystem.h"
#include <sstream>
#include "Settings.h"
#include "Widgets/Viewport.h"
#include "Input/Input.h"
#include "Game/Game.h"
#include "Core/ProgressTracker.h"
//===============================
//================================

//= NAMESPACES =====
using namespace std;
Expand Down
27 changes: 0 additions & 27 deletions editor/ImGui/ImGuiExtension.cpp
View file

This file was deleted.

2 changes: 1 addition & 1 deletion editor/ImGui/ImGuiExtension.h → editor/ImGui/ImGui_Extension.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class EditorHelper
});
}

static Editor* editor;
inline static Editor* editor = nullptr;
};

namespace ImGuiSp
Expand Down
6 changes: 3 additions & 3 deletions editor/ImGui/Implementation/ImGui_Style.h → editor/ImGui/ImGui_Style.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#pragma once

//= INCLUDES ===============
#include "../Source/imgui.h"
//==========================
//= INCLUDES ============
#include "Source/imgui.h"
//=======================

namespace ImGui::Style
{
Expand Down
8 changes: 4 additions & 4 deletions ...Gui/Implementation/ImGui_TransformGizmo.h → editor/ImGui/ImGui_TransformGizmo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#pragma once

//= INCLUDES ===========================
#include "../Source/ImGuizmo/ImGuizmo.h"
#include "../Source/imgui.h"
//= INCLUDES =========================
#include "Source/ImGuizmo/ImGuizmo.h"
#include "Source/imgui.h"
#include "World/Entity.h"
#include "World/Components/Camera.h"
#include "Rendering/Renderer.h"
#include "Input/Input.h"
#include "Commands/CommandStack.h"
#include "Commands/CommandTransform.h"
#include "Engine.h"
//======================================
//====================================

namespace ImGui::TransformGizmo
{
Expand Down
6 changes: 3 additions & 3 deletions editor/Widgets/ButtonColorPicker.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

//= INCLUDES =======================
//= INCLUDES ========================
#include "ButtonColorPicker.h"
#include "../ImGui/Source/imgui.h"
#include "../ImGui/ImGuiExtension.h"
//==================================
#include "../ImGui/ImGui_Extension.h"
//===================================

//= NAMESPACES =====
using namespace std;
Expand Down
6 changes: 3 additions & 3 deletions editor/Widgets/Console.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

//= INCLUDES =======================
//= INCLUDES ========================
#include "Console.h"
#include "Window.h"
#include "../ImGui/ImGuiExtension.h"
//==================================
#include "../ImGui/ImGui_Extension.h"
//===================================

//= NAMESPACES =========
using namespace std;
Expand Down
7 changes: 3 additions & 4 deletions editor/Widgets/Console.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#pragma once

//= INCLUDES ===============
//= INCLUDES ====================
#include "Widget.h"
#include <memory>
#include <functional>
#include <deque>
#include <atomic>
#include <mutex>
#include "Logging/ILogger.h"
#include "../ImGui/Implementation/ImGui_Style.h"
//==========================
#include "../ImGui/ImGui_Style.h"
//===============================

struct LogPackage
{
Expand Down
1 change: 0 additions & 1 deletion editor/Widgets/FileDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "FileDialog.h"
#include "../ImGui/Source/imgui_internal.h"
#include "../ImGui/Source/imgui_stdlib.h"
#include "../ImGui/Implementation/ImGui_Style.h"
#include "Rendering/Mesh.h"
#include "../Widgets/Viewport.h"
//=========================================
Expand Down
6 changes: 3 additions & 3 deletions editor/Widgets/FileDialog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#pragma once

//= INCLUDES =======================
//= INCLUDES ========================
#include "IconLoader.h"
#include "Core/FileSystem.h"
#include "../ImGui/ImGuiExtension.h"
//==================================
#include "../ImGui/ImGui_Extension.h"
//===================================

enum FileDialog_Type
{
Expand Down
7 changes: 3 additions & 4 deletions editor/Widgets/Profiler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

//= INCLUDES =======================
//= INCLUDES ========================
#include "Profiler.h"
#include "../ImGui/ImGuiExtension.h"
#include "../ImGui/ImGui_Extension.h"
#include "Profiling/Profiler.h"
#include <Debugging.h>
//==================================
//===================================

//= NAMESPACES ===============
using namespace std;
Expand Down
8 changes: 4 additions & 4 deletions editor/Widgets/Properties.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

//= INCLUDES ===================================
//= INCLUDES ==============================
#include "Properties.h"
#include "Window.h"
#include "../ImGui/ImGuiExtension.h"
#include "../ImGui/Implementation/ImGui_Style.h"
#include "../ImGui/ImGui_Extension.h"
#include "../ImGui/ImGui_Style.h"
#include "../ImGui/Source/imgui_stdlib.h"
#include "../Widgets/ButtonColorPicker.h"
#include "Core/Engine.h"
Expand All @@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "World/Components/Terrain.h"
#include "World/Components/Camera.h"
#include "Rendering/Mesh.h"
//==============================================
//=========================================

//= NAMESPACES =========
using namespace std;
Expand Down
6 changes: 3 additions & 3 deletions editor/Widgets/RenderOptions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

//= INCLUDES =======================
//= INCLUDES ========================
#include "RenderOptions.h"
#include "Core/Timer.h"
#include "RHI/RHI_Device.h"
#include "../ImGui/ImGuiExtension.h"
//==================================
#include "../ImGui/ImGui_Extension.h"
//===================================

//= NAMESPACES ===============
using namespace std;
Expand Down
6 changes: 3 additions & 3 deletions editor/Widgets/ShaderEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

//= INCLUDES =======================
//= INCLUDES ========================
#include "ShaderEditor.h"
#include <fstream>
#include "RHI/RHI_Shader.h"
#include "../ImGui/ImGuiExtension.h"
//==================================
#include "../ImGui/ImGui_Extension.h"
//===================================

//= NAMESPACES =========
using namespace std;
Expand Down
7 changes: 3 additions & 4 deletions editor/Widgets/Style.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

//= INCLUDES ===================================
//= INCLUDES ====================
#include "Style.h"
#include "../ImGui/Implementation/ImGui_Style.h"
#include "../ImGui/ImGui_Style.h"
#include "../Logging/Log.h"
#include "Core/FileSystem.h"
#include "Core/FileSystem.h"
#include <Window.h>
#include <fstream>
#include <iostream>
//==============================================
//===============================

//= NAMESPACES =========
using namespace std;
Expand Down
6 changes: 3 additions & 3 deletions editor/Widgets/TextureViewer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

//= INCLUDES =======================
//= INCLUDES ========================
#include "TextureViewer.h"
#include "../ImGui/ImGuiExtension.h"
#include "../ImGui/ImGui_Extension.h"
#include "World/Components/Light.h"
#include "World/Entity.h"
//==================================
//===================================

//= NAMESPACES =========
using namespace std;
Expand Down
8 changes: 4 additions & 4 deletions editor/Widgets/Viewport.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

//= INCLUDES ============================================
//= INCLUDES =============================
#include "Viewport.h"
#include "AssetBrowser.h"
#include "WorldViewer.h"
#include "RHI/RHI_Device.h"
#include "../ImGui/ImGuiExtension.h"
#include "../ImGui/Implementation/ImGui_TransformGizmo.h"
#include "../ImGui/ImGui_Extension.h"
#include "../ImGui/ImGui_TransformGizmo.h"
#include "Settings.h"
//=======================================================
//========================================

//= NAMESPACES =========
using namespace std;
Expand Down
4 changes: 2 additions & 2 deletions editor/Widgets/WorldViewer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//= INCLUDES ==============================
#include "WorldViewer.h"
#include "Properties.h"
#include "MenuBar.h"
#include "../MenuBar.h"
#include "Viewport.h"
#include "World/Entity.h"
#include "World/Components/Light.h"
Expand All @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "Input/Input.h"
#include "FileSystem.h"
#include "Core/Engine.h"
#include "../ImGui/ImGuiExtension.h"
#include "../ImGui/ImGui_Extension.h"
SP_WARNINGS_OFF
#include "../ImGui/Source/imgui_stdlib.h"
SP_WARNINGS_ON
Expand Down

0 comments on commit 4e1ac33

Please sign in to comment.