たいして意味のない高速化コードを削除。

diff --git a/GVONavish/GVONavish/GVOWorldMap.cpp b/GVONavish/GVONavish/GVOWorldMap.cpp
index 7e8e46f..01af5e9 100644 (file)
--- a/GVONavish/GVONavish/GVOWorldMap.cpp
+++ b/GVONavish/GVONavish/GVOWorldMap.cpp
@@ -28,7 +28,6 @@ bool GVOWorldMap::loadFromFile( const GVOConfig& config )
        // \89æ\91\9c\82Ì\8d\82\82³\82Æ\88Ü\93x\82Ì\94ä\97¦\82Ì\83X\83P\81[\83\8a\83\93\83O\82Ì\8aî\8f\80\82Æ\82È\82é\81B
        const double mapHeight = m_mapImage.height();
        m_ratioForImageCoordFromWorldCoord = mapHeight / k_worldHeight;
-       m_scaledMapSize = m_mapImage.size();
        return true;
 }
 
@@ -36,8 +35,6 @@ bool GVOWorldMap::loadFromFile( const GVOConfig& config )
 void GVOWorldMap::setViewSize( const SIZE& viewSize )
 {
        m_viewSize = viewSize;
-       m_viewCenter.x = m_viewSize.cx / 2;
-       m_viewCenter.y = m_viewSize.cy / 2;
 }
 
 
@@ -96,7 +93,6 @@ bool GVOWorldMap::zoomIn()
        }
        if ( m_viewScale != scale ) {
                m_viewScale = scale;
-               updateScaleCache();
                return true;
        }
        return false;
@@ -114,7 +110,6 @@ bool GVOWorldMap::zoomOut()
        }
        if ( m_viewScale != scale ) {
                m_viewScale = scale;
-               updateScaleCache();
                return true;
        }
        return false;
@@ -139,7 +134,7 @@ void GVOWorldMap::drawMap( HDC hdc, const GVOShip& ship )
 
        ::SelectObject( hdcMem, m_mapImage.bitmapHandle() );
 
-       const SIZE mapSize = m_scaledMapSize;
+       const SIZE mapSize = scaledMapSize();
        const POINT mapTopLeft = mapOriginInView();
 
        int xDrawOrigin, yDrawOrigin;
@@ -323,17 +318,10 @@ void GVOWorldMap::clearShipRoute()
 }
 
 
-void GVOWorldMap::updateScaleCache()
-{
-       m_scaledMapSize.cx = LONG( m_mapImage.width() * m_viewScale );
-       m_scaledMapSize.cy = LONG( m_mapImage.height() * m_viewScale );
-}
-
-
 POINT GVOWorldMap::mapOriginInView()
 {
-       const POINT viewCenter = m_viewCenter;
-       const SIZE mapSize = m_scaledMapSize;
+       const POINT viewCenter = viewCenterPoint();
+       const SIZE mapSize = scaledMapSize();
        const POINT worldPosInView = drawOffsetFromWorldCoord( m_focusPointInWorldCoord );
 
        POINT mapTopLeft = {

diff --git a/GVONavish/GVONavish/GVOWorldMap.h b/GVONavish/GVONavish/GVOWorldMap.h
index c09d728..7485dc8 100644 (file)
--- a/GVONavish/GVONavish/GVOWorldMap.h
+++ b/GVONavish/GVONavish/GVOWorldMap.h
@@ -30,15 +30,10 @@ private:
        bool m_linkRoute;                                       //!<@brief \8dq\98H\82ð\8cq\82°\82Ä\95`\89æ\82·\82é\83t\83\89\83O
        bool m_shipVectorLineEnabled;           //!<@brief \90j\98H\95`\89æ\83t\83\89\83O
 
-       // \8cv\8eZ\83L\83\83\83b\83V\83\85
-       SIZE m_scaledMapSize;
-       POINT m_viewCenter;
 public:
        GVOWorldMap() :
                m_viewScale( 1.0 ),
                m_ratioForImageCoordFromWorldCoord(),
-               m_scaledMapSize(),
-               m_viewCenter(),
                m_positionUpdated(),
                m_linkRoute(),
                m_shipVectorLineEnabled( true )
@@ -82,7 +77,22 @@ public:
                m_shipVectorLineEnabled = visible;
        }
 private:
-       void updateScaleCache();
+       inline POINT viewCenterPoint() const
+       {
+               POINT p = {
+                       m_viewSize.cx / 2,
+                       m_viewSize.cy / 2
+               };
+               return p;
+       }
+       inline SIZE scaledMapSize() const
+       {
+               SIZE size = {
+                       LONG( m_mapImage.width() * m_viewScale ),
+                       LONG( m_mapImage.height() * m_viewScale )
+               };
+               return size;
+       }
        POINT mapOriginInView();
        POINT imageCoordFromWorldCoord( const POINT& worldCoord ) const;
        POINT drawOffsetFromWorldCoord( const POINT&worldCoord ) const;