Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 22:16:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

working on polylines

Browse source
This commit is contained in:
SamGondelman 2019-01-28 10:52:30 -08:00
parent 70b1e17a8c
commit e2bdac1bdd
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -362,7 +362,7 @@ EntityItemProperties Overlays::convertOverlayToEntityProperties(QVariantMap& ove
} }
} }
// FIXME: // FIXME:
//overlayProps["rotation"] = quatToVariant(glm::angleAxis((float)M_PI_2, Vectors::RIGHT) * rotation); overlayProps["rotation"] = quatToVariant(glm::angleAxis(-(float)M_PI_2, rotation * Vectors::RIGHT) * rotation);
} }
{ {
@ -427,7 +427,7 @@ EntityItemProperties Overlays::convertOverlayToEntityProperties(QVariantMap& ove
RENAME_PROP(startPoint, p1); RENAME_PROP(startPoint, p1);
RENAME_PROP(start, p1); RENAME_PROP(start, p1);
RENAME_PROP(endPoint, p2); RENAME_PROP(endPoint, p2);
RENAME_PROP(end, p1); RENAME_PROP(end, p2);
RENAME_PROP(p1, position); RENAME_PROP(p1, position);
RENAME_PROP_CONVERT(p1, p1, [](const QVariant& v) { return vec3toVariant(glm::vec3(0.0f)); }); RENAME_PROP_CONVERT(p1, p1, [](const QVariant& v) { return vec3toVariant(glm::vec3(0.0f)); });
@ -471,6 +471,15 @@ EntityItemProperties Overlays::convertOverlayToEntityProperties(QVariantMap& ove
overlayProps["strokeWidths"] = widths; overlayProps["strokeWidths"] = widths;
} }
} }
RENAME_PROP_CONVERT(glow, glow, [](const QVariant& v) { return v.toFloat() > 0.0f ? true : false; });
SET_OVERLAY_PROP_DEFAULT(faceCamera, true);
{
QVariantList normals;
normals.append(vec3toVariant(Vectors::UP));
normals.append(vec3toVariant(Vectors::UP));
SET_OVERLAY_PROP_DEFAULT(normals, normals);
}
} }
QScriptEngine scriptEngine; QScriptEngine scriptEngine;