mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-07 21:08:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused speed files from solution

Browse Source
This commit is contained in:
Emma Broman
2021-06-15 16:25:48 +02:00
parent ef180eced3
commit 37483c689e
5 changed files with 0 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/autonavigation/CMakeLists.txt
View File

@@ -31,7 +31,6 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/path.h
${CMAKE_CURRENT_SOURCE_DIR}/pathcurve.h
${CMAKE_CURRENT_SOURCE_DIR}/pathinstruction.h
${CMAKE_CURRENT_SOURCE_DIR}/speedfunction.h
${CMAKE_CURRENT_SOURCE_DIR}/waypoint.h
${CMAKE_CURRENT_SOURCE_DIR}/curves/avoidcollisioncurve.h
${CMAKE_CURRENT_SOURCE_DIR}/curves/zoomoutoverviewcurve.h
@@ -46,7 +45,6 @@ set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/path.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pathcurve.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pathinstruction.cpp
${CMAKE_CURRENT_SOURCE_DIR}/speedfunction.cpp
${CMAKE_CURRENT_SOURCE_DIR}/waypoint.cpp
${CMAKE_CURRENT_SOURCE_DIR}/curves/avoidcollisioncurve.cpp
${CMAKE_CURRENT_SOURCE_DIR}/curves/zoomoutoverviewcurve.cpp

1
modules/autonavigation/path.cpp
View File

@@ -27,7 +27,6 @@
#include <modules/autonavigation/autonavigationmodule.h>
#include <modules/autonavigation/helperfunctions.h>
#include <modules/autonavigation/pathcurve.h>
#include <modules/autonavigation/speedfunction.h>
#include <modules/autonavigation/curves/avoidcollisioncurve.h>
#include <modules/autonavigation/curves/zoomoutoverviewcurve.h>
#include <openspace/engine/globals.h>

1
modules/autonavigation/path.h
View File

@@ -26,7 +26,6 @@
#define __OPENSPACE_MODULE_AUTONAVIGATION___PATH___H__
#include <modules/autonavigation/pathcurve.h>
#include <modules/autonavigation/speedfunction.h>
#include <modules/autonavigation/waypoint.h>
namespace openspace::autonavigation {

100
modules/autonavigation/speedfunction.cpp
View File

@@ -1,100 +0,0 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2021 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/autonavigation/speedfunction.h>
#include <modules/autonavigation/helperfunctions.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/misc/easing.h>
#include <algorithm>
namespace {
constexpr const char* _loggerCat = "SpeedFunction";
} // namespace
namespace openspace::autonavigation {
SpeedFunction::SpeedFunction(Type type) : _type(type) {
initializeIntegratedSum();
}
SpeedFunction::~SpeedFunction() {}
/*
* Get speed at time value in the range [0, duration], scaled according to the constraint
* in eq. 14 in Eberly 2007
* (https://www.geometrictools.com/Documentation/MovingAlongCurveSpecifiedSpeed.pdf)
* OBS! If integrated over the duration for the path it shall match the total length.
*/
double SpeedFunction::scaledValue(double time, double duration, double pathLength) const {
ghoul_assert(time >= 0 && time <= duration, "Time out of range [0, duration]");
double t = std::clamp(time / duration, 0.0, 1.0);
return (pathLength * this->value(t)) / (duration * _integratedSum);
}
void SpeedFunction::initializeIntegratedSum() {
const int steps = 100;
_integratedSum = helpers::simpsonsRule(
0.0,
1.0,
steps,
[this](double t) { return value(t); }
);
}
double SpeedFunction::value(double t) const {
ghoul_assert(t >= 0.0 && t <= 1.0, "Variable t out of range [0,1]");
const double tPeak = 0.5;
double speed = 0.0;
auto applyEasingFunction = [this](double tScaled) {
switch (_type) {
case Type::DampenedQuintic:
return ghoul::cubicEaseInOut(ghoul::quadraticEaseInOut(tScaled));
break;
case Type::DampenedSextic:
return ghoul::cubicEaseInOut(ghoul::cubicEaseInOut(tScaled));
default:
throw ghoul::MissingCaseException();
}
};
// Accelerate
if (t <= tPeak) {
double tScaled = t / tPeak;
speed = applyEasingFunction(tScaled);
}
// Deccelerate
else if (t <= 1.0) {
double tScaled = (t - tPeak) / (1.0 - tPeak);
speed = 1.0 - applyEasingFunction(tScaled);
}
// Avoid zero speed
speed += 0.00001; // TODO: Minimal speed should depend on size of visible object/node
return speed;
}
} // namespace openspace::autonavigation

57
modules/autonavigation/speedfunction.h
View File

@@ -1,57 +0,0 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2021 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___SPEEDFUNCTION___H__
#define __OPENSPACE_MODULE_AUTONAVIGATION___SPEEDFUNCTION___H__
namespace openspace::autonavigation {
// The speed function describing the shape of the speed curve. Values in [0,1]
class SpeedFunction {
public:
enum class Type {
DampenedQuintic,
DampenedSextic
};
SpeedFunction(Type type = Type::DampenedQuintic);
virtual ~SpeedFunction();
double scaledValue(double time, double duration, double pathLength) const;
virtual double value(double t) const;
protected:
void initializeIntegratedSum();
// Store the sum of the function over the duration of the segment,
// so we don't need to recompue it every time we access the speed
double _integratedSum = 0.0;
Type _type;
};
} // namespace openspace::autonavigation
#endif // __OPENSPACE_MODULE_AUTONAVIGATION___SPEEDFUNCTION___H__