Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 22:32:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ask display-plugins if they are head-controllers

Browse source
This commit is contained in:
Seth Alves 2017-05-25 15:14:10 -07:00
parent 3823ece153
commit af5ba3a90a
27 changed files with 86 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/controllers/oculus_touch.json
View file

@ -58,5 +58,7 @@
{ "from": "OculusTouch.RightThumbUp", "to": "Standard.RightThumbUp" },
{ "from": "OculusTouch.LeftIndexPoint", "to": "Standard.LeftIndexPoint" },
{ "from": "OculusTouch.RightIndexPoint", "to": "Standard.RightIndexPoint" }
{ "from": "OculusTouch.Head", "to" : "Standard.Head", "when" : [ "Application.InHMD"] }
]
}

15
interface/src/Application.cpp
View file

@ -4851,6 +4851,21 @@ bool Application::isHMDMode() const {
return getActiveDisplayPlugin()->isHmd();
}
bool Application::isHeadControllerEnabled() const {
const InputPluginList& inputPlugins = PluginManager::getInstance()->getInputPlugins();
for (auto& ip : inputPlugins) {
if (ip->isActive() && ip->isHeadController()) {
return true;
}
}
foreach(DisplayPluginPointer displayPlugin, PluginManager::getInstance()->getDisplayPlugins()) {
if (displayPlugin->isActive() && displayPlugin->isHeadController()) {
return true;
}
}
return false;
}
float Application::getTargetFrameRate() const { return getActiveDisplayPlugin()->getTargetFrameRate(); }
QRect Application::getDesirableApplicationGeometry() const {

1
interface/src/Application.h
View file

@ -248,6 +248,7 @@ public:
// rendering of several elements depend on that
// TODO: carry that information on the Camera as a setting
virtual bool isHMDMode() const override;
bool isHeadControllerEnabled() const;
glm::mat4 getHMDSensorPose() const;
glm::mat4 getEyeOffset(int eye) const;
glm::mat4 getEyeProjection(int eye) const;

18
interface/src/avatar/MyAvatar.cpp
View file

@ -1845,14 +1845,16 @@ void MyAvatar::updateOrientation(float deltaTime) {
getHead()->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime);
glm::quat localOrientation = getHeadControllerPoseInAvatarFrame();
// these angles will be in radians
// ... so they need to be converted to degrees before we do math...
glm::vec3 euler = glm::eulerAngles(localOrientation) * DEGREES_PER_RADIAN;
Head* head = getHead();
head->setBaseYaw(YAW(euler));
head->setBasePitch(PITCH(euler));
head->setBaseRoll(ROLL(euler));
if (qApp->isHeadControllerEnabled()) {
glm::quat localOrientation = getHeadControllerPoseInAvatarFrame();
// these angles will be in radians
// ... so they need to be converted to degrees before we do math...
glm::vec3 euler = glm::eulerAngles(localOrientation) * DEGREES_PER_RADIAN;
Head* head = getHead();
head->setBaseYaw(YAW(euler));
head->setBasePitch(PITCH(euler));
head->setBaseRoll(ROLL(euler));
}
}
void MyAvatar::updateActionMotor(float deltaTime) {

4
interface/src/scripting/HMDScriptingInterface.cpp
View file

@ -54,6 +54,10 @@ bool HMDScriptingInterface::isHMDAvailable(const QString& name) {
return PluginUtils::isHMDAvailable(name);
}
bool HMDScriptingInterface::isHeadControllerAvailable(const QString& name) {
return PluginUtils::isHeadControllerAvailable(name);
}
bool HMDScriptingInterface::isHandControllerAvailable(const QString& name) {
return PluginUtils::isHandControllerAvailable(name);
}

1
interface/src/scripting/HMDScriptingInterface.h
View file

@ -43,6 +43,7 @@ public:
Q_INVOKABLE QString preferredAudioOutput() const;
Q_INVOKABLE bool isHMDAvailable(const QString& name = "");
Q_INVOKABLE bool isHeadControllerAvailable(const QString& name = "");
Q_INVOKABLE bool isHandControllerAvailable(const QString& name = "");
Q_INVOKABLE bool isSubdeviceContainingNameAvailable(const QString& name);

2
libraries/controllers/src/controllers/impl/filters/LowVelocityFilter.h
View file

@ -22,7 +22,7 @@ namespace controller {
_translationConstant(translationConstant), _rotationConstant(rotationConstant) {}
virtual float apply(float value) const override { return value; }
virtual Pose apply(Pose newPose) const;
virtual Pose apply(Pose newPose) const override;
virtual bool parseParameters(const QJsonValue& parameters) override;
private:

2
libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h
View file

@ -26,6 +26,8 @@ public:
virtual bool isThrottled() const override;
virtual bool isHeadController() const override { return false; }
protected:
mutable bool _isThrottled = false;

1
libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h
View file

@ -21,6 +21,7 @@ public:
bool beginFrameRender(uint32_t frameIndex) override;
float getTargetFrameRate() const override { return 90; }
virtual bool isHeadController() const override { return false; }
protected:
void updatePresentPose() override;

1
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
View file

@ -25,6 +25,7 @@ class HmdDisplayPlugin : public OpenGLDisplayPlugin {
public:
~HmdDisplayPlugin();
bool isHmd() const override final { return true; }
bool isHeadController() const override = 0;
float getIPD() const override final { return _ipd; }
glm::mat4 getEyeToHeadTransform(Eye eye) const override final { return _eyeOffsets[eye]; }
glm::mat4 getEyeProjection(Eye eye, const glm::mat4& baseProjection) const override final { return _eyeProjections[eye]; }

2
libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.h
View file

@ -17,6 +17,8 @@ public:
grouping getGrouping() const override { return ADVANCED; }
glm::uvec2 getRecommendedRenderSize() const override;
virtual bool isHeadController() const override { return false; }
protected:
// initialize OpenGL context settings needed by the plugin
void customizeContext() override;

2
libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.h
View file

@ -19,6 +19,8 @@ public:
virtual grouping getGrouping() const override { return ADVANCED; }
virtual glm::uvec2 getRecommendedRenderSize() const override;
virtual bool isHeadController() const override { return false; }
private:
static const QString NAME;
};

1
libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h
View file

@ -71,6 +71,7 @@ public:
const QString getName() const override { return NAME; }
bool isHandController() const override { return false; }
bool isHeadController() const override { return false; }
void pluginFocusOutEvent() override { _inputDevice->focusOutEvent(); }
void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override;

1
libraries/input-plugins/src/input-plugins/TouchscreenDevice.h
View file

@ -40,6 +40,7 @@ public:
virtual const QString getName() const override { return NAME; }
bool isHandController() const override { return false; }
bool isHeadController() const override { return false; }
virtual void pluginFocusOutEvent() override { _inputDevice->focusOutEvent(); }
virtual void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override;

1
libraries/plugins/src/plugins/DisplayPlugin.h
View file

@ -135,6 +135,7 @@ public:
virtual int getRequiredThreadCount() const { return 0; }
virtual bool isHmd() const { return false; }
virtual bool isHeadController() const = 0;
virtual int getHmdScreen() const { return -1; }
/// By default, all HMDs are stereo
virtual bool isStereo() const { return isHmd(); }

1
libraries/plugins/src/plugins/InputPlugin.h
View file

@ -25,5 +25,6 @@ public:
// If an input plugin is only a single device, it will only return it's primary name.
virtual QStringList getSubdeviceNames() { return { getName() }; };
virtual bool isHandController() const = 0;
virtual bool isHeadController() const = 0;
};

14
libraries/plugins/src/plugins/PluginUtils.cpp
View file

@ -24,6 +24,20 @@ bool PluginUtils::isHMDAvailable(const QString& pluginName) {
return false;
}
bool PluginUtils::isHeadControllerAvailable(const QString& pluginName) {
for (auto& inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
if (inputPlugin->isHeadController() && (pluginName.isEmpty() || inputPlugin->getName() == pluginName)) {
return true;
}
}
for (auto& displayPlugin : PluginManager::getInstance()->getDisplayPlugins()) {
if (displayPlugin->isHeadController() && (pluginName.isEmpty() || displayPlugin->getName() == pluginName)) {
return true;
}
}
return false;
};
bool PluginUtils::isHandControllerAvailable(const QString& pluginName) {
for (auto& inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
if (inputPlugin->isHandController() && (pluginName.isEmpty() || inputPlugin->getName() == pluginName)) {

1
libraries/plugins/src/plugins/PluginUtils.h
View file

@ -16,6 +16,7 @@ class PluginUtils {
public:
static bool isHMDAvailable(const QString& pluginName = "");
static bool isHandControllerAvailable(const QString& pluginName = "");
static bool isHeadControllerAvailable(const QString& pluginName = "");
static bool isSubdeviceContainingNameAvailable(QString name);
static bool isViveControllerAvailable();
static bool isOculusTouchControllerAvailable();

16
plugins/hifiKinect/src/KinectPlugin.cpp
View file

@ -273,7 +273,19 @@ bool KinectPlugin::activate() {
return false;
}
bool KinectPlugin::isHandController() const {
bool KinectPlugin::isHandController() const {
bool sensorAvailable = false;
#ifdef HAVE_KINECT
if (_kinectSensor) {
BOOLEAN sensorIsAvailable = FALSE;
HRESULT hr = _kinectSensor->get_IsAvailable(&sensorIsAvailable);
sensorAvailable = SUCCEEDED(hr) && (sensorIsAvailable == TRUE);
}
#endif
return _enabled && _initialized && sensorAvailable;
}
bool KinectPlugin::isHeadController() const {
bool sensorAvailable = false;
#ifdef HAVE_KINECT
if (_kinectSensor) {
@ -654,4 +666,4 @@ void KinectPlugin::InputDevice::clearState() {
int poseIndex = KinectJointIndexToPoseIndex((KinectJointIndex)i);
_poseStateMap[poseIndex] = controller::Pose();
}
}
}

1
plugins/hifiKinect/src/KinectPlugin.h
View file

@ -43,6 +43,7 @@ class KinectPlugin : public InputPlugin {
Q_OBJECT
public:
bool isHandController() const override;
bool isHeadController() const override;
// Plugin functions
virtual void init() override;

1
plugins/hifiNeuron/src/NeuronPlugin.h
View file

@ -26,6 +26,7 @@ public:
friend void FrameDataReceivedCallback(void* context, void* sender, _BvhDataHeaderEx* header, float* data);
bool isHandController() const override { return false; }
bool isHeadController() const override { return false; }
// Plugin functions
virtual void init() override;

1
plugins/hifiSdl2/src/SDL2Manager.h
View file

@ -28,6 +28,7 @@ public:
QStringList getSubdeviceNames() override;
bool isHandController() const override { return false; }
bool isHeadController() const override { return false; }
void init() override;
void deinit() override;

1
plugins/hifiSixense/src/SixenseManager.h
View file

@ -34,6 +34,7 @@ public:
// Sixense always seems to initialize even if the hydras are not present. Is there
// a way we can properly detect whether the hydras are present?
bool isHandController() const override { return false; }
bool isHeadController() const override { return false; }
virtual bool activate() override;
virtual void deactivate() override;

1
plugins/oculus/src/OculusControllerManager.h
View file

@ -28,6 +28,7 @@ public:
const QString getName() const override { return NAME; }
bool isHandController() const override { return _touch != nullptr; }
bool isHeadController() const override { return true; }
QStringList getSubdeviceNames() override;
bool activate() override;

2
plugins/oculus/src/OculusDisplayPlugin.h
View file

@ -24,6 +24,8 @@ public:
virtual QJsonObject getHardwareStats() const;
bool isHeadController() const override { return true; }
protected:
QThread::Priority getPresentPriority() override { return QThread::TimeCriticalPriority; }

4
plugins/openvr/src/OpenVrDisplayPlugin.h
View file

@ -56,7 +56,9 @@ public:
bool isKeyboardVisible() override;
// Possibly needs an additional thread for VR submission
int getRequiredThreadCount() const override;
int getRequiredThreadCount() const override;
bool isHeadController() const override { return true; }
protected:
bool internalActivate() override;

1
plugins/openvr/src/ViveControllerManager.h
View file

@ -39,6 +39,7 @@ public:
const QString getName() const override { return NAME; }
bool isHandController() const override { return true; }
bool isHeadController() const override { return true; }
bool activate() override;
void deactivate() override;