mirror of
https://github.com/overte-org/overte.git
synced 2025-08-20 02:32:38 +02:00
removed faceShiftScriptingInterface
This commit is contained in:
parent
90dc3cf5de
commit
192fe71ac4
3 changed files with 0 additions and 170 deletions
|
|
@ -70,7 +70,6 @@
|
|||
#include "Menu.h"
|
||||
#include "ModelUploader.h"
|
||||
#include "Util.h"
|
||||
#include "FaceshiftScriptingInterface.h"
|
||||
#include "devices/MIDIManager.h"
|
||||
#include "devices/OculusManager.h"
|
||||
#include "devices/TV3DManager.h"
|
||||
|
|
@ -3639,7 +3638,6 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
|
|||
scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance());
|
||||
scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance());
|
||||
scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance());
|
||||
scriptEngine->registerGlobalObject("Faceshift", FaceshiftScriptingInterface::getInstance());
|
||||
scriptEngine->registerGlobalObject("AnimationCache", &_animationCache);
|
||||
scriptEngine->registerGlobalObject("AudioReflector", &_audioReflector);
|
||||
scriptEngine->registerGlobalObject("Account", AccountScriptingInterface::getInstance());
|
||||
|
|
|
|||
|
|
@ -1,105 +0,0 @@
|
|||
//
|
||||
// FaceshiftScriptingInterface.cpp
|
||||
// interface/src/scripting
|
||||
//
|
||||
// Created by Ben Arnold on 7/38/14.
|
||||
// Copyright 2014 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#include "FaceshiftScriptingInterface.h"
|
||||
|
||||
FaceshiftScriptingInterface* FaceshiftScriptingInterface::getInstance() {
|
||||
static FaceshiftScriptingInterface sharedInstance;
|
||||
return &sharedInstance;
|
||||
}
|
||||
|
||||
bool FaceshiftScriptingInterface::isConnectedOrConnecting() const {
|
||||
return Application::getInstance()->getFaceshift()->isConnectedOrConnecting();
|
||||
}
|
||||
|
||||
bool FaceshiftScriptingInterface::isActive() const {
|
||||
return Application::getInstance()->getFaceshift()->isActive();
|
||||
}
|
||||
|
||||
const glm::vec3& FaceshiftScriptingInterface::getHeadAngularVelocity() const {
|
||||
return Application::getInstance()->getFaceshift()->getHeadAngularVelocity();
|
||||
}
|
||||
|
||||
// these pitch/yaw angles are in degrees
|
||||
float FaceshiftScriptingInterface::getEyeGazeLeftPitch() const {
|
||||
return Application::getInstance()->getFaceshift()->getEyeGazeLeftPitch();
|
||||
}
|
||||
float FaceshiftScriptingInterface::getEyeGazeLeftYaw() const {
|
||||
return Application::getInstance()->getFaceshift()->getEyeGazeLeftYaw();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getEyeGazeRightPitch() const {
|
||||
return Application::getInstance()->getFaceshift()->getEyeGazeRightPitch();
|
||||
}
|
||||
float FaceshiftScriptingInterface::getEyeGazeRightYaw() const {
|
||||
return Application::getInstance()->getFaceshift()->getEyeGazeRightYaw();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getLeftBlink() const {
|
||||
return Application::getInstance()->getFaceshift()->getLeftBlink();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getRightBlink() const {
|
||||
return Application::getInstance()->getFaceshift()->getRightBlink();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getLeftEyeOpen() const {
|
||||
return Application::getInstance()->getFaceshift()->getLeftEyeOpen();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getRightEyeOpen() const {
|
||||
return Application::getInstance()->getFaceshift()->getRightEyeOpen();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getBrowDownLeft() const {
|
||||
return Application::getInstance()->getFaceshift()->getBrowDownLeft();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getBrowDownRight() const {
|
||||
return Application::getInstance()->getFaceshift()->getBrowDownRight();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getBrowUpCenter() const {
|
||||
return Application::getInstance()->getFaceshift()->getBrowUpCenter();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getBrowUpLeft() const {
|
||||
return Application::getInstance()->getFaceshift()->getBrowUpLeft();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getBrowUpRight() const {
|
||||
return Application::getInstance()->getFaceshift()->getBrowUpRight();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getMouthSize() const {
|
||||
return Application::getInstance()->getFaceshift()->getMouthSize();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getMouthSmileLeft() const {
|
||||
return Application::getInstance()->getFaceshift()->getMouthSmileLeft();
|
||||
}
|
||||
|
||||
float FaceshiftScriptingInterface::getMouthSmileRight() const {
|
||||
return Application::getInstance()->getFaceshift()->getMouthSmileRight();
|
||||
}
|
||||
|
||||
void FaceshiftScriptingInterface::update() {
|
||||
Application::getInstance()->getFaceshift()->update();
|
||||
}
|
||||
|
||||
void FaceshiftScriptingInterface::reset() {
|
||||
Application::getInstance()->getFaceshift()->reset();
|
||||
}
|
||||
|
||||
void FaceshiftScriptingInterface::updateFakeCoefficients(float leftBlink, float rightBlink, float browUp,
|
||||
float jawOpen, QVector<float>& coefficients) const {
|
||||
Application::getInstance()->getFaceshift()->updateFakeCoefficients(leftBlink, rightBlink, browUp, jawOpen, coefficients);
|
||||
}
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
//
|
||||
// FaceshiftScriptingInterface.h
|
||||
// interface/src/scripting
|
||||
//
|
||||
// Created by Ben Arnold on 7/38/14.
|
||||
// Copyright 2014 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#ifndef hifi_FaceshiftScriptingInterface_h
|
||||
#define hifi_FaceshiftScriptingInterface_h
|
||||
|
||||
#include <QDebug>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
|
||||
#include "Application.h"
|
||||
|
||||
class FaceshiftScriptingInterface : public QObject {
|
||||
Q_OBJECT
|
||||
FaceshiftScriptingInterface() { };
|
||||
public:
|
||||
static FaceshiftScriptingInterface* getInstance();
|
||||
|
||||
public slots:
|
||||
bool isConnectedOrConnecting() const;
|
||||
|
||||
bool isActive() const;
|
||||
|
||||
const glm::vec3& getHeadAngularVelocity() const;
|
||||
|
||||
// these pitch/yaw angles are in degrees
|
||||
float getEyeGazeLeftPitch() const;
|
||||
float getEyeGazeLeftYaw() const;
|
||||
|
||||
float getEyeGazeRightPitch() const;
|
||||
float getEyeGazeRightYaw() const;
|
||||
|
||||
float getLeftBlink() const;
|
||||
float getRightBlink() const;
|
||||
float getLeftEyeOpen() const;
|
||||
float getRightEyeOpen() const;
|
||||
|
||||
float getBrowDownLeft() const;
|
||||
float getBrowDownRight() const;
|
||||
float getBrowUpCenter() const;
|
||||
float getBrowUpLeft() const;
|
||||
float getBrowUpRight() const;
|
||||
|
||||
float getMouthSize() const;
|
||||
float getMouthSmileLeft() const;
|
||||
float getMouthSmileRight() const;
|
||||
|
||||
void update();
|
||||
void reset();
|
||||
|
||||
void updateFakeCoefficients(float leftBlink, float rightBlink, float browUp,
|
||||
float jawOpen, QVector<float>& coefficients) const;
|
||||
};
|
||||
|
||||
#endif // hifi_FaceshiftScriptingInterface_h
|
||||
Loading…
Reference in a new issue