Add eyesLookAtTarget set/get API methods

interface/src/Application.cpp

@@ -5814,14 +5814,14 @@ void Application::pushPostUpdateLambda(void* key, const std::function<void()>& f
 // to everyone.
 // The principal result is to call updateLookAtTargetAvatar() and then setLookAtPosition().
 // Note that it is called BEFORE we update position or joints based on sensors, etc.
-void Application::updateMyAvatarLookAtPosition() {
+void Application::updateMyAvatarLookAtPosition(float deltaTime) {
     PerformanceTimer perfTimer("lookAt");
     bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
     PerformanceWarning warn(showWarnings, "Application::updateMyAvatarLookAtPosition()");
 
     auto myAvatar = getMyAvatar();
     FaceTracker* faceTracker = getActiveFaceTracker();
-    myAvatar->updateLookAtPosition(faceTracker, _myCamera);
+    myAvatar->updateEyesLookAtPosition(faceTracker, _myCamera, deltaTime);
 }
 
 void Application::updateThreads(float deltaTime) {
@@ -6605,7 +6605,7 @@ void Application::update(float deltaTime) {
         {
             PROFILE_RANGE(simulation, "MyAvatar");
             PerformanceTimer perfTimer("MyAvatar");
-            qApp->updateMyAvatarLookAtPosition();
+            qApp->updateMyAvatarLookAtPosition(deltaTime);
             avatarManager->updateMyAvatar(deltaTime);
         }
     }

interface/src/Application.h

@@ -298,7 +298,7 @@ public:
 
     virtual void pushPostUpdateLambda(void* key, const std::function<void()>& func) override;
 
-    void updateMyAvatarLookAtPosition();
+    void updateMyAvatarLookAtPosition(float deltaTime);
 
     float getGameLoopRate() const { return _gameLoopCounter.rate(); }
 

interface/src/avatar/MyAvatar.cpp

@@ -2284,7 +2284,9 @@ void MyAvatar::updateLookAtTargetAvatar() {
     AvatarHash hash = DependencyManager::get<AvatarManager>()->getHashCopy();
 
     // determine what the best look at target for my avatar should be.
-    computeMyLookAtTarget(hash);
+    if (!_scriptControlsEyesLookAt) {
+        computeMyLookAtTarget(hash);
+    }
 
     // snap look at position for avatars that are looking at me.
     snapOtherAvatarLookAtTargetsToMe(hash);
@@ -6617,7 +6619,7 @@ bool MyAvatar::getIsJointOverridden(int jointIndex) const {
     return _skeletonModel->getIsJointOverridden(jointIndex);
 }
 
-void MyAvatar::updateLookAtPosition(FaceTracker* faceTracker, Camera& myCamera) {
+void MyAvatar::updateEyesLookAtPosition(FaceTracker* faceTracker, Camera& myCamera, float deltaTime) {
 
     updateLookAtTargetAvatar();
 
@@ -6647,6 +6649,13 @@ void MyAvatar::updateLookAtPosition(FaceTracker* faceTracker, Camera& myCamera)
         } else {
             lookAtSpot = myHead->getEyePosition() + glm::normalize(leftVec) * 1000.0f;
         }
+    } else if (_scriptControlsEyesLookAt) {
+        if (_scriptEyesControlTimer < MAX_LOOK_AT_TIME_SCRIPT_CONTROL) {
+            _scriptEyesControlTimer += deltaTime;
+            lookAtSpot = _eyesLookAtTarget;
+        } else {
+            _scriptControlsEyesLookAt = false;
+        }
     } else {
         controller::Pose leftEyePose = getControllerPoseInAvatarFrame(controller::Action::LEFT_EYE);
         controller::Pose rightEyePose = getControllerPoseInAvatarFrame(controller::Action::RIGHT_EYE);
@@ -6731,7 +6740,7 @@ void MyAvatar::updateLookAtPosition(FaceTracker* faceTracker, Camera& myCamera)
             }
         }
     }
-
+    _eyesLookAtTarget = lookAtSpot;
     getHead()->setLookAtPosition(lookAtSpot);
 }
 
@@ -6814,6 +6823,17 @@ void MyAvatar::setHeadLookAt(const glm::vec3& lookAtTarget) {
     _lookAtScriptTarget = lookAtTarget;
 }
 
+void MyAvatar::setEyesLookAt(const glm::vec3& lookAtTarget) {
+    if (QThread::currentThread() != thread()) {
+        BLOCKING_INVOKE_METHOD(this, "setEyesLookAt",
+            Q_ARG(const glm::vec3&, lookAtTarget));
+        return;
+    }
+    _eyesLookAtTarget = lookAtTarget;
+    _scriptEyesControlTimer = 0.0f;
+    _scriptControlsEyesLookAt = true;
+}
+
 glm::vec3 MyAvatar::getLookAtPivotPoint() {
     glm::vec3 avatarUp = getWorldOrientation() * Vectors::UP;
     glm::vec3 yAxisEyePosition = getWorldPosition() + avatarUp * glm::dot(avatarUp, _skeletonModel->getDefaultEyeModelPosition());

interface/src/avatar/MyAvatar.h

@@ -1762,10 +1762,26 @@ public:
     /**jsdoc
     * Returns the current head look at target point in world coordinates.
     * @function MyAvatar.getHeadLookAt
-    * @returns {Vec3} Default position between your avatar's eyes in world coordinates.
+    * @returns {Vec3} The head's look at target in world coordinates.
     */
     Q_INVOKABLE glm::vec3 getHeadLookAt() { return _lookAtCameraTarget; }
 
+    /**jsdoc
+    * Force the avatar's eyes to look to the specified location.
+    * Once this method is called, API calls will have full control of the eyes for a limited time.
+    * If this method is not called for two seconds, the engine will regain control of the eyes.
+    * @function MyAvatar.setEyesLookAt
+    * @param {Vec3} lookAtTarget - The target point in world coordinates.
+    */
+    Q_INVOKABLE void setEyesLookAt(const glm::vec3& lookAtTarget);
+
+    /**jsdoc
+    * Returns the current eyes look at target point in world coordinates.
+    * @function MyAvatar.getEyesLookAt
+    * @returns {Vec3} The eyes's look at target in world coordinates.
+    */
+    Q_INVOKABLE glm::vec3 getEyesLookAt() { return _eyesLookAtTarget; }
+
     /**jsdoc
     * Aims the pointing directional blending towards the provided target point.
     * The "point" reaction should be triggered before using this method. 
@@ -1903,7 +1919,7 @@ public:
     bool getFlowActive() const;
     bool getNetworkGraphActive() const;
 
-    void updateLookAtPosition(FaceTracker* faceTracker, Camera& myCamera);
+    void updateEyesLookAtPosition(FaceTracker* faceTracker, Camera& myCamera, float deltaTime);
 
     // sets the reaction enabled and triggered parameters of the passed in params
     // also clears internal reaction triggers
@@ -2662,6 +2678,9 @@ private:
 
     eyeContactTarget _eyeContactTarget;
     float _eyeContactTargetTimer { 0.0f };
+    glm::vec3 _eyesLookAtTarget;
+    bool _scriptControlsEyesLookAt{ false };
+    float _scriptEyesControlTimer{ 0.0f };
 
     glm::vec3 _trackedHeadPosition;