History

Merge pull request #1268 from ey6es/master

Fix for pupil dilation on Ryan's face.

Philip Rosedale committed 13 years ago

Commit ce4e9982 parents 01d29e3 7249e524 files · +24 −9Browse files

Unified · Split

4 files
  1. interface/src/Application.cpp +2 −3
  2. interface/src/Menu.cpp +10 −0
  3. interface/src/Menu.h +2 −0
  4. interface/src/renderer/FBXReader.cpp +10 −6
interface/src/Application.cpp+2−3
@@ -2030,10 +2030,9 @@ void Application::updateMyAvatarLookAtPosition(glm::vec3& lookAtSpot, glm::vec3& · 2029 unmodified lines
20302030 // deflect using Faceshift gaze data
20312031 glm::vec3 origin = _myAvatar.getHead().calculateAverageEyePosition();
20322032 float pitchSign = (_myCamera.getMode() == CAMERA_MODE_MIRROR) ? -1.0f : 1.0f;
2033− const float PITCH_SCALE = 0.25f;
2034− const float YAW_SCALE = 0.25f;
2033+ float deflection = Menu::getInstance()->getFaceshiftEyeDeflection();
20352034 lookAtSpot = origin + _myCamera.getRotation() * glm::quat(glm::radians(glm::vec3(
2036− _faceshift.getEstimatedEyePitch() * pitchSign * PITCH_SCALE, _faceshift.getEstimatedEyeYaw() * YAW_SCALE, 0.0f))) *
2035+ _faceshift.getEstimatedEyePitch() * pitchSign * deflection, _faceshift.getEstimatedEyeYaw() * deflection, 0.0f))) *
20372036 glm::inverse(_myCamera.getRotation()) * (lookAtSpot - origin);
20382037 }
20392038 _myAvatar.getHead().setLookAtPosition(lookAtSpot);
interface/src/Menu.cpp+10−0
@@ -46,12 +46,14 @@ Menu* Menu::getInstance() { · 45 unmodified lines
4646 }
4747
4848 const ViewFrustumOffset DEFAULT_FRUSTUM_OFFSET = {-135.0f, 0.0f, 0.0f, 25.0f, 0.0f};
49+const float DEFAULT_FACESHIFT_EYE_DEFLECTION = 0.25f;
4950
5051 Menu::Menu() :
5152 _actionHash(),
5253 _audioJitterBufferSamples(0),
5354 _bandwidthDialog(NULL),
5455 _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES),
56+ _faceshiftEyeDeflection(DEFAULT_FACESHIFT_EYE_DEFLECTION),
5557 _frustumDrawMode(FRUSTUM_DRAW_MODE_ALL),
5658 _viewFrustumOffset(DEFAULT_FRUSTUM_OFFSET),
5759 _voxelModeActionsGroup(NULL),
@@ -512,6 +514,7 @@ void Menu::loadSettings(QSettings* settings) { · 454 unmodified lines
512514
513515 _audioJitterBufferSamples = loadSetting(settings, "audioJitterBufferSamples", 0);
514516 _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);
517+ _faceshiftEyeDeflection = loadSetting(settings, "faceshiftEyeDeflection", DEFAULT_FACESHIFT_EYE_DEFLECTION);
515518 _maxVoxels = loadSetting(settings, "maxVoxels", DEFAULT_MAX_VOXELS_PER_SYSTEM);
516519 _voxelSizeScale = loadSetting(settings, "voxelSizeScale", DEFAULT_VOXEL_SIZE_SCALE);
517520 _boundaryLevelAdjust = loadSetting(settings, "boundaryLevelAdjust", 0);
@@ -540,6 +543,7 @@ void Menu::saveSettings(QSettings* settings) { · 22 unmodified lines
540543
541544 settings->setValue("audioJitterBufferSamples", _audioJitterBufferSamples);
542545 settings->setValue("fieldOfView", _fieldOfView);
546+ settings->setValue("faceshiftEyeDeflection", _faceshiftEyeDeflection);
543547 settings->setValue("maxVoxels", _maxVoxels);
544548 settings->setValue("voxelSizeScale", _voxelSizeScale);
545549 settings->setValue("boundaryLevelAdjust", _boundaryLevelAdjust);
@@ -790,6 +794,10 @@ void Menu::editPreferences() { · 244 unmodified lines
790794 pupilDilation->setValue(applicationInstance->getAvatar()->getHead().getPupilDilation() * pupilDilation->maximum());
791795 form->addRow("Pupil Dilation:", pupilDilation);
792796
797+ QSlider* faceshiftEyeDeflection = new QSlider(Qt::Horizontal);
798+ faceshiftEyeDeflection->setValue(_faceshiftEyeDeflection * faceshiftEyeDeflection->maximum());
799+ form->addRow("Faceshift Eye Deflection:", faceshiftEyeDeflection);
800+
793801 QSpinBox* fieldOfView = new QSpinBox();
794802 fieldOfView->setMaximum(180);
795803 fieldOfView->setMinimum(1);
@@ -865,6 +873,8 @@ void Menu::editPreferences() { · 69 unmodified lines
865873
866874 _fieldOfView = fieldOfView->value();
867875 applicationInstance->resizeGL(applicationInstance->getGLWidget()->width(), applicationInstance->getGLWidget()->height());
876+
877+ _faceshiftEyeDeflection = faceshiftEyeDeflection->value() / (float)faceshiftEyeDeflection->maximum();
868878 }
869879
870880 sendFakeEnterEvent();
interface/src/Menu.h+2−0
@@ -50,6 +50,7 @@ public: · 49 unmodified lines
5050
5151 float getAudioJitterBufferSamples() const { return _audioJitterBufferSamples; }
5252 float getFieldOfView() const { return _fieldOfView; }
53+ float getFaceshiftEyeDeflection() const { return _faceshiftEyeDeflection; }
5354 BandwidthDialog* getBandwidthDialog() const { return _bandwidthDialog; }
5455 FrustumDrawMode getFrustumDrawMode() const { return _frustumDrawMode; }
5556 ViewFrustumOffset getViewFrustumOffset() const { return _viewFrustumOffset; }
@@ -127,6 +128,7 @@ private: · 71 unmodified lines
127128 int _audioJitterBufferSamples; /// number of extra samples to wait before starting audio playback
128129 BandwidthDialog* _bandwidthDialog;
129130 float _fieldOfView; /// in Degrees, doesn't apply to HMD like Oculus
131+ float _faceshiftEyeDeflection;
130132 FrustumDrawMode _frustumDrawMode;
131133 ViewFrustumOffset _viewFrustumOffset;
132134 QActionGroup* _voxelModeActionsGroup;
interface/src/renderer/FBXReader.cpp+10−6
@@ -1234,7 +1234,6 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping) · 1233 unmodified lines
12341234 }
12351235
12361236 // find the clusters with which the mesh is associated
1237− extracted.mesh.isEye = false;
12381237 QVector<QString> clusterIDs;
12391238 foreach (const QString& childID, childMap.values(it.key())) {
12401239 foreach (const QString& clusterID, childMap.values(childID)) {
@@ -1245,12 +1244,9 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping) · 4 unmodified lines
12451244 const Cluster& cluster = clusters[clusterID];
12461245 clusterIDs.append(clusterID);
12471246
1248− QString jointID = childMap.value(clusterID);
1249− if (jointID == jointEyeLeftID || jointID == jointEyeRightID) {
1250− extracted.mesh.isEye = true;
1251− }
12521247 // see http://stackoverflow.com/questions/13566608/loading-skinning-information-from-fbx for a discussion
12531248 // of skinning information in FBX
1249+ QString jointID = childMap.value(clusterID);
12541250 fbxCluster.jointIndex = modelIDs.indexOf(jointID);
12551251 if (fbxCluster.jointIndex == -1) {
12561252 qDebug() << "Joint not in model list: " << jointID << "\n";
@@ -1278,16 +1274,19 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping) · 21 unmodified lines
12781274 }
12791275
12801276 // whether we're skinned depends on how many clusters are attached
1277+ int maxJointIndex = extracted.mesh.clusters.at(0).jointIndex;
12811278 if (clusterIDs.size() > 1) {
12821279 extracted.mesh.clusterIndices.resize(extracted.mesh.vertices.size());
12831280 extracted.mesh.clusterWeights.resize(extracted.mesh.vertices.size());
1281+ float maxWeight = 0.0f;
12841282 for (int i = 0; i < clusterIDs.size(); i++) {
12851283 QString clusterID = clusterIDs.at(i);
12861284 const Cluster& cluster = clusters[clusterID];
1287−
1285+ float totalWeight = 0.0f;
12881286 for (int j = 0; j < cluster.indices.size(); j++) {
12891287 int oldIndex = cluster.indices.at(j);
12901288 float weight = cluster.weights.at(j);
1289+ totalWeight += weight;
12911290 for (QMultiHash<int, int>::const_iterator it = extracted.newIndices.constFind(oldIndex);
12921291 it != extracted.newIndices.end() && it.key() == oldIndex; it++) {
12931292 glm::vec4& weights = extracted.mesh.clusterWeights[it.value()];
@@ -1302,8 +1301,13 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping) · 8 unmodified lines
13021301 }
13031302 }
13041303 }
1304+ if (totalWeight > maxWeight) {
1305+ maxWeight = totalWeight;
1306+ maxJointIndex = extracted.mesh.clusters.at(i).jointIndex;
1307+ }
13051308 }
13061309 }
1310+ extracted.mesh.isEye = (maxJointIndex == geometry.leftEyeJointIndex || maxJointIndex == geometry.rightEyeJointIndex);
13071311
13081312 // extract spring edges, connections if springy
13091313 if (extracted.mesh.springiness > 0.0f) {

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