Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:27:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

trying to fix overlay rotation

Browse source
This commit is contained in:
SamGondelman 2019-02-25 09:48:41 -08:00
parent 37720e9daa
commit 8058ad884e
2 changed files with 17 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
interface/src/ui/overlays/Overlays.cpp
View file

@ -295,14 +295,14 @@ QString Overlays::overlayToEntityType(const QString& type) {
} \ } \
} }
static QHash<QUuid, glm::quat> savedRotations = QHash<QUuid, glm::quat>(); static QHash<QUuid, std::pair<glm::quat, bool>> savedRotations = QHash<QUuid, std::pair<glm::quat, bool>>();
EntityItemProperties Overlays::convertOverlayToEntityProperties(QVariantMap& overlayProps, const QString& type, bool add, const QUuid& id) { EntityItemProperties Overlays::convertOverlayToEntityProperties(QVariantMap& overlayProps, const QString& type, bool add, const QUuid& id) {
glm::quat rotation; std::pair<glm::quat, bool> rotation;
return convertOverlayToEntityProperties(overlayProps, rotation, type, add, id); return convertOverlayToEntityProperties(overlayProps, rotation, type, add, id);
} }
EntityItemProperties Overlays::convertOverlayToEntityProperties(QVariantMap& overlayProps, glm::quat& rotationToSave, const QString& type, bool add, const QUuid& id) { EntityItemProperties Overlays::convertOverlayToEntityProperties(QVariantMap& overlayProps, std::pair<glm::quat, bool>& rotationToSave, const QString& type, bool add, const QUuid& id) {
overlayProps["type"] = type; overlayProps["type"] = type;
SET_OVERLAY_PROP_DEFAULT(alpha, 0.7); SET_OVERLAY_PROP_DEFAULT(alpha, 0.7);
@ -559,65 +559,33 @@ EntityItemProperties Overlays::convertOverlayToEntityProperties(QVariantMap& ove
SET_OVERLAY_PROP_DEFAULT(textures, PathUtils::resourcesUrl() + "images/whitePixel.png"); SET_OVERLAY_PROP_DEFAULT(textures, PathUtils::resourcesUrl() + "images/whitePixel.png");
} }
{ // Overlays did this conversion for rotation
auto iter = overlayProps.find("rotation");
if (iter != overlayProps.end() && !overlayProps.contains("localRotation")) {
QUuid parentID;
{
auto iter = overlayProps.find("parentID");
if (iter != overlayProps.end()) {
parentID = iter.value().toUuid();
} else if (!add) {
EntityPropertyFlags desiredProperties;
desiredProperties += PROP_PARENT_ID;
parentID = DependencyManager::get<EntityScriptingInterface>()->getEntityProperties(id, desiredProperties).getParentID();
}
}
int parentJointIndex = -1;
{
auto iter = overlayProps.find("parentJointIndex");
if (iter != overlayProps.end()) {
parentJointIndex = iter.value().toInt();
} else if (!add) {
EntityPropertyFlags desiredProperties;
desiredProperties += PROP_PARENT_JOINT_INDEX;
parentJointIndex = DependencyManager::get<EntityScriptingInterface>()->getEntityProperties(id, desiredProperties).getParentJointIndex();
}
}
glm::quat rotation = quatFromVariant(iter.value());
bool success = false;
glm::quat localRotation = SpatiallyNestable::worldToLocal(rotation, parentID, parentJointIndex, false, success);
if (success) {
overlayProps["rotation"] = quatToVariant(localRotation);
}
}
}
if (type == "Text" || type == "Image" || type == "Grid" || type == "Web") { if (type == "Text" || type == "Image" || type == "Grid" || type == "Web") {
glm::quat originalRotation = ENTITY_ITEM_DEFAULT_ROTATION; glm::quat originalRotation = ENTITY_ITEM_DEFAULT_ROTATION;
bool local = false;
{ {
auto iter = overlayProps.find("rotation"); auto iter = overlayProps.find("rotation");
if (iter != overlayProps.end()) { if (iter != overlayProps.end()) {
originalRotation = quatFromVariant(iter.value()); originalRotation = quatFromVariant(iter.value());
local = false;
} else { } else {
iter = overlayProps.find("localRotation"); iter = overlayProps.find("localRotation");
if (iter != overlayProps.end()) { if (iter != overlayProps.end()) {
originalRotation = quatFromVariant(iter.value()); originalRotation = quatFromVariant(iter.value());
local = true;
} else if (!add) { } else if (!add) {
auto iter2 = savedRotations.find(id); auto iter2 = savedRotations.find(id);
if (iter2 != savedRotations.end()) { if (iter2 != savedRotations.end()) {
originalRotation = iter2.value(); originalRotation = iter2.value().first;
local = iter2.value().second;
} }
} }
} }
} }
if (!add) { if (!add) {
savedRotations[id] = originalRotation; savedRotations[id] = { originalRotation, local };
} else { } else {
rotationToSave = originalRotation; rotationToSave = { originalRotation, local };
} }
glm::vec3 dimensions = ENTITY_ITEM_DEFAULT_DIMENSIONS; glm::vec3 dimensions = ENTITY_ITEM_DEFAULT_DIMENSIONS;
@ -648,7 +616,11 @@ EntityItemProperties Overlays::convertOverlayToEntityProperties(QVariantMap& ove
rotation = glm::angleAxis((float)M_PI, rotation * Vectors::UP) * rotation; rotation = glm::angleAxis((float)M_PI, rotation * Vectors::UP) * rotation;
} }
overlayProps["localRotation"] = quatToVariant(rotation); if (local) {
overlayProps["localRotation"] = quatToVariant(rotation);
} else {
overlayProps["rotation"] = quatToVariant(rotation);
}
overlayProps["dimensions"] = vec3toVariant(glm::abs(dimensions)); overlayProps["dimensions"] = vec3toVariant(glm::abs(dimensions));
} }
} }
@ -826,7 +798,7 @@ QUuid Overlays::addOverlay(const QString& type, const QVariant& properties) {
if (type == "rectangle3d") { if (type == "rectangle3d") {
propertyMap["shape"] = "Quad"; propertyMap["shape"] = "Quad";
} }
glm::quat rotationToSave; std::pair<glm::quat, bool> rotationToSave;
QUuid id = DependencyManager::get<EntityScriptingInterface>()->addEntityInternal(convertOverlayToEntityProperties(propertyMap, rotationToSave, entityType, true), entity::HostType::LOCAL); QUuid id = DependencyManager::get<EntityScriptingInterface>()->addEntityInternal(convertOverlayToEntityProperties(propertyMap, rotationToSave, entityType, true), entity::HostType::LOCAL);
if (entityType == "Text" || entityType == "Image" || entityType == "Grid" || entityType == "Web") { if (entityType == "Text" || entityType == "Image" || entityType == "Grid" || entityType == "Web") {
savedRotations[id] = rotationToSave; savedRotations[id] = rotationToSave;

2
interface/src/ui/overlays/Overlays.h
View file

@ -729,7 +729,7 @@ private:
QVariantMap convertEntityToOverlayProperties(const EntityItemProperties& entityProps); QVariantMap convertEntityToOverlayProperties(const EntityItemProperties& entityProps);
EntityItemProperties convertOverlayToEntityProperties(QVariantMap& overlayProps, const QString& type, bool add, const QUuid& id); EntityItemProperties convertOverlayToEntityProperties(QVariantMap& overlayProps, const QString& type, bool add, const QUuid& id);
EntityItemProperties convertOverlayToEntityProperties(QVariantMap& overlayProps, glm::quat& rotationToSave, const QString& type, bool add, const QUuid& id = QUuid()); EntityItemProperties convertOverlayToEntityProperties(QVariantMap& overlayProps, std::pair<glm::quat, bool>& rotationToSave, const QString& type, bool add, const QUuid& id = QUuid());
private slots: private slots:
void mousePressPointerEvent(const QUuid& id, const PointerEvent& event); void mousePressPointerEvent(const QUuid& id, const PointerEvent& event);