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

looking at vive user flag behaviour

Browse source
This commit is contained in:
amantley 2018-12-17 08:42:53 -08:00
parent 5a81d8c093
commit cb672b878c
7 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -8057,7 +8057,7 @@ void Application::windowMinimizedChanged(bool minimized) {
getActiveDisplayPlugin()->activate();
} else if (minimized && getActiveDisplayPlugin()->isActive()) {
getActiveDisplayPlugin()->deactivate();
_minimizedWindowTimer.start(THROTTLED_SIM_FRAME_PERIOD_MS);
//_minimizedWindowTimer.start(THROTTLED_SIM_FRAME_PERIOD_MS);
}
}

3
interface/src/graphics/GraphicsEngine.cpp
View file

@ -32,6 +32,7 @@
#include <QMetaObject>
#include "ui/Stats.h"
#include "Application.h"
#include "InterfaceLogging.h"
GraphicsEngine::GraphicsEngine() {
const QString SPLASH_SKYBOX { "{\"ProceduralEntity\":{ \"version\":2, \"shaderUrl\":\"qrc:///shaders/splashSkybox.frag\" } }" };
@ -153,7 +154,7 @@ bool GraphicsEngine::shouldPaint() const {
(static_cast<RenderEventHandler*>(_renderEventHandler)->_lastTimeRendered.elapsed() < THROTTLED_SIM_FRAME_PERIOD_MS)) {
return false;
}
// qCDebug(interfaceapp) << "we are now throttling!!!!!";
return true;
}

2
libraries/animation/src/AnimClip.cpp
View file

@ -110,7 +110,7 @@ void AnimClip::copyFromNetworkAnim() {
for (int i = 0; i < animJointCount; i++) {
int skeletonJoint = _skeleton->nameToJointIndex(animSkeleton.getJointName(i));
if (skeletonJoint == -1) {
qCWarning(animation) << "animation contains joint =" << animSkeleton.getJointName(i) << " which is not in the skeleton";
//qCWarning(animation) << "animation contains joint =" << animSkeleton.getJointName(i) << " which is not in the skeleton";
}
jointMap.push_back(skeletonJoint);
}

8
libraries/fbx/src/FBXSerializer.cpp
View file

@ -478,8 +478,8 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
std::map<QString, HFMLight> lights;
QVariantHash joints = mapping.value("joint").toHash();
QString jointEyeLeftName = "EyeLeft";
QString jointEyeRightName = "EyeRight";
QString jointEyeLeftName = "LeftEye";
QString jointEyeRightName = "RightEye";
QString jointNeckName = "Neck";
QString jointRootName = "Hips";
QString jointLeanName = "Spine";
@ -603,6 +603,7 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
}
if (name == jointEyeLeftName || name == "EyeL" || name == "joint_Leye" || (hfmModel.hfmToHifiJointNameMapping.contains(jointEyeLeftName) && (name == hfmModel.hfmToHifiJointNameMapping[jointEyeLeftName]))) {
qDebug(modelformat) << "made it to left eye get id " << name << " " << jointEyeLeftName;
jointEyeLeftID = getID(object.properties);
} else if (name == jointEyeRightName || name == "EyeR" || name == "joint_Reye" || (hfmModel.hfmToHifiJointNameMapping.contains(jointEyeRightName) && (name == hfmModel.hfmToHifiJointNameMapping[jointEyeRightName]))) {
@ -1451,11 +1452,14 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
// find our special joints
hfmModel.leftEyeJointIndex = modelIDs.indexOf(jointEyeLeftID);
qDebug(modelformat) << "jointlefteye" << hfmModel.leftEyeJointIndex << " " << jointEyeLeftID;
hfmModel.rightEyeJointIndex = modelIDs.indexOf(jointEyeRightID);
qDebug(modelformat) << "jointrighteye" << hfmModel.rightEyeJointIndex << " " << jointEyeRightID;
hfmModel.neckJointIndex = modelIDs.indexOf(jointNeckID);
hfmModel.rootJointIndex = modelIDs.indexOf(jointRootID);
hfmModel.leanJointIndex = modelIDs.indexOf(jointLeanID);
hfmModel.headJointIndex = modelIDs.indexOf(jointHeadID);
qDebug(modelformat) << "head joint" << hfmModel.headJointIndex;
hfmModel.leftHandJointIndex = modelIDs.indexOf(jointLeftHandID);
hfmModel.rightHandJointIndex = modelIDs.indexOf(jointRightHandID);
hfmModel.leftToeJointIndex = modelIDs.indexOf(jointLeftToeID);

1
plugins/oculus/src/OculusBaseDisplayPlugin.cpp
View file

@ -39,6 +39,7 @@ bool OculusBaseDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
}
if (ovr::hmdMounted(status) != _hmdMounted) {
_hmdMounted = !_hmdMounted;
qCDebug(oculusLog) << "changed the hmd status" << _hmdMounted;
emit hmdMountedChanged();
}
if (ovr::isVisible(status) != _visible) {

1
plugins/openvr/src/OpenVrDisplayPlugin.cpp
View file

@ -686,6 +686,7 @@ void OpenVrDisplayPlugin::postPreview() {
}
if (isHmdMounted() != _hmdMounted) {
qDebug() << "changed hmd status " << isHmdMounted();
_hmdMounted = !_hmdMounted;
emit hmdMountedChanged();
}

20
plugins/openvr/src/OpenVrHelpers.cpp
View file

@ -120,7 +120,7 @@ vr::IVRSystem* acquireOpenVrSystem() {
}
if (activeHmd) {
#if DEV_BUILD
qCDebug(displayplugins) << "OpenVR: incrementing refcount";
//qCDebug(displayplugins) << "OpenVR: incrementing refcount";
#endif
++refCount;
}
@ -268,6 +268,15 @@ void handleOpenVrEvents() {
_keyboardShown = false;
DependencyManager::get<OffscreenUi>()->unfocusWindows();
break;
case vr::VREvent_TrackedDeviceUserInteractionStarted:
qDebug() << "Put on the headset";
//hmdMountedChanged();
break;
case vr::VREvent_TrackedDeviceUserInteractionEnded:
qDebug() << "Took off the headset";
break;
default:
break;
@ -418,6 +427,15 @@ void showMinSpecWarning() {
}
break;
case vr::VREvent_TrackedDeviceUserInteractionStarted:
qDebug() << "Put on the headset2";
//hmdMountedChanged();
break;
case vr::VREvent_TrackedDeviceUserInteractionEnded:
qDebug() << "Took off the headset2";
break;
default:
break;
}