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

Merge pull request #5104 from AndrewMeadows/americium

Browse source 
fix bug where grab.js moves mouse to upper left corner after pressing CTRL
This commit is contained in:
Brad Hefta-Gaub 2015-06-11 08:58:56 -07:00
commit 2e746324d7
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/grab.js
View file

@ -140,6 +140,10 @@ function mouseIntersectionWithPlane(pointOnPlane, planeNormal, event) {
} }
function computeNewGrabPlane() { function computeNewGrabPlane() {
if (!gIsGrabbing) {
return;
}
var maybeResetMousePosition = false; var maybeResetMousePosition = false;
if (gGrabMode !== "rotate") { if (gGrabMode !== "rotate") {
gMouseAtRotateStart = gMouseCursorLocation; gMouseAtRotateStart = gMouseCursorLocation;

2
libraries/render/src/render/Scene.h
View file

@ -245,7 +245,7 @@ public:
void update(const UpdateFunctorPointer& updateFunctor) { _payload->update(updateFunctor); } void update(const UpdateFunctorPointer& updateFunctor) { _payload->update(updateFunctor); }
// Shape Type Interface // Shape Type Interface
const model::MaterialKey& getMaterialKey() const { return _payload->getMaterialKey(); } const model::MaterialKey getMaterialKey() const { return _payload->getMaterialKey(); }
protected: protected:
PayloadPointer _payload; PayloadPointer _payload;