diff --git a/.gitmodules b/.gitmodules
index ec5c436..d199095 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "ComputeEngine"]
path = ComputeEngine
- url = https://git.dawidpietrykowski.com/Personal/ComputeEngine.git
+ url = ssh://git@git.dawidpietrykowski.com:1025/Personal/ComputeEngine.git
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/GPURayTracer.iml b/.idea/GPURayTracer.iml
new file mode 100644
index 0000000..f08604b
--- /dev/null
+++ b/.idea/GPURayTracer.iml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..79b3c94
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..2664b11
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 475e22d..570f527 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,33 +56,35 @@ set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-find_path(GLFW_INCLUDE_DIR GLFW/glfw3.h
-HINTS
-${CMAKE_CURRENT_SOURCE_DIR}/include
-${CMAKE_CURRENT_SOURCE_DIR}/lib
-${GLFW_ROOT}
-${GLFW_ROOT}/include)
+#find_path(GLFW_INCLUDE_DIR GLFW/glfw3.h
+#HINTS
+#${CMAKE_CURRENT_SOURCE_DIR}/include
+#${CMAKE_CURRENT_SOURCE_DIR}/lib
+#${GLFW_ROOT}
+#${GLFW_ROOT}/include)
+#
+#if(GLFW_INCLUDE_DIR)
+#message(STATUS "GLFW_INCLUDE_DIR: ${GLFW_INCLUDE_DIR}")
+#else()
+#message(FATAL_ERROR "glfw3.h not found")
+#endif()
+#
+#find_path(GLFW_LIB_DIR glfw3.lib
+#HINTS
+#${CMAKE_CURRENT_SOURCE_DIR}/include
+#${CMAKE_CURRENT_SOURCE_DIR}/lib
+#${GLFW_ROOT}/lib
+#${GLFW_ROOT}/lib-vc2019
+#${GLFW_ROOT}/lib-vc2017
+#${GLFW_ROOT}/lib-vc2015)
+#
+#if(GLFW_LIB_DIR)
+#message(STATUS "GLFW_LIB_DIR: ${GLFW_LIB_DIR}")
+#else()
+#message(FATAL_ERROR "glfw3.lib not found")
+#endif()
-if(GLFW_INCLUDE_DIR)
-message(STATUS "GLFW_INCLUDE_DIR: ${GLFW_INCLUDE_DIR}")
-else()
-message(FATAL_ERROR "glfw3.h not found")
-endif()
-
-find_path(GLFW_LIB_DIR glfw3.lib
-HINTS
-${CMAKE_CURRENT_SOURCE_DIR}/include
-${CMAKE_CURRENT_SOURCE_DIR}/lib
-${GLFW_ROOT}/lib
-${GLFW_ROOT}/lib-vc2019
-${GLFW_ROOT}/lib-vc2017
-${GLFW_ROOT}/lib-vc2015)
-
-if(GLFW_LIB_DIR)
-message(STATUS "GLFW_LIB_DIR: ${GLFW_LIB_DIR}")
-else()
-message(FATAL_ERROR "glfw3.lib not found")
-endif()
+find_package(glfw3 REQUIRED)
# Find GLEW
@@ -105,13 +107,17 @@ endif()
# Find stb_image
-find_path(stb_image_INCLUDE_DIR stb_image.h
+find_path(stb_image_INCLUDE_DIR include/stb_image.h
HINTS
-${CMAKE_CURRENT_SOURCE_DIR}/include
+${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/include/stb
-${CMAKE_CURRENT_SOURCE_DIR}/lib
+${CMAKE_CURRENT_SOURCE_DIR}/lib
+${CMAKE_CURRENT_SOURCE_DIR}
+"/usr/include/stb"
${stb_image_ROOT})
+#find_package(glfw3 REQUIRED)
+
if(stb_image_INCLUDE_DIR)
message(STATUS "stb_image_INCLUDE_DIR: ${stb_image_INCLUDE_DIR}")
else()
@@ -120,7 +126,10 @@ endif()
# Find ComputeEngine
-find_path(ComputeEngine_LIB_DIR ComputeEngine.lib
+find_path(ComputeEngine_LIB_DIR
+ NAMES
+ ComputeEngine.lib
+ libComputeEngine.a
HINTS
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/lib
@@ -128,7 +137,11 @@ ${ComputeEngine_ROOT}
${ComputeEngine_ROOT}/lib
${ComputeEngine_ROOT}/lib/Release
${ComputeEngine_ROOT}/build/lib
-${ComputeEngine_ROOT}/build/lib/Release)
+${ComputeEngine_ROOT}/build/lib/Release
+ComputeEngine/lib
+ComputeEngine/lib/Release
+ComputeEngine/build/lib
+ComputeEngine/build/lib/Release)
if(ComputeEngine_LIB_DIR)
message(STATUS "ComputeEngine_LIB_DIR: ${ComputeEngine_LIB_DIR}")
@@ -137,10 +150,11 @@ message(FATAL_ERROR "ComputeEngine.lib not found")
endif()
find_path(ComputeEngine_INCLUDE_DIR ComputeEngine.h
-HINTS
-${CMAKE_CURRENT_SOURCE_DIR}/include
-${CMAKE_CURRENT_SOURCE_DIR}/lib
-${ComputeEngine_ROOT}
+HINTS
+ ${CMAKE_CURRENT_SOURCE_DIR}/ComputeEngine/src
+${CMAKE_CURRENT_SOURCE_DIR}/include
+${CMAKE_CURRENT_SOURCE_DIR}/lib
+${ComputeEngine_ROOT}
${ComputeEngine_ROOT}/include
${ComputeEngine_ROOT}/build/include)
@@ -150,19 +164,25 @@ else()
message(FATAL_ERROR "ComputeEngine.h not found")
endif()
+message(STATUS "GLFW_INCLUDE_DIR: ${GLFW_INCLUDE_DIR}")
+message(STATUS "OPENGL_INCLUDE_DIR: ${OPENGL_INCLUDE_DIR}")
+message(STATUS "stb_image_INCLUDE_DIR: ${stb_image_INCLUDE_DIR}")
+message(STATUS "GLEW_INCLUDE_DIR: ${GLEW_INCLUDE_DIR}")
+message(STATUS "ComputeEngine_INCLUDE_DIR: ${ComputeEngine_INCLUDE_DIR}")
# Add source
add_subdirectory(src)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src
-${GLFW_INCLUDE_DIR}
${OPENGL_INCLUDE_DIR}
${stb_image_INCLUDE_DIR}
${ComputeEngine_INCLUDE_DIR}
-${GLEW_INCLUDE_DIR})
+${ComputeEngine_INCLUDE_DIRS}
+${GLEW_INCLUDE_DIR}
+${GLEW_INCLUDE_DIRS})
-target_link_directories(${PROJECT_NAME} PUBLIC ${GLFW_LIB_DIR} ${GLEW_LIBRARIES} ${ComputeEngine_LIB_DIR})
-target_link_libraries(${PROJECT_NAME} "glfw3.lib" "opengl32.lib" "glew32s.lib" "ComputeEngine.lib")
+target_link_directories(${PROJECT_NAME} PUBLIC ${GLFW_LIB_DIR} ${GLEW_LIBRARIES} ${ComputeEngine_LIB_DIR} ${ComputeEngine_INCLUDE_DIR})
+target_link_libraries(${PROJECT_NAME} glfw OpenGL::GL GLEW::GLEW ComputeEngine)
# Copy shaders, assets and configs for binaries to access
file(COPY shaders DESTINATION ${CMAKE_BINARY_DIR}/Release)
diff --git a/ComputeEngine b/ComputeEngine
index c89dda2..133701c 160000
--- a/ComputeEngine
+++ b/ComputeEngine
@@ -1 +1 @@
-Subproject commit c89dda21e209cd8284d44f27a666aeab2c3db096
+Subproject commit 133701c4174c00b869988bdc8b21234dc6d5e718
diff --git a/build.nu b/build.nu
new file mode 100755
index 0000000..c81ae8e
--- /dev/null
+++ b/build.nu
@@ -0,0 +1 @@
+rm -rf cmake-build-debug try return 0 ; rm -fr build try return 0 ; cmake -B build -S . ; cmake --build build --config Release
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 8880085..83813bd 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -1,3 +1,7 @@
+#ifndef _WIN32
+#include
+#endif
+
#include "Utils.h"
float GetRand() {