History

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

stojce committed 13 years ago

Commit a87346d2 parents 7ce483b 53e248667 files · +2332 −882Browse files

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

Unified · Split

interface/src/Application.cpp+108−28
@@ -58,6 +58,7 @@ · 57 unmodified lines
5858 #include <VoxelSceneStats.h>
5959
6060 #include "Application.h"
61+#include "DataServerClient.h"
6162 #include "LogDisplay.h"
6263 #include "Menu.h"
6364 #include "Swatch.h"
@@ -101,6 +102,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 37 unmodified lines
101102 _voxelImporter(_window),
102103 _wantToKillLocalVoxels(false),
103104 _audioScope(256, 200, true),
105+ _profile(QString()),
104106 _mouseX(0),
105107 _mouseY(0),
106108 _touchAvgX(0.0f),
@@ -180,10 +182,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 73 unmodified lines
180182
181183 _settings = new QSettings(this);
182184
183− // check if there is a saved domain server hostname
184− // this must be done now instead of with the other setting checks to allow manual override with
185− // --domain or --local options
186− NodeList::getInstance()->loadData(_settings);
185+ // call Menu getInstance static method to set up the menu
186+ _window->setMenuBar(Menu::getInstance());
187187
188188 // Check to see if the user passed in a command line option for loading a local
189189 // Voxel File.
@@ -205,9 +205,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 15 unmodified lines
205205 NodeList::getInstance()->startSilentNodeRemovalThread();
206206
207207 _window->setCentralWidget(_glWidget);
208−
209− // call Menu getInstance static method to set up the menu
210− _window->setMenuBar(Menu::getInstance());
211208
212209 _networkAccessManager = new QNetworkAccessManager(this);
213210 QNetworkDiskCache* cache = new QNetworkDiskCache(_networkAccessManager);
@@ -242,7 +239,6 @@ Application::~Application() { · 28 unmodified lines
242239
243240 delete _oculusProgram;
244241 delete _settings;
245− delete _networkAccessManager;
246242 delete _followMode;
247243 delete _glWidget;
248244 }
@@ -324,13 +320,22 @@ void Application::initializeGL() { · 75 unmodified lines
324320 }
325321
326322 void Application::paintGL() {
327− PerfStat("display");
323+ PerformanceWarning::setSuppressShortTimings(Menu::getInstance()->isOptionChecked(MenuOption::SuppressShortTimings));
324+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::paintGL()");
328325
329326 glEnable(GL_LINE_SMOOTH);
330327
331328 if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
332329 _myCamera.setTightness (100.0f);
333− _myCamera.setTargetPosition(_myAvatar.getUprightHeadPosition());
330+ glm::vec3 targetPosition = _myAvatar.getUprightHeadPosition();
331+ if (_myAvatar.getHead().getBlendFace().isActive()) {
332+ // make sure we're aligned to the blend face eyes
333+ glm::vec3 leftEyePosition, rightEyePosition;
334+ if (_myAvatar.getHead().getBlendFace().getEyePositions(leftEyePosition, rightEyePosition, true)) {
335+ targetPosition = (leftEyePosition + rightEyePosition) * 0.5f;
336+ }
337+ }
338+ _myCamera.setTargetPosition(targetPosition);
334339 _myCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));
335340
336341 } else if (OculusManager::isConnected()) {
@@ -342,7 +347,7 @@ void Application::paintGL() { · 5 unmodified lines
342347
343348 } else if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
344349 _myCamera.setTightness(0.0f); // In first person, camera follows head exactly without delay
345− _myCamera.setTargetPosition(_myAvatar.getUprightEyeLevelPosition());
350+ _myCamera.setTargetPosition(_myAvatar.getEyeLevelPosition());
346351 _myCamera.setTargetRotation(_myAvatar.getHead().getCameraOrientation());
347352
348353 } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
@@ -445,6 +450,12 @@ void Application::updateProjectionMatrix() { · 96 unmodified lines
445450 glMatrixMode(GL_MODELVIEW);
446451 }
447452
453+void Application::resetProfile(const QString& username) {
454+ // call the destructor on the old profile and construct a new one
455+ (&_profile)->~Profile();
456+ new (&_profile) Profile(username);
457+}
458+
448459 void Application::controlledBroadcastToNodes(unsigned char* broadcastData, size_t dataBytes,
449460 const char* nodeTypes, int numNodeTypes) {
450461 Application* self = getInstance();
@@ -1153,6 +1164,9 @@ void Application::timer() { · 702 unmodified lines
11531164
11541165 // ask the node list to check in with the domain server
11551166 NodeList::getInstance()->sendDomainServerCheckIn();
1167+
1168+ // give the MyAvatar object position to the Profile so it can propagate to the data-server
1169+ _profile.updatePosition(_myAvatar.getPosition());
11561170 }
11571171
11581172 static glm::vec3 getFaceVector(BoxFace face) {
@@ -1186,6 +1200,7 @@ void Application::idle() { · 27 unmodified lines
11861200
11871201 double timeSinceLastUpdate = diffclock(&_lastTimeUpdated, &check);
11881202 if (timeSinceLastUpdate > IDLE_SIMULATE_MSECS) {
1203+
11891204 const float BIGGEST_DELTA_TIME_SECS = 0.25f;
11901205 update(glm::clamp((float)timeSinceLastUpdate / 1000.f, 0.f, BIGGEST_DELTA_TIME_SECS));
11911206 _glWidget->updateGL();
@@ -1254,13 +1269,14 @@ void Application::processAvatarURLsMessage(unsigned char* packetData, size_t dat · 62 unmodified lines
12541269 return;
12551270 }
12561271 QDataStream in(QByteArray((char*)packetData, dataBytes));
1257− QUrl voxelURL, faceURL;
1272+ QUrl voxelURL;
12581273 in >> voxelURL;
1259− in >> faceURL;
12601274
12611275 // invoke the set URL functions on the simulate/render thread
12621276 QMetaObject::invokeMethod(avatar->getVoxels(), "setVoxelURL", Q_ARG(QUrl, voxelURL));
1263− QMetaObject::invokeMethod(&avatar->getHead().getBlendFace(), "setModelURL", Q_ARG(QUrl, faceURL));
1277+
1278+ // use this timing to as the data-server for an updated mesh for this avatar (if we have UUID)
1279+ DataServerClient::getValueForKeyAndUUID(DataServerKey::FaceMeshURL, avatar->getUUID());
12641280 }
12651281
12661282 void Application::processAvatarFaceVideoMessage(unsigned char* packetData, size_t dataBytes) {
@@ -1587,15 +1603,21 @@ void Application::init() { · 320 unmodified lines
15871603 _audio.setJitterBufferSamples(Menu::getInstance()->getAudioJitterBufferSamples());
15881604 }
15891605 qDebug("Loaded settings.\n");
1606+
1607+ if (!_profile.getUsername().isEmpty()) {
1608+ // we have a username for this avatar, ask the data-server for the mesh URL for this avatar
1609+ DataServerClient::getClientValueForKey(DataServerKey::FaceMeshURL);
1610+ }
15901611
15911612 // Set up VoxelSystem after loading preferences so we can get the desired max voxel count
15921613 _voxels.setMaxVoxels(Menu::getInstance()->getMaxVoxels());
15931614 _voxels.setUseVoxelShader(Menu::getInstance()->isOptionChecked(MenuOption::UseVoxelShader));
1615+ _voxels.setVoxelsAsPoints(Menu::getInstance()->isOptionChecked(MenuOption::VoxelsAsPoints));
15941616 _voxels.setUseFastVoxelPipeline(Menu::getInstance()->isOptionChecked(MenuOption::FastVoxelPipeline));
15951617 _voxels.init();
15961618
15971619
1598− Avatar::sendAvatarURLsMessage(_myAvatar.getVoxels()->getVoxelURL(), _myAvatar.getHead().getBlendFace().getModelURL());
1620+ Avatar::sendAvatarURLsMessage(_myAvatar.getVoxels()->getVoxelURL());
15991621
16001622 _palette.init(_glWidget->width(), _glWidget->height());
16011623 _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelAddMode), 0, 0);
@@ -1639,9 +1661,9 @@ Avatar* Application::findLookatTargetAvatar(const glm::vec3& mouseRayOrigin, con · 37 unmodified lines
16391661 glm::vec3 headPosition = avatar->getHead().getPosition();
16401662 float distance;
16411663 if (rayIntersectsSphere(mouseRayOrigin, mouseRayDirection, headPosition,
1642− HEAD_SPHERE_RADIUS * avatar->getScale(), distance)) {
1664+ HEAD_SPHERE_RADIUS * avatar->getHead().getScale(), distance)) {
16431665 eyePosition = avatar->getHead().getEyePosition();
1644− _lookatIndicatorScale = avatar->getScale();
1666+ _lookatIndicatorScale = avatar->getHead().getScale();
16451667 _lookatOtherPosition = headPosition;
16461668 nodeID = avatar->getOwningNode()->getNodeID();
16471669 return avatar;
@@ -1782,8 +1804,8 @@ void Application::update(float deltaTime) { · 134 unmodified lines
17821804 _faceshift.getEstimatedEyePitch(), _faceshift.getEstimatedEyeYaw(), 0.0f))) * glm::vec3(0.0f, 0.0f, -1.0f);
17831805 }
17841806
1785− updateLookatTargetAvatar(lookAtRayOrigin, lookAtRayDirection, lookAtSpot);
1786− if (_lookatTargetAvatar) {
1807+ updateLookatTargetAvatar(mouseRayOrigin, mouseRayDirection, lookAtSpot);
1808+ if (_lookatTargetAvatar && !_faceshift.isActive()) {
17871809 // If the mouse is over another avatar's head...
17881810 _myAvatar.getHead().setLookAtPosition(lookAtSpot);
17891811 } else if (_isHoverVoxel && !_faceshift.isActive()) {
@@ -1975,6 +1997,11 @@ void Application::update(float deltaTime) { · 185 unmodified lines
19751997 _myAvatar.simulate(deltaTime, NULL);
19761998 }
19771999
2000+ // Simulate particle cloud movements
2001+ if (Menu::getInstance()->isOptionChecked(MenuOption::ParticleCloud)) {
2002+ _cloud.simulate(deltaTime);
2003+ }
2004+
19782005 // no transmitter drive implies transmitter pick
19792006 if (!Menu::getInstance()->isOptionChecked(MenuOption::TransmitterDrive) && _myTransmitter.isConnected()) {
19802007 _transmitterPickStart = _myAvatar.getSkeleton().joint[AVATAR_JOINT_CHEST].position;
@@ -2032,7 +2059,7 @@ void Application::update(float deltaTime) { · 51 unmodified lines
20322059 if (_faceshift.isActive()) {
20332060 const float EYE_OFFSET_SCALE = 0.025f;
20342061 glm::vec3 position = _faceshift.getHeadTranslation() * EYE_OFFSET_SCALE;
2035− _myCamera.setEyeOffsetPosition(glm::vec3(position.x * xSign, position.y, position.z));
2062+ _myCamera.setEyeOffsetPosition(glm::vec3(position.x * xSign, position.y, -position.z));
20362063 updateProjectionMatrix();
20372064
20382065 } else if (_webcam.isActive()) {
@@ -2071,8 +2098,7 @@ void Application::updateAvatar(float deltaTime) { · 32 unmodified lines
20712098 _yawFromTouch = 0.f;
20722099
20732100 // Update my avatar's state from gyros and/or webcam
2074− _myAvatar.updateFromGyrosAndOrWebcam(Menu::getInstance()->isOptionChecked(MenuOption::GyroLook),
2075− _pitchFromTouch);
2101+ _myAvatar.updateFromGyrosAndOrWebcam(_pitchFromTouch, Menu::getInstance()->isOptionChecked(MenuOption::TurnWithHead));
20762102
20772103 // Update head mouse from faceshift if active
20782104 if (_faceshift.isActive()) {
@@ -2172,8 +2198,7 @@ void Application::updateAvatar(float deltaTime) { · 93 unmodified lines
21722198 // once in a while, send my urls
21732199 const float AVATAR_URLS_SEND_INTERVAL = 1.0f; // seconds
21742200 if (shouldDo(AVATAR_URLS_SEND_INTERVAL, deltaTime)) {
2175− Avatar::sendAvatarURLsMessage(_myAvatar.getVoxels()->getVoxelURL(),
2176− _myAvatar.getHead().getBlendFace().getModelURL());
2201+ Avatar::sendAvatarURLsMessage(_myAvatar.getVoxels()->getVoxelURL());
21772202 }
21782203 }
21792204 }
@@ -2386,6 +2411,7 @@ void Application::computeOffAxisFrustum(float& left, float& right, float& bottom · 206 unmodified lines
23862411 }
23872412
23882413 void Application::displaySide(Camera& whichCamera) {
2414+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displaySide()");
23892415 // transform by eye offset
23902416
23912417 // flip x if in mirror mode (also requires reversing winding order for backface culling)
@@ -2417,6 +2443,8 @@ void Application::displaySide(Camera& whichCamera) { · 25 unmodified lines
24172443 setupWorldLight(whichCamera);
24182444
24192445 if (Menu::getInstance()->isOptionChecked(MenuOption::Stars)) {
2446+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2447+ "Application::displaySide() ... stars...");
24202448 if (!_stars.getFileLoaded()) {
24212449 _stars.readInput(STAR_FILE, STAR_CACHE_FILE, 0);
24222450 }
@@ -2442,6 +2470,8 @@ void Application::displaySide(Camera& whichCamera) { · 19 unmodified lines
24422470
24432471 // draw the sky dome
24442472 if (Menu::getInstance()->isOptionChecked(MenuOption::Atmosphere)) {
2473+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2474+ "Application::displaySide() ... atmosphere...");
24452475 _environment.renderAtmospheres(whichCamera);
24462476 }
24472477
@@ -2464,6 +2494,9 @@ void Application::displaySide(Camera& whichCamera) { · 16 unmodified lines
24642494
24652495 //draw a grid ground plane....
24662496 if (Menu::getInstance()->isOptionChecked(MenuOption::GroundPlane)) {
2497+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2498+ "Application::displaySide() ... ground plane...");
2499+
24672500 // draw grass plane with fog
24682501 glEnable(GL_FOG);
24692502 glEnable(GL_NORMALIZE);
@@ -2484,17 +2517,29 @@ void Application::displaySide(Camera& whichCamera) { · 14 unmodified lines
24842517 glDisable(GL_NORMALIZE);
24852518
24862519 //renderGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE, _audio.getCollisionSoundMagnitude());
2487− }
2520+ }
2521+ // Draw Cloud Particles
2522+ if (Menu::getInstance()->isOptionChecked(MenuOption::ParticleCloud)) {
2523+ _cloud.render();
2524+ }
24882525 // Draw voxels
24892526 if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) {
2490− _voxels.render(Menu::getInstance()->isOptionChecked(MenuOption::VoxelTextures));
2527+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2528+ "Application::displaySide() ... voxels...");
2529+ if (!Menu::getInstance()->isOptionChecked(MenuOption::DontRenderVoxels)) {
2530+ _voxels.render(Menu::getInstance()->isOptionChecked(MenuOption::VoxelTextures));
2531+ }
24912532 }
24922533
2534+
24932535 // restore default, white specular
24942536 glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR);
24952537
24962538 // indicate what we'll be adding/removing in mouse mode, if anything
24972539 if (_mouseVoxel.s != 0) {
2540+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2541+ "Application::displaySide() ... voxels TOOLS UX...");
2542+
24982543 glDisable(GL_LIGHTING);
24992544 glPushMatrix();
25002545 glScalef(TREE_SCALE, TREE_SCALE, TREE_SCALE);
@@ -2540,6 +2585,9 @@ void Application::displaySide(Camera& whichCamera) { · 39 unmodified lines
25402585 }
25412586
25422587 if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelSelectMode) && _pasteMode) {
2588+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2589+ "Application::displaySide() ... PASTE Preview...");
2590+
25432591 glPushMatrix();
25442592 glTranslatef(_mouseVoxel.x * TREE_SCALE,
25452593 _mouseVoxel.y * TREE_SCALE,
@@ -2555,6 +2603,10 @@ void Application::displaySide(Camera& whichCamera) { · 9 unmodified lines
25552603 _myAvatar.renderScreenTint(SCREEN_TINT_BEFORE_AVATARS, whichCamera);
25562604
25572605 if (Menu::getInstance()->isOptionChecked(MenuOption::Avatars)) {
2606+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2607+ "Application::displaySide() ... Avatars...");
2608+
2609+
25582610 // Render avatars of other nodes
25592611 NodeList* nodeList = NodeList::getInstance();
25602612
@@ -2599,16 +2651,22 @@ void Application::displaySide(Camera& whichCamera) { · 38 unmodified lines
25992651
26002652 // render the ambient occlusion effect if enabled
26012653 if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) {
2654+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2655+ "Application::displaySide() ... AmbientOcclusion...");
26022656 _ambientOcclusionEffect.render();
26032657 }
26042658
26052659 // brad's frustum for debugging
26062660 if (Menu::getInstance()->isOptionChecked(MenuOption::DisplayFrustum)) {
2661+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2662+ "Application::displaySide() ... renderViewFrustum...");
26072663 renderViewFrustum(_viewFrustum);
26082664 }
26092665
26102666 // render voxel fades if they exist
26112667 if (_voxelFades.size() > 0) {
2668+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2669+ "Application::displaySide() ... voxel fades...");
26122670 for(std::vector<VoxelFade>::iterator fade = _voxelFades.begin(); fade != _voxelFades.end();) {
26132671 fade->render();
26142672 if(fade->isDone()) {
@@ -2618,11 +2676,18 @@ void Application::displaySide(Camera& whichCamera) { · 3 unmodified lines
26182676 }
26192677 }
26202678 }
2621−
2622− renderFollowIndicator();
2679+
2680+ {
2681+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2682+ "Application::displaySide() ... renderFollowIndicator...");
2683+ renderFollowIndicator();
2684+ }
26232685
26242686 // render transmitter pick ray, if non-empty
26252687 if (_transmitterPickStart != _transmitterPickEnd) {
2688+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2689+ "Application::displaySide() ... transmitter pick ray...");
2690+
26262691 Glower glower;
26272692 const float TRANSMITTER_PICK_COLOR[] = { 1.0f, 1.0f, 0.0f };
26282693 glColor3fv(TRANSMITTER_PICK_COLOR);
@@ -2644,6 +2709,8 @@ void Application::displaySide(Camera& whichCamera) { · 15 unmodified lines
26442709 }
26452710
26462711 void Application::displayOverlay() {
2712+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displayOverlay()");
2713+
26472714 // Render 2D overlay: I/O level bar graphs and text
26482715 glMatrixMode(GL_PROJECTION);
26492716 glPushMatrix();
@@ -3461,9 +3528,16 @@ void Application::attachNewHeadToNode(Node* newNode) { · 811 unmodified lines
34613528 void Application::domainChanged(QString domain) {
34623529 qDebug("Application title set to: %s.\n", domain.toStdString().c_str());
34633530 _window->setWindowTitle(domain);
3531+
3532+ // update the user's last domain in their Profile (which will propagate to data-server)
3533+ _profile.updateDomain(domain);
3534+
3535+ // reset the environment so that we don't erroneously end up with multiple
3536+ _environment.resetToDefault();
34643537 }
34653538
34663539 void Application::nodeAdded(Node* node) {
3540+
34673541 }
34683542
34693543 void Application::nodeKilled(Node* node) {
@@ -3574,6 +3648,12 @@ void* Application::networkReceive(void* args) { · 104 unmodified lines
35743648 case PACKET_TYPE_AVATAR_FACE_VIDEO:
35753649 processAvatarFaceVideoMessage(app->_incomingPacket, bytesReceived);
35763650 break;
3651+ case PACKET_TYPE_DATA_SERVER_GET:
3652+ case PACKET_TYPE_DATA_SERVER_PUT:
3653+ case PACKET_TYPE_DATA_SERVER_SEND:
3654+ case PACKET_TYPE_DATA_SERVER_CONFIRM:
3655+ DataServerClient::processMessageFromDataServer(app->_incomingPacket, bytesReceived);
3656+ break;
35773657 default:
35783658 NodeList::getInstance()->processNodeData(&senderAddress, app->_incomingPacket, bytesReceived);
35793659 break;

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