FSR fixed

.gitmodules

@@ -1,12 +0,0 @@
-[submodule "ext/imgui"]
-	path = ext/imgui
-	url = ../../ocornut/imgui.git
-[submodule "ext/entt"]
-	path = ext/entt
-	url = ../entt.git
-[submodule "ext/directxtex"]
-	path = ext/directxtex
-	url = ../DirectXTex.git
-[submodule "ext/yaml-cpp"]
-	path = ext/yaml-cpp
-	url = ../yaml-cpp.git

CMakeLists.txt

@@ -12,6 +12,7 @@ era_begin(EraEngine)
     add_subdirectory(programs/EraEditor)
     add_subdirectory(programs/EraRuntime)
     add_subdirectory(programs/EraUnitTests)
+    add_subdirectory(programs/EraLauncher)
 era_end(EraEngine)
 
 

cmake/era_engine_common.cmake

@@ -51,6 +51,7 @@ function(require_module project module_name)
     message("Adding target ${module_name} to ${project} program...")
 
     # Link dependencies (if any)
+    add_dependencies(${project} ${module_name})
     target_link_directories(${project} PUBLIC modules/${module_name}/Release)
 endfunction()
 
@@ -63,6 +64,7 @@ function(require_module_internal module module_name)
     add_subdirectory(${ERA_ENGINE_PATH}/modules/${module_name} build)
 
     # Link dependencies (if any)
+    add_dependencies(${project} ${module_name})
     target_link_directories(${module} PUBLIC modules/${module_name}/Release)
 endfunction()
 

modules/core/src/dlss/dlss.cpp

@@ -4,6 +4,8 @@
 
 #include "dx/dx_command_list.h"
 
+#include "core/project.h"
+
 #include "rendering/main_renderer.h"
 
 namespace era_engine::dlss
@@ -15,7 +17,7 @@ namespace era_engine::dlss
 		NVSDK_NGX_FeatureDiscoveryInfo dlssInfo{};
 		NVSDK_NGX_FeatureRequirement outSupported{};
 		dlssInfo.FeatureID = NVSDK_NGX_Feature_SuperSampling;
-		dlssInfo.ApplicationDataPath = L"E:\\Era Engine\\logs";
+		dlssInfo.ApplicationDataPath = (eproject::enginePath + std::wstring(L"/logs")).c_str();
 		dlssInfo.Identifier.v.ProjectDesc.EngineType = NVSDK_NGX_ENGINE_TYPE_CUSTOM;
 
 		if (NVSDK_NGX_D3D12_GetFeatureRequirements(adapter, &dlssInfo, &outSupported) != NVSDK_NGX_Result_Success)

modules/core/src/dlss/dlss.h

@@ -9,7 +9,7 @@
 #elif _DEBUG
 #define ENABLE_DLSS 0
 #else
-#define ENABLE_DLSS 0
+#define ENABLE_DLSS 1
 #endif
 
 #include "dx/dx_context.h"

modules/core/src/editor/editor.cpp

@@ -2794,7 +2794,8 @@ namespace era_engine
 
 					if (ImGui::BeginProperties())
 					{
-						ImGui::PropertyCheckbox("Enable DLSS", renderer->settings.enableDLSS);
+						// For now it's only fsr2 wrapper. I do not have rtx gpu now :(((
+						ImGui::PropertyCheckbox("Enable FSR 2.0", renderer->settings.enableDLSS);
 
 						ImGui::EndProperties();
 					}

programs/EraLauncher/CMakeLists.txt

@@ -0,0 +1,9 @@
+include(${CMAKE_SOURCE_DIR}/cmake/era_engine_common.cmake)
+
+era_begin(EraLauncher)
+    declare_support_program(EraLauncher)
+
+    require_module(EraLauncher EraScriptingCPPDecls)
+
+    target_compile_definitions(EraLauncher PRIVATE ERA_LAUNCHER)
+era_end(EraLauncher)

programs/EraLauncher/src/launcher_main.cpp

@@ -0,0 +1,6 @@
+// Copyright (c) 2023-present Eldar Muradov. All rights reserved.
+
+int main(int argc, char** argv)
+{
+	return 0;
+}