Skip to content

Commit 3842c22

Browse files
committed
Update
1 parent 543522f commit 3842c22

Some content is hidden

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

71 files changed

+871
-594
lines changed

CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
cmake_minimum_required (VERSION 3.10)
22

3-
project (Multor)
43
set(CMAKE_CXX_STANDARD 17)
54

65
if("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -16,4 +15,6 @@ elseif(UNIX)
1615
endif()
1716

1817
add_subdirectory(dependencies)
19-
add_subdirectory(Multor)
18+
19+
include_directories(${CMAKE_SOURCE_DIR}/scr)
20+
add_subdirectory(src)

Multor/CMakeLists.txt

-52
This file was deleted.

Multor/src/ImageLoader.h

-92
This file was deleted.

Multor/src/Mesh.h

-117
This file was deleted.

shaders/Base.frag

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ void main()
4444
//vec3 viewDir = normalize(vs_out.TangentViewPos - vs_out.TangentFragPos);
4545
//FragColor = texture(diffuse, vs_out.TexCoords);
4646
//FragColor = vec4(vs_out.FragPos,1.0);
47-
FragColor = vec4(0.0f,1.0f,0.0f,1.0f);
47+
FragColor = vec4(0.5f, 0.5f,0.0f,1.0f);
4848
}
4949

src/CMakeLists.txt

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
cmake_minimum_required (VERSION 3.8)
2+
3+
project (Multor)
4+
set(CMAKE_CXX_STANDARD 17)
5+
6+
#Searching sourse files
7+
file(GLOB_RECURSE SOURCE_FILES
8+
${CMAKE_CURRENT_SOURCE_DIR}/*.c
9+
${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
10+
11+
# include_directories(${CMAKE_CURRENT_SOURCE_DIR}/utils)
12+
# include_directories(${CMAKE_CURRENT_SOURCE_DIR}/vulkan)
13+
# include_directories(${CMAKE_CURRENT_SOURCE_DIR}/scene_objects)
14+
# include_directories(${CMAKE_CURRENT_SOURCE_DIR}/gui)
15+
16+
##########################Glm##############################
17+
include_directories(${CMAKE_SOURCE_DIR}/dependencies/glm/)
18+
##########################STB##############################
19+
include_directories(${CMAKE_SOURCE_DIR}/dependencies/stb/)
20+
##########################SDL##############################
21+
include_directories(${CMAKE_SOURCE_DIR}/dependencies/sdl/include/)
22+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gui)
23+
##########################Vulkan###########################
24+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vulkan)
25+
include_directories(${VULKAN_SDK_INCLUDE_DIR})
26+
message(;rolijgdogjero;gjreorej ${CMAKE_BINARY_DIR}/dependencies/VulkanSDK)
27+
include_directories(${CMAKE_BINARY_DIR}/dependencies/VulkanSDK)
28+
29+
if(WIN32)
30+
add_executable(${PROJECT_NAME} WIN32 ${SOURCE_FILES})
31+
else()
32+
add_executable(${PROJECT_NAME} ${SOURCE_FILES})
33+
endif()
34+
35+
# Define the link libraries
36+
target_link_libraries(${PROJECT_NAME} ${LIBS} vulkan_subsystem)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Multor/src/RenderEngine.cpp renamed to src/RenderEngine.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/// \file RenderEngine.cpp
2+
23
#include "RenderEngine.h"
34

45
namespace Multor

Multor/src/RenderEngine.h renamed to src/RenderEngine.h

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
#ifndef RENDERENGINE_H
55
#define RENDERENGINE_H
66

7+
#include "vulkan/VulkanRenderer.h"
8+
9+
#include "gui/Window.h"
10+
#include "Transformation.h"
11+
#include "utils/Time.h"
12+
#include "utils/Logger.h"
13+
714
#include <array>
815
#include <functional>
9-
#include "Window.h"
10-
#include "Transformation.h"
11-
#include "VulkanRenderer.h"
12-
#include "Time.h"
13-
#include "Logger.h"
1416

1517
namespace Multor
1618
{

Multor/src/Transformation.cpp renamed to src/Transformation.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/// \file Transformation.cpp
2+
23
#include "Transformation.h"
34

45
namespace Multor

Multor/src/Transformation.h renamed to src/Transformation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#ifndef TRANSFORMATION_H
55
#define TRANSFORMATION_H
66

7-
#include "Shader.h"
7+
// #include "Shader.h"
88
#include "Camera.h"
99

1010
#include <memory>

src/gui/CMakeLists.txt

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
cmake_minimum_required (VERSION 3.20)
2+
3+
project (gui_subsystem)
4+
set(CMAKE_CXX_STANDARD 17)
5+
6+
SET(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Window.cpp)
7+
8+
##########################Glm##############################
9+
include_directories(${CMAKE_SOURCE_DIR}/dependencies/glm/)
10+
##########################SDL##############################
11+
include_directories(${CMAKE_SOURCE_DIR}/dependencies/sdl/include/)
12+
13+
add_library(${PROJECT_NAME} STATIC ${SOURCES})

Multor/src/Window.cpp renamed to src/gui/Window.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
/// \file Window.cpp
2+
23
#include "Window.h"
34

5+
#include <chrono>
6+
#include <thread>
7+
#include <string>
8+
49
namespace Multor
510
{
611

0 commit comments

Comments
 (0)