Missed some comments in transferring from main.cpp to Application.h; trying to

preserve original formatting.
This commit is contained in:
Andrzej Kapolka 2013-05-14 10:45:54 -07:00
parent 31b94203ff
commit 096421347e
2 changed files with 25 additions and 23 deletions

View file

@ -54,7 +54,7 @@ static char STAR_FILE[] = "https://s3-us-west-1.amazonaws.com/highfidelity/stars
static char STAR_CACHE_FILE[] = "cachedStars.txt"; static char STAR_CACHE_FILE[] = "cachedStars.txt";
const glm::vec3 START_LOCATION(6.1f, 0, 1.4f); // Where one's own agent begins in the world const glm::vec3 START_LOCATION(6.1f, 0, 1.4f); // Where one's own agent begins in the world
// (will be overwritten if avatar data file is found) // (will be overwritten if avatar data file is found)
const int IDLE_SIMULATE_MSECS = 16; // How often should call simulate and other stuff const int IDLE_SIMULATE_MSECS = 16; // How often should call simulate and other stuff
// in the idle loop? (60 FPS is default) // in the idle loop? (60 FPS is default)
@ -489,6 +489,8 @@ void Application::keyPressEvent(QKeyEvent* event) {
return; return;
} }
qDebug() << QKeySequence(event->key());
bool shifted = event->modifiers().testFlag(Qt::ShiftModifier); bool shifted = event->modifiers().testFlag(Qt::ShiftModifier);
switch (event->key()) { switch (event->key()) {
case Qt::Key_BracketLeft: case Qt::Key_BracketLeft:

View file

@ -121,18 +121,18 @@ private:
QMainWindow* _window; QMainWindow* _window;
QGLWidget* _glWidget; QGLWidget* _glWidget;
QAction* _lookingInMirror; QAction* _lookingInMirror; // Are we currently rendering one's own head as if in mirror?
QAction* _gyroLook; QAction* _gyroLook; // Whether to allow the gyro data from head to move your view
QAction* _renderVoxels; QAction* _renderVoxels; // Whether to render voxels
QAction* _renderStarsOn; QAction* _renderStarsOn; // Whether to display the stars
QAction* _renderAtmosphereOn; QAction* _renderAtmosphereOn; // Whether to display the atmosphere
QAction* _renderAvatarsOn; QAction* _renderAvatarsOn; // Whether to render avatars
QAction* _oculusOn; QAction* _oculusOn; // Whether to configure the display for the Oculus Rift
QAction* _renderStatsOn; QAction* _renderStatsOn; // Whether to show onscreen text overlay with stats
QAction* _logOn; QAction* _logOn; // Whether to show on-screen log
QAction* _frustumOn; QAction* _frustumOn; // Whether or not to display the debug view frustum
QAction* _viewFrustumFromOffset; QAction* _viewFrustumFromOffset; // Whether or not to offset the view of the frustum
QAction* _cameraFrustum; QAction* _cameraFrustum; // which frustum to look at
QAction* _frustumRenderModeAction; QAction* _frustumRenderModeAction;
SerialInterface _serialPort; SerialInterface _serialPort;
@ -189,20 +189,20 @@ private:
enum MouseMode { NO_EDIT_MODE, ADD_VOXEL_MODE, DELETE_VOXEL_MODE, COLOR_VOXEL_MODE }; enum MouseMode { NO_EDIT_MODE, ADD_VOXEL_MODE, DELETE_VOXEL_MODE, COLOR_VOXEL_MODE };
MouseMode _mouseMode; MouseMode _mouseMode;
VoxelDetail _mouseVoxel; // details of the voxel under the mouse cursor VoxelDetail _mouseVoxel; // details of the voxel under the mouse cursor
float _mouseVoxelScale; // the scale for adding/removing voxels float _mouseVoxelScale; // the scale for adding/removing voxels
bool _paintOn; bool _paintOn; // Whether to paint voxels as you fly around
unsigned char _dominantColor; unsigned char _dominantColor; // The dominant color of the voxel we're painting
VoxelDetail _paintingVoxel; VoxelDetail _paintingVoxel; // The voxel we're painting if we're painting
bool _perfStatsOn; bool _perfStatsOn; // Do we want to display perfStats?
ChatEntry _chatEntry; ChatEntry _chatEntry; // chat entry field
bool _chatEntryOn; bool _chatEntryOn; // Whether to show the chat entry
GLuint _oculusTextureID; GLuint _oculusTextureID; // The texture to which we render for Oculus distortion
ProgramObject* _oculusProgram; ProgramObject* _oculusProgram; // The GLSL program containing the distortion shader
float _oculusDistortionScale; float _oculusDistortionScale; // Controls the Oculus field of view
int _textureLocation; int _textureLocation;
int _lensCenterLocation; int _lensCenterLocation;
int _screenCenterLocation; int _screenCenterLocation;