Changeset 3028 for lang/actionscript/swfgmap

Timestamp:

12/11/07 01:48:40 (13 months ago)

Author:

gyuque

Message:

lang/actionscript/swfgmap: implemented zooming animation.

Location:

lang/actionscript/swfgmap/trunk

Files:

• TestApp.swf (modified) (previous)
• gyuque/gmap/GMapView.as (modified) (3 diffs)
• gyuque/gmap/Layer.as (modified) (2 diffs)
• gyuque/gmap/LayerManager.as (modified) (5 diffs)
• gyuque/gmap/PointZoomAnimation.as (modified) (1 diff)
• gyuque/gmap/googlemaps/GMapMapLayer.as (modified) (3 diffs)

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

@@ -126 +126 @@
                         z += d;
                         if (z < 0)  z = 0;
-                        if (z > 16) z = 16;
-                        
+                        if (z > 17) z = 17;
+                        
+                        var oldZ:int = mCurrentViewport.zoom;
                         mCurrentViewport.zoom = z;
+                        
+                        if (mCurrentViewport.zoom == oldZ)
+                                return;
+                        
                         if (px >= 0 || py >= 0) {
                                 var mv:Point = calcFixedPointZoom(px, py, (d>0) ? 2 : 0.5, mCurrentViewport);
@@ -134 +139 @@
                         }
                         
-                        fireViewportChange(0,0,z - oldz, animation);
+                        fireViewportChange(mv.x, mv.y, z - oldz, animation);
                 }
                 
@@ -148 +153 @@
                         var dy:Number = sy2 - sy;
                 
-//                      var retval:Point = new Point();
-//                      vpAfter.transformVectorScreenToView(dx, dy, retval);
-//                      return retval;
                         return new Point(dx, dy);
                 }

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

@@ -32 +32 @@
                 }
                 
-                protected function onViewportChanged(e:GMapViewEvent):void
+                public function onViewportChanged(e:GMapViewEvent):void
                 {}
                 
@@ -45 +45 @@
                 }               
                 
-                public function relay(e:GMapViewEvent):void
+                public function clone():Layer
                 {
+                        return new Layer(mEventSource, mParent);
                 }
         }

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

@@ -7 +7 @@
                 
                 private var mAnimDisp:IAnimationDispatcher;
+                private var mTransformMat:Matrix = new Matrix();
                 
                 public function LayerManager(c:DisplayObjectContainer)
@@ -18 +19 @@
                 }
                 
-                public function floatLayer(idx:int):void
-                {
-                        //getChildAt(
-                }
                 
                 public function removeLayer(idx:int, floatLayer:Boolean):void
                 {
                         var cidx:int = idx*2 + (floatLayer ? 1 : 0);
-                        if (getChildAt(cidx))
+                        if (cidx <= numChildren && getChildAt(cidx))
                                 removeChildAt(cidx);
                 }
@@ -36 +33 @@
                 }
                 
-                protected override function onViewportChanged(e:GMapViewEvent):void
+                public override function onViewportChanged(e:GMapViewEvent):void
                 {
                         var firstset:Boolean = false;
@@ -70 +67 @@
                         M.ty = v.height * 0.5;
                         
+                        mTransformMat = M;
+                        transform.matrix = M;
+                }
+                
+                public function set postZoom(r:Number):void
+                {
+                        var M:Matrix = mTransformMat.clone();
+                        M.a *= r;
+                        M.b *= r;
+                        M.c *= r;
+                        M.d *= r;
                         transform.matrix = M;
                 }
@@ -77 +85 @@
                         out.x = 0;
                         out.y = 0;
-                        //mViewport.transformVectorScreenToView(mPanPos.x, mPanPos.y, out);
                 }
                 

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

@@ -3 +3 @@
         public class PointZoomAnimation extends Animation
         {
+                import flash.geom.Point;
+                
                 private var mOldLayer:Layer;
                 private var mViewEvent:GMapViewEvent;
-                public function PointZoomAnimation(oldLayer:Layer, e:GMapViewEvent)
+                private var mLayerMan:LayerManager;
+                private var mFloatingIndex:int;
+                private var mDZoom:int;
+                private var STEPS:int = 6;
+                private var mCount:int = 0;
+                
+                private var mOrgX:Number;
+                private var mOrgY:Number;
+                private var mShift:Point;
+                
+                public function PointZoomAnimation(oldLayer:Layer, e:GMapViewEvent, man:LayerManager)
                 {
                         mOldLayer  = oldLayer;
+                        
+                        mDZoom = e.dZoom;
+                        e.dZoom = 0;
+                        
                         mViewEvent = e;
+                        mLayerMan = man;
+                        mOrgX = oldLayer.x;
+                        mOrgY = oldLayer.y;
+                        
+                        mShift = new Point(e.screenDX, e.screenDY);
+                        e.screenDX = 0;
+                        e.screenDY = 0;
+                        
                 }
                 
+                private function relayAndFloat():void
+                {
+                        mOldLayer.terminate();
+                        
+                        var cidx:int = mOldLayer.layerIndex*2;
+                        mFloatingIndex = cidx+1;
+                        if (cidx < (mLayerMan.numChildren-1) && mLayerMan.getChildAt(mFloatingIndex))
+                                mLayerMan.removeChildAt(mFloatingIndex);
+                                        
+                        mLayerMan.removeChildAt(cidx);
+                        var newLayer:Layer = mOldLayer.clone();
+                        mLayerMan.addChildAt(newLayer, cidx);
+                        mLayerMan.addChildAt(mOldLayer, mFloatingIndex);
+                                        
+                        newLayer.onViewportChanged(mViewEvent);
+                }
                 
                 public override function next():Boolean
                 {
-                        skip();
-                        return false;
+                        if (mCount == 0)
+                                relayAndFloat();
+
+                        if (++mCount >= STEPS)
+                        {
+                                skip();
+                                return false;
+                        }
+                        
+                        var rt:Number = 0.14 * mCount;
+                        var pz:Number = (mDZoom > 0) ? (rt + 1.0) : (1.0 - rt/2);
+                        
+                        mLayerMan.postZoom = pz;        
+                        mOldLayer.x = mOrgX - rt * mShift.x/pz;
+                        mOldLayer.y = mOrgY - rt * mShift.y/pz;
+                        
+                        return true;
                 }
                 
                 public override function skip():void
                 {
-                        mOldLayer.terminate();
-                        mOldLayer.relay(mViewEvent);
-                }               
+                        mLayerMan.postZoom = 1;
+                        if (mFloatingIndex < mLayerMan.numChildren && mLayerMan.getChildAt(mFloatingIndex) == mOldLayer)
+                                mLayerMan.removeChildAt(mFloatingIndex);
+                }
         }
 }

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

@@ -41 +41 @@
                 }
                 
-                protected override function onViewportChanged(e:GMapViewEvent):void
+                public override function onViewportChanged(e:GMapViewEvent):void
                 {
                         var firstset:Boolean = false;
@@ -49 +49 @@
                         if (e.dZoom)
                         {
-                                e.dZoom = 0;
-                                
-                                var a:PointZoomAnimation = new PointZoomAnimation(this, e);
-                                addAnimation(a);
+                                if (mParent is LayerManager)
+                                {
+                                        var a:PointZoomAnimation = new PointZoomAnimation(this, e, LayerManager(mParent));
+                                        addAnimation(a);
+                                }
                                 
                                 return;
@@ -70 +71 @@
                 }
 
-                public override function relay(e:GMapViewEvent):void
+                public override function clone():Layer
                 {
-                        var man:LayerManager;
-                        if (mParent is LayerManager)
-                                man = LayerManager(mParent);
-                        else
-                                return;
-                        
-                        man.removeLayer(layerIndex, false);
-                        
-                        var newLayer:GMapMapLayer = new GMapMapLayer(mEventSource, man);
+                        var newLayer:GMapMapLayer = new GMapMapLayer(mEventSource, mParent);
                         newLayer.layerIndex = layerIndex;
                         newLayer.debug_out = mVPobs.dout; //
-                        man.putLayer(layerIndex, newLayer);
-                        newLayer.onViewportChanged(e);
+                        
+                        return newLayer
                 }