Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 17:30:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab

Browse source
This commit is contained in:
Seth Alves 2017-09-25 12:31:55 -07:00
commit e09d82c8f2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/shared/src/PointerEvent.cpp
View file

@ -77,13 +77,13 @@ QScriptValue PointerEvent::toScriptValue(QScriptEngine* engine, const PointerEve
normal.setProperty("x", event._normal.x); normal.setProperty("x", event._normal.x);
normal.setProperty("y", event._normal.y); normal.setProperty("y", event._normal.y);
normal.setProperty("z", event._normal.z); normal.setProperty("z", event._normal.z);
obj.setProperty("pos3D", normal); obj.setProperty("normal", normal);
QScriptValue direction = engine->newObject(); QScriptValue direction = engine->newObject();
direction.setProperty("x", event._direction.x); direction.setProperty("x", event._direction.x);
direction.setProperty("y", event._direction.y); direction.setProperty("y", event._direction.y);
direction.setProperty("z", event._direction.z); direction.setProperty("z", event._direction.z);
obj.setProperty("pos3D", direction); obj.setProperty("direction", direction);
bool isPrimaryButton = false; bool isPrimaryButton = false;
bool isSecondaryButton = false; bool isSecondaryButton = false;