Changeset 125

Timestamp:

08/20/10 20:30:16 (18 months ago)

Author:

Carsten

Message:

Improved mouse input handling in the cafu_to_wx branch.

Location:

cafu/branches/cafu_to_wx

Files:

• Ca3DE/MainCanvas.cpp (modified) (3 diffs)
• Ca3DE/MainCanvas.hpp (modified) (2 diffs)
• CaWE/GuiEditor/ChildFrame.cpp (modified) (2 diffs)
• Libs/GuiSys/Gui.hpp (modified) (1 diff)
• Libs/GuiSys/GuiImpl.cpp (modified) (1 diff)
• Libs/GuiSys/GuiImpl.hpp (modified) (1 diff)

cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.cpp

@@ -120 +120 @@
       m_ConByGuiWin(NULL),
       m_Timer(),
-      m_TotalTime(0.0)
+      m_TotalTime(0.0),
+      m_LastMousePos(IN_OTHER_2D_GUI)
 {
     m_GLContext=new wxGLContext(this);
@@ -553 +554 @@
     cf::GuiSys::GuiMan->DistributeClockTickEvents(FrameTimeF);
 
+    // If the active GUI is the client GUI, see how far the mouse cursor is off center,
+    // derive a mouse event from it, then recenter the mouse cursor.
+    cf::GuiSys::GuiI* ActiveGui=cf::GuiSys::GuiMan->GetTopmostActiveAndInteractive();
+
+    if (ActiveGui && ActiveGui->GetRootWindow()->Name=="Client")
+    {
+        const wxPoint MousePos  =ScreenToClient(wxGetMousePosition());  // Note: ScreenToClient() is a method of wxWindow.
+        const wxSize  WinCenter =GetClientSize()/2;
+        const wxPoint MouseDelta=MousePos-WinCenter;
+
+        if (m_LastMousePos==IN_CLIENT_3D_GUI)
+        {
+            CaMouseEventT ME;
+
+            ME.Type  =CaMouseEventT::CM_MOVE_X;
+            ME.Amount=MouseDelta.x;     // TODO: Factor out screen resolution...
+            if (ME.Amount!=0) ActiveGui->ProcessDeviceEvent(ME);
+
+            ME.Type  =CaMouseEventT::CM_MOVE_Y;
+            ME.Amount=MouseDelta.y;     // TODO: Factor out screen resolution...
+            if (ME.Amount!=0) ActiveGui->ProcessDeviceEvent(ME);
+        }
+
+        if (MouseDelta.x || MouseDelta.y) WarpPointer(WinCenter.x, WinCenter.y);
+        m_LastMousePos=IN_CLIENT_3D_GUI;
+    }
+
     if (!m_Parent->IsIconized())
     {
@@ -584 +612 @@
     cf::GuiSys::GuiI* Gui=cf::GuiSys::GuiMan->GetTopmostActiveAndInteractive();
 
-    // This is equivalent to (but much easier than) calling cf::GuiSys::GuiMan->ProcessDeviceEvent(MouseEvent).
-    if (Gui)
-    {
-        Gui->SetMousePos(ME.GetX()*(cf::GuiSys::VIRTUAL_SCREEN_SIZE_X/GetSize().x),
-                         ME.GetY()*(cf::GuiSys::VIRTUAL_SCREEN_SIZE_Y/GetSize().y));
+    // This is equivalent to calling cf::GuiSys::GuiMan->ProcessDeviceEvent(MouseEvent),
+    // but computing the amount of mouse movement is much easier (and more precise) like this.
+    if (Gui && Gui->GetRootWindow()->Name!="Client")
+    {
+        float OldMousePosX;
+        float OldMousePosY;
+
+        Gui->GetMousePos(OldMousePosX, OldMousePosY);
+
+        const float NewMousePosX=ME.GetX()*(cf::GuiSys::VIRTUAL_SCREEN_SIZE_X/GetSize().x);
+        const float NewMousePosY=ME.GetY()*(cf::GuiSys::VIRTUAL_SCREEN_SIZE_Y/GetSize().y);
+
+        // This works, but doesn't forward the mouse event to the windows.
+        // Gui->SetMousePos(NewMousePosX, NewMousePosY);
+
+        CaMouseEventT ME;
+
+        ME.Type  =CaMouseEventT::CM_MOVE_X;
+        ME.Amount=NewMousePosX-OldMousePosX;
+        if (ME.Amount!=0) Gui->ProcessDeviceEvent(ME);
+
+        ME.Type  =CaMouseEventT::CM_MOVE_Y;
+        ME.Amount=NewMousePosY-OldMousePosY;
+        if (ME.Amount!=0) Gui->ProcessDeviceEvent(ME);
+
+        m_LastMousePos=IN_OTHER_2D_GUI;
     }
 }

cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.hpp

@@ -57 +57 @@
 
     enum InitStateT { INIT_REQUIRED, INIT_FAILED, INIT_SUCCESS };
+    enum LastMousePosT { IN_CLIENT_3D_GUI, IN_OTHER_2D_GUI };
 
     void Initialize();
@@ -89 +90 @@
     TimerT        m_Timer;
     double        m_TotalTime;
+    LastMousePosT m_LastMousePos;   ///< Used to prevent unwanted changes to the players heading and pitch when we're switching back from a 2D GUI to the 3D client view.
 
     DECLARE_EVENT_TABLE()

cafu/branches/cafu_to_wx/CaWE/GuiEditor/ChildFrame.cpp

@@ -496 +496 @@
 void GuiEditor::ChildFrameT::OnMenuEditDelete(wxCommandEvent& CE)
 {
-    SubmitCommand(new CommandDeleteT(m_GuiDocument, m_GuiDocument->GetSelection()));
+    if (m_GuiDocument->GetSelection().Size()>0)
+        SubmitCommand(new CommandDeleteT(m_GuiDocument, m_GuiDocument->GetSelection()));
 }
 
@@ -698 +699 @@
 
         case ID_TOOLBAR_WINDOW_DELETE:
-            SubmitCommand(new CommandDeleteT(m_GuiDocument, m_GuiDocument->GetSelection()));
+            if (m_GuiDocument->GetSelection().Size()>0)
+                SubmitCommand(new CommandDeleteT(m_GuiDocument, m_GuiDocument->GetSelection()));
             break;
 

cafu/branches/cafu_to_wx/Libs/GuiSys/Gui.hpp

@@ -69 +69 @@
             /// Returns whether this GUI is fullscreen and fully opaque, i.e. whether this GUI covers everything under it. If true, the GuiSys saves the rendering of the GUIs "below" this one. This can improve the GUI performance significantly if e.g. the player is at a point in the game where the world rendering FPS is low.
             virtual bool GetIsFullCover() const=0;
+
+            /// Returns the position of the mouse cursor.
+            virtual void GetMousePos(float& MousePosX, float& MousePosY) const=0;
 
             /// Sets the position of the mouse cursor.

cafu/branches/cafu_to_wx/Libs/GuiSys/GuiImpl.cpp

@@ -291 +291 @@
 {
     IsInteractive=IsInteractive_;
+}
+
+
+void GuiImplT::GetMousePos(float& MousePosX_, float& MousePosY_) const
+{
+    MousePosX_=MousePosX;
+    MousePosY_=MousePosY;
 }
 

cafu/branches/cafu_to_wx/Libs/GuiSys/GuiImpl.hpp

@@ -76 +76 @@
             bool GetIsInteractive() const { return IsInteractive; }
             bool GetIsFullCover() const { return IsFullCover; }
+            void GetMousePos(float& MousePosX_, float& MousePosY_) const;
             void SetMousePos(float MousePosX_, float MousePosY_);
             void SetShowMouse(bool ShowMouse_);