Silence some warnings

This commit is contained in:
Georg Hagen
2024-07-09 13:43:48 +02:00
parent b4619be858
commit 268be2ca60
5 changed files with 12 additions and 8 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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<true>(m_archive, a.get());
long result = LibArchiveHelper::CopyArchiveData<true>(m_archive, a.get());
ChkErr(result);
LibArchiveHelper::CheckError(result, a.get(), m_logger);
@@ -283,4 +283,4 @@ namespace OpenVulkano
}
return std::nullopt;
}
}
}

View File

@@ -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<TouchId, bool>& t) { return t.second; });
}
void GestureTap::Cancel()
@@ -84,4 +84,4 @@ namespace OpenVulkano::Input
}
if (!GetTouchCount()) Reset(); // empty map if no touch
}
}
}

View File

@@ -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<int>(m_steps.size() - 1)))];
}
void SequenceAnimationController::SequenceCompletedCallback(SimpleAnimationController *ignored)
@@ -127,4 +125,4 @@ namespace OpenVulkano::Scene
m_animationController.Reset();
}
}
}
}