fix models with registrations other than 0,0,0

ZappoMan committed 11 years ago

Commit ae647d31 parent 0ccbb983 files · +27 −5Browse files

Unified · Split

3 files

interface/src/renderer/Model.cpp +19 −5
libraries/entities/src/EntityTreeElement.cpp +4 −0
libraries/octree/src/OctreeElement.cpp +4 −0

     qDebug() << "    modelExtents:" << modelExtents;
     glm::vec3 dimensions = modelExtents.maximum - modelExtents.minimum;
-    glm::vec3 corner = dimensions * _registrationPoint; // since we're going to do the ray picking in the model frame of reference
+    glm::vec3 corner = -(dimensions * _registrationPoint); // since we're going to do the ray picking in the model frame of reference
-    AABox overlayFrameBox(corner, dimensions);
+    AABox modelFrameBox(corner, dimensions);
-    qDebug() << "    overlayFrameBox:" << overlayFrameBox;
+    qDebug() << "    modelFrameBox:" << modelFrameBox;
     glm::vec3 modelFrameOrigin = glm::vec3(worldToModelMatrix * glm::vec4(origin, 1.0f));
     glm::vec3 modelFrameDirection = glm::vec3(worldToModelMatrix * glm::vec4(direction, 0.0f));
     // we can use the AABox's ray intersection by mapping our origin and direction into the model frame
     // and testing intersection there.
-    if (overlayFrameBox.findRayIntersection(modelFrameOrigin, modelFrameDirection, distance, face)) {
+    if (modelFrameBox.findRayIntersection(modelFrameOrigin, modelFrameDirection, distance, face)) {
+        qDebug() << "    modelFrameBox.findRayIntersection() HITS!!!";
         float bestDistance = std::numeric_limits<float>::max();
         float bestTriangleDistance = std::numeric_limits<float>::max();
         int subMeshIndex = 0;
         const FBXGeometry& geometry = _geometry->getFBXGeometry();
+        qDebug() << "    Checking mesh boxes....";
         // If we hit the models box, then consider the submeshes...
         foreach(const AABox& subMeshBox, _calculatedMeshBoxes) {
-            qDebug() << "subMeshBox[" << subMeshIndex <<"]:" << subMeshBox;
+            qDebug() << "    subMeshBox[" << subMeshIndex <<"]:" << subMeshBox;
             if (subMeshBox.findRayIntersection(origin, direction, distanceToSubMesh, subMeshFace)) {
+                qDebug() << "    subMeshBox[" << subMeshIndex <<"].findRayIntersection() HITS!";
+                qDebug() << "    subMeshBox[" << subMeshIndex <<"].distanceToSubMesh:" << distanceToSubMesh;
+                qDebug() << "    bestDistance:" << bestDistance;
                 if (distanceToSubMesh < bestDistance) {
+                    qDebug() << "    distanceToSubMesh < bestDistance !! looks like a good match!";
                     if (pickAgainstTriangles) {
                         if (!_calculatedMeshTrianglesValid) {
                             recalcuateMeshBoxes();
                     intersectedSomething = true;
                     face = subMeshFace;
                     extraInfo = geometry.getModelNameOfMesh(subMeshIndex);
+                } else {
+                    qDebug() << "    distanceToSubMesh >= bestDistance !! TOO FAR AWAY!";
                 }
             }
             subMeshIndex++;
         // if we were asked to pick against triangles, and we didn't hit one, then we
         // do not consider this model to be hit at all.
         if (pickAgainstTriangles && !someTriangleHit) {
+            qDebug() << "pickAgainstTriangles && !someTriangleHit --- call it a NON-HIT!";
             intersectedSomething = false;
         }
         qDebug() << "pickAgainstTriangles:" << pickAgainstTriangles;
         }
         return intersectedSomething;
+    } else {
+        qDebug() << "modelFrameBox.findRayIntersection()... DID NOT INTERSECT...";
     }
     return intersectedSomething;

libraries/entities/src/EntityTreeElement.cpp+4−0

                                 face = localFace;
                                 *intersectedObject = (void*)entity;
                                 somethingIntersected = true;
+                            } else {
+                                qDebug() << "   localDistance >= distance... TOO FAR AWAY";
                             }
                         }
                     } else {
                             face = localFace;
                             *intersectedObject = (void*)entity;
                             somethingIntersected = true;
+                        } else {
+                            qDebug() << "   localDistance >= distance... TOO FAR AWAY";
                         }
                     }
                 }

libraries/octree/src/OctreeElement.cpp+4−0

                 qDebug() << "   distance:" << distance << " -- THIS ONE IS GOOD -------";
                 return true;
+            } else {
+                qDebug() << "   distanceToElementDetails:" << distanceToElementDetails;
+                qDebug() << "   distance:" << distance;
+                qDebug() << "   distanceToElementDetails >= distance -- THIS ONE IS NOT SELECTED even though it INTERSECTED -------";
             }
         }
     }