redagito · redagito · Dec 1, 2018 · Nov 18, 2019 · May 13, 2020 · Jan 3, 2022
diff --git a/.clang-format b/.clang-format
@@ -1,5 +1,5 @@
 BasedOnStyle: Google
-ColumnLimit: 100
+ColumnLimit: 120
 UseTab: Never
 IndentWidth: 4
 BreakBeforeBraces: Allman

diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,2 @@
-# Visual code
-.vs/
-
-# Visual studio project files
-*.vcxproj
-*.vcxproj.filters
-*.sln
-
-# Visual studio temp files
-*.dir/
-Debug/
-Release/
-x64/
-
-# CMake cache files
-cmake_install.cmake
-CMakeCache.txt
-CMakeFiles/
+build/
+CMakeUserPresets.json
diff --git a/.gitmodules b/.gitmodules
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "cmake.configureOnOpen": true
+}
diff --git a/Application/CMakeLists.txt b/Application/CMakeLists.txt
diff --git a/Application/Lib/CMakeLists.txt b/Application/Lib/CMakeLists.txt
diff --git a/Application/Lib/include/application/app/AGameApplication.h b/Application/Lib/include/application/app/AGameApplication.h
diff --git a/Application/Lib/include/application/io/LoadGame.h b/Application/Lib/include/application/io/LoadGame.h
diff --git a/Application/Lib/source/app/AGameApplication.cpp b/Application/Lib/source/app/AGameApplication.cpp
diff --git a/Application/Lib/source/game/IController.cpp b/Application/Lib/source/game/IController.cpp
diff --git a/Application/Lib/source/game/IGameState.cpp b/Application/Lib/source/game/IGameState.cpp
diff --git a/Application/Test/CMakeLists.txt b/Application/Test/CMakeLists.txt
diff --git a/Application/Test/source/Main.cpp b/Application/Test/source/Main.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,23 +1,50 @@
-cmake_minimum_required (VERSION 3.0.0)
-project (KernEngine)
+cmake_minimum_required(VERSION 3.25.0)
+project(KernEngine)
 
-# Use folder structure
-set_property (GLOBAL PROPERTY USE_FOLDERS ON)
+# Demo project as default startup
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT RenderDemo)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set(CXX_STANDARD_REQUIRED ON)
 
-# Foundation library
-add_subdirectory (Foundation)
+if (MSVC)
+	# Ignore warnings about missing pdb
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099")
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /ignore:4099")
+	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4099")
+endif()
 
-# Graphics and rendering library
-add_subdirectory (Graphics)
 
-# Application layer library
-add_subdirectory (Application)
+# Testing
+find_package(catch2 REQUIRED)
 
-# Utility library for toolkit
-add_subdirectory (Util)
+# Dependencies
+# Foundation
+find_package(glm REQUIRED)
+find_package(nlohmann_json REQUIRED)
+find_package(SQLite3 REQUIRED)
+find_package(fmtlog REQUIRED)
 
-# Tools and applications
-add_subdirectory (Toolkit)
+# Graphics
+find_package(OpenGL REQUIRED)
+find_package(glfw3 REQUIRED)
+find_package(glad REQUIRED)
+find_package(tinyobjloader REQUIRED)
+find_package(assimp REQUIRED)
+find_package(stb REQUIRED)
+find_package(Freetype REQUIRED)
+find_package(imgui REQUIRED)
 
-# Demo
-add_subdirectory (Demo)
+# Audio
+find_package(OpenAL REQUIRED)
+find_package(vorbis REQUIRED)
+find_package(minimp3 REQUIRED)
+
+# Scripting
+find_package(lua REQUIRED)
+
+# Engine
+add_subdirectory(Engine)
+
+# Demo applications and sample games
+# Depends on Engine
+add_subdirectory(Demo)
diff --git a/Demo/CG2015/CMakeLists.txt b/Demo/CG2015/CMakeLists.txt
@@ -1,26 +1,27 @@
-cmake_minimum_required (VERSION 3.0.0)
-project (DemoCG2015)
+# Computer Graphics 2 project from 2015
+project (CG2015)
 
-file (GLOB_RECURSE SOURCE_FILES
+file (GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS 
 	${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/source/*.cxx
 	${CMAKE_CURRENT_SOURCE_DIR}/source/*.h
 	${CMAKE_CURRENT_SOURCE_DIR}/source/*.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/source/*.hxx
 )
+# Source group to preserve folder structure in ide
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCE_FILES})
 
 add_executable (${PROJECT_NAME} ${SOURCE_FILES})
 
 set_target_properties (${PROJECT_NAME} PROPERTIES
-	CXX_STANDARD 11
+	CXX_STANDARD 17
+	FOLDER "Demo"
 )
 
-# Link dependencies
 target_link_libraries (${PROJECT_NAME} 
-	LINK_PRIVATE Application
+	PRIVATE EngineLib
 )
 
-# Includes
 target_include_directories (${PROJECT_NAME}
 	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/source
 )

diff --git a/Demo/CG2015/data/audio/bgm/kim-lightyear-stardust-vision-ii-135754.mp3 b/Demo/CG2015/data/audio/bgm/kim-lightyear-stardust-vision-ii-135754.mp3
diff --git a/Demo/CG2015/data/audio/bgm/this-minimal-technology-pure-12327.mp3 b/Demo/CG2015/data/audio/bgm/this-minimal-technology-pure-12327.mp3
diff --git a/Demo/CG2015/data/audio/sfx/Readme.txt b/Demo/CG2015/data/audio/sfx/Readme.txt
diff --git a/Demo/CG2015/data/audio/sfx/explosion-91872.mp3 b/Demo/CG2015/data/audio/sfx/explosion-91872.mp3
diff --git a/Demo/CG2015/data/audio/sfx/explosion1.mp3 b/Demo/CG2015/data/audio/sfx/explosion1.mp3
diff --git a/Demo/CG2015/data/audio/sfx/shoot02wav-14562.mp3 b/Demo/CG2015/data/audio/sfx/shoot02wav-14562.mp3
diff --git a/Demo/CG2015/data/image/lava_ground.png b/Demo/CG2015/data/image/lava_ground.png
diff --git a/Demo/CG2015/data/material/stone_lava.json b/Demo/CG2015/data/material/stone_lava.json
@@ -1,4 +1,4 @@
 {
-	"base" : "data/image/lava_ground.png",
+	"base" : "data/image/lava_ground.jpg",
 	"glow" : "data/image/lava_ground_glow.png"
 }
diff --git a/Demo/CG2015/data/script/main.lua b/Demo/CG2015/data/script/main.lua
diff --git a/Demo/CG2015/data/startup.ini b/Demo/CG2015/data/startup.ini
@@ -12,8 +12,8 @@
 #   and sets the application into the initial game state.
 #   This mode is used for actual games.
 # The default value is demo.
-type=demo
-#type=game
+#type=demo
+type=game
 
 
 [scene]