History

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

Philip Rosedale committed 13 years ago

Commit ba2c98a2 parents 5498324 a96c1df26 files · +1042 −428Browse files

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

Unified · Split

interface/src/Application.cpp+62−45
@@ -164,9 +164,9 @@ void GLCanvas::wheelEvent(QWheelEvent* event) { · 163 unmodified lines
164164 Application::getInstance()->wheelEvent(event);
165165 }
166166
167−void messageHandler(QtMsgType type, const char* message) {
168− fprintf(stdout, "%s", message);
169− LogDisplay::instance.addMessage(message);
167+void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message) {
168+ fprintf(stdout, "%s", message.toLocal8Bit().constData());
169+ LogDisplay::instance.addMessage(message.toLocal8Bit().constData());
170170 }
171171
172172 Application::Application(int& argc, char** argv, timeval &startup_time) :
@@ -224,7 +224,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 51 unmodified lines
224224 _applicationStartupTime = startup_time;
225225 _window->setWindowTitle("Interface");
226226
227− qInstallMsgHandler(messageHandler);
227+ qInstallMessageHandler(messageHandler);
228228
229229 unsigned int listenPort = 0; // bind to an ephemeral port by default
230230 const char** constArgv = const_cast<const char**>(argv);
@@ -566,6 +566,11 @@ void Application::keyPressEvent(QKeyEvent* event) { · 335 unmodified lines
566566 }
567567 return;
568568 }
569+
570+ //this is for switching between modes for the leap rave glove test
571+ if (_simulateLeapHand->isChecked() || _testRaveGlove->isChecked()) {
572+ _myAvatar.getHand().setRaveGloveEffectsMode((QKeyEvent*)event);
573+ }
569574
570575 bool shifted = event->modifiers().testFlag(Qt::ShiftModifier);
571576 switch (event->key()) {
@@ -1226,7 +1231,7 @@ void Application::editPreferences() { · 654 unmodified lines
12261231
12271232 if (domainServerHostname->text().size() > 0) {
12281233 // the user input a new hostname, use that
1229− newHostname = domainServerHostname->text().toAscii();
1234+ newHostname = domainServerHostname->text().toLocal8Bit();
12301235 } else {
12311236 // the user left the field blank, use the default hostname
12321237 newHostname = QByteArray(DEFAULT_DOMAIN_HOSTNAME);
@@ -1522,12 +1527,12 @@ bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) { · 289 unmodified lines
15221527 }
15231528
15241529 void Application::exportVoxels() {
1525− QString desktopLocation = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
1530+ QString desktopLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
15261531 QString suggestedName = desktopLocation.append("/voxels.svo");
15271532
15281533 QString fileNameString = QFileDialog::getSaveFileName(_glWidget, tr("Export Voxels"), suggestedName,
15291534 tr("Sparse Voxel Octree Files (*.svo)"));
1530− QByteArray fileNameAscii = fileNameString.toAscii();
1535+ QByteArray fileNameAscii = fileNameString.toLocal8Bit();
15311536 const char* fileName = fileNameAscii.data();
15321537 VoxelNode* selectedNode = _voxels.getVoxelAt(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
15331538 if (selectedNode) {
@@ -1542,11 +1547,11 @@ void Application::exportVoxels() { · 8 unmodified lines
15421547
15431548 const char* IMPORT_FILE_TYPES = "Sparse Voxel Octree Files, Square PNG, Schematic Files (*.svo *.png *.schematic)";
15441549 void Application::importVoxelsToClipboard() {
1545− QString desktopLocation = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
1550+ QString desktopLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
15461551 QString fileNameString = QFileDialog::getOpenFileName(_glWidget, tr("Import Voxels to Clipboard"), desktopLocation,
15471552 tr(IMPORT_FILE_TYPES));
15481553
1549− QByteArray fileNameAscii = fileNameString.toAscii();
1554+ QByteArray fileNameAscii = fileNameString.toLocal8Bit();
15501555 const char* fileName = fileNameAscii.data();
15511556
15521557 _clipboardTree.eraseAllVoxels();
@@ -1576,11 +1581,11 @@ void Application::importVoxelsToClipboard() { · 23 unmodified lines
15761581 }
15771582
15781583 void Application::importVoxels() {
1579− QString desktopLocation = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
1584+ QString desktopLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
15801585 QString fileNameString = QFileDialog::getOpenFileName(_glWidget, tr("Import Voxels"), desktopLocation,
15811586 tr(IMPORT_FILE_TYPES));
15821587
1583− QByteArray fileNameAscii = fileNameString.toAscii();
1588+ QByteArray fileNameAscii = fileNameString.toLocal8Bit();
15841589 const char* fileName = fileNameAscii.data();
15851590
15861591 VoxelTree importVoxels;
@@ -1994,8 +1999,11 @@ const float MAX_VOXEL_EDIT_DISTANCE = 20.0f; · 407 unmodified lines
19941999 const float HEAD_SPHERE_RADIUS = 0.07;
19952000
19962001
2002+static uint16_t DEFAULT_NODE_ID_REF = 1;
2003+
2004+
19972005 bool Application::isLookingAtOtherAvatar(glm::vec3& mouseRayOrigin, glm::vec3& mouseRayDirection,
1998− glm::vec3& eyePosition, uint16_t& nodeID) {
2006+ glm::vec3& eyePosition, uint16_t& nodeID = DEFAULT_NODE_ID_REF) {
19992007
20002008 NodeList* nodeList = NodeList::getInstance();
20012009 for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
@@ -2052,8 +2060,8 @@ void Application::update(float deltaTime) { · 50 unmodified lines
20522060
20532061 // Set where I am looking based on my mouse ray (so that other people can see)
20542062 glm::vec3 eyePosition;
2055− uint16_t ignored;
2056− _isLookingAtOtherAvatar = isLookingAtOtherAvatar(mouseRayOrigin, mouseRayDirection, eyePosition, ignored);
2063+
2064+ _isLookingAtOtherAvatar = isLookingAtOtherAvatar(mouseRayOrigin, mouseRayDirection, eyePosition);
20572065 if (_isLookingAtOtherAvatar) {
20582066 // If the mouse is over another avatar's head...
20592067 glm::vec3 myLookAtFromMouse(eyePosition);
@@ -2353,8 +2361,8 @@ void Application::updateAvatar(float deltaTime) { · 293 unmodified lines
23532361 _viewFrustum.computePickRay(MIDPOINT_OF_SCREEN, MIDPOINT_OF_SCREEN, screenCenterRayOrigin, screenCenterRayDirection);
23542362
23552363 glm::vec3 eyePosition;
2356− uint16_t ignored;
2357− _isLookingAtOtherAvatar = isLookingAtOtherAvatar(screenCenterRayOrigin, screenCenterRayDirection, eyePosition, ignored);
2364+
2365+ _isLookingAtOtherAvatar = isLookingAtOtherAvatar(screenCenterRayOrigin, screenCenterRayDirection, eyePosition);
23582366 if (_isLookingAtOtherAvatar) {
23592367 glm::vec3 myLookAtFromMouse(eyePosition);
23602368 _myAvatar.getHead().setLookAtPosition(myLookAtFromMouse);
@@ -2393,7 +2401,7 @@ void Application::updateAvatar(float deltaTime) { · 32 unmodified lines
23932401 NodeList* nodeList = NodeList::getInstance();
23942402 if (nodeList->getOwnerID() != UNKNOWN_NODE_ID) {
23952403 // if I know my ID, send head/hand data to the avatar mixer and voxel server
2396− unsigned char broadcastString[200];
2404+ unsigned char broadcastString[MAX_PACKET_SIZE];
23972405 unsigned char* endOfBroadcastStringWrite = broadcastString;
23982406
23992407 endOfBroadcastStringWrite += populateTypeAndVersion(endOfBroadcastStringWrite, PACKET_TYPE_HEAD_DATA);
@@ -2764,13 +2772,12 @@ void Application::displaySide(Camera& whichCamera) { · 364 unmodified lines
27642772 _particleSystem.render();
27652773 }
27662774 }
2767−
2775+
27682776 // Render the world box
27692777 if (!_lookingInMirror->isChecked() && _renderStatsOn->isChecked()) { render_world_box(); }
27702778
27712779 // brad's frustum for debugging
27722780 if (_frustumOn->isChecked()) renderViewFrustum(_viewFrustum);
2773−
27742781 }
27752782
27762783 void Application::displayOverlay() {
@@ -3668,7 +3675,7 @@ void Application::saveSettings(QSettings* settings) { · 891 unmodified lines
36683675 }
36693676
36703677 void Application::importSettings() {
3671− QString locationDir(QDesktopServices::displayName(QDesktopServices::DesktopLocation));
3678+ QString locationDir(QStandardPaths::displayName(QStandardPaths::DesktopLocation));
36723679 QString fileName = QFileDialog::getOpenFileName(_window,
36733680 tr("Open .ini config file"),
36743681 locationDir,
@@ -3680,7 +3687,7 @@ void Application::importSettings() { · 5 unmodified lines
36803687 }
36813688
36823689 void Application::exportSettings() {
3683− QString locationDir(QDesktopServices::displayName(QDesktopServices::DesktopLocation));
3690+ QString locationDir(QStandardPaths::displayName(QStandardPaths::DesktopLocation));
36843691 QString fileName = QFileDialog::getSaveFileName(_window,
36853692 tr("Save .ini config file"),
36863693 locationDir,
@@ -3693,56 +3700,57 @@ void Application::exportSettings() { · 6 unmodified lines
36933700 }
36943701
36953702
3696−
36973703 void Application::updateParticleSystem(float deltaTime) {
36983704
36993705 if (!_particleSystemInitialized) {
3706+
3707+ const int LIFESPAN_IN_SECONDS = 100000.0f;
3708+ const float EMIT_RATE_IN_SECONDS = 10000.0;
37003709 // create a stable test emitter and spit out a bunch of particles
37013710 _coolDemoParticleEmitter = _particleSystem.addEmitter();
3702−
3711+
37033712 if (_coolDemoParticleEmitter != -1) {
3713+
37043714 _particleSystem.setShowingEmitter(_coolDemoParticleEmitter, true);
37053715 glm::vec3 particleEmitterPosition = glm::vec3(5.0f, 1.0f, 5.0f);
3706− _particleSystem.setEmitterPosition(_coolDemoParticleEmitter, particleEmitterPosition);
3707− glm::vec3 velocity(0.0f, 0.1f, 0.0f);
3708− float lifespan = 100000.0f;
3709− _particleSystem.emitParticlesNow(_coolDemoParticleEmitter, 1500, velocity, lifespan);
3716+
3717+ _particleSystem.setEmitterPosition (_coolDemoParticleEmitter, particleEmitterPosition);
3718+ _particleSystem.setEmitterParticleLifespan(_coolDemoParticleEmitter, LIFESPAN_IN_SECONDS);
3719+ _particleSystem.setEmitterThrust (_coolDemoParticleEmitter, 0.0f);
3720+ _particleSystem.setEmitterRate (_coolDemoParticleEmitter, EMIT_RATE_IN_SECONDS); // to emit a pile o particles now
37103721 }
37113722
37123723 // signal that the particle system has been initialized
37133724 _particleSystemInitialized = true;
37143725 } else {
37153726 // update the particle system
3716−
3717− static float t = 0.0f;
3718− t += deltaTime;
3727+
3728+ static bool emitting = true;
3729+ static float effectsTimer = 0.0f;
3730+ effectsTimer += deltaTime;
37193731
37203732 if (_coolDemoParticleEmitter != -1) {
37213733
3722− glm::vec3 tilt = glm::vec3
3723− (
3724− 30.0f * sinf( t * 0.55f ),
3725− 0.0f,
3726− 30.0f * cosf( t * 0.75f )
3727− );
3728−
3729− _particleSystem.setEmitterRotation(_coolDemoParticleEmitter, glm::quat(glm::radians(tilt)));
3734+ _particleSystem.setEmitterDirection(_coolDemoParticleEmitter, glm::vec3(0.0f, 1.0f, 0.0f));
37303735
37313736 ParticleSystem::ParticleAttributes attributes;
37323737
37333738 attributes.radius = 0.01f;
37343739 attributes.color = glm::vec4( 1.0f, 1.0f, 1.0f, 1.0f);
3735− attributes.gravity = 0.0f + 0.05f * sinf( t * 0.52f );
3736− attributes.airFriction = 2.5 + 2.0f * sinf( t * 0.32f );
3737− attributes.jitter = 0.05f + 0.05f * sinf( t * 0.42f );
3738− attributes.emitterAttraction = 0.015f + 0.015f * cosf( t * 0.6f );
3739− attributes.tornadoForce = 0.0f + 0.03f * sinf( t * 0.7f );
3740− attributes.neighborAttraction = 0.1f + 0.1f * cosf( t * 0.8f );
3741− attributes.neighborRepulsion = 0.2f + 0.2f * sinf( t * 0.4f );
3740+ attributes.gravity = 0.0f + 0.05f * sinf( effectsTimer * 0.52f );
3741+ attributes.airFriction = 2.5 + 2.0f * sinf( effectsTimer * 0.32f );
3742+ attributes.jitter = 0.05f + 0.05f * sinf( effectsTimer * 0.42f );
3743+ attributes.emitterAttraction = 0.015f + 0.015f * cosf( effectsTimer * 0.6f );
3744+ attributes.tornadoForce = 0.0f + 0.03f * sinf( effectsTimer * 0.7f );
3745+ attributes.neighborAttraction = 0.1f + 0.1f * cosf( effectsTimer * 0.8f );
3746+ attributes.neighborRepulsion = 0.2f + 0.2f * sinf( effectsTimer * 0.4f );
37423747 attributes.bounce = 1.0f;
37433748 attributes.usingCollisionSphere = true;
37443749 attributes.collisionSpherePosition = glm::vec3( 5.0f, 0.5f, 5.0f );
37453750 attributes.collisionSphereRadius = 0.5f;
3751+ attributes.usingCollisionPlane = true;
3752+ attributes.collisionPlanePosition = glm::vec3( 5.0f, 0.0f, 5.0f );
3753+ attributes.collisionPlaneNormal = glm::vec3( 0.0f, 1.0f, 0.0f );
37463754
37473755 if (attributes.gravity < 0.0f) {
37483756 attributes.gravity = 0.0f;
@@ -3753,6 +3761,15 @@ void Application::updateParticleSystem(float deltaTime) { · 4 unmodified lines
37533761
37543762 _particleSystem.setUpDirection(glm::vec3(0.0f, 1.0f, 0.0f));
37553763 _particleSystem.simulate(deltaTime);
3764+
3765+ const float EMIT_RATE_IN_SECONDS = 0.0;
3766+
3767+ if (_coolDemoParticleEmitter != -1) {
3768+ if (emitting) {
3769+ _particleSystem.setEmitterRate(_coolDemoParticleEmitter, EMIT_RATE_IN_SECONDS); // stop emitter
3770+ emitting = false;
3771+ }
3772+ }
37563773 }
37573774 }
37583775

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