Fixing RAYX RAYCore include and renaming

hz-b · Apr 15, 2023 · 0a0aed0 · 0a0aed0
1 parent bfc5a16
commit 0a0aed0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/Intern/RAY-CLI/CMakeLists.txt b/Intern/RAY-CLI/CMakeLists.txt
@@ -3,7 +3,8 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 # ---- Project ----
 project(RAY-CLI VERSION 0.5.0.0)
-add_executable(${PROJECT_NAME} main.cpp TerminalApp.cpp CommandParser.cpp)
+file(GLOB_RECURSE SOURCE ${PROJECT_SOURCE_DIR}/*.cpp)
+add_executable(${PROJECT_NAME} ${SOURCE})
 # ------------------
 
 

diff --git a/Intern/RAY-CLI/TerminalApp.h b/Intern/RAY-CLI/TerminalApp.h
@@ -6,7 +6,7 @@
 #include <filesystem>
 
 #include "CommandParser.h"
-#include "RayCore.h"
+#include "RAY-Core.h"
 #include "TerminalAppConfig.h"
 
 class TerminalApp {

diff --git a/Intern/RAY-Core/src/RayCore.h → Intern/RAY-Core/src/RAY-Core.h b/Intern/RAY-Core/src/RayCore.h → Intern/RAY-Core/src/RAY-Core.h
diff --git a/Intern/RAY-Core/src/Tracer/VulkanTracer.cpp b/Intern/RAY-Core/src/Tracer/VulkanTracer.cpp
@@ -10,7 +10,7 @@
 #include "Debug/Debug.h"
 #include "Debug/Instrumentor.h"
 #include "Random.h"
-#include "RayCore.h"
+#include "RAY-Core.h"
 
 #ifdef RAYX_PLATFORM_MSVC
 #ifdef USE_NSIGHT_AFTERMATH

diff --git a/Intern/RAY-Core/src/VulkanEngine/VulkanEngine.h b/Intern/RAY-Core/src/VulkanEngine/VulkanEngine.h
@@ -9,7 +9,7 @@
 #include <vector>
 #include <vulkan/vulkan.hpp>
 
-#include "RayCore.h"
+#include "RAY-Core.h"
 
 namespace RAYX {
 

diff --git a/Intern/RAY-X/CMakeLists.txt b/Intern/RAY-X/CMakeLists.txt
@@ -13,4 +13,4 @@ add_executable(${PROJECT_NAME} ${SOURCE})
 
 
 # ---- Dependencies ----
-target_include_directories(${PROJECT_NAME} PRIVATE RAY-Core)
+target_link_libraries(${PROJECT_NAME} PRIVATE RAY-Core)
diff --git a/Intern/RAY-X/src/main.cpp b/Intern/RAY-X/src/main.cpp
@@ -1,8 +1,11 @@
 // This is currently just to establish the base structure of the project.
 
 #include <iostream>
+#include <RAY-Core.h>
+#include <Random.h>
 
 int main()
 {
-    std::cout << "Hello World!" << std::endl;
+    RAYX::randomSeed();
+    std::cout << RAYX::randomDouble() << std::endl;
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@ add_executable(${PROJECT_NAME} ${SOURCE})


		# ---- Dependencies ----
		target_include_directories(${PROJECT_NAME} PRIVATE RAY-Core)
		target_link_libraries(${PROJECT_NAME} PRIVATE RAY-Core)