Changeset 435 for cafu/trunk

Timestamp:

11/27/11 16:14:43 (6 months ago)

Author:

Carsten

Message:

Model Editor:
Minor fixes to the 3D view and camera navigation to improve the behavior when the user is doing a detail inspection of models.

Location:

cafu/trunk

Files:

• CaWE/Generic3DWindow.cpp (modified) (1 diff)
• CaWE/ModelEditor/ModelDocument.cpp (modified) (1 diff)
• Libs/Models/AnimPose.cpp (modified) (1 diff)

cafu/trunk/CaWE/Generic3DWindow.cpp

@@ -599 +599 @@
 void Generic3DWindowT::OnMouseWheel(wxMouseEvent& ME)
 {
-    m_Camera->Pos+=normalizeOr0(WindowToWorld(ME.GetPosition()) - m_Camera->Pos)*(ME.GetWheelRotation()/2);
+    int factor=2;
+
+    // It would probably be better to use WXK_ALT here, or even better to have a "mouse sensitivity" state/member.
+    if (wxGetKeyState(WXK_SHIFT  )) factor*=4;
+    if (wxGetKeyState(WXK_CONTROL)) factor*=4;
+
+    m_Camera->Pos+=normalizeOr0(WindowToWorld(ME.GetPosition()) - m_Camera->Pos)*(ME.GetWheelRotation()/factor);
     InfoCameraChanged();
 }

cafu/trunk/CaWE/ModelEditor/ModelDocument.cpp

@@ -81 +81 @@
     m_Cameras.PushBack(new CameraT);
     m_Cameras[0]->Pos.y=-500.0f;
+    m_Cameras[0]->NearPlaneDist=1.0f;
 
     m_LightSources.PushBack(new LightSourceT(true,  true, Vector3fT(200.0f,   0.0f, 200.0f), 1500.0f, wxColour(255, 235, 215)));

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -728 +728 @@
     // If we miss the bounding-box, then we miss all the triangles as well.
     float Fraction=0.0f;
-    if (!GetBB().TraceRay(RayOrigin, RayDir, Fraction)) return false;
+    if (!GetBB()/*.GetEpsilonBox(...)*/.Contains(RayOrigin) && !GetBB().TraceRay(RayOrigin, RayDir, Fraction)) return false;
 
     typedef CafuModelT::MeshT MeshT;