Commit: 28 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 28 (tree)
• Time: 2014-10-13 00:01:37
• Author: c477

Log Message

マウスポインタ位置の地形ポリゴンを検出、バグ修正済み

Change Summary

• modified: trunk/core/core/geometry/TerrainUtil.cs
• modified: trunk/core/impl/view/SceneBuilder.cs
• modified: trunk/core/impl/view/DrawIndexUtil.cs
• modified: trunk/framework/framework/drawing/I3DObject.cs
• modified: trunk/NeoFT.suo

Incremental Difference

--- trunk/core/core/geometry/TerrainUtil.cs	(revision 27)
+++ trunk/core/core/geometry/TerrainUtil.cs	(revision 28)
@@ -128,11 +128,15 @@
 		}
 
         static public bool IsInnerPoint2D(Point[] triangle_vertex, Point testpos) {
+            double c,c2=0.0;
             for (int i=0; i<3; i++) {
                 Point p = triangle_vertex[i];                
                 Point v1 = SubVector(testpos, p);
                 Point v2 = SubVector(p, triangle_vertex[(i + 2) % 3]);
-                if (GetOuterProduct2D(v1, v2) < 0) return false;
+                c = GetOuterProduct2D(v1, v2);
+                if (c == 0) return true; // On the line
+                if (c2 != 0 && c2 * c < 0) return false; // Out of triangle
+                c2 = c;
             }
             return true;
         }

--- trunk/core/impl/view/SceneBuilder.cs	(revision 27)
+++ trunk/core/impl/view/SceneBuilder.cs	(revision 28)
@@ -34,7 +34,7 @@
 
         public SceneBuilder(GameImpl g) {
             this.game = g;
-            SetViewFactor(new ViewFactor(InterCardinalDirection.NORTHEAST, ZoomScale.x2));
+            SetViewFactor(new ViewFactor(InterCardinalDirection.NORTHEAST));
         }
 
         public SceneBuilder(GameImpl g, ISurface s) : this(g){
@@ -274,8 +274,8 @@
         }
 
         protected Point WorldPosToGrid(PointF3D p3d) {
-            int isx = (int)Math.Floor(p3d.X / Geocon.UnitWidthPixel);
-            int isy = (int)Math.Floor(p3d.Y / Geocon.UnitWidthPixel);
+            int isx = (int)Math.Round(p3d.X / Geocon.UnitWidthPixel);
+            int isy = (int)Math.Round(p3d.Y / Geocon.UnitWidthPixel);
             int d = (int)Math.Ceiling(p3d.Z / Geocon.HalfOf_UnitWidthPixel);
             return new Point(isx - d, isy - d);
         }
@@ -283,6 +283,7 @@
         public object GetObjectAt(Point spos) {
             ITerrainPolygon pol;
             PointF3D p3dv;
+            marker0 = null;
             if (DrawIndexUtil.ResolveTerrain(this, spos, out pol, out p3dv)) {
 
                 return pol;
@@ -290,14 +291,14 @@
             return null;
         }
 
-        public object GetObjectAt_old(Point spos) {
+        public object GetGroundAt(Point spos) {
             PointF3D p3d = surface.ToWorldPosition(spos);
 #if DEBUG
             Debug.Write("mouse(" + spos.X + "," + spos.Y + ")");
             //Debug.Write("world(" + (int)p3d.X + "," + (int)p3d.Y + "," + (int)p3d.Z + ")");
 #endif
-            int isx = (int)Math.Floor(p3d.X / Geocon.UnitWidthPixel);
-            int isy = (int)Math.Floor(p3d.Y / Geocon.UnitWidthPixel);
+            int isx = (int)Math.Round(p3d.X / Geocon.UnitWidthPixel);
+            int isy = (int)Math.Round(p3d.Y / Geocon.UnitWidthPixel);
             object ret = null;
             TerrainMapImpl map = game.TerrainMap;
             // 標高の高い地表セルは画面上方に表示される。
@@ -323,15 +324,15 @@
 #endif
             marker0 = null;
             while(true){
-                //Debug.Write("(" + l1.X + "," + l1.Y + ")");
                 if (l2.X >= 0 && l2.Y >= 0 && l2.X < sz.sx && l2.Y < sz.sy) {
+                    //Debug.Write("l2(" + l2.X + "," + l2.Y + ")");
                     HitTest(l2, spos, out ret);
                     if (ret != null) break;
                 }
                 if (l1.X >= 0 && l1.Y >= 0 && l1.X < sz.sx && l1.Y < sz.sy) {
-                    if (HitTest(l1, spos, out ret)) {
-                        break;
-                    }
+                    //Debug.Write("l1(" + l1.X + "," + l1.Y + ")");
+                    HitTest(l1, spos, out ret);
+                    if (ret != null) break;
                 }
                 if (isx < l1.X) {
                     //Debug.Write("exit3");
@@ -379,22 +380,21 @@
             Point rep = surface.ToScreenPosition(p3d);
             //Debug.Write(":rep(" + rep.X + "," + rep.Y + ")");
             // ビューのY座標は上に行くほど小さくなることに注意
-            //Debug.Write(":h="+h);
             if (rep.Y < vw_p.Y) { // 指定ポイントより上＝絶対ヒットしない
                 //Debug.Write("HitTest at=" + iso_p);
                 //Debug.WriteLine(":e1=" + (rep.Y - vw_p.Y));
                 return true;
             }
-            int xoff = rep.X - vw_p.X;
+            int xoff = vw_p.X - rep.X;
             int yoff = 0;
             //Debug.WriteLine("HitTest at=" + iso_p);
             bool cliff = false;
-            //rep.Y -= (Geocon.TerrainMaxHeightInPixel + Geocon.HalfOf_UnitWidthPixel);
-            foreach (ITerrainPiece p in map[iso_p.X, iso_p.Y, upperDir]) {
+            //rep.Y += (Geocon.TerrainMaxHeightInPixel + Geocon.HalfOf_UnitWidthPixel);
+            Location l = cdUtil.IsometricGridToLocation(iso_p.X, iso_p.Y, 0);
+            foreach (ITerrainPiece p in map[l.X, l.Y, upperDir]) {
                 int h1 = p.BaseHeight * Geocon.UnitHeightPixel;
                 yoff = vw_p.Y - rep.Y + h1;
                 //Debug.Write(",off(" + xoff + "," + yoff + ")");
-                //Debug.Write(",h1="+h1);
                 if (yoff > 0 ) {
                     cliff = true; //おそらく手前の崖を差している
                     continue;
@@ -404,10 +404,20 @@
                 TerrainPieceTemplate.TerrainPolygonSet tpset = p.Template.GetPolygons(upperDir);
                 if (tpset.Ground.IsVisible) {
                     //Debug.Write("!");
-                    if (TerrainUtil.IsInnerPoint2D(tpset.Ground.GetVerticis(scaler), new Point(xoff,yoff))) {
+                    Debug.Write("["+iso_p.X+","+iso_p.Y+"]+(" + xoff + "," + yoff + ")");
+                    if (TerrainUtil.IsInnerPoint2D(tpset.Ground.GetVerticis(scaler), new Point(xoff, yoff))) {
+#if false //DEBUG
+                        Debug.Write("%");
+                        foreach (Point bp in tpset.Ground.GetVerticis(scaler)) {
+                            Debug.Write("<"+bp.X+","+bp.Y+">");
+                        }
+                        Debug.Write("%");
+#endif
                         ret = tpset.Ground;
+                        //Debug.Write("vw.Y=" + vw_p.Y + ", rp.Y=" + rep.Y + ", h1=" + h1);
                         //Debug.WriteLine("");
-                        marker0 = new TerrainMarker(iso_p, tpset, true);
+                        //marker0 = new TerrainMarker(iso_p, tpset, true);
+                        CreateMarker(iso_p.X, iso_p.Y, TrMk_Ground);
                         return true;
                     }
                 }

--- trunk/core/impl/view/DrawIndexUtil.cs	(revision 27)
+++ trunk/core/impl/view/DrawIndexUtil.cs	(revision 28)
@@ -59,53 +59,57 @@
             if (AdjustPointForGround(ref p3dv, idx)) {
                 int gx = (int)Math.Round(p3dv.X / Geocon.UnitWidthPixel);
                 int gy = (int)Math.Round(p3dv.Y / Geocon.UnitWidthPixel);
-                Debug.Write("->(" + p3dv.X + "," + p3dv.Y + ") : grid[" + gx + "," + gy + "]");
-                foreach (ITerrainPiece p in map[gx, gy, sb.upperDir]) {
+                Debug.Write(":Ground->(" + p3dv.X + "," + p3dv.Y + ") : grid[" + gx + "," + gy + "]");
+                Location l = sb.cdUtil.IsometricGridToLocation(gx, gy, 0);
+                foreach (ITerrainPiece p in map[l.X, l.Y, sb.upperDir]) {
                     TerrainPieceTemplate.TerrainPolygonSet tpset = p.Template.GetPolygons(sb.upperDir);
                     if (tpset.Ground.IsVisible) {
-                        Point rep = sb.surface.ToScreenPosition(p3dv);
+                        PointF3D p3d = new PointF3D(gx * Geocon.UnitWidthPixel, gy * Geocon.UnitWidthPixel, 0);
+                        Point rep = sb.surface.ToScreenPosition(p3d);
                         int xoff = mousePos.X - rep.X;
                         int yoff = mousePos.Y - rep.Y;
+                        int h1 = p.BaseHeight * Geocon.UnitHeightPixel;
+                        yoff += h1;
                         //Debug.Write("!");
                         if (TerrainUtil.IsInnerPoint2D(tpset.Ground.GetVerticis(sb.scaler), new Point(xoff, yoff))) {
+                            Debug.WriteLine("+(" + xoff + "," + yoff + ")");
                             pol = tpset.Ground;
-                            Debug.WriteLine(": Ground hit 1 off(" + xoff + ", yoff=" + yoff + ")");
+                            sb.CreateMarker(gx, gy, SceneBuilder.TrMk_Ground);
                             break;
-                        } else if (pol == null) {
-                            Debug.WriteLine(": Ground hit 2 off(" + xoff + ", yoff=" + yoff + ")");
-                            pol = tpset.Ground;
+                        //} else if (pol == null) {
+                        //    pol = tpset.Ground;
                         }
                     }
-                    sb.CreateMarker(gx, gy, SceneBuilder.TrMk_Ground);
                 }
-                Debug.WriteLineIf(pol == null, "WTF!?");
+                //Debug.WriteLineIf(pol == null, "WTF!?");
                 return pol != null;
             } else if (AdjustPointForCliff(ref p3dv, idx)) {
                 int gx = (int)Math.Round(p3dv.X / Geocon.UnitWidthPixel);
                 int gy = (int)Math.Round(p3dv.Y / Geocon.UnitWidthPixel);
-                Debug.Write("->(" + p3dv.X + "," + p3dv.Y + ") : grid[" + gx + "," + gy + "]");
-                foreach (ITerrainPiece p in map[gx, gy, sb.upperDir]) {
+                Debug.Write(":Cliff->(" + p3dv.X + "," + p3dv.Y + ") : grid[" + gx + "," + gy + "]");
+                Location l = sb.cdUtil.IsometricGridToLocation(gx, gy, 0);
+                foreach (ITerrainPiece p in map[l.X, l.Y, sb.upperDir]) {
                     //if (p.BaseHeight < p3dv.Z) continue;
                     TerrainPieceTemplate.TerrainPolygonSet tpset = p.Template.GetPolygons(sb.upperDir);
                     UInt32 testval = (idx & Mask_CliffPolygon_D);
                     if (testval == Mask_CliffPolygon_D) {
-                        Debug.WriteLine(": Cliff(Diagonal)");
+                        Debug.WriteLine(":Diagonal");
                         pol = tpset.CliffDiagonal;
                         sb.CreateMarker(gx, gy, SceneBuilder.TrMk_CliffDiag);
                     } else if (testval == Mask_CliffPolygon_R) {
-                        Debug.WriteLine(": Cliff(Right)");
+                        Debug.WriteLine(":Right");
                         pol = tpset.CliffRight;
                         sb.CreateMarker(gx, gy, SceneBuilder.TrMk_CliffRight);
                     } else {
-                        Debug.WriteLine(": Cliff(Left)");
+                        Debug.WriteLine(":Left");
                         pol = tpset.CliffLeft;
                         sb.CreateMarker(gx, gy, SceneBuilder.TrMk_CliffLeft);
                     }
                 }
-                Debug.WriteLineIf(pol == null, "WTF2!?");
+                //Debug.WriteLineIf(pol == null, "WTF2!?");
                 return pol != null;
             }
-            Debug.WriteLine("--");
+            //Debug.WriteLine("--");
             return false;
         }
 

--- trunk/framework/framework/drawing/I3DObject.cs	(revision 27)
+++ trunk/framework/framework/drawing/I3DObject.cs	(revision 28)
@@ -26,7 +26,7 @@
             Point minP = new Point(int.MaxValue, int.MaxValue);
             Point maxP = new Point(int.MinValue, int.MinValue);
             for (int i = 0; i < n; i++) {
-                int x = locs[i].Y - locs[i].X;
+                int x = locs[i].X - locs[i].Y;
                 int y = -locs[i].Z - (locs[i].X + locs[i].Y) / 2;
                 minP.X = Math.Min(minP.X, x);
                 maxP.X = Math.Max(maxP.X, x);