Merge branch 'master' of https://github.com/highfidelity/hifi into animenu

examples/editVoxels.js

@@ -630,7 +630,7 @@ var trackAsDelete = false;
 var trackAsRecolor = false;
 var trackAsEyedropper = false;
 
-var voxelToolSelected = true;
+var voxelToolSelected = false;
 var recolorToolSelected = false;
 var eyedropperToolSelected = false;
 var pasteMode = false;
@@ -848,7 +848,7 @@ function showPreviewLines() {
 }
 
 function showPreviewGuides() {
-    if (editToolsOn && !isImporting) {
+    if (editToolsOn && !isImporting && (voxelToolSelected || recolorToolSelected || eyedropperToolSelected)) {
         if (previewAsVoxel) {
             showPreviewVoxel();
             
@@ -964,7 +964,7 @@ function mousePressEvent(event) {
     
     if (clickedOverlay == voxelTool) {
         modeSwitchSound.play(0);
-        voxelToolSelected = true;
+        voxelToolSelected = !voxelToolSelected;
         recolorToolSelected = false;
         eyedropperToolSelected = false;
         moveTools();
@@ -972,7 +972,7 @@ function mousePressEvent(event) {
     } else if (clickedOverlay == recolorTool) {
         modeSwitchSound.play(1);
         voxelToolSelected = false;
-        recolorToolSelected = true;
+        recolorToolSelected = !recolorToolSelected;
         eyedropperToolSelected = false;
         moveTools();
         clickedOnSomething = true;
@@ -980,7 +980,7 @@ function mousePressEvent(event) {
         modeSwitchSound.play(2);
         voxelToolSelected = false;
         recolorToolSelected = false;
-        eyedropperToolSelected = true;
+        eyedropperToolSelected = !eyedropperToolSelected;
         moveTools();
         clickedOnSomething = true;
     } else if (scaleSelector.clicked(event.x, event.y)) {
@@ -1000,7 +1000,7 @@ function mousePressEvent(event) {
             }
         }
     }
-    if (clickedOnSomething || isImporting) {
+    if (clickedOnSomething || isImporting || (!voxelToolSelected && !recolorToolSelected && !eyedropperToolSelected)) {
         return; // no further processing
     }
     
@@ -1344,7 +1344,7 @@ function moveTools() {
         recolorToolOffset = 2;
     } else if (eyedropperToolSelected) {
         eyedropperToolOffset = 2;
-    } else {
+    } else if (voxelToolSelected) {
         if (pasteMode) {
             voxelToolColor = pasteModeColor;
         }

interface/src/Application.cpp

@@ -560,10 +560,9 @@ void Application::paintGL() {
         _myCamera.setUpShift(0.0f);
         _myCamera.setDistance(0.0f);
         _myCamera.setTightness(0.0f);     //  Camera is directly connected to head without smoothing
-        _myCamera.setTargetPosition(_myAvatar->getHead()->calculateAverageEyePosition());
-        _myCamera.setTargetRotation(_myAvatar->getHead()->getCameraOrientation());
-
-    } else if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
+    } 
+    
+    if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
         _myCamera.setTightness(0.0f);  //  In first person, camera follows (untweaked) head exactly without delay
         _myCamera.setTargetPosition(_myAvatar->getHead()->calculateAverageEyePosition());
         _myCamera.setTargetRotation(_myAvatar->getHead()->getCameraOrientation());

interface/src/Audio.cpp

@@ -201,21 +201,26 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
         IMMDeviceEnumerator* pMMDeviceEnumerator = NULL;
         CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_ALL, __uuidof(IMMDeviceEnumerator), (void**)&pMMDeviceEnumerator);
         IMMDevice* pEndpoint;
-        pMMDeviceEnumerator->GetDefaultAudioEndpoint(mode == QAudio::AudioOutput ? eRender : eCapture, eMultimedia, &pEndpoint);
-        IPropertyStore* pPropertyStore;
-        pEndpoint->OpenPropertyStore(STGM_READ, &pPropertyStore);
-        pEndpoint->Release();
-        pEndpoint = NULL;
-        PROPVARIANT pv;
-        PropVariantInit(&pv);
-        hr = pPropertyStore->GetValue(PKEY_Device_FriendlyName, &pv);
-        pPropertyStore->Release();
-        pPropertyStore = NULL;
-        //QAudio devices seems to only take the 31 first characters of the Friendly Device Name.
-        const DWORD QT_WIN_MAX_AUDIO_DEVICENAME_LEN = 31;
-        deviceName = QString::fromWCharArray((wchar_t*)pv.pwszVal).left(QT_WIN_MAX_AUDIO_DEVICENAME_LEN);
-        qDebug() << (mode == QAudio::AudioOutput ? "output" : "input") << " device:" << deviceName;
-        PropVariantClear(&pv);
+        hr = pMMDeviceEnumerator->GetDefaultAudioEndpoint(mode == QAudio::AudioOutput ? eRender : eCapture, eMultimedia, &pEndpoint);
+        if (hr == E_NOTFOUND){
+            printf("Audio Error: device not found\n");
+            deviceName = QString("NONE");
+        } else {
+            IPropertyStore* pPropertyStore;
+            pEndpoint->OpenPropertyStore(STGM_READ, &pPropertyStore);
+            pEndpoint->Release();
+            pEndpoint = NULL;
+            PROPVARIANT pv;
+            PropVariantInit(&pv);
+            hr = pPropertyStore->GetValue(PKEY_Device_FriendlyName, &pv);
+            pPropertyStore->Release();
+            pPropertyStore = NULL;
+            //QAudio devices seems to only take the 31 first characters of the Friendly Device Name.
+            const DWORD QT_WIN_MAX_AUDIO_DEVICENAME_LEN = 31;
+            deviceName = QString::fromWCharArray((wchar_t*)pv.pwszVal).left(QT_WIN_MAX_AUDIO_DEVICENAME_LEN);
+            qDebug() << (mode == QAudio::AudioOutput ? "output" : "input") << " device:" << deviceName;
+            PropVariantClear(&pv);
+        }
         pMMDeviceEnumerator->Release();
         pMMDeviceEnumerator = NULL;
         CoUninitialize();

interface/src/avatar/MyAvatar.cpp

@@ -264,11 +264,16 @@ void MyAvatar::updateFromTrackers(float deltaTime) {
     // their head only 30 degrees or so, this may correspond to a 90 degree field of view.
     // Note that roll is magnified by a constant because it is not related to field of view.
 
-    float magnifyFieldOfView = Menu::getInstance()->getFieldOfView() / Menu::getInstance()->getRealWorldFieldOfView();
-    
+
     Head* head = getHead();
-    head->setDeltaPitch(estimatedRotation.x * magnifyFieldOfView);
-    head->setDeltaYaw(estimatedRotation.y * magnifyFieldOfView);
+    if (OculusManager::isConnected()){
+        head->setDeltaPitch(estimatedRotation.x);
+        head->setDeltaYaw(estimatedRotation.y);
+    } else {
+        float magnifyFieldOfView = Menu::getInstance()->getFieldOfView() / Menu::getInstance()->getRealWorldFieldOfView();
+        head->setDeltaPitch(estimatedRotation.x * magnifyFieldOfView);
+        head->setDeltaYaw(estimatedRotation.y * magnifyFieldOfView);
+    }
     head->setDeltaRoll(estimatedRotation.z);
 
     // the priovr can give us exact lean

interface/src/ui/PreferencesDialog.cpp

@@ -123,7 +123,9 @@ void PreferencesDialog::loadPreferences() {
                                              ui.faceshiftEyeDeflectionSider->maximum());
     
     ui.audioJitterSpin->setValue(menuInstance->getAudioJitterBufferSamples());
-    
+
+    ui.realWorldFieldOfViewSpin->setValue(menuInstance->getRealWorldFieldOfView());
+
     ui.fieldOfViewSpin->setValue(menuInstance->getFieldOfView());
     
     ui.leanScaleSpin->setValue(myAvatar->getLeanScale());
@@ -177,6 +179,8 @@ void PreferencesDialog::savePreferences() {
     Application::getInstance()->resizeGL(Application::getInstance()->getGLWidget()->width(),
                                          Application::getInstance()->getGLWidget()->height());
 
+    Menu::getInstance()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());
+    
     Menu::getInstance()->setFieldOfView(ui.fieldOfViewSpin->value());
 
     Menu::getInstance()->setFaceshiftEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /

interface/ui/preferencesDialog.ui

@@ -154,9 +154,9 @@ color: #0e7077</string>
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>0</y>
-      <width>615</width>
-      <height>936</height>
+      <y>-271</y>
+      <width>598</width>
+      <height>1018</height>
      </rect>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -723,6 +723,94 @@ color: #0e7077</string>
        </property>
       </widget>
      </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>10</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>10</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_9">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
+         <property name="text">
+          <string>Real world vertical field of view (angular size of monitor)</string>
+         </property>
+         <property name="indent">
+          <number>15</number>
+         </property>
+         <property name="buddy">
+          <cstring>fieldOfViewSpin</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_11">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="realWorldFieldOfViewSpin">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>95</width>
+           <height>36</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>95</width>
+           <height>36</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>180</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <property name="spacing">

libraries/fbx/src/FBXReader.cpp

@@ -1635,11 +1635,16 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
                     setTangents(extracted.mesh, part.quadIndices.at(i + 2), part.quadIndices.at(i + 3));
                     setTangents(extracted.mesh, part.quadIndices.at(i + 3), part.quadIndices.at(i));
                 }
-                for (int i = 0; i < part.triangleIndices.size(); i += 3) {
+                // <= size - 3 in order to prevent overflowing triangleIndices when (i % 3) != 0 
+                // This is most likely evidence of a further problem in extractMesh()
+                for (int i = 0; i <= part.triangleIndices.size() - 3; i += 3) {
                     setTangents(extracted.mesh, part.triangleIndices.at(i), part.triangleIndices.at(i + 1));
                     setTangents(extracted.mesh, part.triangleIndices.at(i + 1), part.triangleIndices.at(i + 2));
                     setTangents(extracted.mesh, part.triangleIndices.at(i + 2), part.triangleIndices.at(i));
                 }
+                if ((part.triangleIndices.size() % 3) != 0){
+                    qDebug() << "Error in extractFBXGeometry part.triangleIndices.size() is not divisible by three ";
+                }
             }
         }