Changeset 22903 for lang/actionscript/gmapkmz

Timestamp:

11/07/08 11:42:42 (2 months ago)

Author:

gyuque

Message:

fixed '4_4 element of matrix' bug

Location:

lang/actionscript/gmapkmz/FOSS4G-Demo

Files:

• proxy/files/3dwarehouse/GMapKMZ.swf (modified) (previous)
• proxy/files/3dwarehouse/details (added)
• swf/GMapKMZ.as (modified) (6 diffs)
• swf/exl/render/collada/DAEModel.as (modified) (1 diff)
• swf/exl/render/collada/DAEModelRenderer.as (modified) (3 diffs)
• swf/exl/trans3d/M44.as (modified) (1 diff)

lang/actionscript/gmapkmz/FOSS4G-Demo/swf/GMapKMZ.as

@@ -20 +20 @@
         public class GMapKMZ extends STDOUT
         {
+                public static const SCREEN_WIDTH:int  = 500;
+                public static const SCREEN_HEIGHT:int = 480;
+
                 public static const DPI:Number = Math.PI * 2.0;
                 public static const DEGTORAD:Number = 0.0174533;
@@ -49 +52 @@
                 {
                         mQualitySwitcher = new QualitySwitcher(this);
-                        drawBase(graphics, 500, 480);
+                        drawBase(graphics, SCREEN_WIDTH, SCREEN_HEIGHT);
 
                         mMapRoot = new Sprite();
@@ -59 +62 @@
 
                         mGMap = new MyGMap();
-                        mGMap.setSize(new Point(500, 480));
+                        mGMap.setSize(new Point(SCREEN_WIDTH, SCREEN_HEIGHT));
                         mMapRoot.addChild(mGMap);
 
                         mGMap.addEventListener(MapEvent.MAP_READY, onMapReady);
 
-                        mGMap.x = -250;
-                        mGMap.y = -240;
-
-                        tx.width  = 500;
-                        tx.height = 480;
+                        mGMap.x = -(SCREEN_WIDTH/2);
+                        mGMap.y = -(SCREEN_HEIGHT/2);
+
+                        tx.width  = SCREEN_WIDTH;
+                        tx.height = SCREEN_HEIGHT;
 
                         mMapMask = new Sprite();
                         var mg:Graphics = mMapMask.graphics;
                         mg.beginFill(0);
-                        mg.drawRect(-250, -240, 500, 480);
+                        mg.drawRect(-SCREEN_WIDTH/2, -SCREEN_HEIGHT/2, SCREEN_WIDTH, SCREEN_HEIGHT);
                         mMapMask.visible = false;
                         mMapRoot.addChild(mMapMask);
 
                         mLoadingLabel = new TextLabel("Loading...");
-                        mLoadingLabel.x = 250;
-                        mLoadingLabel.y = 240;
+                        mLoadingLabel.x = SCREEN_WIDTH/2;
+                        mLoadingLabel.y = SCREEN_HEIGHT/2;
                         addChild(mLoadingLabel);
 
                         removeChild(tx);
                         addChild(tx);
+//                      tx.height = SCREEN_HEIGHT;
+//tx.mouseEnabled = true;
                 }
 
@@ -131 +136 @@
                                 if (loadpath == null)
                                         throw "null path";
+
+                                ttw = new Map3DObject(loadpath);
                         } catch(exc:*) {
                                 STDOUT.puts("Cannot get kmz location.");
                                 return;
                         }
-
-                        ttw = new Map3DObject(loadpath);
 
                         mModelLayer.addChild(ttw);
@@ -309 +314 @@
                         mViewSpriteTrans.d = m._22;
 
-                        mViewSpriteTrans.tx = 250;
-                        mViewSpriteTrans.ty = 240  - (mRX*100);
+                        mViewSpriteTrans.tx = SCREEN_WIDTH/2;
+                        mViewSpriteTrans.ty = SCREEN_HEIGHT/2 - (mRX*100);
 
                         mMapRoot.transform.matrix = mViewSpriteTrans;
@@ -406 +411 @@
         {
                 super();
-                key = "*******************************************************";
+                key = "ABQIAAAABxFFkLd0-1pnEhhkOq6s5RQQ613AaS6dPOLP9_3YjhSkYQuxfhT1J8ddGmXKkiaEKoKO7PL4jHhkMA";
         }
 }

lang/actionscript/gmapkmz/FOSS4G-Demo/swf/exl/render/collada/DAEModel.as

@@ -132 +132 @@
                                 var instance_node:DaeInstanceNode = node.instance_nodes[i];
                                 var iNode:DaeNode = mDocument.getDaeNodeById(instance_node.url);
-
                                 var iObj:DAESceneObject = getChildByName(iNode.id);
 

lang/actionscript/gmapkmz/FOSS4G-Demo/swf/exl/render/collada/DAEModelRenderer.as

@@ -127 +127 @@
         
                                         mFacesCount = 0;
+
                                         traverse(mSceneRoot, g);
                                         mTraverseDirty = false;
@@ -421 +422 @@
 
                         var end:uint = mFacesCount;
-
                         if (end > start)
                                 applyTransforms(start, end - start);
@@ -450 +450 @@
                                 var m1:M44 = M44(mMatrixStack[mMatrixStack.length-1]);
                                 var m2:M44 = new M44();
+
+                                if (m._44 != 1 && m._44 != 0) { // (x,y,z)/w
+                                        var w:Number = 1.0 / m._44;
+                                        m = new M44(m);
+
+                                        m._11 *= w;
+                                        m._12 *= w;
+                                        m._13 *= w;
+                                        m._21 *= w;
+                                        m._22 *= w;
+                                        m._23 *= w;
+                                        m._31 *= w;
+                                        m._32 *= w;
+                                        m._33 *= w;
+                                        m._41 *= w;
+                                        m._42 *= w;
+                                        m._43 *= w;
+                                        m._44 = 1;
+                                }
 
                                 m2.mul(m, m1);

lang/actionscript/gmapkmz/FOSS4G-Demo/swf/exl/trans3d/M44.as

@@ -22 +22 @@
                         m._21 = a[4];  m._22 = a[5];  m._23 = a[6];  m._24 = a[7];
                         m._31 = a[8];  m._32 = a[9];  m._33 = a[10]; m._34 = a[11];
-
+                                                                     m._44 = a[15];
                         return m;
                 }