This commit is contained in:
bart
2026-11-08 17:06:47 +01:00
parent 17901ce25c
commit 408541c7e0
46 changed files with 1474 additions and 1057 deletions
+22
View File
@@ -56,10 +56,21 @@ protected:
void drawFloatingTexts(QPainter &painter, const QMatrix4x4 &vMatrix);
// City & Territory Overlays
void drawCityBorders(QPainter &painter, const QMatrix4x4 &vMatrix);
void drawImprovementsOverlay(QPainter &painter, const QMatrix4x4 &vMatrix);
void drawCityViewOverlay(QPainter &painter, const QMatrix4x4 &vMatrix);
bool screenToHex(const QPoint &screenPos, const QMatrix4x4 &vMatrix, int &outX, int &outY);
QImage getTintedIcon(const QString &path, const QColor &color);
float getCameraPitchDeg() const;
float getCameraForwardDist() const;
QVector3D getCameraLookAt() const;
void loadCameraConfig();
float m_cameraMinZoom = 2.0f;
float m_cameraMaxZoom = 16.0f;
float m_cameraPitchMinDeg = 45.0f;
float m_cameraPitchMaxDeg = 75.0f;
float m_camera_x = 10.0f;
float m_camera_y = 0.0f;
QMatrix4x4 Projection;
@@ -81,6 +92,11 @@ protected:
bool m_draggingMinimap;
float m_minimapZoom;
// Saved camera state for restoring after City View
QVector3D m_savedCamPos;
float m_savedZoom = 8.0f;
float m_savedZRot = 90.0f;
// Units & UI state
UnitRenderer m_unitRenderer;
QMap<QString, QImage> m_iconCache;
@@ -107,6 +123,12 @@ protected:
};
std::vector<CitySlotHit> m_citySlotHits;
struct CityBuyTileHit {
QRect rect;
int tx, ty;
};
std::vector<CityBuyTileHit> m_cityBuyTileHits;
struct CityBannerHit {
QRect rect;
int cityId;