Skip to content

#25 organize file #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrScriptX merged 1 commit into from
May 5, 2021
Merged

#25 organize file #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Engine/Engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#ifndef _ENGINE_H
#define _ENGINE_H

#include "GameObject.h"
#include "Scene.h"
#include "Window.h"

#include "world/GameObject.h"
#include "world/Scene.h"

class Engine
{
public:
Expand Down
36 changes: 18 additions & 18 deletions Engine/Engine.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,10 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Camera.cpp" />
<ClCompile Include="cameras\Camera.cpp" />
<ClCompile Include="cameras\Player.cpp" />
<ClCompile Include="Engine.cpp" />
<ClCompile Include="GameObject.cpp" />
<ClCompile Include="Logger.cpp" />
<ClCompile Include="Material.cpp" />
<ClCompile Include="Mesh.cpp" />
<ClCompile Include="Player.cpp" />
<ClCompile Include="renderer\Renderer.cpp" />
<ClCompile Include="renderer\VulkanBuffer.cpp" />
<ClCompile Include="renderer\VulkanCommandBuffer.cpp" />
Expand All @@ -60,23 +57,24 @@
<ClCompile Include="renderer\VulkanPipeline.cpp" />
<ClCompile Include="renderer\VulkanRenderPass.cpp" />
<ClCompile Include="renderer\VulkanSwapchain.cpp" />
<ClCompile Include="Scene.cpp" />
<ClCompile Include="Source.cpp" />
<ClCompile Include="Texture.cpp" />
<ClCompile Include="Window.cpp" />
<ClCompile Include="world\GameObject.cpp" />
<ClCompile Include="world\Material.cpp" />
<ClCompile Include="world\Mesh.cpp" />
<ClCompile Include="world\Scene.cpp" />
<ClCompile Include="world\Texture.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Camera.h" />
<ClInclude Include="Config.h" />
<ClInclude Include="cameras\Camera.h" />
<ClInclude Include="cameras\Player.h" />
<ClInclude Include="Engine.h" />
<ClInclude Include="errors.h" />
<ClInclude Include="GameObject.h" />
<ClInclude Include="Graphics.h" />
<ClInclude Include="graphics\Config.h" />
<ClInclude Include="graphics\Graphics.h" />
<ClInclude Include="graphics\Math.h" />
<ClInclude Include="graphics\Vertex.h" />
<ClInclude Include="Logger.h" />
<ClInclude Include="Material.h" />
<ClInclude Include="Math.h" />
<ClInclude Include="Mesh.h" />
<ClInclude Include="Player.h" />
<ClInclude Include="renderer\Renderer.h" />
<ClInclude Include="renderer\VulkanBuffer.h" />
<ClInclude Include="renderer\VulkanCommandBuffer.h" />
Expand All @@ -87,10 +85,12 @@
<ClInclude Include="renderer\VulkanPipeline.h" />
<ClInclude Include="renderer\VulkanRenderPass.h" />
<ClInclude Include="renderer\VulkanSwapchain.h" />
<ClInclude Include="Scene.h" />
<ClInclude Include="Texture.h" />
<ClInclude Include="Vertex.h" />
<ClInclude Include="Window.h" />
<ClInclude Include="world\GameObject.h" />
<ClInclude Include="world\Material.h" />
<ClInclude Include="world\Mesh.h" />
<ClInclude Include="world\Scene.h" />
<ClInclude Include="world\Texture.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\shaders\shader.frag" />
Expand Down
140 changes: 70 additions & 70 deletions Engine/Engine.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
<Filter Include="Engine\Graphics">
<UniqueIdentifier>{c8467a9d-cccc-486f-814e-ac1fa2cce737}</UniqueIdentifier>
</Filter>
<Filter Include="Engine\Graphics\Header">
<UniqueIdentifier>{0773a226-0a6e-44bb-997b-0848af431efa}</UniqueIdentifier>
<Filter Include="Engine\Cameras">
<UniqueIdentifier>{3bcbc072-07c8-49df-926a-7e4a2a3da833}</UniqueIdentifier>
</Filter>
<Filter Include="Engine\Graphics\Source">
<UniqueIdentifier>{2e3255ef-0cc2-44cf-9e70-64ccc5b203bc}</UniqueIdentifier>
<Filter Include="Engine\World">
<UniqueIdentifier>{f0d3173b-0d3b-48a2-a5fb-0ec342f99870}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Expand All @@ -39,33 +39,6 @@
<ClCompile Include="Logger.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="Engine.cpp">
<Filter>Engine</Filter>
</ClCompile>
<ClCompile Include="Camera.cpp">
<Filter>Engine\Graphics\Source</Filter>
</ClCompile>
<ClCompile Include="GameObject.cpp">
<Filter>Engine\Graphics\Source</Filter>
</ClCompile>
<ClCompile Include="Material.cpp">
<Filter>Engine\Graphics\Source</Filter>
</ClCompile>
<ClCompile Include="Mesh.cpp">
<Filter>Engine\Graphics\Source</Filter>
</ClCompile>
<ClCompile Include="Player.cpp">
<Filter>Engine\Graphics\Source</Filter>
</ClCompile>
<ClCompile Include="Scene.cpp">
<Filter>Engine\Graphics\Source</Filter>
</ClCompile>
<ClCompile Include="Texture.cpp">
<Filter>Engine\Graphics\Source</Filter>
</ClCompile>
<ClCompile Include="Window.cpp">
<Filter>Engine\Graphics\Source</Filter>
</ClCompile>
<ClCompile Include="renderer\Renderer.cpp">
<Filter>Engine\Renderer\Source</Filter>
</ClCompile>
Expand Down Expand Up @@ -96,50 +69,38 @@
<ClCompile Include="renderer\VulkanSwapchain.cpp">
<Filter>Engine\Renderer\Source</Filter>
</ClCompile>
<ClCompile Include="cameras\Camera.cpp">
<Filter>Engine\Cameras</Filter>
</ClCompile>
<ClCompile Include="world\GameObject.cpp">
<Filter>Engine\World</Filter>
</ClCompile>
<ClCompile Include="world\Material.cpp">
<Filter>Engine\World</Filter>
</ClCompile>
<ClCompile Include="world\Mesh.cpp">
<Filter>Engine\World</Filter>
</ClCompile>
<ClCompile Include="world\Scene.cpp">
<Filter>Engine\World</Filter>
</ClCompile>
<ClCompile Include="world\Texture.cpp">
<Filter>Engine\World</Filter>
</ClCompile>
<ClCompile Include="cameras\Player.cpp">
<Filter>Engine\Cameras</Filter>
</ClCompile>
<ClCompile Include="Window.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="Engine.cpp">
<Filter>Source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Logger.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="Vertex.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="Math.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="Engine.h">
<Filter>Engine</Filter>
</ClInclude>
<ClInclude Include="Graphics.h">
<Filter>Engine\Renderer\Header</Filter>
</ClInclude>
<ClInclude Include="Camera.h">
<Filter>Engine\Graphics\Header</Filter>
</ClInclude>
<ClInclude Include="Config.h">
<Filter>Engine\Graphics\Header</Filter>
</ClInclude>
<ClInclude Include="GameObject.h">
<Filter>Engine\Graphics\Header</Filter>
</ClInclude>
<ClInclude Include="Material.h">
<Filter>Engine\Graphics\Header</Filter>
</ClInclude>
<ClInclude Include="Mesh.h">
<Filter>Engine\Graphics\Header</Filter>
</ClInclude>
<ClInclude Include="Player.h">
<Filter>Engine\Graphics\Header</Filter>
</ClInclude>
<ClInclude Include="Scene.h">
<Filter>Engine\Graphics\Header</Filter>
</ClInclude>
<ClInclude Include="Texture.h">
<Filter>Engine\Graphics\Header</Filter>
</ClInclude>
<ClInclude Include="Window.h">
<Filter>Engine\Graphics\Header</Filter>
</ClInclude>
<ClInclude Include="renderer\Renderer.h">
<Filter>Engine\Renderer\Header</Filter>
</ClInclude>
Expand Down Expand Up @@ -173,6 +134,45 @@
<ClInclude Include="errors.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="cameras\Camera.h">
<Filter>Engine\Cameras</Filter>
</ClInclude>
<ClInclude Include="world\GameObject.h">
<Filter>Engine\World</Filter>
</ClInclude>
<ClInclude Include="world\Material.h">
<Filter>Engine\World</Filter>
</ClInclude>
<ClInclude Include="world\Mesh.h">
<Filter>Engine\World</Filter>
</ClInclude>
<ClInclude Include="world\Scene.h">
<Filter>Engine\World</Filter>
</ClInclude>
<ClInclude Include="world\Texture.h">
<Filter>Engine\World</Filter>
</ClInclude>
<ClInclude Include="cameras\Player.h">
<Filter>Engine\Cameras</Filter>
</ClInclude>
<ClInclude Include="graphics\Vertex.h">
<Filter>Engine\Graphics</Filter>
</ClInclude>
<ClInclude Include="graphics\Graphics.h">
<Filter>Engine\Graphics</Filter>
</ClInclude>
<ClInclude Include="graphics\Config.h">
<Filter>Engine\Graphics</Filter>
</ClInclude>
<ClInclude Include="graphics\Math.h">
<Filter>Engine\Graphics</Filter>
</ClInclude>
<ClInclude Include="Window.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="Engine.h">
<Filter>Header</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\shaders\shader.vert">
Expand Down
58 changes: 0 additions & 58 deletions Engine/Voxel.h
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Engine/Window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

#include <memory>

#include "Config.h"
#include "Player.h"
#include "graphics/Config.h"
#include "cameras/Player.h"

class Window
{
Expand Down
2 changes: 1 addition & 1 deletion Engine/Camera.cpp → Engine/cameras/Camera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "Camera.h"

#include "Math.h"
#include "../graphics/Math.h"

Camera::Camera()
{
Expand Down
3 changes: 2 additions & 1 deletion Engine/Camera.h → Engine/cameras/Camera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
#include <bitset>
#include <iostream>

#include "Vertex.h"
#include "../graphics/Graphics.h"
#include "../graphics/Vertex.h"

class Camera
{
Expand Down
0 Engine/Player.cpp → Engine/cameras/Player.cpp
View file
Open in desktop
File renamed without changes.
0 Engine/Player.h → Engine/cameras/Player.h
View file
Open in desktop
File renamed without changes.
0 Engine/Config.h → Engine/graphics/Config.h
View file
Open in desktop
File renamed without changes.
0 Engine/Graphics.h → Engine/graphics/Graphics.h
View file
Open in desktop
File renamed without changes.
0 Engine/Math.h → Engine/graphics/Math.h
View file
Open in desktop
File renamed without changes.
0 Engine/Vertex.h → Engine/graphics/Vertex.h
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion Engine/renderer/Renderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
#include "VulkanCommandPool.h"
#include "VulkanPipeline.h"
#include "VulkanBuffer.h"
#include "../Graphics.h"

#include "../graphics/Graphics.h"

#include "../Logger.h"

Expand Down
2 changes: 1 addition & 1 deletion Engine/renderer/VulkanBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <memory>
#include <stdexcept>

#include "../Graphics.h"
#include "../graphics/Graphics.h"

class VulkanBuffer
{
Expand Down
2 changes: 1 addition & 1 deletion Engine/renderer/VulkanCommandPool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <stdexcept>

#include "../Graphics.h"
#include "../graphics/Graphics.h"


class VulkanCommandPool
Expand Down
4 changes: 2 additions & 2 deletions Engine/renderer/VulkanDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <array>
#include <stdexcept>

#include "../Vertex.h"
#include "../Graphics.h"
#include "../graphics/Vertex.h"
#include "../graphics/Graphics.h"

class VulkanDescriptor
{
Expand Down
3 changes: 2 additions & 1 deletion Engine/renderer/VulkanDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

#include <iostream>
#include <set>
#include "../Graphics.h"

#include "../graphics/Graphics.h"

class VulkanDevice
{
Expand Down
Loading