mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-28 07:59:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add error handling

Browse Source
This commit is contained in:
Malin Ejdbo
2021-03-22 10:01:16 +01:00
parent f1d66b1a74
commit 0a9af8f0ed
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: d7db2ad6be...b2b7331fb4

48
modules/base/rendering/renderablemodel.cpp
View File

@@ -262,10 +262,6 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
}
}
if (p.animationStartTime.has_value()) {
_animationStart = *p.animationStartTime;
}
if (std::holds_alternative<std::string>(p.geometryFile)) {
// Handle single file
std::string file;
@@ -323,12 +319,32 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
}*/
}
if (p.animationStartTime.has_value()) {
if (!_geometry->hasAnimation()) {
LWARNING("Animation start time given to model without animation");
}
_animationStart = *p.animationStartTime;
_enableAnimation = true;
}
if (p.enableAnimation.has_value()) {
_enableAnimation = *p.enableAnimation;
_geometry->enableAnimation(_enableAnimation.value());
if (!_geometry->hasAnimation()) {
LWARNING("Attempting to enable animation for a model that does not have any");
}
else if (*p.enableAnimation &&_animationStart == "") {
LWARNING("Cannot enable animation without a given start time");
}
else {
_enableAnimation = *p.enableAnimation;
_geometry->enableAnimation(_enableAnimation.value());
}
}
if (p.animationTimeScale.has_value()) {
if (!_geometry->hasAnimation()) {
LWARNING("Animation time scale given to model without animation");
}
if (std::holds_alternative<float>(*p.animationTimeScale)) {
_geometry->setTimeScale(std::get<float>(*p.animationTimeScale));
}
@@ -348,6 +364,10 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
}
if (p.animationMode.has_value()) {
if (!_geometry->hasAnimation()) {
LWARNING("Animation mode given to model without animation");
}
switch (*p.animationMode) {
case Parameters::AnimationMode::LoopFromStart:
_animationMode = AnimationMode::LoopFromStart;
@@ -421,12 +441,16 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
});
_enableAnimation.onChange([this]() {
if (_enableAnimation.value() && !_geometry->hasAnimation()) {
if (!_geometry->hasAnimation()) {
LWARNING("Attempting to enable animation for a model that does not have any");
}
else if (_enableAnimation.value() && _animationStart == "") {
LWARNING("Cannot enable animation without a given start time");
_enableAnimation = false;
}
_geometry->enableAnimation(_enableAnimation.value());
else {
_geometry->enableAnimation(_enableAnimation.value());
}
});
@@ -461,6 +485,10 @@ bool RenderableModel::isReady() const {
void RenderableModel::initialize() {
ZoneScoped
if (_geometry->hasAnimation() && _enableAnimation.value() && _animationStart == "") {
LWARNING("Model with animation not given any start time");
}
for (const std::unique_ptr<LightSource>& ls : _lightSources) {
ls->initialize();
}
@@ -610,7 +638,7 @@ void RenderableModel::update(const UpdateData& data) {
ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
}
if (_geometry->hasAnimation()) {
if (_geometry->hasAnimation() && _animationStart != "") {
double realtiveTime;
double now = data.time.j2000Seconds();
double startTime = data.time.convertTime(_animationStart);

2
modules/base/rendering/renderablemodel.h
View File

@@ -80,7 +80,7 @@ private:
std::unique_ptr<ghoul::modelgeometry::ModelGeometry> _geometry;
bool _forceRenderInvisible = false;
bool _notifyInvisibleDropped = true;
std::string _animationStart;
std::string _animationStart = "";
AnimationMode _animationMode;
properties::BoolProperty _enableAnimation;