mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 18:56:55 +02:00
Move constant back to Menu
This commit is contained in:
parent
9ce405a744
commit
cf7089e145
4 changed files with 5 additions and 3 deletions
|
@ -28,7 +28,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "devices/Faceshift.h"
|
#include "devices/Faceshift.h"
|
||||||
#include "devices/OculusManager.h"
|
|
||||||
#include "devices/SixenseManager.h"
|
#include "devices/SixenseManager.h"
|
||||||
#include "ui/ChatWindow.h"
|
#include "ui/ChatWindow.h"
|
||||||
#include "ui/JSConsole.h"
|
#include "ui/JSConsole.h"
|
||||||
|
@ -56,6 +55,8 @@ const int ONE_SECOND_OF_FRAMES = 60;
|
||||||
const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES;
|
const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES;
|
||||||
//////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
const float DEFAULT_OCULUS_UI_ANGULAR_SIZE = 72.0f;
|
||||||
|
|
||||||
const QString SETTINGS_ADDRESS_KEY = "address";
|
const QString SETTINGS_ADDRESS_KEY = "address";
|
||||||
class QSettings;
|
class QSettings;
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,6 @@
|
||||||
|
|
||||||
#include <ProgramObject.h>
|
#include <ProgramObject.h>
|
||||||
|
|
||||||
const float DEFAULT_OCULUS_UI_ANGULAR_SIZE = 72.0f;
|
|
||||||
|
|
||||||
class Camera;
|
class Camera;
|
||||||
class PalmData;
|
class PalmData;
|
||||||
class Text3DOverlay;
|
class Text3DOverlay;
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
class PalmData;
|
||||||
|
|
||||||
const unsigned int BUTTON_0 = 1U << 0; // the skinny button between 1 and 2
|
const unsigned int BUTTON_0 = 1U << 0; // the skinny button between 1 and 2
|
||||||
const unsigned int BUTTON_1 = 1U << 5;
|
const unsigned int BUTTON_1 = 1U << 5;
|
||||||
const unsigned int BUTTON_2 = 1U << 6;
|
const unsigned int BUTTON_2 = 1U << 6;
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#ifndef hifi_ApplicationOverlay_h
|
#ifndef hifi_ApplicationOverlay_h
|
||||||
#define hifi_ApplicationOverlay_h
|
#define hifi_ApplicationOverlay_h
|
||||||
|
|
||||||
|
class Camera;
|
||||||
class Overlays;
|
class Overlays;
|
||||||
class QOpenGLFramebufferObject;
|
class QOpenGLFramebufferObject;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue