From 7f131e2c4fe06eb2d2faf3901ebcece4ec3c14ec Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Thu, 19 May 2016 15:00:08 -0700
Subject: [PATCH] Reset avatar as well as displayPlugin when "driving"

---
 interface/src/avatar/MyAvatar.cpp     | 6 ++++--
 interface/src/avatar/MyAvatar.h       | 2 +-
 interface/src/ui/OverlayConductor.cpp | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index a3cf1f9f4f..183a24f252 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -234,7 +234,7 @@ QByteArray MyAvatar::toByteArray(bool cullSmallChanges, bool sendAll) {
     return AvatarData::toByteArray(cullSmallChanges, sendAll);
 }
 
-void MyAvatar::reset(bool andRecenter) {
+void MyAvatar::reset(bool andRecenter, bool andReload) {
 
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "reset", Q_ARG(bool, andRecenter));
@@ -244,7 +244,9 @@ void MyAvatar::reset(bool andRecenter) {
     // Reset dynamic state.
     _wasPushing = _isPushing = _isBraking = false;
     _follow.deactivate();
-    _skeletonModel->reset();
+    if (andReload) {
+        _skeletonModel->reset();
+    }
     getHead()->reset();
     _targetVelocity = glm::vec3(0.0f);
     setThrust(glm::vec3(0.0f));
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 66e6af340e..d7af6b5683 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -94,7 +94,7 @@ public:
     AudioListenerMode getAudioListenerModeCamera() const { return FROM_CAMERA; }
     AudioListenerMode getAudioListenerModeCustom() const { return CUSTOM; }
 
-    Q_INVOKABLE void reset(bool andRecenter = false);
+    Q_INVOKABLE void reset(bool andRecenter = false, bool andReload = true);
     void update(float deltaTime);
     virtual void postUpdate(float deltaTime) override;
     void preDisplaySide(RenderArgs* renderArgs);
diff --git a/interface/src/ui/OverlayConductor.cpp b/interface/src/ui/OverlayConductor.cpp
index b44ea91a60..1ceceb741e 100644
--- a/interface/src/ui/OverlayConductor.cpp
+++ b/interface/src/ui/OverlayConductor.cpp
@@ -86,6 +86,7 @@ void OverlayConductor::updateMode() {
             _mode = FLAT;  // Seems appropriate to let things reset, below, after the following.
             // All reset of, e.g., room-scale location as though by apostrophe key, without all the other adjustments.
             qApp->getActiveDisplayPlugin()->resetSensors();
+            myAvatar->reset(true, false);
         }
         if (_wantsOverlays) {
             qDebug() << "flipping" << !nowDriving;