Commit: 34 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 34 (tree)
• Time: 2015-03-29 14:45:37
• Author: c477

Log Message

調査ツールの地形ポリゴン表示の回転によるズレ修正

Change Summary

• modified: trunk/NeoFT.v12.suo
• modified: trunk/core/impl/view/SceneBuilder.cs
• modified: trunk/core/core/geometry/ViewGeoObjects.cs
• modified: trunk/core/core/geometry/CoordinationUtil.cs
• modified: trunk/ui_jp/ui/core/InspectorTool.cs

Incremental Difference

--- trunk/core/impl/view/SceneBuilder.cs	(revision 33)
+++ trunk/core/impl/view/SceneBuilder.cs	(revision 34)
@@ -208,15 +208,11 @@
             Debug.WriteLine(string.Format("time={0}ms", watch0.ElapsedMilliseconds));
         }
 
-        public IEnumerable<I3DObject> GetTerrainsAt(int gridX, int gridY) {
+        public IEnumerable<I3DObject> GetTerrainsAt(Location l) {
             // 概ね GetEnumerator() のループ内と同じだが、崖のチェックをしない（必ず描画）
             InterCardinalDirection dir = UpperDirection;
             TerrainMapImpl map = game.TerrainMap;
             Size3D sz = map.Size;
-            // terrain assembl loop
-
-            Point3DV pv = new Point3DV(gridX * Geocon.UnitWidthPixel, gridY * Geocon.UnitWidthPixel, 0);
-            Location l = cdUtil.IsometricGridToLocation(gridX, gridY, 0);
             int x = l.X;
             int y = l.Y;
             if (x < 0 || y < 0 || x >= sz.sx || y >= sz.sy) {
@@ -227,6 +223,8 @@
             if (pair == null) {
                 yield break;
             }
+            //Point3DV pv = new Point3DV(gridX * Geocon.UnitWidthPixel, gridY * Geocon.UnitWidthPixel, 0);
+            Point3DV pv = cdUtil.LocationToPoint3DV(l);
             TerrainPiecePair.ArrangedTerrainPieces atp = pair.GetTerrainPieces(UpperDirection);
             ITerrainPlate plate;
             int hgap = 0;
@@ -269,21 +267,22 @@
                 plate.Location = new PointF3D(pv.VX, pv.VY, pv.VZ);
                 yield return plate;
             }
-            // Process Diagonal Cliff
-            cp = atp.CliffDiagonal;
-            hgap = atp.BaseHeightDiagonal * Geocon.UnitHeightPixel;
-            pv.VZ = 0;
-            if (cp == null && hgap > 0) {
-                cp = CliffPolygon.DiagonalUnitCliff;
-                hgap -= Geocon.TerrainStepHeightInUnit;
-                pv.VZ -= Geocon.TerrainStepHeightInUnit;
+            if (atp.PolygonSets[0].HorzSplitted) {
+                // Process Diagonal Cliff
+                cp = atp.CliffDiagonal;
+                hgap = atp.BaseHeightDiagonal * Geocon.UnitHeightPixel;
+                pv.VZ = 0;
+                if (cp == null && hgap > 0) {
+                    cp = CliffPolygon.DiagonalUnitCliff;
+                    hgap -= Geocon.TerrainStepHeightInUnit;
+                    pv.VZ -= Geocon.TerrainStepHeightInUnit;
+                }
+                if (cp != null) {
+                    plate = apparents.DefaultCliffTexture.Get(cp, hgap, pv);
+                    plate.Location = new PointF3D(pv.VX, pv.VY, pv.VZ);
+                    yield return plate;
+                }
             }
-            if (cp != null) {
-                plate = apparents.DefaultCliffTexture.Get(cp, hgap, pv);
-                plate.Location = new PointF3D(pv.VX, pv.VY, pv.VZ);
-                yield return plate;
-            }
-
         }
 
         System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {

--- trunk/core/core/geometry/ViewGeoObjects.cs	(revision 33)
+++ trunk/core/core/geometry/ViewGeoObjects.cs	(revision 34)
@@ -37,6 +37,11 @@
         public int VY;
         public int VZ;
 
+        /// <summary>
+        /// Do not called except from CoordinationUtil.
+        /// ビューの回転が考慮されていないので、CoordinationUtil以外から使わないこと
+        /// </summary>
+        /// <param name="src"></param>
         internal Point3DV(Location src) {
             this.VX = src.X;
             this.VY = src.Y;
@@ -49,6 +54,12 @@
             this.VZ = src.VZ;
         }
 
+        public Point3DV(Point3D src) {
+            this.VX = src.X;
+            this.VY = src.Y;
+            this.VZ = src.Z;
+        }
+
         public Point3DV(int vx, int vy, int vz) {
             this.VX = vx;
             this.VY = vy;
@@ -63,6 +74,24 @@
         /// 位置を持たないことを示す特殊な値
         /// </summary>
         public static readonly Point3DV UNPLACED = new Point3DV(short.MinValue, short.MinValue, short.MinValue);
+
+        #region cast operators for 'nft.framework.drawing' objects.
+        public static implicit operator Point3DV(Point3D p) {
+            return new Point3DV(p);
+        }
+
+        public static implicit operator Point3D(Point3DV p) {
+            return new Point3D(p.VX, p.VY, p.VZ);
+        }
+
+        public static implicit operator PointF3D(Point3DV p) {
+            return new PointF3D(p.VX, p.VY, p.VZ);
+        }
+
+        public static explicit operator Point3DV(PointF3D p) {
+            return new Point3DV((int)p.X, (int)p.Y, (int)p.Z);
+        }
+        #endregion
     }
 
     public class Rect3DV {
@@ -81,6 +110,11 @@
 		public int WidthY { get{ return size.VY; }  }
 		public int Height { get{ return size.VZ; }  }
 
+        /// <summary>
+        /// Do not called except from CoordinationUtil.
+        /// ビューの回転が考慮されていないので、CoordinationUtil以外から使わないこと
+        /// </summary>
+        /// <param name="src"></param>
         internal Rect3DV(Rect3D src) {
             this.loc = new Point3DV(src.Location);
             this.size = new Size3DV(src.Size);

--- trunk/core/core/geometry/CoordinationUtil.cs	(revision 33)
+++ trunk/core/core/geometry/CoordinationUtil.cs	(revision 34)
@@ -57,6 +57,13 @@
         /// </summary>
         public abstract Location IsometricGridToLocation(int vx, int vy, int loc_z);
 
+        public Location Point3DVToLocation(Point3DV p) {
+            int ux = p.VX / Geocon.UnitWidthPixel;
+            int uy = p.VY / Geocon.UnitWidthPixel;
+            int uz = p.VZ / Geocon.UnitHeightPixel;
+            return IsometricGridToLocation(ux, uy, uz);
+        }
+
         /// <summary>
         /// Converts the quarter view coordinates(p) to world map location(X,Y,locZ).
         /// </summary>
@@ -82,6 +89,19 @@
         }
 
         /// <summary>
+        /// Converts the world map location(X,Y,Z) to 3D world coordination in pixel (not grid).
+        /// </summary>
+        /// <param name="loc"></param>
+        /// <returns></returns>
+        public Point3DV LocationToPoint3DV(Location loc) {
+            Point3DV p = RotatedForViewAxis(loc);
+            p.VX *= Geocon.UnitWidthPixel;
+            p.VY *= Geocon.UnitWidthPixel;
+            p.VZ *= Geocon.UnitHeightPixel;
+            return p;
+        }
+
+        /// <summary>
         /// Converts the rotated world map coordinates(X,Y,Z) to quarter view coordinates(X,Y).
         /// </summary>
         public Point LocationToQuarterXY(Point3DV pt) {
@@ -100,7 +120,7 @@
         public abstract PointF LocationToQuarterXY(LocationF loc);
 
         /// <summary>
-        /// Rotate 3D Rectangle along the quarter view pseudo axis.
+        /// Rotate 3D Rectangle along the quarter view pseudo axis. result is by grid unit.
         /// the vertex which point out the Location will re-selected to 
         /// the one most nearest to the axis origin (0,0,0);
         /// Y Axis:Increase from bottom right to top left
@@ -111,7 +131,7 @@
         public abstract Rect3DV RotatedForViewAxis(Rect3D rect);
 
         /// <summary>
-        /// Rotate 3D Location along the quarter view pseudo axis.
+        /// Rotate 3D Location along the quarter view pseudo axis. result is by grid unit.
         /// coordination will recalced to be an offset from the front vertex of the world rectangle.
         /// Y Axis:Increase from bottom right to top left
         /// X Axis:Increase from bottom left to top right

--- trunk/ui_jp/ui/core/InspectorTool.cs	(revision 33)
+++ trunk/ui_jp/ui/core/InspectorTool.cs	(revision 34)
@@ -11,6 +11,7 @@
 using nft.framework.drawing;
 using nft.impl.game;
 using Geocon = nft.core.geometry.GeometricConstants;
+using nft.core.geometry;
 
 namespace nft.ui.core
 {
@@ -53,11 +54,21 @@
             Point pos = args.OriginalEventArgs.Location;
             SelectionInfo si = view.SceneBuilder.GetObjectAt(pos);
             if (si != null) {
-                if (si.Polygon != null) {
-                    lbStatus.Text = String.Format("HT={0:X6},PID={1:X6}", si.HitTestValue, si.Polygon.ID);
+                StringBuilder sb = new StringBuilder();
+                sb.AppendLine(String.Format("Location({0},{1}), Height={2}", si.Location.X, si.Location.Y, si.Location.Z));
+                sb.AppendLine(String.Format("ViewGrid({0:f1},{1:f1},{2:f1})", si.WorldPosition.X / Geocon.UnitWidthPixel, si.WorldPosition.Z / Geocon.UnitWidthPixel, si.WorldPosition.Y / Geocon.UnitHeightPixel));
+                sb.Append(String.Format("HT={0:X6}", si.HitTestValue));
+                if (si.TerrainPiece != null) {
+                    sb.Append(String.Format(",TID={0:X6}", si.TerrainPiece.Template.ID));
+                    if (si.Polygon != null) {
+                        sb.AppendLine(String.Format(",PID={0:X6}", si.Polygon.ID));
+                    } else {
+                        sb.AppendLine();
+                    }
                 } else {
-                    lbStatus.Text = String.Format("HT={0:X6},PID=N/A", si.HitTestValue);
+                    sb.AppendLine(",NoTerrain");
                 }
+                lbStatus.Text = sb.ToString();
                 this.renderViewPanel.Surface.Objects = ToRenderObjects(si);
             } else {
                 lbStatus.Text = "N/A";
@@ -66,20 +77,16 @@
 
         protected IEnumerable<I3DObject> ToRenderObjects(SelectionInfo si) {
             if (si.TerrainPiece != null) {
-                int x = si.Location.X;
-                int y = si.Location.Y;
+                Point3DV pv = (Point3DV)si.WorldPosition;
+                IEnumerable<I3DObject> terrains = si.SceneBuilder.GetTerrainsAt(si.Location);
                 int h = si.TerrainPiece.BaseHeight * Geocon.UnitHeightPixel;
-                IEnumerable<I3DObject> terrains = si.SceneBuilder.GetTerrainsAt(x, y);
-                x *= Geocon.UnitWidthPixel;
-                y *= Geocon.UnitWidthPixel;
-                PointF3D pt;
+                PointF3D pt;                
                 foreach (I3DObject obj in terrains) {
                     ITerrainPlate p = obj as ITerrainPlate;
                     pt = p.Location;
-                    p.Location = new PointF3D(pt.X - x, pt.Y - y, pt.Z - h);
+                    p.Location = new PointF3D(0, 0, pt.Z - h);
                     yield return p;
                 }
-
             }
             yield break;
         }