Changeset 2485 for lang/actionscript/swfgmap

Timestamp:

12/05/07 18:15:26 (13 months ago)

Author:

gyuque

Message:

lang/actionscript/swfgmap: implemented spreading.

Location:

lang/actionscript/swfgmap/trunk

Files:

• TestApp.as (modified) (1 diff)
• gyuque/gmap/GMapView.as (modified) (3 diffs)
• gyuque/gmap/GMapViewport.as (modified) (2 diffs)
• gyuque/gmap/IDebugOut.as (added)
• gyuque/gmap/IMeshMap.as (modified) (1 diff)
• gyuque/gmap/LayerManager.as (modified) (1 diff)
• gyuque/gmap/Math2D.as (modified) (1 diff)
• gyuque/gmap/ViewportUpdater.as (modified) (3 diffs)
• gyuque/gmap/googlemaps/GMapMapLayer.as (modified) (2 diffs)

lang/actionscript/swfgmap/trunk/TestApp.as

@@ -21 +21 @@
                         
                         var T:Matrix = new Matrix();
-                        T.rotate(0.1);
+                        T.rotate(0.2);
                         vp.setTransform(T);
                         setViewport(vp);

lang/actionscript/swfgmap/trunk/gyuque/gmap/GMapView.as

@@ -7 +7 @@
         import gyuque.gmap.googlemaps.*;
         
-        public class GMapView extends MovieClip
+        public class GMapView extends MovieClip implements IDebugOut
         {
                 private static const GOOGLE_LOGO_URL:String = "http://www.google.com/intl/ja_jp/mapfiles/poweredby.png";
@@ -20 +20 @@
                 public function GMapView(options:*)
                 {
-GMapCalc.DEFAULT_TILE_SIZE // compile focibly. remove later!
                         mBaseSprite = putBaseSprite();
                         if (options.initial_size)
@@ -75 +74 @@
                 protected function addGoogleMapLayer():Boolean
                 {
-                        var lyr:Layer = new GMapMapLayer(this);
+                        var lyr:GMapMapLayer = new GMapMapLayer(this);
+                        lyr.debug_out = this;
                         mSuperLayer.push(lyr);
                         

lang/actionscript/swfgmap/trunk/gyuque/gmap/GMapViewport.as

@@ -40 +40 @@
                 }
                 
-                private function transformVectorScreenToView(x:Number, y:Number, out:Point):void
+                public function transformVectorScreenToView(x:Number, y:Number, out:Point):void
                 {
                         out.x = x;
@@ -48 +48 @@
                 }
                 
-                private function transformVectorViewToScreen(x:Number, y:Number, out:Point):void
+                public function transformVectorViewToScreen(x:Number, y:Number, out:Point):void
                 {
                         out.x = x;

lang/actionscript/swfgmap/trunk/gyuque/gmap/IMeshMap.as

@@ -5 +5 @@
         public interface IMeshMap
         {
-                function getCurrentPanning(out:Point) :void;
+                function getCurrentPanning(out:Point)  :void;
+                function get centerTileX()             :int;
+                function get centerTileY()             :int;
                 function resetPanning(tx:int, ty:int)  :void;
                 function setTileOffset(ox:int, oy:int) :void;

lang/actionscript/swfgmap/trunk/gyuque/gmap/LayerManager.as

@@ -3 +3 @@
         public class LayerManager extends Layer
         {
-                import flash.display.DisplayObjectContainer;
+                import flash.display.*;
                 import flash.geom.Matrix;
                 

lang/actionscript/swfgmap/trunk/gyuque/gmap/Math2D.as

@@ -8 +8 @@
                 public static function transformNoMove(v:Point, M:Matrix):void
                 {
-                        var x:Number = v.x;
-                        var y:Number = v.y;
+                        var m:Matrix = M.clone();
+                        m.tx = 0;
+                        m.ty = 0;
 
-                        v.x = x*M.a + y*M.b;
-                        v.y = x*M.c + y*M.d;
+                        var res:Point = m.transformPoint(v);
+                        v.x = res.x;
+                        v.y = res.y;
                 }
         }

lang/actionscript/swfgmap/trunk/gyuque/gmap/ViewportUpdater.as

@@ -3 +3 @@
         import flash.events.*;
         import flash.utils.Timer;
-        import flash.geom.Point;
+        import flash.geom.*;
         
         public class ViewportUpdater
         {
+public var dout:IDebugOut;
+        
                 private var mCurViewport:GMapViewport = null;
                 private var mListener:IMeshMap;
@@ -56 +58 @@
                 }
                 
-                private function spread(tx:int, ty:int):void
+                private static const AROUND_POS:Array = [0, 1, 0, -1];
+                private function spread(tx:int, ty:int, nest:int = -1):Boolean
                 {
-                        addLoadJob(tx    , ty - 1);
-                        addLoadJob(tx + 1, ty    );
-                        addLoadJob(tx    , ty + 1);
-                        addLoadJob(tx - 1, ty    );
+                        if (nest == -1)
+                        {
+                                for (var n:int = 0;n < 5;n++)
+                                {
+                                        if (!spread(tx, ty, n))
+                                                break;
+                                }
+                                return false;
+                        }
+                        
+                        var retval:Boolean = false;
+                        for (var i:int = 0;i < 4;i++)
+                        {
+                                var x:int = tx + AROUND_POS[i];
+                                var y:int = ty + AROUND_POS[(i+3)%4];
+                                
+                                if (nest == 0)
+                                {
+                                        if (isTileVisible(x, y) != T_INVISIBLE)
+                                        {
+                                                retval = true;
+                                                addLoadJob(x, y);
+                                        }
+                                }
+                                else
+                                        retval = spread(x, y, nest-1) || retval;
+                        }
+                        
+                        
+                        
+                        return retval;
                 }
                 
                 private function checkAndLoad(tx:int, ty:int):void
                 {
-                        if (!mGHash.peek(tx, ty))
-                        {
-                                mGHash.poke(tx, ty, 1);
+                        if (mGHash.peek(tx, ty))
                                 mListener.loadTile(tx, ty);
-                        }
                 }
                 
                 private function addLoadJob(tx:int, ty:int):void
                 {
-                        mReqQueue.push(tx, ty, 1);
+                        if (!mGHash.peek(tx, ty))
+                        {
+                                mGHash.poke(tx, ty, 1);
+                                mReqQueue.push(tx, ty, 1);
+
+                                dout.puts((tx-29095)+", "+(ty-12855));
+                        }
                 }
                 
@@ -86 +119 @@
                         mListener.setTileOffset(tiledata.offset.x, tiledata.offset.y);
                         
-                        checkAndLoad(tiledata.tile_index.x, tiledata.tile_index.y);
+                        addLoadJob(tiledata.tile_index.x, tiledata.tile_index.y);
                         spread(tiledata.tile_index.x, tiledata.tile_index.y);
+                }
+                
+                private static const T_INVISIBLE :int = 0;
+                private static const T_CLOSELY   :int = 1;
+                private static const T_VISIBLE   :int = 2;
+                private function isTileVisible(tx:int, ty:int):int
+                {
+                        if (!mListener)
+                                return T_INVISIBLE;
+                                
+                        var bx:Number = (tx - mListener.centerTileX) * GMapCalc.TILE_SIZE;
+                        var by:Number = (ty - mListener.centerTileY) * GMapCalc.TILE_SIZE;
+                        
+                        var p:Point = new Point();
+
+                        mListener.getCurrentPanning(p);
+                        bx += p.x;
+                        by += p.y;
+
+                        mCurViewport.transformVectorViewToScreen(bx, by, p);
+                        
+                        var padding:Number = GMapCalc.TILE_SIZE*0.7;
+                        for (var i:int = 0;i < 2;i++) {
+                        if (p.x >= (-mCurViewport.width*0.5 - padding) && p.y >= (-mCurViewport.height*0.5 - padding) && p.x < (mCurViewport.width*0.5 + padding) && p.y < (mCurViewport.height*0.5 + padding))
+                                return T_VISIBLE-i;
+                                
+                                padding *= 1.5;
+                        }
+                        
+                        return T_INVISIBLE;
                 }
         }

lang/actionscript/swfgmap/trunk/gyuque/gmap/googlemaps/GMapMapLayer.as

@@ -12 +12 @@
                 protected var mCenterTX:int;
                 protected var mCenterTY:int;
+                
+                public function set debug_out(d:IDebugOut):void
+                {
+                        mVPobs.dout = d;
+                }
                 
                 public function GMapMapLayer(eventSrc:EventDispatcher)
@@ -70 +75 @@
                 {
                         out.x = x;
-                        out.x = y;
+                        out.y = y;
+                }
+                
+                public function get centerTileX():int
+                {
+                        return mCenterTX;
+                }
+                
+                public function get centerTileY():int           
+                {
+                        return mCenterTY;
                 }
         }