Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 03:03:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update tutorial to work with HMD + Hand Controllers only

Browse source
This commit is contained in:
Ryan Huffman 2016-09-22 14:18:25 -07:00
parent 66a33d020d
commit 216cf2b4bc
15 changed files with 116 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/Application.cpp
View file

@ -87,6 +87,7 @@
#include <PhysicsEngine.h>
#include <PhysicsHelpers.h>
#include <plugins/PluginManager.h>
#include <plugins/PluginUtils.h>
#include <plugins/CodecPlugin.h>
#include <RecordingScriptingInterface.h>
#include <RenderableWebEntityItem.h>
@ -1276,17 +1277,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
bool hasTutorialContent = contentVersion >= 1;
Setting::Handle<bool> firstRun { Settings::firstRun, true };
bool hasVive = false;
for (auto& displayPlugin : PluginManager::getInstance()->getDisplayPlugins()) {
if (displayPlugin->getName() == "OpenVR (Vive)") {
hasVive = true;
break;
}
}
bool hasHMDAndHandControllers = PluginUtils::isHMDAvailable() && PluginUtils::isHandControllerAvailable();
Setting::Handle<bool> tutorialComplete { "tutorialComplete", false };
bool shouldGoToTutorial = hasVive && hasTutorialContent && !tutorialComplete.get();
qDebug() << "has vive: " << hasVive << ", current plugin: " << _displayPlugin->getName();
bool shouldGoToTutorial = hasHMDAndHandControllers && hasTutorialContent && !tutorialComplete.get();
qDebug() << "Has HMD + Hand Controllers: " << hasHMDAndHandControllers << ", current plugin: " << _displayPlugin->getName();
qDebug() << "has tutorial content" << hasTutorialContent;
qDebug() << "tutorial complete" << tutorialComplete.get();
qDebug() << "should go to tutorial " << shouldGoToTutorial;
@ -1300,10 +1296,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
addressLookupString = arguments().value(urlIndex + 1);
}
const QString TUTORIAL_PATH = "/tutorial_begin";
if (shouldGoToTutorial) {
DependencyManager::get<AddressManager>()->ifLocalSandboxRunningElse([=]() {
qDebug() << "Home sandbox appears to be running, going to Home.";
DependencyManager::get<AddressManager>()->goToLocalSandbox("/tutorial_begin");
DependencyManager::get<AddressManager>()->goToLocalSandbox(TUTORIAL_PATH);
}, [=]() {
qDebug() << "Home sandbox does not appear to be running, going to Entry.";
if (firstRun.get()) {

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

@ -13,10 +13,12 @@
#include <QtScript/QScriptContext>
#include <avatar/AvatarManager.h>
#include <display-plugins/DisplayPlugin.h>
#include <display-plugins/CompositorHelper.h>
#include <OffscreenUi.h>
#include <avatar/AvatarManager.h>
#include <plugins/PluginUtils.h>
#include "Application.h"
HMDScriptingInterface::HMDScriptingInterface() {
@ -47,6 +49,14 @@ glm::vec2 HMDScriptingInterface::overlayToSpherical(const glm::vec2 & position)
return qApp->getApplicationCompositor().overlayToSpherical(position);
}
bool HMDScriptingInterface::isHMDAvailable() {
return PluginUtils::isHMDAvailable();
}
bool HMDScriptingInterface::isHandControllerAvailable() {
return PluginUtils::isHandControllerAvailable();
}
QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) {
glm::vec3 hudIntersection;
auto instance = DependencyManager::get<HMDScriptingInterface>();

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

@ -38,6 +38,9 @@ public:
Q_INVOKABLE QString preferredAudioInput() const;
Q_INVOKABLE QString preferredAudioOutput() const;
Q_INVOKABLE bool isHMDAvailable();
Q_INVOKABLE bool isHandControllerAvailable();
Q_INVOKABLE bool setHandLasers(int hands, bool enabled, const glm::vec4& color, const glm::vec3& direction) const;
Q_INVOKABLE void disableHandLasers(int hands) const;

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

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

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

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

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

@ -19,7 +19,8 @@ namespace controller {
class InputPlugin : public Plugin {
public:
virtual void pluginFocusOutEvent() = 0;
virtual void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) = 0;
virtual bool isHandController() const = 0;
};

35
libraries/plugins/src/plugins/PluginUtils.cpp Normal file
View file

@ -0,0 +1,35 @@
// PluginUtils.cpp
// input-plugins/src/input-plugins
//
// Created by Ryan Huffman on 9/22/16.
// Copyright 2016 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 "PluginUtils.h"
#include "DisplayPlugin.h"
#include "InputPlugin.h"
#include "PluginManager.h"
bool PluginUtils::isHMDAvailable() {
for (auto& displayPlugin : PluginManager::getInstance()->getDisplayPlugins()) {
if (displayPlugin->isHmd()) {
return true;
break;
}
}
return false;
}
bool PluginUtils::isHandControllerAvailable() {
for (auto& inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
if (inputPlugin->isHandController()) {
return true;
break;
}
}
return false;
};

17
libraries/plugins/src/plugins/PluginUtils.h Normal file
View file

@ -0,0 +1,17 @@
// PluginUtils.h
// input-plugins/src/input-plugins
//
// Created by Ryan Huffman on 9/22/16.
// Copyright 2016 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
//
#pragma once
class PluginUtils {
public:
static bool isHMDAvailable();
static bool isHandControllerAvailable();
};

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

@ -25,6 +25,8 @@ class NeuronPlugin : public InputPlugin {
public:
friend void FrameDataReceivedCallback(void* context, void* sender, _BvhDataHeaderEx* header, float* data);
bool isHandController() const override { return false; }
// Plugin functions
virtual bool isSupported() const override;
virtual const QString& getName() const override { return NAME; }

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

@ -26,6 +26,8 @@ public:
bool isSupported() const override;
const QString& getName() const override { return NAME; }
bool isHandController() const override { return false; }
void init() override;
void deinit() override;

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

@ -31,6 +31,8 @@ public:
virtual const QString& getName() const override { return NAME; }
virtual const QString& getID() const override { return HYDRA_ID_STRING; }
bool isHandController() const override { return true; }
virtual bool activate() override;
virtual void deactivate() override;

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

@ -26,6 +26,8 @@ public:
bool isSupported() const override;
const QString& getName() const override { return NAME; }
bool isHandController() const override { return true; }
bool activate() override;
void deactivate() override;

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

@ -35,6 +35,8 @@ public:
bool isSupported() const override;
const QString& getName() const override { return NAME; }
bool isHandController() const override { return true; }
bool activate() override;
void deactivate() override;

21
tutorial/tutorialStartZone.js
View file

@ -8,20 +8,21 @@
},
enterEntity: function() {
// send message to outer zone
print("ENTERED THE TUTORIAL START AREA");
var parentID = Entities.getEntityProperties(this.entityID, 'parentID').parentID;
print("HERE", parentID);
if (parentID) {
print("HERE2");
Entities.callEntityMethod(parentID, 'start');
print("HERE4");
print("Entered the tutorial start area");
if (HMD.isHMDAvailable() && HMD.isHandControllerAvailable()) {
var parentID = Entities.getEntityProperties(this.entityID, 'parentID').parentID;
if (parentID) {
Entities.callEntityMethod(parentID, 'start');
} else {
print("ERROR: No parent id found on tutorial start zone");
}
} else {
print("HERE3");
print("ERROR: No parent id found on tutorial start zone");
Window.alert("To proceed with this tutorial, please connect your VR headset and hand controllers.");
location = "/";
}
},
leaveEntity: function() {
print("EXITED THE TUTORIAL START AREA");
print("Exited the tutorial start area");
}
};

26
tutorial/tutorialZone.js
View file

@ -27,8 +27,10 @@ if (!Function.prototype.bind) {
}
(function() {
Script.include("ownershipToken.js");
Script.include("tutorial.js");
var ownershipTokenPath = Script.resolvePath("ownershipToken.js");
var tutorialPath = Script.resolvePath("tutorial.js");
Script.include(ownershipTokenPath);
Script.include(tutorialPath);
var TutorialZone = function() {
this.token = null;
@ -37,17 +39,19 @@ if (!Function.prototype.bind) {
TutorialZone.prototype = {
keyReleaseHandler: function(event) {
print(event.text);
if (event.text == ",") {
if (!this.tutorialManager.startNextStep()) {
if (event.isShifted && event.isAlt) {
if (event.text == ",") {
if (!this.tutorialManager.startNextStep()) {
this.tutorialManager.startTutorial();
}
} else if (event.text == "F11") {
this.tutorialManager.restartStep();
} else if (event.text == "F10") {
MyAvatar.shouldRenderLocally = !MyAvatar.shouldRenderLocally;
} else if (event.text == "r") {
this.tutorialManager.stopTutorial();
this.tutorialManager.startTutorial();
}
} else if (event.text == "F11") {
this.tutorialManager.restartStep();
} else if (event.text == "F10") {
MyAvatar.shouldRenderLocally = !MyAvatar.shouldRenderLocally;
} else if (event.text == "r") {
this.tutorialManager.stopTutorial();
this.tutorialManager.startTutorial();
}
},
preload: function(entityID) {