diff --git a/openVulkanoCpp/AR/Provider/ArKit/ArTrackingStateConverter.h b/openVulkanoCpp/AR/Provider/ArKit/ArTrackingStateConverter.h index 4ec2fb2..8e6d3bf 100644 --- a/openVulkanoCpp/AR/Provider/ArKit/ArTrackingStateConverter.h +++ b/openVulkanoCpp/AR/Provider/ArKit/ArTrackingStateConverter.h @@ -26,6 +26,7 @@ namespace OpenVulkano::AR::ArKit case ARTrackingStateReasonInitializing: return ArTrackingState::INITIALIZING; case ARTrackingStateReasonInsufficientFeatures: return ArTrackingState::INSUFFICIENT_FEATURES; case ARTrackingStateReasonRelocalizing: return ArTrackingState::RELOCALIZING; + case ARTrackingStateReasonNone: return ArTrackingState::UNKNOWN; } } break; diff --git a/openVulkanoCpp/Host/iOS/SystemInfo.mm b/openVulkanoCpp/Host/iOS/SystemInfo.mm index 9daaec3..e6107c4 100644 --- a/openVulkanoCpp/Host/iOS/SystemInfo.mm +++ b/openVulkanoCpp/Host/iOS/SystemInfo.mm @@ -113,6 +113,7 @@ namespace OpenVulkano case UIUserInterfaceIdiomTV: return DeviceType::TV; case UIUserInterfaceIdiomMac: return DeviceType::PC; case UIUserInterfaceIdiomVision: return DeviceType::VR; + default: break; } return DeviceType::Unknown; } @@ -176,6 +177,7 @@ namespace OpenVulkano case UIDeviceBatteryStateUnplugged: return BatteryState::Unplugged; case UIDeviceBatteryStateCharging: return BatteryState::Charging; case UIDeviceBatteryStateFull: return BatteryState::ChargingFull; + default: break; } return BatteryState::Unavailable; } @@ -200,6 +202,7 @@ namespace OpenVulkano case UIDeviceOrientationLandscapeRight: return DeviceOrientation::LandscapeRight; case UIDeviceOrientationFaceUp: return DeviceOrientation::FaceUp; case UIDeviceOrientationFaceDown: return DeviceOrientation::FaceDown; + default: break; } return DeviceOrientation::Unknown; } @@ -231,6 +234,7 @@ namespace OpenVulkano case UIInterfaceOrientationPortraitUpsideDown: return InterfaceOrientation::PortraitUpsideDown; case UIInterfaceOrientationLandscapeLeft: return InterfaceOrientation::LandscapeLeft; case UIInterfaceOrientationLandscapeRight: return InterfaceOrientation::LandscapeRight; + default: break; } } else @@ -241,6 +245,7 @@ namespace OpenVulkano case DeviceOrientation::PortraitUpsideDown: return InterfaceOrientation::PortraitUpsideDown; case DeviceOrientation::LandscapeLeft: return InterfaceOrientation::LandscapeRight; case DeviceOrientation::LandscapeRight: return InterfaceOrientation::LandscapeLeft; + default: break; } } return InterfaceOrientation::Landscape; diff --git a/openVulkanoCpp/IO/Archive/ArchiveReader.cpp b/openVulkanoCpp/IO/Archive/ArchiveReader.cpp index 770f2a0..1d028fb 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveReader.cpp +++ b/openVulkanoCpp/IO/Archive/ArchiveReader.cpp @@ -213,7 +213,7 @@ namespace OpenVulkano ChkErr(archive_write_disk_set_options(a.get(), ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_ACL | ARCHIVE_EXTRACT_FFLAGS)); ChkErr(archive_write_header(a.get(), entry.get())); - int result = LibArchiveHelper::CopyArchiveData(m_archive, a.get()); + long result = LibArchiveHelper::CopyArchiveData(m_archive, a.get()); ChkErr(result); LibArchiveHelper::CheckError(result, a.get(), m_logger); @@ -283,4 +283,4 @@ namespace OpenVulkano } return std::nullopt; } -} \ No newline at end of file +} diff --git a/openVulkanoCpp/Input/Touch/GestureTap.cpp b/openVulkanoCpp/Input/Touch/GestureTap.cpp index 2080cc0..aefe9f8 100644 --- a/openVulkanoCpp/Input/Touch/GestureTap.cpp +++ b/openVulkanoCpp/Input/Touch/GestureTap.cpp @@ -19,7 +19,7 @@ namespace OpenVulkano::Input int GestureTap::GetTouchCount() const { - return std::count_if(m_touchMap.begin(), m_touchMap.end(), [](const auto& t) { return t.second; }); + return std::count_if(m_touchMap.begin(), m_touchMap.end(), [](const std::pair& t) { return t.second; }); } void GestureTap::Cancel() @@ -84,4 +84,4 @@ namespace OpenVulkano::Input } if (!GetTouchCount()) Reset(); // empty map if no touch } -} \ No newline at end of file +} diff --git a/openVulkanoCpp/Scene/SequenceAnimationController.cpp b/openVulkanoCpp/Scene/SequenceAnimationController.cpp index 989b938..019cecc 100644 --- a/openVulkanoCpp/Scene/SequenceAnimationController.cpp +++ b/openVulkanoCpp/Scene/SequenceAnimationController.cpp @@ -15,9 +15,7 @@ namespace OpenVulkano::Scene const SequenceAnimationController::PoseDurationPair& SequenceAnimationController::GetStep(int index) const { - if(index >= 0 && index < m_steps.size()) - return m_steps[index]; - return PoseDurationPair(); + return m_steps[std::max(0, std::min(index, static_cast(m_steps.size() - 1)))]; } void SequenceAnimationController::SequenceCompletedCallback(SimpleAnimationController *ignored) @@ -127,4 +125,4 @@ namespace OpenVulkano::Scene m_animationController.Reset(); } } -} \ No newline at end of file +}