Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:23:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

correcting comments, removing dead code + back slash

Browse source
This commit is contained in:
SamGondelman 2015-07-20 16:48:53 -07:00
parent 17220542d8
commit d985d0293a
19 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/InputPlugins.cpp
View file

@ -1,5 +1,5 @@
//
// Created by Bradley Austin Davis on 2015/05/30
// Created by Sam Gondelman on 7/16/2015
// Copyright 2015 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.

2
interface/src/Menu.cpp
View file

@ -28,7 +28,7 @@
#include "devices/DdeFaceTracker.h"
#include "devices/Faceshift.h"
#include "devices/RealSense.h"
#include <input-plugins\SixenseManager.h> // TODO: should be able to remove this once input plugin architecture is finished
#include <input-plugins/SixenseManager.h> // TODO: should be able to remove this once input plugin architecture is finished
#include "MainWindow.h"
#include "scripting/MenuScriptingInterface.h"
#if defined(Q_OS_MAC) || defined(Q_OS_WIN)

2
libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp
View file

@ -35,7 +35,7 @@ const QString & OpenVrDisplayPlugin::getName() const {
return NAME;
}
vr::IVRSystem *_hmd{ nullptr };
vr::IVRSystem* _hmd{ nullptr };
int hmdRefCount = 0;
static vr::IVRCompositor* _compositor{ nullptr };
vr::TrackedDevicePose_t _trackedDevicePose[vr::k_unMaxTrackedDeviceCount];

3
libraries/input-plugins/src/input-plugins/InputDevice.cpp
View file

@ -1,4 +1,7 @@
//
// InputDevice.cpp
// input-plugins/src/input-plugins
//
// Created by Sam Gondelman on 7/15/2015
// Copyright 2015 High Fidelity, Inc.
//

3
libraries/input-plugins/src/input-plugins/InputDevice.h
View file

@ -1,4 +1,7 @@
//
// InputDevice.h
// input-plugins/src/input-plugins
//
// Created by Sam Gondelman on 7/15/2015
// Copyright 2015 High Fidelity, Inc.
//

3
libraries/input-plugins/src/input-plugins/InputPlugin.cpp
View file

@ -1,4 +1,7 @@
//
// InputPlugin.cpp
// input-plugins/src/input-plugins
//
// Created by Sam Gondelman on 7/13/2015
// Copyright 2015 High Fidelity, Inc.
//

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

@ -1,4 +1,7 @@
//
// InputPlugin.h
// input-plugins/src/input-plugins
//
// Created by Sam Gondelman on 7/13/2015
// Copyright 2015 High Fidelity, Inc.
//

3
libraries/input-plugins/src/input-plugins/Joystick.cpp
View file

@ -1,7 +1,4 @@
//
// Joystick.cpp
// interface/src/devices
//
// Created by Stephen Birarda on 2014-09-23.
// Copyright 2014 High Fidelity, Inc.
//

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

@ -1,6 +1,6 @@
//
// Joystick.h
// interface/src/devices
// input-plugins/src/input-plugins
//
// Created by Stephen Birarda on 2014-09-23.
// Copyright 2014 High Fidelity, Inc.

3
libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
View file

@ -1,7 +1,6 @@
//
// KeyboardMouseDevice.cpp
// interface/src/devices
// input-plugins/src/input-plugins
//
// Created by Sam Gateau on 4/27/15.
// Copyright 2015 High Fidelity, Inc.

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

@ -1,6 +1,6 @@
//
// KeyboardMouseDevice.h
// interface/src/devices
// input-plugins/src/input-plugins
//
// Created by Sam Gateau on 4/27/15.
// Copyright 2015 High Fidelity, Inc.

16
libraries/input-plugins/src/input-plugins/SDL2Manager.cpp
View file

@ -1,6 +1,6 @@
//
// SDL2Manager.cpp
// interface/src/devices
// input-plugins/src/input-plugins
//
// Created by Sam Gondelman on 6/5/15.
// Copyright 2015 High Fidelity, Inc.
@ -121,20 +121,6 @@ void SDL2Manager::pluginUpdate(float deltaTime, bool jointsCaptured) {
qApp->sendEvent(qApp, &backEvent);
}
// TODO: This will probably end up being deleted
//else if (event.cbutton.button == SDL_CONTROLLER_BUTTON_A) {
// // this will either start or stop a global action event
// QEvent::Type actionType = (event.type == SDL_CONTROLLERBUTTONDOWN)
// ? HFActionEvent::startType()
// : HFActionEvent::endType();
//
// // global action events fire in the center of the screen
// Application* app = Application::getInstance();
// PickRay pickRay = app->getCamera()->computePickRay(app->getTrueMouseX(),
// app->getTrueMouseY());
// HFActionEvent actionEvent(actionType, pickRay);
// qApp->sendEvent(qApp, &actionEvent);
//}
} else if (event.type == SDL_CONTROLLERDEVICEADDED) {
SDL_GameController* controller = SDL_GameControllerOpen(event.cdevice.which);

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

@ -1,6 +1,6 @@
//
// SDL2Manager.h
// interface/src/devices
// input-plugins/src/input-plugins
//
// Created by Sam Gondelman on 6/5/15.
// Copyright 2015 High Fidelity, Inc.

2
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
View file

@ -1,6 +1,6 @@
//
// SixenseManager.cpp
// interface/src/devices
// input-plugins/src/input-plugins
//
// Created by Andrzej Kapolka on 11/15/13.
// Copyright 2013 High Fidelity, Inc.

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

@ -1,6 +1,6 @@
//
// SixenseManager.h
// interface/src/devices
// input-plugins/src/input-plugins
//
// Created by Andrzej Kapolka on 11/15/13.
// Copyright 2013 High Fidelity, Inc.

2
libraries/input-plugins/src/input-plugins/UserInputMapper.cpp
View file

@ -1,6 +1,6 @@
//
// UserInputMapper.cpp
// interface/src/ui
// input-plugins/src/input-plugins
//
// Created by Sam Gateau on 4/27/15.
// Copyright 2015 High Fidelity, Inc.

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

@ -1,6 +1,6 @@
//
// UserInputMapper.h
// interface/src/ui
// input-plugins/src/input-plugins
//
// Created by Sam Gateau on 4/27/15.
// Copyright 2015 High Fidelity, Inc.

4
libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
View file

@ -1,6 +1,6 @@
//
// ViveControllerManager.cpp
// interface/src/devices
// input-plugins/src/input-plugins
//
// Created by Sam Gondelman on 6/29/15.
// Copyright 2013 High Fidelity, Inc.
@ -21,7 +21,7 @@
#include "NumericalConstants.h"
#include "UserActivityLogger.h"
extern vr::IVRSystem *_hmd;
extern vr::IVRSystem* _hmd;
extern int hmdRefCount;
extern vr::TrackedDevicePose_t _trackedDevicePose[vr::k_unMaxTrackedDeviceCount];
extern mat4 _trackedDevicePoseMat4[vr::k_unMaxTrackedDeviceCount];

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

@ -1,6 +1,6 @@
//
// ViveControllerManager.h
// interface/src/devices
// input-plugins/src/input-plugins
//
// Created by Sam Gondelman on 6/29/15.
// Copyright 2013 High Fidelity, Inc.