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

Merge branch 'master' into feature/gamma-correction

Browse Source
This commit is contained in:
Ylva Selling
2022-06-29 04:21:46 -04:00
parent f80cc0cd53 4cb75f5820
commit bcb5c7bd28
197 changed files with 492 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/interaction/joystickcamerastates.cpp
+5 -5
View File
@@ -238,7 +238,7 @@ void JoystickCameraStates::setAxisMapping(std::string joystickName,
}
// If the axis index is too big for the vector then resize it to have room
if (axis >= joystickCameraState->axisMapping.size()) {
if (axis >= static_cast<int>(joystickCameraState->axisMapping.size())) {
joystickCameraState->axisMapping.resize(axis + 1);
joystickCameraState->prevAxisValues.resize(axis + 1);
}
@@ -266,7 +266,7 @@ void JoystickCameraStates::setAxisMappingProperty(std::string joystickName,
}
// If the axis index is too big for the vector then resize it to have room
if (axis >= joystickCameraState->axisMapping.size()) {
if (axis >= static_cast<int>(joystickCameraState->axisMapping.size())) {
joystickCameraState->axisMapping.resize(axis + 1);
joystickCameraState->prevAxisValues.resize(axis + 1);
}
@@ -292,7 +292,7 @@ JoystickCameraStates::AxisInformation JoystickCameraStates::axisMapping(
return dummy;
}
if (axis >= joystick->axisMapping.size()) {
if (axis >= static_cast<int>(joystick->axisMapping.size())) {
JoystickCameraStates::AxisInformation dummy;
return dummy;
}
@@ -309,7 +309,7 @@ void JoystickCameraStates::setDeadzone(const std::string& joystickName, int axis
}
// If the axis index is too big for the vector then resize it to have room
if (axis >= joystickCameraState->axisMapping.size()) {
if (axis >= static_cast<int>(joystickCameraState->axisMapping.size())) {
joystickCameraState->axisMapping.resize(axis + 1);
joystickCameraState->prevAxisValues.resize(axis + 1);
}
@@ -323,7 +323,7 @@ float JoystickCameraStates::deadzone(const std::string& joystickName, int axis)
return 0.f;
}
if (axis >= joystick->axisMapping.size()) {
if (axis >= static_cast<int>(joystick->axisMapping.size())) {
return 0.f;
}
src/interaction/sessionrecording.cpp
+72 -33
View File
@@ -271,7 +271,7 @@ void SessionRecording::stopRecording() {
if (_state == SessionState::Recording) {
// Add all property baseline scripts to the beginning of the recording file
datamessagestructures::ScriptMessage smTmp;
for (TimelineEntry initPropScripts : _keyframesSavePropertiesBaseline_timeline) {
for (TimelineEntry& initPropScripts : _keyframesSavePropertiesBaseline_timeline) {
if (initPropScripts.keyframeType == RecordedType::Script) {
smTmp._script = _keyframesSavePropertiesBaseline_scripts
[initPropScripts.idxIntoKeyframeTypeArray];
@@ -1514,7 +1514,7 @@ bool SessionRecording::playbackScript() {
_playbackLineNum
);
success &= checkIfScriptUsesScenegraphNode(kf._script);
checkIfScriptUsesScenegraphNode(kf._script);
if (success) {
success = addKeyframe(
@@ -1534,61 +1534,100 @@ void SessionRecording::populateListofLoadedSceneGraphNodes() {
}
}
bool SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
void SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
if (s.rfind(scriptReturnPrefix, 0) == 0) {
s.erase(0, scriptReturnPrefix.length());
}
// This works for both setPropertyValue and setPropertyValueSingle
if (s.rfind("openspace.setPropertyValue", 0) == 0) {
std::string found;
if (s.find("(\"") != std::string::npos) {
std::string subj = s.substr(s.find("(\"") + 2);
checkForScenegraphNodeAccess_Scene(subj, found);
checkForScenegraphNodeAccess_Nav(subj, found);
if (found.length() > 0) {
auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), found);
bool containsSetPropertyVal = (s.rfind("openspace.setPropertyValue", 0) == 0);
bool containsParensStart = (s.find("(") != std::string::npos);
if (containsSetPropertyVal && containsParensStart) {
std::string subjectOfSetProp = isolateTermFromQuotes(s.substr(s.find("(") + 1));
if (checkForScenegraphNodeAccessNav(subjectOfSetProp)) {
size_t commaPos = s.find(",");
std::string navNode = isolateTermFromQuotes(s.substr(commaPos + 1));
if (navNode != "nil") {
std::vector<std::string>::iterator it =
std::find(_loadedNodes.begin(), _loadedNodes.end(), navNode);
if (it == _loadedNodes.end()) {
LERROR(fmt::format(
"Playback file requires scenegraph node '{}', which is "
"not currently loaded", found
LWARNING(fmt::format(
"Playback file contains a property setting of navigation using"
" scenegraph node '{}', which is not currently loaded", navNode
));
}
}
}
else if (checkForScenegraphNodeAccessScene(subjectOfSetProp)) {
std::string found = extractScenegraphNodeFromScene(subjectOfSetProp);
if (!found.empty()) {
std::vector<properties::Property*> matchHits =
global::renderEngine->scene()->propertiesMatchingRegex(
subjectOfSetProp
);
if (matchHits.empty()) {
LWARNING(fmt::format(
"Playback file contains a property setting of scenegraph"
" node '{}', which is not currently loaded", found
));
return false;
}
}
}
}
return true;
}
void SessionRecording::checkForScenegraphNodeAccess_Scene(std::string& s,
std::string& result)
{
bool SessionRecording::checkForScenegraphNodeAccessScene(std::string& s) {
const std::string scene = "Scene.";
auto posScene = s.find(scene);
return (s.find(scene) != std::string::npos);
}
std::string SessionRecording::extractScenegraphNodeFromScene(std::string& s) {
const std::string scene = "Scene.";
std::string extracted;
size_t posScene = s.find(scene);
if (posScene != std::string::npos) {
auto posDot = s.find(".", posScene + scene.length() + 1);
size_t posDot = s.find(".", posScene + scene.length() + 1);
if (posDot > posScene && posDot != std::string::npos) {
result = s.substr(posScene + scene.length(), posDot
- (posScene + scene.length()));
extracted = s.substr(posScene + scene.length(), posDot -
(posScene + scene.length()));
}
}
return extracted;
}
void SessionRecording::checkForScenegraphNodeAccess_Nav(std::string& s,
std::string& result)
{
bool SessionRecording::checkForScenegraphNodeAccessNav(std::string& navTerm) {
const std::string nextTerm = "NavigationHandler.OrbitalNavigator.";
auto posNav = s.find(nextTerm);
size_t posNav = navTerm.find(nextTerm);
if (posNav != std::string::npos) {
for (std::string accessName : _navScriptsUsingNodes) {
if (s.substr(posNav + nextTerm.length()).rfind(accessName) == 0) {
std::string postName = s.substr(posNav + nextTerm.length()
+ accessName.length() + 2);
eraseSpacesFromString(postName);
result = getNameFromSurroundingQuotes(postName);
}
if (navTerm.find(accessName) != std::string::npos) {
return true;
}
}
}
return false;
}
std::string SessionRecording::isolateTermFromQuotes(std::string s) {
//Remove any leading spaces
while (s.front() == ' ') {
s.erase(0, 1);
}
const std::string possibleQuotes = "\'\"[]";
while (possibleQuotes.find(s.front()) != std::string::npos) {
s.erase(0, 1);
}
for (char q : possibleQuotes) {
if (s.find(q) != std::string::npos) {
s = s.substr(0, s.find(q));
return s;
}
}
//If no quotes found, remove other possible characters from end
std::string unwantedChars = " );";
while (unwantedChars.find(s.back()) != std::string::npos) {
s.pop_back();
}
return s;
}
void SessionRecording::eraseSpacesFromString(std::string& s) {
src/navigation/orbitalnavigator.cpp
-1
View File
@@ -312,7 +312,6 @@ OrbitalNavigator::IdleBehavior::IdleBehavior()
, defaultBehavior(IdleBehaviorInfo)
{
addProperty(apply);
using Behavior = IdleBehavior::Behavior;
defaultBehavior.addOptions({
{ static_cast<int>(Behavior::Orbit), IdleKeyOrbit },
{ static_cast<int>(Behavior::OrbitAtConstantLat), IdleKeyOrbitAtConstantLat },
src/rendering/luaconsole.cpp
+1 -2
View File
@@ -781,10 +781,9 @@ void LuaConsole::render() {
}
// Computes the location for right justified text on the same y height as the entry
auto locationForRightJustifiedText = [this, res](const std::string& text) {
auto locationForRightJustifiedText = [this, res, dpi](const std::string& text) {
using namespace ghoul::fontrendering;
const float dpi = global::windowDelegate->osDpiScaling();
const glm::vec2 loc = glm::vec2(
EntryFontSize * dpi / 2.f,
res.y - _currentHeight + EntryFontSize * dpi
src/scene/profile.cpp
+33 -1
View File
@@ -490,7 +490,39 @@ void from_json(const nlohmann::json& j, version10::Keybinding& v) {
{ "key", "documentation", "name", "gui_path", "is_local", "script" }
);
v.key = stringToKey(j.at("key").get<std::string>());
std::string key = j.at("key").get<std::string>();
if (key == "KP0") {
key = "KP_0";
}
else if (key == "KP1") {
key = "KP_1";
}
else if (key == "KP2") {
key = "KP_2";
}
else if (key == "KP3") {
key = "KP_3";
}
else if (key == "KP4") {
key = "KP_4";
}
else if (key == "KP5") {
key = "KP_5";
}
else if (key == "KP6") {
key = "KP_6";
}
else if (key == "KP7") {
key = "KP_7";
}
else if (key == "KP8") {
key = "KP_8";
}
else if (key == "KP9") {
key = "KP_9";
}
v.key = stringToKey(key);
j["documentation"].get_to(v.documentation);
j["name"].get_to(v.name);
j["gui_path"].get_to(v.guiPath);
src/scene/scene.cpp
+6
View File
@@ -812,6 +812,12 @@ PropertyValueType Scene::propertyValueType(const std::string& value) {
}
}
std::vector<properties::Property*> Scene::propertiesMatchingRegex(
std::string propertyString)
{
return findMatchesInAllProperties(propertyString, allProperties(), "");
}
scripting::LuaLibrary Scene::luaLibrary() {
return {
"",
src/scene/scene_lua.inl
+40 -14
View File
@@ -81,21 +81,17 @@ openspace::properties::PropertyOwner* findPropertyOwnerWithMatchingGroupTag(T* p
return tagMatchOwner;
}
void applyRegularExpression(lua_State* L, const std::string& regex,
const std::vector<openspace::properties::Property*>& properties,
double interpolationDuration,
const std::string& groupName,
ghoul::EasingFunction easingFunction)
std::vector<openspace::properties::Property*> findMatchesInAllProperties(
const std::string& regex,
const std::vector<openspace::properties::Property*>& properties,
const std::string& groupName)
{
using namespace openspace;
using ghoul::lua::errorLocation;
using ghoul::lua::luaTypeToString;
std::vector<properties::Property*> matches;
const bool isGroupMode = !groupName.empty();
bool isLiteral = false;
const int type = lua_type(L, -1);
// Extract the property and node name to be searched for from regex
std::string propertyName;
std::string nodeName;
@@ -107,25 +103,25 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
// If none then malformed regular expression
if (propertyName.empty() && nodeName.empty()) {
LERRORC(
"applyRegularExpression",
"findMatchesInAllProperties",
fmt::format(
"Malformed regular expression: '{}': Empty both before and after '*'",
regex
)
);
return;
return matches;
}
// Currently do not support several wildcards
if (regex.find_first_of("*", wildPos + 1) != std::string::npos) {
LERRORC(
"applyRegularExpression",
"findMatchesInAllProperties",
fmt::format(
"Malformed regular expression: '{}': Currently only one '*' is "
"supported", regex
)
);
return;
return matches;
}
}
// Literal or tag
@@ -146,7 +142,7 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
if (isLiteral && id != propertyName) {
continue;
}
else if (!propertyName.empty()){
else if (!propertyName.empty()) {
size_t propertyPos = id.find(propertyName);
if (propertyPos != std::string::npos) {
// Check that the propertyName fully matches the property in id
@@ -192,6 +188,36 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
continue;
}
}
matches.push_back(prop);
}
return matches;
}
void applyRegularExpression(lua_State* L, const std::string& regex,
const std::vector<openspace::properties::Property*>& properties,
double interpolationDuration,
const std::string& groupName,
ghoul::EasingFunction easingFunction)
{
using namespace openspace;
using ghoul::lua::errorLocation;
using ghoul::lua::luaTypeToString;
const bool isGroupMode = !groupName.empty();
bool isLiteral = false;
const int type = lua_type(L, -1);
std::vector<properties::Property*> matchingProps = findMatchesInAllProperties(
regex,
properties,
groupName
);
// Stores whether we found at least one matching property. If this is false at the
// end of the loop, the property name regex was probably misspelled.
bool foundMatching = false;
for (properties::Property* prop : matchingProps) {
// Check that the types match
if (type != prop->typeLua()) {