Skip to content

Commit f978a13

Browse files
MathewBensonCodeMathewBensonCode
committed
restructure include files to a folder with project name
1 parent 221ed08 commit f978a13

268 files changed

Lines changed: 3125 additions & 2849 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 59 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,82 @@
1-
cmake_minimum_required (VERSION 3.17 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
22

3-
set (CMAKE_CXX_STANDARD_REQUIRED ON)
4-
set (CMAKE_CXX_EXTENSIONS OFF)
5-
set (CMAKE_CXX_STANDARD 20)
3+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
4+
set(CMAKE_CXX_EXTENSIONS OFF)
5+
set(CMAKE_CXX_STANDARD 20)
66

7-
project (RendererEngine
8-
VERSION 1.0
9-
DESCRIPTION "Renderer Engine is an open-source 2D - 3D rendering engine written in C/C++"
10-
LANGUAGES CXX
11-
)
7+
project(
8+
RendererEngine
9+
VERSION 1.0
10+
DESCRIPTION
11+
"Renderer Engine is an open-source 2D - 3D rendering engine written in C/C++"
12+
LANGUAGES CXX)
1213

13-
set_property (GLOBAL PROPERTY USE_FOLDERS ON)
14+
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1415

1516
# Core invariants
1617
#
17-
get_filename_component (ENLISTMENT_ROOT "." ABSOLUTE CACHE)
18-
get_filename_component (EXAMPLE_DIR "${ENLISTMENT_ROOT}/Examples" ABSOLUTE CACHE)
18+
get_filename_component(ENLISTMENT_ROOT "." ABSOLUTE CACHE)
19+
get_filename_component(EXAMPLE_DIR "${ENLISTMENT_ROOT}/Examples" ABSOLUTE CACHE)
1920

2021
include(${ENLISTMENT_ROOT}/Scripts/CMake/NuGet.cmake)
2122

22-
23-
option (COPY_EXAMPLE_PROJECT "Copy example projects that show how to use Launcher" ON)
24-
option (LAUNCHER_ONLY "Build Launcher only" OFF)
25-
26-
set (MACOSX_ARCHITECTURE_ARM64 OFF)
27-
if (APPLE)
28-
# Use uname to detect the macOS processor architecture
29-
execute_process(
30-
COMMAND uname -m
31-
OUTPUT_VARIABLE MACOSX_ARCHITECTURE
32-
OUTPUT_STRIP_TRAILING_WHITESPACE
33-
)
34-
if (MACOSX_ARCHITECTURE STREQUAL "arm64")
35-
set (MACOSX_ARCHITECTURE_ARM64 ON)
36-
endif ()
37-
endif ()
23+
option(COPY_EXAMPLE_PROJECT
24+
"Copy example projects that show how to use Launcher" ON)
25+
option(LAUNCHER_ONLY "Build Launcher only" OFF)
26+
27+
set(MACOSX_ARCHITECTURE_ARM64 OFF)
28+
if(APPLE)
29+
# Use uname to detect the macOS processor architecture
30+
execute_process(
31+
COMMAND uname -m
32+
OUTPUT_VARIABLE MACOSX_ARCHITECTURE
33+
OUTPUT_STRIP_TRAILING_WHITESPACE)
34+
if(MACOSX_ARCHITECTURE STREQUAL "arm64")
35+
set(MACOSX_ARCHITECTURE_ARM64 ON)
36+
endif()
37+
endif()
3838

3939
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
40-
add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING) # Fix Warning from VS 2022 +
40+
add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
41+
)# Fix Warning from VS 2022 +
4142
endif()
4243

43-
include(externals.cmake)
44+
include(externals.cmake)
4445

45-
# Core engine lib is here
46-
#
47-
add_subdirectory (ZEngine)
46+
# Core engine lib is here
47+
#
48+
add_subdirectory(ZEngine)
4849

49-
# Editor is here
50-
#
51-
add_subdirectory (Tetragrama)
50+
# Editor is here
51+
#
52+
add_subdirectory(Tetragrama)
5253

5354
# Launcher is here
5455
#
55-
#add_subdirectory (Panzerfaust)
56+
# add_subdirectory (Panzerfaust)
5657

57-
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
58-
set_property (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Panzerfaust)
59-
endif ()
58+
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
59+
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT
60+
Panzerfaust)
61+
endif()
6062

6163
# Post build operation
6264
#
63-
set (SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
64-
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
65-
set (SYSTEM_ARCHITECTURE "win-x64")
66-
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
67-
set (SYSTEM_ARCHITECTURE "linux-x64")
68-
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
69-
if (MACOSX_ARCHITECTURE_ARM64)
70-
set (SYSTEM_ARCHITECTURE "osx-arm64")
71-
else ()
72-
set (SYSTEM_ARCHITECTURE "osx-x64")
73-
endif ()
74-
endif ()
75-
65+
set(SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
66+
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
67+
set(SYSTEM_ARCHITECTURE "win-x64")
68+
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
69+
set(SYSTEM_ARCHITECTURE "linux-x64")
70+
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
71+
if(MACOSX_ARCHITECTURE_ARM64)
72+
set(SYSTEM_ARCHITECTURE "osx-arm64")
73+
else()
74+
set(SYSTEM_ARCHITECTURE "osx-x64")
75+
endif()
76+
endif()
7677

77-
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
78-
# add_dependencies(AssembleContent Panzerfaust-WinBuild)
79-
else ()
80-
# add_dependencies(AssembleContent Panzerfaust)
81-
endif ()
78+
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
79+
# add_dependencies(AssembleContent Panzerfaust-WinBuild)
80+
else()
81+
# add_dependencies(AssembleContent Panzerfaust)
82+
endif()

‎Tetragrama/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ endif ()
3636

3737
target_include_directories (Tetragrama
3838
PRIVATE
39-
include/
39+
${CMAKE_CURRENT_SOURCE_DIR}
4040
)
4141

4242
target_compile_definitions(Tetragrama

Tetragrama/include/Components/AboutUIComponent.h renamed to Tetragrama/Tetragrama/Components/AboutUIComponent.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
#pragma once
22
#include <ZEngine/ZEngine.h>
33

4-
namespace Tetragrama::Components {
5-
class AboutUIComponent : public ZEngine::Components::UI::UIComponent {
4+
namespace Tetragrama::Components
5+
{
6+
class AboutUIComponent : public ZEngine::Components::UI::UIComponent
7+
{
68
public:
79
AboutUIComponent(std::string_view name = "AboutUIComponent", bool visibility = true) : UIComponent(name, visibility, true) {}
810
virtual ~AboutUIComponent() = default;
911

10-
virtual void Render() override {
12+
virtual void Render() override
13+
{
1114
ImGui::ShowAboutWindow(&m_is_open);
1215
}
1316

Tetragrama/include/Components/DemoUIComponent.h renamed to Tetragrama/Tetragrama/Components/DemoUIComponent.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
#pragma once
22
#include <ZEngine/ZEngine.h>
33

4-
namespace Tetragrama::Components {
5-
class DemoUIComponent : public ZEngine::Components::UI::UIComponent {
4+
namespace Tetragrama::Components
5+
{
6+
class DemoUIComponent : public ZEngine::Components::UI::UIComponent
7+
{
68
public:
79
DemoUIComponent(std::string_view name = "DemoUIComponent", bool visibility = true) : UIComponent(name, visibility, true) {}
810
virtual ~DemoUIComponent() = default;
911

10-
virtual void Render() override {
12+
virtual void Render() override
13+
{
1114
ImGui::ShowDemoWindow(&m_is_open);
1215
}
1316

Tetragrama/include/Components/DockspaceUIComponent.h renamed to Tetragrama/Tetragrama/Components/DockspaceUIComponent.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
2+
#include <Tetragrama/Importers/IAssetImporter.h>
3+
#include <Tetragrama/Messengers/Message.h>
4+
#include <Tetragrama/Serializers/EditorSceneSerializer.h>
25
#include <ZEngine/ZEngine.h>
3-
#include <Messengers/Message.h>
4-
#include <Importers/IAssetImporter.h>
5-
#include <Serializers/EditorSceneSerializer.h>
66

77
namespace Tetragrama::Components
88
{

Tetragrama/include/Components/Events/SceneTextureAvailableEvent.h renamed to Tetragrama/Tetragrama/Components/Events/SceneTextureAvailableEvent.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
#pragma once
22
#include <ZEngine/ZEngine.h>
33

4-
namespace Tetragrama::Components::Event {
4+
namespace Tetragrama::Components::Event
5+
{
56

6-
class SceneTextureAvailableEvent : public ZEngine::Components::UI::Event::UIComponentEvent {
7+
class SceneTextureAvailableEvent : public ZEngine::Components::UI::Event::UIComponentEvent
8+
{
79
public:
810
SceneTextureAvailableEvent(uint32_t texture_identifier) : m_texture_identifier(texture_identifier) {}
911

1012
EVENT_TYPE(SceneTextureAvailable)
1113

12-
uint32_t GetSceneTexture() const {
14+
uint32_t GetSceneTexture() const
15+
{
1316
return m_texture_identifier;
1417
}
1518

16-
virtual ZEngine::Event::EventType GetType() const override {
19+
virtual ZEngine::Event::EventType GetType() const override
20+
{
1721
return GetStaticType();
1822
}
1923

20-
virtual int GetCategory() const override {
24+
virtual int GetCategory() const override
25+
{
2126
return GetStaticCategory();
2227
}
2328

Tetragrama/include/Components/Events/SceneViewportFocusedEvent.h renamed to Tetragrama/Tetragrama/Components/Events/SceneViewportFocusedEvent.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
#pragma once
22
#include <ZEngine/ZEngine.h>
33

4-
namespace Tetragrama::Components::Event {
4+
namespace Tetragrama::Components::Event
5+
{
56

6-
class SceneViewportFocusedEvent : public ZEngine::Components::UI::Event::UIComponentEvent {
7+
class SceneViewportFocusedEvent : public ZEngine::Components::UI::Event::UIComponentEvent
8+
{
79
public:
810
SceneViewportFocusedEvent() = default;
911
~SceneViewportFocusedEvent() = default;
1012

1113
EVENT_TYPE(SceneViewportFocused)
1214

13-
virtual ZEngine::Event::EventType GetType() const override {
15+
virtual ZEngine::Event::EventType GetType() const override
16+
{
1417
return GetStaticType();
1518
}
1619

17-
virtual int GetCategory() const override {
20+
virtual int GetCategory() const override
21+
{
1822
return GetStaticCategory();
1923
}
2024
};

Tetragrama/include/Components/Events/SceneViewportResizedEvent.h renamed to Tetragrama/Tetragrama/Components/Events/SceneViewportResizedEvent.h

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
11
#pragma once
22
#include <ZEngine/ZEngine.h>
33

4-
namespace Tetragrama::Components::Event {
4+
namespace Tetragrama::Components::Event
5+
{
56

6-
class SceneViewportResizedEvent : public ZEngine::Components::UI::Event::UIComponentEvent {
7+
class SceneViewportResizedEvent : public ZEngine::Components::UI::Event::UIComponentEvent
8+
{
79
public:
810
SceneViewportResizedEvent(float width, float heigth) : m_width(width), m_height(heigth) {}
911

1012
EVENT_TYPE(SceneViewportResized)
1113

12-
float GetWidth() const {
14+
float GetWidth() const
15+
{
1316
return m_width;
1417
}
15-
float GetHeight() const {
18+
float GetHeight() const
19+
{
1620
return m_height;
1721
}
1822

19-
virtual ZEngine::Event::EventType GetType() const override {
23+
virtual ZEngine::Event::EventType GetType() const override
24+
{
2025
return GetStaticType();
2126
}
2227

23-
virtual int GetCategory() const override {
28+
virtual int GetCategory() const override
29+
{
2430
return GetStaticCategory();
2531
}
2632

Tetragrama/include/Components/Events/SceneViewportUnfocusedEvent.h renamed to Tetragrama/Tetragrama/Components/Events/SceneViewportUnfocusedEvent.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
#pragma once
22
#include <ZEngine/ZEngine.h>
33

4-
namespace Tetragrama::Components::Event {
4+
namespace Tetragrama::Components::Event
5+
{
56

6-
class SceneViewportUnfocusedEvent : public ZEngine::Components::UI::Event::UIComponentEvent {
7+
class SceneViewportUnfocusedEvent : public ZEngine::Components::UI::Event::UIComponentEvent
8+
{
79
public:
810
SceneViewportUnfocusedEvent() = default;
911
~SceneViewportUnfocusedEvent() = default;
1012

1113
EVENT_TYPE(SceneViewportUnfocused)
1214

13-
virtual ZEngine::Event::EventType GetType() const override {
15+
virtual ZEngine::Event::EventType GetType() const override
16+
{
1417
return GetStaticType();
1518
}
1619

17-
virtual int GetCategory() const override {
20+
virtual int GetCategory() const override
21+
{
1822
return GetStaticCategory();
1923
}
2024
};

Tetragrama/include/Components/HierarchyViewUIComponent.h renamed to Tetragrama/Tetragrama/Components/HierarchyViewUIComponent.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#pragma once
2-
#include <string>
3-
#include <mutex>
2+
#include <Tetragrama/EditorCameraController.h>
3+
#include <Tetragrama/Messengers/Message.h>
44
#include <ZEngine/ZEngine.h>
5-
#include <Messengers/Message.h>
6-
#include <EditorCameraController.h>
5+
#include <mutex>
76

87
namespace Tetragrama::Components
98
{

0 commit comments

Comments
 (0)