even more assets

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.7...3.23)
 if(${CMAKE_VERSION} VERSION_LESS 3.12)
     cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
 endif()
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(VCPKG_INSTALL_OPTIONS "--allow-unsupported")
 
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
@@ -21,31 +21,20 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
+find_package(Seele REQUIRED)
 find_package(Vulkan REQUIRED)
 find_package(assimp CONFIG REQUIRED)
 find_package(Stb REQUIRED)
 find_package(EnTT CONFIG REQUIRED)
 find_package(FreeType CONFIG REQUIRED)
+find_package(harfbuzz CONFIG REQUIRED)
 find_package(glfw3 CONFIG REQUIRED)
 find_package(glm CONFIG REQUIRED)
 find_package(Ktx CONFIG REQUIRED)
 find_package(nlohmann_json CONFIG REQUIRED)
 find_package(fmt CONFIG REQUIRED)
+find_package(unofficial-lunasvg CONFIG REQUIRED)
 find_package(VulkanMemoryAllocator CONFIG REQUIRED)
-find_package(glslang CONFIG REQUIRED)
-find_package(Seele CONFIG REQUIRED)
-
-add_library(slang SHARED IMPORTED)
-if(WIN32)
-    add_library(slang-glslang SHARED IMPORTED)
-    set_target_properties(slang-glslang PROPERTIES IMPORTED_LOCATION ${Seele_DIR}../../../../bin/slang-glslang.dll)
-    set_target_properties(slang-glslang PROPERTIES IMPORTED_IMPLIB ${Seele_DIR}../../../../lib/slang.lib)
-    target_link_libraries(slang INTERFACE slang-glslang)
-    set_target_properties(slang PROPERTIES IMPORTED_LOCATION ${Seele_DIR}../../../../bin/slang.dll)
-    set_target_properties(slang PROPERTIES IMPORTED_IMPLIB ${Seele_DIR}../../../../lib/slang.lib)
-else()
-    set_target_properties(slang PROPERTIES IMPORTED_LOCATION /usr/local/lib/libslang.dylib)
-endif()
 
 add_library(MeshShadingDemo SHARED "")
 target_link_libraries(MeshShadingDemo PUBLIC Seele::Engine)

src/MeshShadingDemoGame.cpp

@@ -26,7 +26,7 @@ void MeshShadingDemoGame::setupScene(PScene scene, PSystemGraph graph)
 	followCam = new PathFollowCam(scene);
 	//followCam->getCamera().mainCamera = true;
 	
-	{
+	/* {
 		Array<Vector> lightPoints = {
 			Vector(13.542, 3.12369, -12.3293),
 			Vector(20.6668, 3.04548, -20.9486),
@@ -119,7 +119,7 @@ void MeshShadingDemoGame::setupScene(PScene scene, PSystemGraph graph)
 		path->attachComponent<Path>(p);
 		chapel = new StaticMeshActor(scene, AssetRegistry::findMesh("Whitechapel", "Whitechapel"));
 		followCam->getPathFollow().path = path;
-	}
+	}*/
 	/*
 	{
 		Path p = Path({
@@ -166,7 +166,7 @@ void MeshShadingDemoGame::setupScene(PScene scene, PSystemGraph graph)
 		//followCam->getPathFollow().path = path;
 		//minecraft = new StaticMeshActor(scene, AssetRegistry::findMesh("minecraft", "minecraft-medieval-city"));
 		//minecraft->getTransform().setScale(Vector(0.01, 0.01, 0.01));
-	}/*
+	}
 	{
 		Path p = Path({
 			Vector(89.3805, 153.648, 270.467),
@@ -182,9 +182,9 @@ void MeshShadingDemoGame::setupScene(PScene scene, PSystemGraph graph)
 		//followCam->getPathFollow().path = path;
 		//volvo = new StaticMeshActor(scene, AssetRegistry::findMesh("Volvo", "Volvo"));
 	}
-	*/
+	
 
-	//test = new StaticMeshActor(scene, AssetRegistry::findMesh("", "plane"));
+	test = new StaticMeshActor(scene, AssetRegistry::findMesh("", "rttest"));
 	//test->getTransform().setScale(Vector(0.01, 0.01, 0.01));
 
 	for (int32 y = -40; y < 40; ++y)
@@ -198,7 +198,8 @@ void MeshShadingDemoGame::setupScene(PScene scene, PSystemGraph graph)
 		}
 	}
 
-	light = new DirectionalLightActor(scene, Vector4(1, 1, 1, 0.1), Vector(-1, -0.4, 0.2));
+	//pointLight = new PointLightActor(scene, Vector(5, 0, 0), Vector(1, 1, 1), 100);
+	light = new DirectionalLightActor(scene, Vector4(1, 1, 1, 0.1), Vector(1, -0.4, 0.2));
 	graph->addSystem(new FlyCamSystem(scene));
 	graph->addSystem(new SplineCamSystem(scene));
 }

src/MeshShadingDemoGame.h

@@ -24,6 +24,7 @@ private:
 	OFlyCam flyCam;
 	OPathFollowCam followCam;
 	ODirectionalLightActor light;
+	OPointLightActor pointLight;
 };
 
 extern "C" MESHSHADINGDEMO_API Game* createInstance();

vcpkg.json

@@ -1,18 +1,19 @@
 {
-    "dependencies": [
-        "assimp",
-        "entt",
-        "stb",
-        "entt",
-        "freetype",
-        "glfw3",
-        "glm",
-        "ktx",
-        "nlohmann-json",
-        "fmt",
-        "gtest",
-        "vulkan-memory-allocator",
-        "spirv-cross",
-        "glslang"
-    ]
+  "dependencies": [
+    "assimp",
+    "entt",
+    "stb",
+    "entt",
+    "freetype",
+    "glfw3",
+    "glm",
+    "ktx",
+    "nlohmann-json",
+    "fmt",
+    "gtest",
+    "vulkan-memory-allocator",
+    "lunasvg",
+    "harfbuzz",
+    "shader-slang"
+  ]
 }