Browse Source

fix default map orientation

djeada 2 months ago
parent
commit
4dfaa0bfb4
4 changed files with 13 additions and 13 deletions
  1. 1 1
      ui/campaign_map_view.cpp
  2. 2 2
      ui/campaign_map_view.h
  3. 5 5
      ui/qml/CampaignMenu.qml
  4. 5 5
      ui/qml/MediterraneanMapPanel.qml

+ 1 - 1
ui/campaign_map_view.cpp

@@ -1069,7 +1069,7 @@ void CampaignMapView::setOrbitYaw(float yaw) {
 }
 
 void CampaignMapView::setOrbitPitch(float pitch) {
-  const float clamped = qBound(5.0F, pitch, 85.0F);
+  const float clamped = qBound(5.0F, pitch, 90.0F);
   if (qFuzzyCompare(m_orbit_pitch, clamped)) {
     return;
   }

+ 2 - 2
ui/campaign_map_view.h

@@ -53,8 +53,8 @@ signals:
 
 private:
   float m_orbit_yaw = 180.0F;
-  float m_orbit_pitch = 55.0F;
-  float m_orbit_distance = 2.4F;
+  float m_orbit_pitch = 90.0F;
+  float m_orbit_distance = 1.2F;
   QString m_hover_province_id;
 
   struct ProvinceHit {

+ 5 - 5
ui/qml/CampaignMenu.qml

@@ -237,8 +237,8 @@ Item {
 
         property var campaignData: null
         property real mapOrbitYaw: 180
-        property real mapOrbitPitch: 55
-        property real mapOrbitDistance: 2.4
+        property real mapOrbitPitch: 90
+        property real mapOrbitDistance: 1.2
         property var provinceLabels: []
         property string hoverProvinceName: ""
         property string hoverProvinceOwner: ""
@@ -352,8 +352,8 @@ Item {
         }
         onCampaignDataChanged: {
             mapOrbitYaw = 180;
-            mapOrbitPitch = 55;
-            mapOrbitDistance = 2.4;
+            mapOrbitPitch = 90;
+            mapOrbitDistance = 1.2;
         }
         visible: false
         anchors.fill: parent
@@ -446,7 +446,7 @@ Item {
                             lastX = mouse.x;
                             lastY = mouse.y;
                             missionDetailPanel.mapOrbitYaw += dx * 0.4;
-                            missionDetailPanel.mapOrbitPitch = Math.max(5, Math.min(85, missionDetailPanel.mapOrbitPitch + dy * 0.4));
+                            missionDetailPanel.mapOrbitPitch = Math.max(5, Math.min(90, missionDetailPanel.mapOrbitPitch + dy * 0.4));
                         }
                         onMouseXChanged: function() {
                             if (!hoverEnabled)

+ 5 - 5
ui/qml/MediterraneanMapPanel.qml

@@ -9,8 +9,8 @@ Rectangle {
     property var selected_mission: null
     property string active_region_id: selected_mission && selected_mission.world_region_id ? selected_mission.world_region_id : ""
     property real map_orbit_yaw: 180
-    property real map_orbit_pitch: 55
-    property real map_orbit_distance: 2.4
+    property real map_orbit_pitch: 90
+    property real map_orbit_distance: 1.2
     property string hover_province_name: ""
     property string hover_province_owner: ""
     property real hover_mouse_x: 0
@@ -101,8 +101,8 @@ Rectangle {
             focus_on_region(selected_mission.world_region_id);
         } else {
             map_orbit_yaw = 180;
-            map_orbit_pitch = 55;
-            map_orbit_distance = 2.4;
+            map_orbit_pitch = 90;
+            map_orbit_distance = 1.2;
         }
     }
 
@@ -171,7 +171,7 @@ Rectangle {
                 last_x = mouse.x;
                 last_y = mouse.y;
                 root.map_orbit_yaw += dx * 0.4;
-                root.map_orbit_pitch = Math.max(5, Math.min(85, root.map_orbit_pitch + dy * 0.4));
+                root.map_orbit_pitch = Math.max(5, Math.min(90, root.map_orbit_pitch + dy * 0.4));
             }
             root.hover_mouse_x = mouse.x;
             root.hover_mouse_y = mouse.y;