Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 19:14:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting

Browse source
This commit is contained in:
Seth Alves 2015-12-16 10:16:06 -08:00
commit 2f17051b1f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/baseball/createBatButton.js
View file

@ -46,7 +46,7 @@
var BAT_MODEL = "atp:c47deaae09cca927f6bc9cca0e8bbe77fc618f8c3f2b49899406a63a59f885cb.fbx"; var BAT_MODEL = "atp:c47deaae09cca927f6bc9cca0e8bbe77fc618f8c3f2b49899406a63a59f885cb.fbx";
var BAT_COLLISION_HULL = "atp:9eafceb7510c41d50661130090de7e0632aa4da236ebda84a0059a4be2130e0c.obj"; 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 = { var batUserData = {
grabbableKey: { grabbableKey: {
@ -69,7 +69,7 @@
velocity: { x: 0, y: 0.05, z: 0}, // workaround for gravity not taking effect on add velocity: { x: 0, y: 0.05, z: 0}, // workaround for gravity not taking effect on add
gravity: { x: 0, y: -9.81, z: 0}, gravity: { x: 0, y: -9.81, z: 0},
rotation: Quat.fromPitchYawRollDegrees(0.0, 0.0, -90.0), rotation: Quat.fromPitchYawRollDegrees(0.0, 0.0, -90.0),
script: SCRIPT_URL, script: Script.resolvePath(SCRIPT_RELATIVE_PATH),
userData: JSON.stringify(batUserData) userData: JSON.stringify(batUserData)
}); });
}; };

2
interface/src/Application.cpp
View file

@ -671,7 +671,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
sendEvent(_glWidget, &mousePress); sendEvent(_glWidget, &mousePress);
_reticleClickPressed = true; _reticleClickPressed = true;
} else { } 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); sendEvent(_glWidget, &mouseRelease);
_reticleClickPressed = false; _reticleClickPressed = false;
} }