Update 0.0.61

Author: simo8902

.gitignore

@@ -2,4 +2,4 @@
 cmake-build-debug/
 bin/
 idkbuild/
-
+src/libdata/

CMakeLists.txt

@@ -12,12 +12,13 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 
 # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
 
+
 add_definitions(-DSOURCE_DIR=\"${CMAKE_SOURCE_DIR}\")
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     if (WIN32)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address,undefined -g -O0 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address,undefined")
+       # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address,undefined -g -O0 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+       # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address,undefined")
     elseif (UNIX)
         # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address,undefined -g -O0 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
         # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address,undefined")
@@ -45,11 +46,6 @@ else ()
     message(FATAL_ERROR "Boost not found")
 endif ()
 
-
-#GLFW
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(GLFW3 REQUIRED glfw3)
-
 include_directories(
         ${PROJECT_SOURCE_DIR}/src/Engine/Core
         ${PROJECT_SOURCE_DIR}/src/Engine/Rendering
@@ -99,9 +95,6 @@ set(HEADER_FILES
         ${PROJECT_SOURCE_DIR}/src/Engine/Lighting/Light.h
 
         # Utilities
-        ${PROJECT_SOURCE_DIR}/src/Engine/Utilities/CameraManager.h
-        ${PROJECT_SOURCE_DIR}/src/Engine/Utilities/DragAndDropPayload.h
-        ${PROJECT_SOURCE_DIR}/src/Engine/Utilities/Logger.h
         ${PROJECT_SOURCE_DIR}/src/Engine/Utilities/Transform.h
 
         # ========================== Editor ==========================
@@ -112,11 +105,9 @@ set(HEADER_FILES
 
         ${PROJECT_SOURCE_DIR}/src/Editor/Utilities/SelectionManager.h
 )
-
 set(SOURCE_FILES
         # Core
         ${PROJECT_SOURCE_DIR}/src/Engine/Core/AssetManager.cpp
-        ${PROJECT_SOURCE_DIR}/src/Engine/Core/AssetItem.cpp
         ${PROJECT_SOURCE_DIR}/src/Engine/Core/Initialization.cpp
 
         # Rendering
@@ -139,30 +130,34 @@ set(SOURCE_FILES
 
         ${PROJECT_SOURCE_DIR}/src/Editor/Utilities/SelectionManager.cpp
         src/Engine/Utilities/Profiler.h
-        src/Engine/Utilities/Tracker.h
-        src/Engine/Core/AssetItem.cpp
-       # src/Engine/Rendering/ShaderManager.cpp
+        # src/Engine/Rendering/ShaderManager.cpp
        # src/Engine/Rendering/ShaderManager.h
         src/Engine/Physics/Capsule.h
         src/Engine/Rendering/Shader.cpp
         src/Engine/Rendering/Shader.h
+        src/Engine/Rendering/ShaderManager.cpp
+        src/Engine/Rendering/ShaderManager.h
 )
 
+# GLFW 3
+set(GLFW_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/external/glfw/include")
+set(GLFW_LIBRARY "${CMAKE_SOURCE_DIR}/external/glfw/lib/libglfw3.a")
+
+include_directories(${GLFW_INCLUDE_DIR})
+
 set(ICONS_FONT_AWESOME_6_DIR ${CMAKE_SOURCE_DIR}/external/fontawesome)
 
 # GLAD
 set(GLAD_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/glad/include)
 set(GLAD_SOURCE ${CMAKE_SOURCE_DIR}/external/glad/src/glad.c
         src/Engine/Utilities/FPSCounter.cpp
         src/Engine/Utilities/FPSCounter.h
-        src/Engine/Utilities/ThreadSafeQueue.h
-        src/Engine/Utilities/ShaderData.h)
+)
 
 add_library(glad ${GLAD_SOURCE})
 include_directories(${GLAD_INCLUDE_DIR})
 
 
-
 # ImGuizmo
 set(IMGUIzmo_PATH ${CMAKE_SOURCE_DIR}/external/ImGuizmo)
 
@@ -172,7 +167,6 @@ set(IMGUI_PATH ${CMAKE_SOURCE_DIR}/external/imgui)
 #GLM
 set(GLM_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/glm/include)
 
-
 # STB_IMAGE
 set(STB_IMAGE_DIR ${CMAKE_SOURCE_DIR}/external/stb_image)
 
@@ -205,35 +199,53 @@ include_directories(
         ${PROJECT_SOURCE_DIR}/src/Editor/Utilities
 )
 
-
+##############################
+# System packages
+##############################
 find_package(Threads REQUIRED)
 find_package(OpenGL REQUIRED)
 
+
+add_library(libData SHARED src/libdata/libData.cpp)
+set(CMAKE_SHARED_LIBRARY_PREFIX "")
+
 add_executable(idk_core main.cpp ${SOURCE_FILES})
 
-target_link_libraries(idk_core
+link_directories("${PROJECT_SOURCE_DIR}/cmake-build-debug")
+
+target_link_libraries(libData
         PRIVATE
         glad
         ImGui
-        glfw
+        ${GLFW_LIBRARY}
         Boost::filesystem
         Boost::system
         Threads::Threads
         OpenGL::GL
 )
-target_include_directories(idk_core PRIVATE ${GLFW3_INCLUDE_DIRS})
 
-target_include_directories(idk_core PRIVATE
-        "${CMAKE_SOURCE_DIR}/external/glad/include"
+target_link_libraries(idk_core
+        PRIVATE
+        glad
+        ImGui
+        ${GLFW_LIBRARY}
+        Boost::filesystem
+        Boost::system
+        Threads::Threads
+        OpenGL::GL
+        libData
 )
+
+target_include_directories(idk_core PUBLIC "${GLFW3_INCLUDE_DIR}")
+
 if (UNIX)
     target_link_libraries(idk_core
             PRIVATE
-            GLX
-            OpenGL
+            opengl32 gdi32
     )
 endif()
 
+
 if (MSVC)
     target_compile_options(idk_core PRIVATE /W4 /EHsc /std:c++20)
 else()

ROOT/materials/mat1.mat

@@ -0,0 +1,15 @@
+#type vertex
+#version 330 core
+layout (location = 0) in vec3 aPos;
+
+void main() {
+    gl_Position = vec4(aPos, 1.0);
+}
+
+#type fragment
+#version 330 core
+out vec4 FragColor;
+
+void main() {
+    FragColor = vec4(1.0, 0.5, 0.2, 1.0);
+}

ROOT/shaders/shader.glsl

@@ -1,13 +1,13 @@
 # Generated by CMake
 
 if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
-   message(FATAL_ERROR "CMake >= 2.8.0 required")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
 endif()
 if(CMAKE_VERSION VERSION_LESS "2.8.3")
    message(FATAL_ERROR "CMake >= 2.8.3 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.3...3.28)
+cmake_policy(VERSION 2.8.3...3.29)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------
@@ -60,7 +60,7 @@ add_library(glfw STATIC IMPORTED)
 
 set_target_properties(glfw PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Threads::Threads>;/usr/lib/x86_64-linux-gnu/librt.a;/usr/lib/x86_64-linux-gnu/libm.so;\$<LINK_ONLY:dl>"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Threads::Threads>"
 )
 
 # Load information for each installed configuration.

external/GLFW/lib/cmake/glfw3/glfw3Targets-noconfig.cmake

@@ -1,13 +1,13 @@
-prefix=/home/simeon/Documents/glfw
+prefix=C:/glfw
 exec_prefix=${prefix}
-includedir=/home/simeon/Documents/glfw/include
-libdir=/home/simeon/Documents/glfw/lib
+includedir=C:/glfw/include
+libdir=C:/glfw/lib
 
 Name: GLFW
 Description: A multi-platform library for OpenGL, window and input
 Version: 3.4.0
 URL: https://www.glfw.org/
 Requires.private: 
 Libs: -L${libdir} -lglfw3
-Libs.private:  -lrt -lm -ldl
+Libs.private:  -lgdi32
 Cflags: -I${includedir}