History

Merge branch 'master' of https://github.com/worklist/hifi into glow

Andrzej Kapolka committed 13 years ago

Commit cb89f052 parents 597842e 4279d5025 files · +306 −140Browse files

Showing the changes to interface/src/Application.cpp (1 of 25 files). Show all

Unified · Split

interface/src/Application.cpp+66−62
@@ -439,7 +439,7 @@ void Application::paintGL() { · 438 unmodified lines
439439 // myCamera is. But we also want to do meaningful camera transforms on OpenGL for the offset camera
440440 Camera whichCamera = _myCamera;
441441
442− if (_viewFrustumFromOffset->isChecked() && _frustumOn->isChecked()) {
442+ if (_frustumOn->isChecked()) {
443443
444444 // set the camera to third-person view but offset so we can see the frustum
445445 _viewFrustumOffsetCamera.setTargetPosition(_myCamera.getTargetPosition());
@@ -467,56 +467,49 @@ void Application::paintGL() { · 21 unmodified lines
467467 _frameCount++;
468468 }
469469
470−void Application::resizeGL(int width, int height) {
470+void Application::resetCamerasOnResizeGL(Camera& camera, int width, int height) {
471471 float aspectRatio = ((float)width/(float)height); // based on screen resize
472−
473− // reset the camera FOV to our preference...
474− _myCamera.setFieldOfView(_horizontalFieldOfView);
475−
476− // get the lens details from the current camera
477− Camera& camera = _viewFrustumFromOffset->isChecked() ? _viewFrustumOffsetCamera : _myCamera;
478− float nearClip = camera.getNearClip();
479− float farClip = camera.getFarClip();
480− float fov;
481−
472+
482473 if (OculusManager::isConnected()) {
483474 // more magic numbers; see Oculus SDK docs, p. 32
484475 camera.setAspectRatio(aspectRatio *= 0.5);
485− camera.setFieldOfView(fov = 2 * atan((0.0468 * _oculusDistortionScale) / 0.041) * (180 / PIf));
486−
487− // resize the render texture
488− if (_oculusTextureID != 0) {
489− glBindTexture(GL_TEXTURE_2D, _oculusTextureID);
490− glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
491− glBindTexture(GL_TEXTURE_2D, 0);
492− }
476+ camera.setFieldOfView(2 * atan((0.0468 * _oculusDistortionScale) / 0.041) * (180 / PIf));
493477 } else {
494478 camera.setAspectRatio(aspectRatio);
495− camera.setFieldOfView(fov = _horizontalFieldOfView);
479+ camera.setFieldOfView(_fieldOfView);
496480 }
481+}
497482
498− // Tell our viewFrustum about this change
499− _viewFrustum.setAspectRatio(aspectRatio);
483+void Application::resizeGL(int width, int height) {
484+ resetCamerasOnResizeGL(_viewFrustumOffsetCamera, width, height);
485+ resetCamerasOnResizeGL(_myCamera, width, height);
486+
487+ // resize the render texture
488+ if (OculusManager::isConnected() && _oculusTextureID != 0) {
489+ glBindTexture(GL_TEXTURE_2D, _oculusTextureID);
490+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
491+ glBindTexture(GL_TEXTURE_2D, 0);
492+ }
493+
494+ // Tell our viewFrustum about this change, using the application camera
495+ loadViewFrustum(_myCamera, _viewFrustum);
500496
501497 glViewport(0, 0, width, height); // shouldn't this account for the menu???
502498
503499 glMatrixMode(GL_PROJECTION);
504500 glLoadIdentity();
505501
506− // XXXBHG - If we're in view frustum mode, then we need to do this little bit of hackery so that
507− // OpenGL won't clip our frustum rendering lines. This is a debug hack for sure! Basically, this makes
508− // the near clip a little bit closer (therefor you see more) and the far clip a little bit farther (also,
509− // to see more.)
510− if (_frustumOn->isChecked()) {
511− nearClip -= 0.01f;
512− farClip += 0.01f;
513− }
514−
515502 // On window reshape, we need to tell OpenGL about our new setting
516503 float left, right, bottom, top, nearVal, farVal;
517504 glm::vec4 nearClipPlane, farClipPlane;
518− loadViewFrustum(camera, _viewFrustum);
519505 _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
506+
507+ // If we're in Display Frustum mode, then we want to use the slightly adjust near/far clip values of the
508+ // _viewFrustumOffsetCamera, so that we can see more of the application content in the application's frustum
509+ if (_frustumOn->isChecked()) {
510+ nearVal = _viewFrustumOffsetCamera.getNearClip();
511+ farVal = _viewFrustumOffsetCamera.getFarClip();
512+ }
520513 glFrustum(left, right, bottom, top, nearVal, farVal);
521514
522515 glMatrixMode(GL_MODELVIEW);
@@ -819,11 +812,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 296 unmodified lines
819812 _colorVoxelMode->trigger();
820813 break;
821814 case Qt::Key_O:
822− if (isShifted) {
823− _viewFrustumFromOffset->trigger();
824− } else {
825− _selectVoxelMode->trigger();
826− }
815+ _selectVoxelMode->trigger();
827816 break;
828817 case Qt::Key_Slash:
829818 _renderStatsOn->trigger();
@@ -1295,11 +1284,11 @@ void Application::editPreferences() { · 465 unmodified lines
12951284 avatarURL->setMinimumWidth(QLINE_MINIMUM_WIDTH);
12961285 form->addRow("Avatar URL:", avatarURL);
12971286
1298− QSpinBox* horizontalFieldOfView = new QSpinBox();
1299− horizontalFieldOfView->setMaximum(180);
1300− horizontalFieldOfView->setMinimum(1);
1301− horizontalFieldOfView->setValue(_horizontalFieldOfView);
1302− form->addRow("Horizontal field of view (degrees):", horizontalFieldOfView);
1287+ QSpinBox* fieldOfView = new QSpinBox();
1288+ fieldOfView->setMaximum(180);
1289+ fieldOfView->setMinimum(1);
1290+ fieldOfView->setValue(_fieldOfView);
1291+ form->addRow("Vertical Field of View (Degrees):", fieldOfView);
13031292
13041293 QDoubleSpinBox* gyroCameraSensitivity = new QDoubleSpinBox();
13051294 gyroCameraSensitivity->setValue(_gyroCameraSensitivity);
@@ -1359,7 +1348,7 @@ void Application::editPreferences() { · 53 unmodified lines
13591348 if (!shouldDynamicallySetJitterBuffer()) {
13601349 _audio.setJitterBufferSamples(_audioJitterBufferSamples);
13611350 }
1362− _horizontalFieldOfView = horizontalFieldOfView->value();
1351+ _fieldOfView = fieldOfView->value();
13631352 resizeGL(_glWidget->width(), _glWidget->height());
13641353
13651354 }
@@ -2060,8 +2049,6 @@ void Application::initMenu() { · 694 unmodified lines
20602049 QMenu* frustumMenu = debugMenu->addMenu("View Frustum Debugging Tools");
20612050 (_frustumOn = frustumMenu->addAction("Display Frustum"))->setCheckable(true);
20622051 _frustumOn->setShortcut(Qt::SHIFT | Qt::Key_F);
2063− (_viewFrustumFromOffset = frustumMenu->addAction(
2064− "Use Offset Camera", this, SLOT(setFrustumOffset(bool)), Qt::SHIFT | Qt::Key_O))->setCheckable(true);
20652052 _frustumRenderModeAction = frustumMenu->addAction(
20662053 "Render Mode", this, SLOT(cycleFrustumRenderMode()), Qt::SHIFT | Qt::Key_R);
20672054 updateFrustumRenderModeAction();
@@ -2776,6 +2763,7 @@ void Application::loadViewFrustum(Camera& camera, ViewFrustum& viewFrustum) { · 708 unmodified lines
27762763 float fov = camera.getFieldOfView();
27772764 float nearClip = camera.getNearClip();
27782765 float farClip = camera.getFarClip();
2766+ float aspectRatio = camera.getAspectRatio();
27792767
27802768 glm::quat rotation = camera.getRotation();
27812769
@@ -2784,6 +2772,7 @@ void Application::loadViewFrustum(Camera& camera, ViewFrustum& viewFrustum) { · 2 unmodified lines
27842772 viewFrustum.setOrientation(rotation);
27852773
27862774 // Also make sure it's got the correct lens details from the camera
2775+ viewFrustum.setAspectRatio(aspectRatio);
27872776 viewFrustum.setFieldOfView(fov);
27882777 viewFrustum.setNearClip(nearClip);
27892778 viewFrustum.setFarClip(farClip);
@@ -2940,6 +2929,9 @@ void Application::displayOculus(Camera& whichCamera) { · 150 unmodified lines
29402929 glPopMatrix();
29412930 }
29422931
2932+const GLfloat WHITE_SPECULAR_COLOR[] = { 1.0f, 1.0f, 1.0f, 1.0f };
2933+const GLfloat NO_SPECULAR_COLOR[] = { 0.0f, 0.0f, 0.0f, 1.0f };
2934+
29432935 void Application::setupWorldLight(Camera& whichCamera) {
29442936
29452937 // Setup 3D lights (after the camera transform, so that they are positioned in world space)
@@ -2954,10 +2946,9 @@ void Application::setupWorldLight(Camera& whichCamera) { · 8 unmodified lines
29542946 glLightfv(GL_LIGHT0, GL_AMBIENT, ambient_color);
29552947 GLfloat diffuse_color[] = { 0.8, 0.7, 0.7 };
29562948 glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse_color);
2957− GLfloat specular_color[] = { 1.0, 1.0, 1.0, 1.0};
2958− glLightfv(GL_LIGHT0, GL_SPECULAR, specular_color);
29592949
2960− glMaterialfv(GL_FRONT, GL_SPECULAR, specular_color);
2950+ glLightfv(GL_LIGHT0, GL_SPECULAR, WHITE_SPECULAR_COLOR);
2951+ glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR);
29612952 glMateriali(GL_FRONT, GL_SHININESS, 96);
29622953 }
29632954
@@ -3035,6 +3026,9 @@ void Application::displaySide(Camera& whichCamera) { · 71 unmodified lines
30353026 glutSolidSphere(sphereRadius, 15, 15);
30363027 glPopMatrix();
30373028
3029+ // disable specular lighting for ground and voxels
3030+ glMaterialfv(GL_FRONT, GL_SPECULAR, NO_SPECULAR_COLOR);
3031+
30383032 //draw a grid ground plane....
30393033 if (_renderGroundPlaneOn->isChecked()) {
30403034 // draw grass plane with fog
@@ -3063,6 +3057,9 @@ void Application::displaySide(Camera& whichCamera) { · 22 unmodified lines
30633057 _voxels.render(_renderVoxelTextures->isChecked());
30643058 }
30653059
3060+ // restore default, white specular
3061+ glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR);
3062+
30663063 // indicate what we'll be adding/removing in mouse mode, if anything
30673064 if (_mouseVoxel.s != 0) {
30683065 glDisable(GL_LIGHTING);
@@ -3110,16 +3107,14 @@ void Application::displaySide(Camera& whichCamera) { · 41 unmodified lines
31103107 }
31113108
31123109 // Render my own Avatar
3113− if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON) {
3114− if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
3115− _myAvatar.getHead().setLookAtPosition(_myCamera.getPosition());
3116− }
3117− _myAvatar.render(_lookingInMirror->isChecked(), _renderAvatarBalls->isChecked());
3118− _myAvatar.setDisplayingLookatVectors(_renderLookatOn->isChecked());
3110+ if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
3111+ _myAvatar.getHead().setLookAtPosition(_myCamera.getPosition());
3112+ }
3113+ _myAvatar.render(_lookingInMirror->isChecked(), _renderAvatarBalls->isChecked());
3114+ _myAvatar.setDisplayingLookatVectors(_renderLookatOn->isChecked());
31193115
3120− if (_renderLookatIndicatorOn->isChecked() && _isLookingAtOtherAvatar) {
3121− renderLookatIndicator(_lookatOtherPosition, whichCamera);
3122− }
3116+ if (_renderLookatIndicatorOn->isChecked() && _isLookingAtOtherAvatar) {
3117+ renderLookatIndicator(_lookatOtherPosition, whichCamera);
31233118 }
31243119 }
31253120
@@ -3312,7 +3307,7 @@ void Application::displayStats() { · 186 unmodified lines
33123307 int statsVerticalOffset = 8;
33133308
33143309 char stats[200];
3315− sprintf(stats, "%3.0f FPS, %d Pkts/sec, %3.2f Mbps",
3310+ sprintf(stats, "%3.0f FPS, %d Pkts/sec, %3.2f Mbps ",
33163311 _fps, _packetsPerSecond, (float)_bytesPerSecond * 8.f / 1000000.f);
33173312 drawtext(10, statsVerticalOffset + 15, 0.10f, 0, 1.0, 0, stats);
33183313
@@ -3343,11 +3338,16 @@ void Application::displayStats() { · 24 unmodified lines
33433338 pingVoxel = totalPingVoxel/voxelServerCount;
33443339 }
33453340
3346−
33473341 char pingStats[200];
33483342 sprintf(pingStats, "Ping audio/avatar/voxel: %d / %d / %d avg %d max ", pingAudio, pingAvatar, pingVoxel, pingVoxelMax);
33493343 drawtext(10, statsVerticalOffset + 35, 0.10f, 0, 1.0, 0, pingStats);
33503344 }
3345+
3346+ char avatarStats[200];
3347+ glm::vec3 avatarPos = _myAvatar.getPosition();
3348+ sprintf(avatarStats, "Avatar position: %.3f, %.3f, %.3f, yaw = %.2f", avatarPos.x, avatarPos.y, avatarPos.z, _myAvatar.getBodyYaw());
3349+ drawtext(10, statsVerticalOffset + 55, 0.10f, 0, 1.0, 0, avatarStats);
3350+
33513351
33523352 std::stringstream voxelStats;
33533353 voxelStats.precision(4);
@@ -3961,6 +3961,8 @@ void Application::nodeKilled(Node* node) { · 607 unmodified lines
39613961 // Add the jurisditionDetails object to the list of "fade outs"
39623962 VoxelFade fade(VoxelFade::FADE_OUT, NODE_KILLED_RED, NODE_KILLED_GREEN, NODE_KILLED_BLUE);
39633963 fade.voxelDetails = jurisditionDetails;
3964+ const float slightly_smaller = 0.99;
3965+ fade.voxelDetails.s = fade.voxelDetails.s * slightly_smaller;
39643966 _voxelFades.push_back(fade);
39653967 }
39663968 }
@@ -3990,6 +3992,8 @@ int Application::parseVoxelStats(unsigned char* messageData, ssize_t messageLeng · 23 unmodified lines
39903992 // Add the jurisditionDetails object to the list of "fade outs"
39913993 VoxelFade fade(VoxelFade::FADE_OUT, NODE_ADDED_RED, NODE_ADDED_GREEN, NODE_ADDED_BLUE);
39923994 fade.voxelDetails = jurisditionDetails;
3995+ const float slightly_smaller = 0.99;
3996+ fade.voxelDetails.s = fade.voxelDetails.s * slightly_smaller;
39933997 _voxelFades.push_back(fade);
39943998 }
39953999 // store jurisdiction details for later use
@@ -4144,7 +4148,7 @@ void Application::loadSettings(QSettings* settings) { · 148 unmodified lines
41444148
41454149 _gyroCameraSensitivity = loadSetting(settings, "gyroCameraSensitivity", 0.5f);
41464150 _audioJitterBufferSamples = loadSetting(settings, "audioJitterBufferSamples", 0);
4147− _horizontalFieldOfView = loadSetting(settings, "horizontalFieldOfView", HORIZONTAL_FIELD_OF_VIEW_DEGREES);
4151+ _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);
41484152
41494153 settings->beginGroup("View Frustum Offset Camera");
41504154 // in case settings is corrupt or missing loadSetting() will check for NaN
@@ -4168,7 +4172,7 @@ void Application::saveSettings(QSettings* settings) { · 17 unmodified lines
41684172
41694173 settings->setValue("gyroCameraSensitivity", _gyroCameraSensitivity);
41704174 settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples);
4171− settings->setValue("horizontalFieldOfView", _horizontalFieldOfView);
4175+ settings->setValue("fieldOfView", _fieldOfView);
41724176 settings->beginGroup("View Frustum Offset Camera");
41734177 settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffsetYaw);
41744178 settings->setValue("viewFrustumOffsetPitch", _viewFrustumOffsetPitch);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t