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

CR feedback

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-01-11 11:07:07 -08:00
parent 3e05d95478
commit dfba05ae5f
26 changed files with 37 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
interface/src/Application.cpp
View file

@ -5062,9 +5062,23 @@ const DisplayPlugin* Application::getActiveDisplayPlugin() const {
static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) {
auto menu = Menu::getInstance();
QString name = displayPlugin->getName();
QString grouping = displayPlugin->getGrouping();
auto grouping = displayPlugin->getGrouping();
QString groupingMenu { "" };
Q_ASSERT(!menu->menuItemExists(MenuOption::OutputMenu, name));
// assign the meny grouping based on plugin grouping
switch (grouping) {
case Plugin::ADVANCED:
groupingMenu = "Advanced";
break;
case Plugin::DEVELOPER:
groupingMenu = "Developer";
break;
default:
groupingMenu = "Standard";
break;
}
static QActionGroup* displayPluginGroup = nullptr;
if (!displayPluginGroup) {
displayPluginGroup = new QActionGroup(menu);
@ -5074,7 +5088,8 @@ static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool acti
auto action = menu->addActionToQMenuAndActionHash(parent,
name, 0, qApp,
SLOT(updateDisplayMode()),
QAction::NoRole, UNSPECIFIED_POSITION, grouping);
QAction::NoRole, UNSPECIFIED_POSITION, groupingMenu);
action->setCheckable(true);
action->setChecked(active);
displayPluginGroup->addAction(action);
@ -5094,13 +5109,17 @@ void Application::updateDisplayMode() {
DisplayPluginList advanced;
DisplayPluginList developer;
foreach(auto displayPlugin, displayPlugins) {
QString grouping = displayPlugin->getGrouping();
if (grouping == "Advanced") {
advanced.push_back(displayPlugin);
} else if (grouping == "Developer") {
developer.push_back(displayPlugin);
} else {
standard.push_back(displayPlugin);
auto grouping = displayPlugin->getGrouping();
switch (grouping) {
case Plugin::ADVANCED:
advanced.push_back(displayPlugin);
break;
case Plugin::DEVELOPER:
developer.push_back(displayPlugin);
break;
default:
standard.push_back(displayPlugin);
break;
}
}

1
libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
View file

@ -16,7 +16,6 @@
#include <plugins/PluginContainer.h>
const QString Basic2DWindowOpenGLDisplayPlugin::NAME("Desktop");
const QString Basic2DWindowOpenGLDisplayPlugin::GROUPING("Standard");
static const QString FULLSCREEN = "Fullscreen";

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

@ -19,7 +19,6 @@ class Basic2DWindowOpenGLDisplayPlugin : public WindowOpenGLDisplayPlugin {
public:
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
virtual float getTargetFrameRate() override { return _framerateTarget ? (float) _framerateTarget : TARGET_FRAMERATE_Basic2DWindowOpenGL; }
@ -38,7 +37,6 @@ protected:
private:
void updateFramerate();
static const QString NAME;
static const QString GROUPING;
QScreen* getFullscreenTarget();
std::vector<QAction*> _framerateActions;
QAction* _vsyncAction { nullptr };

1
libraries/display-plugins/src/display-plugins/NullDisplayPlugin.cpp
View file

@ -13,7 +13,6 @@
#include <plugins/PluginContainer.h>
const QString NullDisplayPlugin::NAME("NullDisplayPlugin");
const QString NullDisplayPlugin::GROUPING("Developer");
const QString & NullDisplayPlugin::getName() const {
return NAME;

1
libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h
View file

@ -14,6 +14,7 @@ public:
virtual ~NullDisplayPlugin() final {}
virtual const QString & getName() const override;
virtual grouping getGrouping() const override { return DEVELOPER; }
void stop() override;

1
libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.cpp
View file

@ -45,7 +45,6 @@ void main() {
)FS";
const QString InterleavedStereoDisplayPlugin::NAME("3D TV - Interleaved");
const QString InterleavedStereoDisplayPlugin::GROUPING("Advanced");
InterleavedStereoDisplayPlugin::InterleavedStereoDisplayPlugin() {
}

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

@ -15,7 +15,7 @@ public:
InterleavedStereoDisplayPlugin();
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
virtual grouping getGrouping() const override { return ADVANCED; }
// initialize OpenGL context settings needed by the plugin
virtual void customizeContext() override;
@ -25,5 +25,4 @@ public:
private:
static const QString NAME;
static const QString GROUPING;
};

1
libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.cpp
View file

@ -10,7 +10,6 @@
#include <GLMHelpers.h>
const QString SideBySideStereoDisplayPlugin::NAME("3D TV - Side by Side Stereo");
const QString SideBySideStereoDisplayPlugin::GROUPING("Advanced");
SideBySideStereoDisplayPlugin::SideBySideStereoDisplayPlugin() {
}

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

@ -16,9 +16,8 @@ class SideBySideStereoDisplayPlugin : public StereoDisplayPlugin {
public:
SideBySideStereoDisplayPlugin();
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
virtual grouping getGrouping() const override { return ADVANCED; }
virtual glm::uvec2 getRecommendedRenderSize() const override;
private:
static const QString NAME;
static const QString GROUPING;
};

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

@ -19,7 +19,6 @@
#include <NumericalConstants.h>
const QString KeyboardMouseDevice::NAME = "Keyboard/Mouse";
const QString KeyboardMouseDevice::GROUPING = "Standard";
void KeyboardMouseDevice::pluginUpdate(float deltaTime, bool jointsCaptured) {
_inputDevice->update(deltaTime, jointsCaptured);

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

@ -68,7 +68,6 @@ public:
virtual bool isSupported() const override { return true; }
virtual bool isJointController() const override { return false; }
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
virtual void pluginFocusOutEvent() override { _inputDevice->focusOutEvent(); }
virtual void pluginUpdate(float deltaTime, bool jointsCaptured) override;
@ -88,7 +87,6 @@ public:
void wheelEvent(QWheelEvent* event);
static const QString NAME;
static const QString GROUPING;
protected:

6
libraries/plugins/src/plugins/Plugin.h
View file

@ -19,8 +19,10 @@ public:
/// \return human-readable name
virtual const QString& getName() const = 0;
/// \return human-readable grouping for the plugin, Standard, Advanced, or Developer
virtual const QString& getGrouping() const = 0;
typedef enum { STANDARD, ADVANCED, DEVELOPER } grouping;
/// \return human-readable grouping for the plugin, STANDARD, ADVANCED, or DEVELOPER
virtual grouping getGrouping() const { return STANDARD; }
/// \return string ID (not necessarily human-readable)
virtual const QString& getID() const { assert(false); return UNKNOWN_PLUGIN_ID; }

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

@ -30,7 +30,6 @@ Q_LOGGING_CATEGORY(inputplugins, "hifi.inputplugins")
#endif
const QString NeuronPlugin::NAME = "Neuron";
const QString NeuronPlugin::GROUPING = "Standard";
const QString NeuronPlugin::NEURON_ID_STRING = "Perception Neuron";
// indices of joints of the Neuron standard skeleton.

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

@ -29,7 +29,6 @@ public:
virtual bool isSupported() const override;
virtual bool isJointController() const override { return true; }
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
const QString& getID() const override { return NEURON_ID_STRING; }
virtual void activate() override;
@ -66,7 +65,6 @@ protected:
std::shared_ptr<InputDevice> _inputDevice { std::make_shared<InputDevice>() };
static const QString NAME;
static const QString GROUPING;
static const QString NEURON_ID_STRING;
std::string _serverAddress;

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

@ -44,7 +44,6 @@ static_assert(
const QString SDL2Manager::NAME = "SDL2";
const QString SDL2Manager::GROUPING = "Standard";
#ifdef HAVE_SDL2
SDL_JoystickID SDL2Manager::getInstanceId(SDL_GameController* controller) {

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

@ -30,7 +30,6 @@ public:
virtual bool isSupported() const override;
virtual bool isJointController() const override { return false; }
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
virtual void init() override;
virtual void deinit() override;
@ -85,7 +84,6 @@ private:
#endif
bool _isInitialized;
static const QString NAME;
static const QString GROUPING;
};
#endif // hifi__SDL2Manager_h

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

@ -56,7 +56,6 @@ bool SixenseManager::_sixenseLoaded = false;
const QString SixenseManager::NAME = "Sixense";
const QString SixenseManager::GROUPING = "Standard";
const QString SixenseManager::HYDRA_ID_STRING = "Razer Hydra";
const QString MENU_PARENT = "Developer";

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

@ -30,7 +30,6 @@ public:
virtual bool isSupported() const override;
virtual bool isJointController() const override { return true; }
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
virtual const QString& getID() const override { return HYDRA_ID_STRING; }
virtual void activate() override;
@ -98,7 +97,6 @@ private:
std::shared_ptr<InputDevice> _inputDevice { std::make_shared<InputDevice>() };
static const QString NAME;
static const QString GROUPING;
static const QString HYDRA_ID_STRING;
static bool _sixenseLoaded;

2
plugins/oculus/src/OculusDebugDisplayPlugin.cpp
View file

@ -9,8 +9,6 @@
#include <QtCore/QProcessEnvironment>
const QString OculusDebugDisplayPlugin::NAME("Oculus Rift (Simulator)");
const QString OculusDebugDisplayPlugin::GROUPING("Developer");
static const QString DEBUG_FLAG("HIFI_DEBUG_OCULUS");
static bool enableDebugOculus = QProcessEnvironment::systemEnvironment().contains("HIFI_DEBUG_OCULUS");

3
plugins/oculus/src/OculusDebugDisplayPlugin.h
View file

@ -12,7 +12,7 @@
class OculusDebugDisplayPlugin : public OculusBaseDisplayPlugin {
public:
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
virtual grouping getGrouping() const override { return DEVELOPER; }
virtual bool isSupported() const override;
protected:
@ -20,6 +20,5 @@ protected:
private:
static const QString NAME;
static const QString GROUPING;
};

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

@ -137,7 +137,6 @@ private:
#endif
const QString OculusDisplayPlugin::NAME("Oculus Rift");
const QString OculusDisplayPlugin::GROUPING("Standard");
static const QString MONO_PREVIEW = "Mono Preview";
static const QString FRAMERATE = DisplayPlugin::MENU_PATH() + ">Framerate";

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

@ -18,7 +18,6 @@ class OculusDisplayPlugin : public OculusBaseDisplayPlugin {
public:
virtual void activate() override;
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
virtual void setEyeRenderPose(uint32_t frameIndex, Eye eye, const glm::mat4& pose) override final;
virtual float getTargetFrameRate() override { return TARGET_RATE_Oculus; }
@ -31,7 +30,6 @@ protected:
private:
using EyePoses = std::pair<ovrPosef, ovrPosef>;
static const QString NAME;
static const QString GROUPING;
bool _enablePreview{ false };
bool _monoPreview { true };
QMap<uint32_t, EyePoses> _frameEyePoses;

4
plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
View file

@ -26,9 +26,7 @@
using namespace oglplus;
const QString OculusLegacyDisplayPlugin::NAME("Oculus Rift (0.5) (Simulated)");
const QString OculusLegacyDisplayPlugin::GROUPING("Standard");
const QString OculusLegacyDisplayPlugin::NAME("Oculus Rift (0.5) (Legacy)");
OculusLegacyDisplayPlugin::OculusLegacyDisplayPlugin() {
}

2
plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
View file

@ -20,7 +20,6 @@ public:
OculusLegacyDisplayPlugin();
virtual bool isSupported() const override;
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
virtual void activate() override;
virtual void deactivate() override;
@ -47,7 +46,6 @@ protected:
private:
static const QString NAME;
static const QString GROUPING;
ovrHmd _hmd;
mutable ovrTrackingState _trackingState;

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

@ -28,11 +28,9 @@ Q_DECLARE_LOGGING_CATEGORY(displayplugins)
Q_LOGGING_CATEGORY(displayplugins, "hifi.displayplugins")
const QString OpenVrDisplayPlugin::NAME("OpenVR (Vive)");
const QString OpenVrDisplayPlugin::GROUPING("Standard");
const QString StandingHMDSensorMode = "Standing HMD Sensor Mode"; // this probably shouldn't be hardcoded here
static vr::IVRCompositor* _compositor{ nullptr };
vr::TrackedDevicePose_t _trackedDevicePose[vr::k_unMaxTrackedDeviceCount];
mat4 _trackedDevicePoseMat4[vr::k_unMaxTrackedDeviceCount];

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

@ -19,7 +19,6 @@ class OpenVrDisplayPlugin : public WindowOpenGLDisplayPlugin {
public:
virtual bool isSupported() const override;
virtual const QString& getName() const override { return NAME; }
virtual const QString& getGrouping() const override { return GROUPING; }
virtual bool isHmd() const override { return true; }
virtual float getTargetFrameRate() override { return TARGET_RATE_OpenVr; }
@ -46,6 +45,5 @@ protected:
private:
vr::IVRSystem* _hmd { nullptr };
static const QString NAME;
static const QString GROUPING;
};