From 13c83bb262ca5f788d2ad80d754b49cafd657308 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 15 Dec 2015 17:23:29 -0800 Subject: [PATCH 1/2] update link to bat script in createBatButton.js --- examples/baseball/createBatButton.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/baseball/createBatButton.js b/examples/baseball/createBatButton.js index 75f3dee26e..684e579ee7 100644 --- a/examples/baseball/createBatButton.js +++ b/examples/baseball/createBatButton.js @@ -46,7 +46,7 @@ var BAT_MODEL = "atp:c47deaae09cca927f6bc9cca0e8bbe77fc618f8c3f2b49899406a63a59f885cb.fbx"; var BAT_COLLISION_HULL = "atp:9eafceb7510c41d50661130090de7e0632aa4da236ebda84a0059a4be2130e0c.obj"; - var SCRIPT_URL = "http://rawgit.com/birarda/hifi/baseball/examples/baseball/bat.js" + var SCRIPT_RELATIVE_PATH = "bat.js" var batUserData = { grabbableKey: { @@ -70,7 +70,7 @@ velocity: { x: 0, y: 0.05, z: 0}, // workaround for gravity not taking effect on add gravity: { x: 0, y: -9.81, z: 0}, rotation: Quat.fromPitchYawRollDegrees(0.0, 0.0, -90.0), - script: SCRIPT_URL, + script: Script.resolvePath(SCRIPT_RELATIVE_PATH), userData: JSON.stringify(batUserData) }); }; From 76da3a14acda6f57d88d717adcb4c95ded57dc1e Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 15 Dec 2015 17:58:07 -0800 Subject: [PATCH 2/2] fix bug in simulated left click - make qml menus work --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8ec5506f21..2286c73d6e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -671,7 +671,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : sendEvent(_glWidget, &mousePress); _reticleClickPressed = true; } else { - QMouseEvent mouseRelease(QEvent::MouseButtonRelease, localPos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + QMouseEvent mouseRelease(QEvent::MouseButtonRelease, localPos, Qt::LeftButton, Qt::NoButton, Qt::NoModifier); sendEvent(_glWidget, &mouseRelease); _reticleClickPressed = false; }