GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some bugfixes

Browse Source
This commit is contained in:
GeorgH93
2023-11-25 22:31:33 +01:00
parent 5bcbef65bb
commit 9d53047f94
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Filter.cmake
View File

@@ -12,5 +12,7 @@ function(FilterPlatformPaths sourcesVar)
list(FILTER ${sourcesVar} EXCLUDE REGEX ".*[\\/]Host[\\/]Windows[\\/].*") list(FILTER ${sourcesVar} EXCLUDE REGEX ".*[\\/]Host[\\/]Windows[\\/].*")
endif () endif ()
list(FILTER sources EXCLUDE REGEX "main\.(m|mm|c|cpp)") list(FILTER ${sourcesVar} EXCLUDE REGEX "main\.(m|mm|c|cpp)")
set(${sourcesVar} ${${sourcesVar}} PARENT_SCOPE)
endfunction() endfunction()

4
cmake/SetCompilerSettings.cmake
View File

@@ -14,10 +14,10 @@ endfunction()
function(SetWarningSettings TARGET) function(SetWarningSettings TARGET)
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunknown-pragmas" PARENT_SCOPE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas" PARENT_SCOPE)
endif () endif ()
if (LINUX) if (LINUX)
#target_compile_options(${TARGET} PRIVATE -Wall) target_compile_options(${TARGET} PRIVATE -Wall)
endif() endif()
endfunction() endfunction()

6
cmake/SetupVulkan.cmake
View File

@@ -13,9 +13,9 @@ function(SetupVulkan TARGET)
endif() endif()
else () else ()
find_package(Vulkan REQUIRED) find_package(Vulkan REQUIRED)
target_link_libraries(TARGET PRIVATE Vulkan::Vulkan) target_link_libraries(${TARGET} PRIVATE Vulkan::Vulkan)
endif () endif ()
target_include_directories(TARGET PUBLIC ${Vulkan_INCLUDE_DIR}) target_include_directories(${TARGET} PUBLIC ${Vulkan_INCLUDE_DIR})
if (ANDROID) if (ANDROID)
add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR) add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
@@ -24,6 +24,6 @@ function(SetupVulkan TARGET)
elseif (LINUX) elseif (LINUX)
add_definitions(-DVK_USE_PLATFORM_XCB_KHR) add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
find_package(XCB REQUIRED) find_package(XCB REQUIRED)
target_link_libraries(TARGET PRIVATE ${XCB_LIBRARIES}) target_link_libraries(${TARGET} PRIVATE ${XCB_LIBRARIES})
endif() endif()
endfunction() endfunction()

5
openVulkanoCpp/AR/ArSessionMetadata.cpp
View File

@@ -30,14 +30,13 @@ namespace OpenVulkano::AR
ArSessionMetadata ArSessionMetadata::FromYaml(const std::string& filePath) ArSessionMetadata ArSessionMetadata::FromYaml(const std::string& filePath)
{ {
//TODO YAML::Node meta = YAML::LoadFile(filePath);
/*YAML::Node meta = YAML::LoadFile(filePath);
return { return {
ArType::GetFromName(meta["Type"].Scalar()), ArType::GetFromName(meta["Type"].Scalar()),
ArDepthFormat::GetFromName(meta["DepthType"].Scalar()).value_or(ArDepthFormat::UNAVAILABLE), ArDepthFormat::GetFromName(meta["DepthType"].Scalar()).value_or(ArDepthFormat::UNAVAILABLE),
Math::Range<uint8_t>(meta["MinConfidence"].as<uint8_t>(), meta["MaxConfidence"].as<uint8_t>()) Math::Range<uint8_t>(meta["MinConfidence"].as<uint8_t>(), meta["MaxConfidence"].as<uint8_t>())
};*/ };
} }
ArSessionMetadata::ArSessionMetadata(const std::string& dirPath) ArSessionMetadata::ArSessionMetadata(const std::string& dirPath)

4
openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp
View File

@@ -7,7 +7,7 @@
#include "ResourceLoaderAppDirLinux.hpp" #include "ResourceLoaderAppDirLinux.hpp"
#include "Base/Utils.hpp" #include "Base/Utils.hpp"
#include <unistd.h> #include <unistd.h>
#include <limits.h> #include <climits>
#include <iostream> #include <iostream>
namespace OpenVulkano namespace OpenVulkano
@@ -19,7 +19,7 @@ namespace OpenVulkano
std::string FindAppDir() std::string FindAppDir()
{ {
char buffer[PATH_MAX]; char buffer[PATH_MAX];
size_t size; ssize_t size;
if ((size = readlink("/proc/self/exe", buffer, sizeof(buffer))) != -1) if ((size = readlink("/proc/self/exe", buffer, sizeof(buffer))) != -1)
{ {
std::string_view appDirPath(buffer, size); std::string_view appDirPath(buffer, size);