From 3546bcc10167fc87fa39ed6e5a11e0aa65b723f5 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@coffeeandpower.com>
Date: Wed, 12 Jun 2013 11:36:28 -0700
Subject: [PATCH] Avatar can set velocity, velocity set to zero on reset

---
 interface/src/Application.cpp | 2 ++
 interface/src/Avatar.h        | 1 +
 2 files changed, 3 insertions(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4c37be98c3..2de3b8295f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2502,6 +2502,8 @@ void Application::resetSensors() {
     QCursor::setPos(_headMouseX, _headMouseY);
     _myAvatar.reset();
     _myTransmitter.resetLevels();
+    _myAvatar.setVelocity(glm::vec3(0,0,0));
+    _myAvatar.setThrust(glm::vec3(0,0,0));
 }
 
 static void setShortcutsEnabled(QWidget* widget, bool enabled) {
diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h
index de76092328..4018764ffc 100644
--- a/interface/src/Avatar.h
+++ b/interface/src/Avatar.h
@@ -96,6 +96,7 @@ public:
     void setMovedHandOffset        (glm::vec3 movedHandOffset        ) { _movedHandOffset = movedHandOffset;}
     void setThrust                 (glm::vec3 newThrust              ) { _thrust          = newThrust; };
     void setDisplayingLookatVectors(bool      displayingLookatVectors) { _head.setRenderLookatVectors(displayingLookatVectors);}
+    void setVelocity               (const glm::vec3 velocity         ) { _velocity = velocity; };
     void setGravity                (glm::vec3 gravity);
     void setMouseRay               (const glm::vec3 &origin, const glm::vec3 &direction);
     void setOrientation            (const glm::quat& orientation);