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

Conflicts:
	interface/src/Application.h

interface/resources/styles/log_dialog.qss

@@ -0,0 +1,7 @@
+QPlainTextEdit {
+    font-family: Inconsolata, Lucida Console, Andale Mono, Monaco;
+    font-size: 16px;
+    padding-left: 28px;
+    color: #333333;
+    background-color: #FFFFFF;
+}

interface/src/Application.cpp

@@ -143,11 +143,17 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
         _pasteMode(false)
 {
     _applicationStartupTime = startup_time;
+
+    switchToResourcesParentIfRequired();
+    QFontDatabase::addApplicationFont("resources/styles/Inconsolata.otf");
     _window->setWindowTitle("Interface");
-    
-    qDebug( "[VERSION] Build sequence: %i", BUILD_VERSION);
-    
+
     qInstallMessageHandler(messageHandler);
+
+    // call Menu getInstance static method to set up the menu
+    _window->setMenuBar(Menu::getInstance());
+
+    qDebug("[VERSION] Build sequence: %i", BUILD_VERSION);
     
     unsigned int listenPort = 0; // bind to an ephemeral port by default
     const char** constArgv = const_cast<const char**>(argv);
@@ -173,16 +179,9 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
 
     // network receive thread and voxel parsing thread are both controlled by the --nonblocking command line
     _enableProcessVoxelsThread = _enableNetworkThread = !cmdOptionExists(argc, constArgv, "--nonblocking");
-    
-    // setup QSettings    
-#ifdef Q_OS_MAC
-    QString resourcesPath = QCoreApplication::applicationDirPath() + "/../Resources";
-#else
-    QString resourcesPath = QCoreApplication::applicationDirPath() + "/resources";
-#endif
-    
+
     // read the ApplicationInfo.ini file for Name/Version/Domain information
-    QSettings applicationInfo(resourcesPath + "/info/ApplicationInfo.ini", QSettings::IniFormat);
+    QSettings applicationInfo("resources/info/ApplicationInfo.ini", QSettings::IniFormat);
     
     // set the associated application properties
     applicationInfo.beginGroup("INFO");
@@ -191,11 +190,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
     setApplicationVersion(applicationInfo.value("version").toString());
     setOrganizationName(applicationInfo.value("organizationName").toString());
     setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
-    
+
     _settings = new QSettings(this);
-    
-    // call Menu getInstance static method to set up the menu
-    _window->setMenuBar(Menu::getInstance());
 
     // Check to see if the user passed in a command line option for loading a local
     // Voxel File.
@@ -251,6 +247,9 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
 }
 
 Application::~Application() {
+
+    qInstallMessageHandler(NULL);
+    
     // make sure we don't call the idle timer any more
     delete idleTimer;
 
@@ -4480,3 +4479,12 @@ void Application::loadScript() {
     // restore the main window's active state
     _window->activateWindow();
 }
+
+void Application::toggleLogDialog() {
+    if (! _logDialog) {
+        _logDialog = new LogDialog(_glWidget);
+        _logDialog->show();
+    } else {
+        _logDialog->close();
+    }
+}

interface/src/Application.h

@@ -18,6 +18,7 @@
 #include <QSettings>
 #include <QTouchEvent>
 #include <QList>
+#include <QPointer>
 
 #include <NetworkPacket.h>
 #include <NodeList.h>
@@ -67,6 +68,7 @@
 #include "ui/VoxelStatsDialog.h"
 #include "ui/RearMirrorTools.h"
 #include "ui/LodToolsDialog.h"
+#include "ui/LogDialog.h"
 #include "ParticleTreeRenderer.h"
 #include "ParticleEditHandle.h"
 #include "ControllerScriptingInterface.h"
@@ -224,7 +226,7 @@ public slots:
     void decreaseVoxelSize();
     void increaseVoxelSize();
     void loadScript();
-    
+    void toggleLogDialog();
     
 private slots:
     
@@ -505,8 +507,8 @@ private:
     
     std::vector<VoxelFade> _voxelFades;
     std::vector<Avatar*> _avatarFades;
-    
     ControllerScriptingInterface _controllerScriptingInterface;
+    QPointer<LogDialog> _logDialog;
 };
 
 #endif /* defined(__interface__Application__) */

interface/src/LogDisplay.cpp

@@ -6,12 +6,13 @@
 // Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
 
-#include "LogDisplay.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 
+#include <QStringList>
+
+#include "LogDisplay.h"
 #include "Util.h"
 
 using namespace std;
@@ -91,6 +92,7 @@ void LogDisplay::setCharacterSize(unsigned width, unsigned height) {
 void LogDisplay::addMessage(const char* ptr) {
 
     pthread_mutex_lock(& _mutex);
+    emit logReceived(ptr);
 
     // T-pipe, if requested
     if (_stream != 0l) {
@@ -118,7 +120,7 @@ void LogDisplay::addMessage(const char* ptr) {
             _writePos = _chars;
         }
 
-        if (++_writtenInLine >= _lineLength || c == '\0') {
+        if (c == '\0') {
 
             // new line? store its start to the line buffer and mark next line as empty
             ++_lastLinePos;
@@ -148,13 +150,24 @@ void LogDisplay::addMessage(const char* ptr) {
 
             // remember start position in character buffer for next line and reset character count
             _writeLineStartPos = _writePos;
-            _writtenInLine = 0;
         }
     }
 
     pthread_mutex_unlock(& _mutex);
 }
 
+QStringList LogDisplay::getLogData() {
+    // wait for adding new log data whilr iterating over _lines
+    pthread_mutex_lock(& _mutex);
+    QStringList list;
+    int i = 0;
+    while (_lines[i] != *_lastLinePos) {
+        list.append(_lines[i++]);
+    }
+    pthread_mutex_unlock(& _mutex);
+    return list;
+}
+
 //
 // Rendering
 //

interface/src/LogDisplay.h

@@ -14,7 +14,8 @@
 
 #include "ui/TextRenderer.h"
 
-class LogDisplay {
+class LogDisplay : public QObject {
+    Q_OBJECT
 public:
 
     static LogDisplay instance;
@@ -43,6 +44,11 @@ public:
     static unsigned const LINE_BUFFER_SIZE         = 256;   // number of lines that are buffered
     static unsigned const MAX_MESSAGE_LENGTH       = 512;   // maximum number of characters for a message
 
+    QStringList getLogData();
+
+signals:
+    void logReceived(QString message);
+
 private:
     // use static 'instance' to access the single instance
     LogDisplay();

interface/src/Menu.cpp

@@ -265,7 +265,7 @@ Menu::Menu() :
     
     addDisabledActionAndSeparator(viewMenu, "Stats");
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats, Qt::Key_Slash);
-    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Log, Qt::CTRL | Qt::Key_L);
+    addActionToQMenuAndActionHash(viewMenu, MenuOption::Log, Qt::CTRL | Qt::Key_L, appInstance, SLOT(toggleLogDialog()));
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Oscilloscope, 0, true);
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Bandwidth, 0, true);
     addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, this, SLOT(bandwidthDetails()));

interface/src/Menu.h

@@ -146,7 +146,6 @@ private:
     int _boundaryLevelAdjust;
     QAction* _useVoxelShader;
     int _maxVoxelPacketsPerSecond;
-    
     QMenu* _activeScriptsMenu;
 };
 

interface/src/avatar/Hand.cpp

@@ -24,11 +24,11 @@ using namespace std;
 const float FINGERTIP_VOXEL_SIZE = 0.05;
 const int TOY_BALL_HAND = 1;
 const float TOY_BALL_RADIUS = 0.05f;
-const float TOY_BALL_DAMPING = 0.99f;
+const float TOY_BALL_DAMPING = 0.1f;
 const glm::vec3 NO_VELOCITY = glm::vec3(0,0,0);
 const glm::vec3 NO_GRAVITY = glm::vec3(0,0,0);
 const float NO_DAMPING = 0.f;
-const glm::vec3 TOY_BALL_GRAVITY = glm::vec3(0,-0.5,0);
+const glm::vec3 TOY_BALL_GRAVITY = glm::vec3(0,-2.0,0);
 const QString TOY_BALL_UPDATE_SCRIPT("");
 const float PALM_COLLISION_RADIUS = 0.03f;
 const float CATCH_RADIUS = 0.2f;
@@ -98,7 +98,7 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
             
             // update the particle with it's new state...
 #ifdef DEBUG_HAND
-            qDebug("Update caught particle!\n");
+            qDebug("Caught!\n");
 #endif
             caughtParticle->updateParticle(newPosition,
                                             closestParticle->getRadius(),
@@ -108,6 +108,7 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
                                             NO_DAMPING,
                                             IN_HAND, // we just grabbed it!
                                             closestParticle->getUpdateScript());
+            
                                             
             // now tell our hand about us having caught it...
             _toyBallInHand[handID] = true;
@@ -115,6 +116,11 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
             //printf(">>>>>>> caught... handID:%d particle ID:%d _toyBallInHand[handID] = true\n", handID, closestParticle->getID());
             _ballParticleEditHandles[handID] = caughtParticle;
             caughtParticle = NULL;
+            //  Play a catch sound!
+            Application::getInstance()->getAudio()->startDrumSound(1.0,
+                                                                   300,
+                                                                   0.5,
+                                                                   0.05);
         }
     }
     
@@ -158,11 +164,17 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
                                                                      TOY_BALL_DAMPING,
                                                                      IN_HAND,
                                                                      TOY_BALL_UPDATE_SCRIPT);
+                // Play a new ball sound
+                Application::getInstance()->getAudio()->startDrumSound(1.0,
+                                                                       2000,
+                                                                       0.5,
+                                                                       0.02);
+
             }
         } else {
             //  Ball is in hand
 #ifdef DEBUG_HAND
-            qDebug("Ball in hand\n");
+            //qDebug("Ball in hand\n");
 #endif
             glm::vec3 ballPosition = ballFromHand ? palm.getPosition() : fingerTipPosition;
             _ballParticleEditHandles[handID]->updateParticle(ballPosition / (float)TREE_SCALE,
@@ -178,13 +190,14 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
         //  If toy ball just released, add velocity to it!
         if (_toyBallInHand[handID]) {
         
+            const float THROWN_VELOCITY_SCALING = 1.5f;
             _toyBallInHand[handID] = false;
             glm::vec3 ballPosition = ballFromHand ? palm.getPosition() : fingerTipPosition;
             glm::vec3 ballVelocity = ballFromHand ? palm.getRawVelocity() : palm.getTipVelocity();
             glm::quat avatarRotation = _owningAvatar->getOrientation();
             ballVelocity = avatarRotation * ballVelocity;
+            ballVelocity *= THROWN_VELOCITY_SCALING;
 
-            // ball is no longer in hand...
 #ifdef DEBUG_HAND
             qDebug("Threw ball, v = %.3f\n", glm::length(ballVelocity));
 #endif
@@ -201,6 +214,13 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
             // note: deleting the edit handle doesn't effect the actual particle
             delete _ballParticleEditHandles[handID];
             _ballParticleEditHandles[handID] = NULL;
+            
+            // Play a throw sound
+            Application::getInstance()->getAudio()->startDrumSound(1.0,
+                                                                   3000,
+                                                                   0.5,
+                                                                   0.02);
+
 
         }
     }

interface/src/ui/LogDialog.cpp

@@ -0,0 +1,75 @@
+//
+//  LogDialog.cpp
+//  interface
+//
+//  Created by Stojce Slavkovski on 12/12/13.
+//  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
+
+#include <QDesktopWidget>
+#include <QTextBlock>
+#include <QtGui>
+
+#include "SharedUtil.h"
+#include "ui/LogDialog.h"
+#include "LogDisplay.h"
+
+const int INITIAL_WIDTH  = 720;
+const float INITIAL_HEIGHT_RATIO = 0.6f;
+
+int cursorMeta = qRegisterMetaType<QTextCursor>("QTextCursor");
+int blockMeta = qRegisterMetaType<QTextBlock>("QTextBlock");
+
+LogDialog::LogDialog(QWidget* parent) : QDialog(parent, Qt::Dialog) {
+
+    setWindowTitle("Log");
+
+    _logTextBox = new QPlainTextEdit(this);
+    _logTextBox->setReadOnly(true);
+    _logTextBox->show();
+
+    switchToResourcesParentIfRequired();
+    QFile styleSheet("resources/styles/log_dialog.qss");
+
+    if (styleSheet.open(QIODevice::ReadOnly)) {
+        setStyleSheet(styleSheet.readAll());
+    }
+
+    QDesktopWidget desktop;
+    QRect screen = desktop.screenGeometry();
+    resize(INITIAL_WIDTH, static_cast<int>(screen.height() * INITIAL_HEIGHT_RATIO));
+    move(screen.center() - rect().center());
+
+    setAttribute(Qt::WA_DeleteOnClose);
+}
+
+LogDialog::~LogDialog() {
+    deleteLater();
+}
+
+void LogDialog::showEvent(QShowEvent *e)  {
+    _logTextBox->clear();
+
+    pthread_mutex_lock(& _mutex);
+    QStringList _logData = LogDisplay::instance.getLogData();
+
+    connect(&LogDisplay::instance, &LogDisplay::logReceived, this, &LogDialog::appendLogLine);
+    for(int i = 0; i < _logData.size(); ++i) {
+        appendLogLine(_logData[i]);
+    }
+
+    pthread_mutex_unlock(& _mutex);
+}
+
+void LogDialog::resizeEvent(QResizeEvent *e) {
+    _logTextBox->resize(width(), height());
+}
+
+void LogDialog::appendLogLine(QString logLine) {
+    if (isVisible()) {
+        pthread_mutex_lock(& _mutex);
+        _logTextBox->appendPlainText(logLine.simplified());
+        pthread_mutex_unlock(& _mutex);
+        _logTextBox->ensureCursorVisible();
+    }
+}

interface/src/ui/LogDialog.h

@@ -0,0 +1,36 @@
+//
+//  LogDialog.h
+//  interface
+//
+//  Created by Stojce Slavkovski on 12/12/13.
+//  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
+//
+
+#ifndef __interface__LogDialog__
+#define __interface__LogDialog__
+
+#include <QDialog>
+#include <QPlainTextEdit>
+
+class LogDialog : public QDialog {
+    Q_OBJECT
+
+public:
+    LogDialog(QWidget* parent);
+    ~LogDialog();
+
+public slots:
+    void appendLogLine(QString logLine);
+
+protected:
+    void resizeEvent(QResizeEvent* e);
+    void showEvent(QShowEvent* e);
+
+private:
+    QPlainTextEdit* _logTextBox;
+    pthread_mutex_t _mutex;
+
+};
+
+#endif
+

libraries/particles/src/ParticleCollisionSystem.cpp

@@ -206,7 +206,7 @@ void ParticleCollisionSystem::applyHardCollision(Particle* particle, const glm::
 void ParticleCollisionSystem::updateCollisionSound(Particle* particle, const glm::vec3 &penetration, float frequency) {
                                 
     //  consider whether to have the collision make a sound
-    const float AUDIBLE_COLLISION_THRESHOLD = 0.02f;
+    const float AUDIBLE_COLLISION_THRESHOLD = 0.1f;
     const float COLLISION_LOUDNESS = 1.f;
     const float DURATION_SCALING = 0.004f;
     const float NOISE_SCALING = 0.1f;
@@ -235,6 +235,6 @@ void ParticleCollisionSystem::updateCollisionSound(Particle* particle, const glm
                     fmin(COLLISION_LOUDNESS * velocityTowardCollision, 1.f),
                     frequency * (1.f + velocityTangentToCollision / velocityTowardCollision),
                     fmin(velocityTangentToCollision / velocityTowardCollision * NOISE_SCALING, 1.f),
-                    1.f - DURATION_SCALING * powf(frequency, 0.5f) / velocityTowardCollision, true);
+                    1.f - DURATION_SCALING * powf(frequency, 0.5f) / velocityTowardCollision, false);
     }
 }