mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-05 19:19:39 -06:00
* Remove Escape keybind; move gui keybind to F2 * Clear up keybinds properly * Workaround for CEF focus bug * Add TODO comment * Guard against null ptr dereferencing * Remove shift tab * add additional keyboard mapping from glfw to cef * Change dashboards to make prototype for first user test * add mission added/removed event, disptached when a mission has been loaded/unloaded * send missions as map instaed of array, rename missionName -> name * Set keybind for toggling overlays to shift+f2 * Remove property for showing the title in the gui skybrowser module * Remove default setting for skybrowser * First implementation of setting the ui panel visibility from the launcher * Add profile topic * Coding style adjustment * Add markNodes to the profiletopic * Change format of additional data of options in engine * Address PR comments * map escape key from glfw to cef correctly * fix issue with "Enter" key not working on buttons and other input fields in CEF * Add test for new profile version * Send skybrowser data although we are outside the solar system * Update webgui to new ui * Add name to profile topic * Add cef variable to javascript context for when browser is in cef * Use camelcase for cef variable * Rewrite shortcuts topic to ActionKeybind and pass data in a better way (#3590) * Rewrite shortcuts topic to ActionKeybind and pass data in a better way * Fix strange error with file structure * Address PR comments * Address PR comments * Address PR comments * Make numbers in asset file prettier * Rename name to identifier for missions event * Clean up browser code * Update UI hash (to fix the actions panel not working) And update outdated comment. The backend is not part of this * Feature/notify meta data change (#3605) * Add notifyMetaDataChangeListener to topic * First round of clean up the data passing * Convert from string to json for metadata * Update additional data to json * Use nlohmann::json for additional data * Pass meta data in new structure to topics * Remove meta data method * Fix mistake in merge * Update src/properties/property.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * remove TODO comment that will be fixed by this PR * Address PR comments --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Emma Broman <emma.broman@liu.se> * Address PR comment * Remove function for setting the endpoint * Update frontend hash * Remove enabled property from exoplanets module * Remove enabled property from skybrowser module * Update default UI panels json * Remove setting of enabled properties for skybrowser and exoplanets * Update gui hash * Auto format json --------- Co-authored-by: Andreas Engberg <adde.engberg@gmail.com> Co-authored-by: Emma Broman <emma.broman@liu.se> Co-authored-by: Alexander Bock <alexander.bock@liu.se> Co-authored-by: Alexander Bock <mail@alexanderbock.eu> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
158 lines
6.3 KiB
C++
158 lines
6.3 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2025 *
|
|
* *
|
|
* 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 <string_view>
|
|
|
|
namespace {
|
|
constexpr std::string_view MinimumValueKey = "min";
|
|
constexpr std::string_view MaximumValueKey = "max";
|
|
constexpr std::string_view SteppingValueKey = "step";
|
|
constexpr std::string_view ExponentValueKey = "exponent";
|
|
|
|
std::string luaToJson(std::string luaValue) {
|
|
if (luaValue[0] == '{') {
|
|
luaValue.replace(0, 1, "[");
|
|
}
|
|
if (luaValue[luaValue.size() - 1] == '}') {
|
|
luaValue.replace(luaValue.size() - 1, 1, "]");
|
|
}
|
|
return luaValue;
|
|
}
|
|
} // namespace
|
|
|
|
namespace openspace::properties {
|
|
|
|
template <typename T>
|
|
NumericalProperty<T>::NumericalProperty(Property::PropertyInfo info, T value,
|
|
T minimumValue, T maximumValue, T steppingValue,
|
|
float exponent)
|
|
: TemplateProperty<T>(std::move(info), std::move(value))
|
|
, _minimumValue(std::move(minimumValue))
|
|
, _maximumValue(std::move(maximumValue))
|
|
, _stepping(std::move(steppingValue))
|
|
, _exponent(exponent)
|
|
{}
|
|
|
|
template <typename T>
|
|
T NumericalProperty<T>::minValue() const {
|
|
return _minimumValue;
|
|
}
|
|
|
|
template <typename T>
|
|
void NumericalProperty<T>::setMinValue(T value) {
|
|
_minimumValue = std::move(value);
|
|
Property::notifyMetaDataChangeListeners();
|
|
}
|
|
|
|
template <typename T>
|
|
T NumericalProperty<T>::maxValue() const {
|
|
return _maximumValue;
|
|
}
|
|
|
|
template <typename T>
|
|
void NumericalProperty<T>::setMaxValue(T value) {
|
|
_maximumValue = std::move(value);
|
|
Property::notifyMetaDataChangeListeners();
|
|
}
|
|
|
|
template <typename T>
|
|
T NumericalProperty<T>::steppingValue() const {
|
|
return _stepping;
|
|
}
|
|
|
|
template <typename T>
|
|
void NumericalProperty<T>::setSteppingValue(T value) {
|
|
_stepping = std::move(value);
|
|
Property::notifyMetaDataChangeListeners();
|
|
}
|
|
|
|
template <typename T>
|
|
float NumericalProperty<T>::exponent() const {
|
|
return _exponent;
|
|
}
|
|
|
|
template <typename T>
|
|
void NumericalProperty<T>::setExponent(float exponent) {
|
|
ghoul_assert(std::abs(exponent) > 0.f, "Exponent for property input cannot be zero");
|
|
|
|
if (!std::is_unsigned<T>::value) {
|
|
auto isValidRange = [](const T& minValue, const T& maxValue) {
|
|
if constexpr (ghoul::isGlmVector<T>() || ghoul::isGlmMatrix<T>()) {
|
|
return glm::all(glm::greaterThanEqual(minValue, T(0))) &&
|
|
glm::all(glm::greaterThanEqual(maxValue, T(0)));
|
|
}
|
|
else {
|
|
return (minValue >= T(0) && maxValue >= T(0));
|
|
}
|
|
};
|
|
|
|
// While the exponential slider does not support ranges with negative values,
|
|
// prevent setting the exponent for such ranges
|
|
// @TODO (2021-06-30, emmbr), remove this check when no longer needed
|
|
ghoul_assert(
|
|
isValidRange(_minimumValue, _maximumValue),
|
|
"Setting exponent for properties with negative values in [min, max] "
|
|
"range is not yet supported"
|
|
);
|
|
if (!isValidRange(_minimumValue, _maximumValue)) {
|
|
exponent = 1.f;
|
|
}
|
|
}
|
|
|
|
_exponent = exponent;
|
|
Property::notifyMetaDataChangeListeners();
|
|
}
|
|
|
|
template <typename T>
|
|
nlohmann::json NumericalProperty<T>::generateAdditionalJsonDescription() const {
|
|
nlohmann::json result = {
|
|
{ MinimumValueKey, nlohmann::json::parse(luaToJson(ghoul::to_string(_minimumValue))) },
|
|
{ MaximumValueKey, nlohmann::json::parse(luaToJson(ghoul::to_string(_maximumValue))) },
|
|
{ SteppingValueKey, nlohmann::json::parse(luaToJson(ghoul::to_string(_stepping))) },
|
|
{ ExponentValueKey, nlohmann::json::parse(luaToJson(ghoul::to_string(_exponent))) }
|
|
};
|
|
return result;
|
|
}
|
|
|
|
template <typename T>
|
|
void NumericalProperty<T>::setLuaInterpolationTarget(lua_State* state) {
|
|
T targetValue = toValue(state);
|
|
_interpolationStart = TemplateProperty<T>::_value;
|
|
_interpolationEnd = std::move(targetValue);
|
|
}
|
|
|
|
template <typename T>
|
|
void NumericalProperty<T>::interpolateValue(float t,
|
|
ghoul::EasingFunc<float> easingFunction)
|
|
{
|
|
if (easingFunction) {
|
|
t = easingFunction(t);
|
|
}
|
|
TemplateProperty<T>::setValue(static_cast<T>(
|
|
glm::mix(_interpolationStart, _interpolationEnd, t)
|
|
));
|
|
}
|
|
|
|
} // namespace openspace::properties
|