mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 08:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tiny pathnavigation cleanup

Browse Source
This commit is contained in:
Emma Broman
2021-09-06 09:38:39 +02:00
parent 82ecf60ea2
commit 46cb439a3f
2 changed files with 7 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/navigation/path.cpp
+5 -3
View File
@@ -217,11 +217,13 @@ glm::dquat Path::lookAtTargetsRotation(double t) const {
}
// Handle up vector separately
// @TODO (2021-09-06 emmbr) This actually does not interpolate the up vector of the
// camera, but just the "hint" up vector for the lookAt. This leads to fast rolling
// when the up vector gets close to the camera's forward vector. Should be improved
// so any rolling is spread out over the entire motion instead
double tUp = ghoul::sineEaseInOut(t);
glm::dvec3 startUp = _start.rotation() * glm::dvec3(0.0, 1.0, 0.0);
glm::dvec3 endUp = _end.rotation() * glm::dvec3(0.0, 1.0, 0.0);
double tUp = helpers::shiftAndScale(t, t1, t2);
tUp = ghoul::sineEaseInOut(tUp);
glm::dvec3 up = ghoul::interpolateLinear(tUp, startUp, endUp);
return ghoul::lookAtQuaternion(_curve->positionAt(t), lookAtPos, up);
src/navigation/pathnavigator_lua.inl
+2 -45
View File
@@ -67,51 +67,8 @@ int stopPath(lua_State* L) {
return 0;
}
int handleOptionalGoToParameters(lua_State* L, const int startLocation,
const int nArguments,
ghoul::Dictionary& resultInstruction)
{
const bool firstIsNumber = (lua_isnumber(L, startLocation) != 0);
const bool firstIsBool = (lua_isboolean(L, startLocation) != 0);
if (!(firstIsNumber || firstIsBool)) {
const char* msg = lua_pushfstring(
L,
"%s or %s expected, got %s",
lua_typename(L, LUA_TNUMBER),
lua_typename(L, LUA_TBOOLEAN),
luaL_typename(L, -1)
);
return ghoul::lua::luaError(
L, fmt::format("bad argument #{} ({})", startLocation, msg)
);
}
int location = startLocation;
if (firstIsBool) {
const bool useUpFromTarget = (lua_toboolean(L, location) == 1);
resultInstruction.setValue("UseTargetUpDirection", useUpFromTarget);
if (nArguments > startLocation) {
location++;
}
}
if (firstIsNumber || nArguments > startLocation) {
double duration = ghoul::lua::value<double>(L, location);
if (duration <= Epsilon) {
lua_settop(L, 0);
return ghoul::lua::luaError(L, "Duration must be larger than zero.");
}
resultInstruction.setValue("Duration", duration);
}
return 0;
}
int goTo(lua_State* L) {
int nArguments = ghoul::lua::checkArgumentsAndThrow(L, { 1, 3 }, "lua::goTo");
ghoul::lua::checkArgumentsAndThrow(L, { 1, 3 }, "lua::goTo");
auto [nodeIdentifier, useUpFromTargetOrDuration, duration] = ghoul::lua::values<
std::string, std::optional<std::variant<bool, double>>, std::optional<double>
>(L);
@@ -164,7 +121,7 @@ int goTo(lua_State* L) {
}
int goToHeight(lua_State* L) {
int nArguments = ghoul::lua::checkArgumentsAndThrow(L, { 2, 4 }, "lua::goToHeight");
ghoul::lua::checkArgumentsAndThrow(L, { 2, 4 }, "lua::goToHeight");
auto [nodeIdentifier, height, useUpFromTargetOrDuration, duration] =
ghoul::lua::values<
std::string, double, std::optional<std::variant<bool, double>>,