Commit: 27 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 27 (tree)
• Time: 2014-09-15 23:47:40
• Author: c477

Log Message

マウスポインタ位置の地形ポリゴンを検出できるようにした。

Change Summary

• modified: trunk/framework/framework/drawing/I3DObject.cs
• modified: trunk/NeoFT.suo
• modified: trunk/xna/NFT.XNA/XnaSurface.cs
• modified: trunk/core/impl/game/TerrainMapImpl.cs
• modified: trunk/core/impl/view/SceneBuilder.cs
• added: trunk/core/impl/view/DrawIndexUtil.cs
• modified: trunk/core/contributions/terrain/TerrainPlateSet.cs
• modified: trunk/core/contributions/terrain/CliffPolygon.cs
• modified: trunk/core/NFT.Core.csproj

Incremental Difference

--- trunk/framework/framework/drawing/I3DObject.cs	(revision 26)
+++ trunk/framework/framework/drawing/I3DObject.cs	(revision 27)
@@ -63,6 +63,14 @@
         public override string ToString() {
             return "PointF3D("+X+","+Y+","+Z+")";
         }
+
+        Point3D Ceiling() {
+            return new Point3D((int)Math.Ceiling(X), (int)Math.Ceiling(Y), (int)Math.Ceiling(Z));
+        }
+
+        Point3D Floor() {
+            return new Point3D((int)Math.Floor(X), (int)Math.Floor(Y), (int)Math.Floor(Z));
+        }
     }
 
     /// <summary>

--- trunk/xna/NFT.XNA/XnaSurface.cs	(revision 26)
+++ trunk/xna/NFT.XNA/XnaSurface.cs	(revision 27)
@@ -264,9 +264,9 @@
         }
 
         public UInt32 HitTestAt(int vx, int vy) {
-            XnaColor xc = GetWorkPixelAt(vx, vy, 1);
-            Debug.WriteLine("mouse=" + xc);
-            return xc.PackedValue&0xffffff;
+            XnaColor xc = GetWorkPixelAt(vx, vy, (int)RenderOutput.ObjKeyMap);
+            //Debug.WriteLine("mouse=" + xc);
+            return xc.PackedValue;
         }
         #endregion
 

--- trunk/core/impl/game/TerrainMapImpl.cs	(revision 26)
+++ trunk/core/impl/game/TerrainMapImpl.cs	(revision 27)
@@ -113,7 +113,7 @@
                 try {
                     return hmap[x, y].GetPieces(viewupper);
                 } catch (IndexOutOfRangeException) {
-                    Debug.WriteLine("x="+x+", y="+y+", map="+hmap.GetUpperBound(0)+","+hmap.GetUpperBound(1));
+                    Debug.WriteLine("The location (" + x + ", y=" + y + ") is OUTSIDE of the map{ size:(" + hmap.GetUpperBound(0) + "," + hmap.GetUpperBound(1)+")}");
                     return NullEnumerator();
                 }
             }

--- trunk/core/impl/view/SceneBuilder.cs	(revision 26)
+++ trunk/core/impl/view/SceneBuilder.cs	(revision 27)
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using Geocon = nft.core.geometry.GeometricConstants;
 using nft.core.game;
+using nft.core.view;
 
 namespace nft.impl.view
 {
@@ -16,19 +17,24 @@
     {
         public delegate void TerrainPlateModifier(ITerrainPlate plate, ITerrainMap map, int x, int y, TerrainPieceTemplate.TerrainPolygonSet tpset);
 
-        CoordinationUtil cdUtil = null;
-        Scaler scaler;
-        InterCardinalDirection upperDir;
+        internal const int TrMk_Ground = 0;
+        internal const int TrMk_CliffLeft = 1;
+        internal const int TrMk_CliffRight = 2;
+        internal const int TrMk_CliffDiag = 3;
 
+        internal CoordinationUtil cdUtil = null;
+        internal Scaler scaler;
+        internal InterCardinalDirection upperDir;
+
         IApparentAssignor apparents;
-        GameImpl game;
-        ISurface surface;
+        internal GameImpl game;
+        internal ISurface surface;
         Point viewpos;
         int voffset;
 
         public SceneBuilder(GameImpl g) {
             this.game = g;
-            SetViewFactor(new ViewFactor(InterCardinalDirection.NORTHEAST));
+            SetViewFactor(new ViewFactor(InterCardinalDirection.NORTHEAST, ZoomScale.x2));
         }
 
         public SceneBuilder(GameImpl g, ISurface s) : this(g){
@@ -83,6 +89,19 @@
             viewpos = p;
         }
 
+        private bool CheckMarker(Point uv, int typecode, ref ITerrainPlate plate) {
+            if (marker0 != null && marker0.Same(uv, typecode)) {
+                //Debug.WriteLine("Hit("+x+","+y+")");
+                PointF3D pmk = plate.Location;
+                pmk.Z += 0.5f;
+                plate.Location = pmk;
+                plate.Effect = GraphicManagerEx.GraphicManager.GetFilterByUsage();
+                return true;
+            } else {
+                return false;
+            }
+        }
+
         Stopwatch watch0 = new Stopwatch();
         int xxx = 0;
         public IEnumerator<I3DObject> GetEnumerator() {
@@ -117,12 +136,8 @@
                         plate.Location = new PointF3D(pv.VX, pv.VY, pv.VZ);
                         watch0.Stop();
                         yield return plate;
-                        if (marker0 != null && marker0.Same(uv, tpset)) {
+                        if (CheckMarker(uv, TrMk_Ground, ref plate)) {
                             //Debug.WriteLine("Hit("+x+","+y+")");
-                            PointF3D pmk = plate.Location;
-                            pmk.Z += 0.5f;
-                            plate.Location = pmk;
-                            plate.Effect = GraphicManagerEx.GraphicManager.GetFilterByUsage();
                             yield return plate;
                         }
                     }
@@ -142,6 +157,9 @@
                                 plate = apparents.DefaultCliffTexture.Get(cp, hgap, pv);
                                 plate.Location = new PointF3D(pv.VX, pv.VY, pvz);
                                 yield return plate;
+                                if (CheckMarker(uv, TrMk_CliffLeft, ref plate)) {
+                                    yield return plate;
+                                }
                             }
                         }
                         if (dside != ViewDirection8.RIGHT && cdUtil.IsRightCliffVisible(map, l, out hgap)) {
@@ -158,6 +176,9 @@
                                 plate = apparents.DefaultCliffTexture.Get(cp, hgap, pv);
                                 plate.Location = new PointF3D(pv.VX, pv.VY, pvz);
                                 yield return plate;
+                                if (CheckMarker(uv, TrMk_CliffRight, ref plate)) {
+                                    yield return plate;
+                                }
                             }
                         }
                     } else {
@@ -175,6 +196,9 @@
                                 plate = apparents.DefaultCliffTexture.Get(cp, hgap, pv);
                                 plate.Location = new PointF3D(pv.VX, pv.VY, pvz);
                                 yield return plate;
+                                if (CheckMarker(uv, TrMk_CliffDiag, ref plate)) {
+                                    yield return plate;
+                                }
                             }
                         }
                     }
@@ -219,13 +243,23 @@
 #endif
             for (int h = hmin; h <= hmax; h++) {
                 for (int w = wmin; w <= wmax; w++) {
-                    yield return ViewToIsometricPlane(w, h);
+                    yield return ViewGridToIsometricPlane(w, h);
                 }
             }
         }
 
         // view grid (cell sized) to isometric grid
+        internal protected Point ViewGridToIsometricPlane(int vx, int vy) {
+            int v2 = vy / 2;
+            int x = v2 - vx + (vy & 1);
+            int y = v2 + vx;
+            return new Point(x, y);
+        }
+
+        // view pixel pos to isometric grid
         internal protected Point ViewToIsometricPlane(int vx, int vy) {
+            vx = (vx / Geocon.UnitWidthPixel) / 2;
+            vy = (vy / Geocon.HalfOf_UnitWidthPixel) - 10;
             int v2 = vy / 2;
             int x = v2 - vx + (vy & 1);
             int y = v2 + vx;
@@ -232,7 +266,6 @@
             return new Point(x, y);
         }
 
-
         // isometric grid to view positon (in pixel).
         internal protected Point IsometricGridToView(int isx, int isy) {
             int x = (isy - isx)/2;
@@ -240,7 +273,24 @@
             return new Point(x * Geocon.UnitWidthPixel, y * Geocon.HalfOf_UnitWidthPixel);
         }
 
+        protected Point WorldPosToGrid(PointF3D p3d) {
+            int isx = (int)Math.Floor(p3d.X / Geocon.UnitWidthPixel);
+            int isy = (int)Math.Floor(p3d.Y / Geocon.UnitWidthPixel);
+            int d = (int)Math.Ceiling(p3d.Z / Geocon.HalfOf_UnitWidthPixel);
+            return new Point(isx - d, isy - d);
+        }
+
         public object GetObjectAt(Point spos) {
+            ITerrainPolygon pol;
+            PointF3D p3dv;
+            if (DrawIndexUtil.ResolveTerrain(this, spos, out pol, out p3dv)) {
+
+                return pol;
+            }
+            return null;
+        }
+
+        public object GetObjectAt_old(Point spos) {
             PointF3D p3d = surface.ToWorldPosition(spos);
 #if DEBUG
             Debug.Write("mouse(" + spos.X + "," + spos.Y + ")");
@@ -297,18 +347,29 @@
         class TerrainMarker
         {
             int x, y;
-            ushort id;
+            int code;
             bool trianglehit;
+            public TerrainMarker(Point pt, int typecode, bool inner_triangle) {
+                this.x = pt.X;
+                this.y = pt.Y;
+                this.code = typecode;
+                this.trianglehit = inner_triangle;
+            }
             public TerrainMarker(Point pt, TerrainPieceTemplate.TerrainPolygonSet tpset, bool inner_triangle) {
                 this.x = pt.X;
                 this.y = pt.Y;
-                this.id = tpset.Ground.ID;
+                this.code = -1;
                 this.trianglehit = inner_triangle;
             }
-            public bool Same(Point pt, TerrainPieceTemplate.TerrainPolygonSet tpset) {
-                return pt.X == x && pt.Y == y && tpset.Ground.ID == id;
+            public bool Same(Point pt, int typecode) {
+                return pt.X == x && pt.Y == y && this.code == typecode;
             }
         }
+
+        internal void CreateMarker(int gx, int gy, int tpcode) {
+            marker0 = new TerrainMarker(new Point(gx, gy), tpcode, true);
+        }
+
         TerrainMarker marker0;
         protected bool HitTest(Point iso_p, Point vw_p, out object ret){
             //Debug.Write("HitTest at="+iso_p);

--- trunk/core/impl/view/DrawIndexUtil.cs	(nonexistent)
+++ trunk/core/impl/view/DrawIndexUtil.cs	(revision 27)
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using nft.core.geometry;
+using System.Drawing;
+using nft.framework.drawing;
+using nft.impl.game;
+using Geocon = nft.core.geometry.GeometricConstants;
+using System.Diagnostics;
+
+namespace nft.impl.view {
+    public class DrawIndexUtil {
+        private const UInt32 IndexForUnknown = 0xffffffff;
+        private const UInt32 TypeMask =  0xf0000000;
+        private const UInt32 ValueMask = 0x0fffffff;
+        private const UInt32 Mask_GroundPolygon = 0x80000000;
+        private const UInt32 Mask_GroundPolygon2 = 0xa0000000;
+        private const UInt32 Mask_CliffPolygon = 0xc0000000;
+        private const UInt32 Mask_CliffPolygon_L = 0xc0000000;
+        private const UInt32 Mask_CliffPolygon_R = 0xe0000000;
+        private const UInt32 Mask_CliffPolygon_D = 0xf0000000;
+        private static UInt32[] cliffMaskMap;
+
+        static DrawIndexUtil() {
+            cliffMaskMap = new UInt32[Enum.GetValues(typeof(CliffPolygon.CliffSide)).Length];
+            cliffMaskMap[(int)CliffPolygon.CliffSide.Left] = Mask_CliffPolygon_L;
+            cliffMaskMap[(int)CliffPolygon.CliffSide.Right] = Mask_CliffPolygon_R;
+            cliffMaskMap[(int)CliffPolygon.CliffSide.Diagonal] = Mask_CliffPolygon_D;
+        }
+
+        public static UInt32 GetIndexForTerrain(Point3DV pos, ITerrainPolygon polygon) {
+            if (polygon is GroundPolygon) {
+                return GetIndexForGroundPolygon((GroundPolygon)polygon, pos);
+            } else if (polygon is CliffPolygon) {
+                return GetIndexForCliffPolygon((CliffPolygon)polygon, pos);
+            }
+            return IndexForUnknown;
+        }
+
+        public static UInt32 GetIndexForGroundPolygon(GroundPolygon polygon, Point3DV pos) {
+            bool b = polygon.DiagonalSide == ViewDirection8.FRONT || polygon.DiagonalSide == ViewDirection8.LEFT;
+            UInt32 idx = (UInt32)(pos.VX + pos.VY + (b ? Mask_GroundPolygon2 : Mask_GroundPolygon));
+            return idx;
+        }
+
+        public static UInt32 GetIndexForCliffPolygon(CliffPolygon polygon, Point3DV pos) {
+            UInt32 idx = (UInt32)(pos.VX + pos.VY + cliffMaskMap[(int)polygon._Side]);
+            return idx;
+        }
+
+
+        internal static bool ResolveTerrain(SceneBuilder sb, Point mousePos, out ITerrainPolygon pol, out PointF3D p3dv) {
+            pol = null;
+            //mousePos.Y++;
+            Debug.Write("ResolveTerrain:  mouse=(" + mousePos.X + "," + mousePos.Y + ")");
+            p3dv = sb.surface.ToWorldPosition(mousePos);
+            UInt32 idx = sb.surface.HitTestAt(mousePos.X, mousePos.Y);
+            TerrainMapImpl map = sb.game.TerrainMap;
+            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]) {
+                    TerrainPieceTemplate.TerrainPolygonSet tpset = p.Template.GetPolygons(sb.upperDir);
+                    if (tpset.Ground.IsVisible) {
+                        Point rep = sb.surface.ToScreenPosition(p3dv);
+                        int xoff = mousePos.X - rep.X;
+                        int yoff = mousePos.Y - rep.Y;
+                        //Debug.Write("!");
+                        if (TerrainUtil.IsInnerPoint2D(tpset.Ground.GetVerticis(sb.scaler), new Point(xoff, yoff))) {
+                            pol = tpset.Ground;
+                            Debug.WriteLine(": Ground hit 1 off(" + xoff + ", yoff=" + yoff + ")");
+                            break;
+                        } else if (pol == null) {
+                            Debug.WriteLine(": Ground hit 2 off(" + xoff + ", yoff=" + yoff + ")");
+                            pol = tpset.Ground;
+                        }
+                    }
+                    sb.CreateMarker(gx, gy, SceneBuilder.TrMk_Ground);
+                }
+                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]) {
+                    //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)");
+                        pol = tpset.CliffDiagonal;
+                        sb.CreateMarker(gx, gy, SceneBuilder.TrMk_CliffDiag);
+                    } else if (testval == Mask_CliffPolygon_R) {
+                        Debug.WriteLine(": Cliff(Right)");
+                        pol = tpset.CliffRight;
+                        sb.CreateMarker(gx, gy, SceneBuilder.TrMk_CliffRight);
+                    } else {
+                        Debug.WriteLine(": Cliff(Left)");
+                        pol = tpset.CliffLeft;
+                        sb.CreateMarker(gx, gy, SceneBuilder.TrMk_CliffLeft);
+                    }
+                }
+                Debug.WriteLineIf(pol == null, "WTF2!?");
+                return pol != null;
+            }
+            Debug.WriteLine("--");
+            return false;
+        }
+
+        internal static bool AdjustPointForCliff(ref PointF3D p3dv, UInt32 idx) {
+            if ((idx & Mask_CliffPolygon) == Mask_CliffPolygon) {
+                AdjustPoint(ref p3dv, ValueMask & idx);
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        internal static bool AdjustPointForGround(ref PointF3D p3dv, UInt32 idx) {
+            UInt32 test = (idx & TypeMask);
+            if (test == Mask_GroundPolygon || test == Mask_GroundPolygon2) {
+                AdjustPoint(ref p3dv, ValueMask & idx);
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        private static void AdjustPoint(ref PointF3D p3dv, UInt32 idxval) {
+            float diff = p3dv.X + p3dv.Y - idxval;
+            p3dv.Z = diff;
+            diff = diff/2.0f;
+            float x = p3dv.X - diff;
+            float y = p3dv.Y - diff;
+            if (x < 0) {
+                p3dv.Z -= x * 2;
+                x = 0;
+            }
+            if (y < 0) {
+                p3dv.Z -= y * 2;
+                y = 0;
+            }
+            int ix = (int)Math.Floor(x);
+            int iy = (int)Math.Floor(y);
+            int v2 = ix + iy;
+            p3dv.X = ix;
+            p3dv.Y = iy;
+            //Debug.Write(" [check idxval-v2=" + (idxval - v2) + ", fx=" + x + ", ix=" + ix + ", fy=" + y + ", iy=" + iy + "]");
+            if (idxval != v2) {
+                /*
+                float w = (x - ix) / Geocon.UnitWidthPixel;
+                if (w > 0.5f) {
+                    p3dv.X += 1;
+                } else {
+                    p3dv.Y += 1;
+                }
+                 */
+            }
+        }
+    }
+}

--- trunk/core/contributions/terrain/TerrainPlateSet.cs	(revision 26)
+++ trunk/core/contributions/terrain/TerrainPlateSet.cs	(revision 27)
@@ -11,6 +11,7 @@
 using System.Windows.Forms;
 using nft.framework.plugin;
 using nft.core;
+using nft.impl.view;
 
 namespace nft.contributions.terrain {
     public interface IGroundPlateSet {
@@ -73,7 +74,7 @@
                 holder = Add(key, templ);
             }
             templ = holder.AddRef();
-            UInt32 idkey = (UInt32)(hint.VX + hint.VY+0x800000);
+            UInt32 idkey = DrawIndexUtil.GetIndexForTerrain(hint, polygon);
             return GraphicManager.CreateTerrainPlate(idkey, templ);
         }
 
@@ -138,7 +139,7 @@
                 holder = Add(key, templ);
             }
             templ = holder.AddRef();
-            UInt32 idkey = (UInt32)(hint.VX + hint.VY);
+            UInt32 idkey = DrawIndexUtil.GetIndexForCliffPolygon(polygon, hint);
             return GraphicManager.CreateTerrainPlate(idkey, templ);
         }
 

--- trunk/core/contributions/terrain/CliffPolygon.cs	(revision 26)
+++ trunk/core/contributions/terrain/CliffPolygon.cs	(revision 27)
@@ -12,7 +12,7 @@
 namespace nft.core.geometry {
     public class CliffPolygon : ITerrainPolygon, ISerializable {
         [Flags]
-        public enum Side { Undefined = 0, Right = 0x01, Left = 0x02, Diagonal = 0x03 }
+        public enum CliffSide { Undefined = 0, Right = 0x01, Left = 0x02, Diagonal = 0x03 }
 
         static Dictionary<ushort, CliffPolygon> stock = new Dictionary<ushort, CliffPolygon>(256);
         static CliffPolygon[] fillers = new CliffPolygon[4];
@@ -58,9 +58,9 @@
                     registerRectPattern(-1, p2, p1);
                 }
             }
-            fillers[(int)Side.Left] = CreateFillerPattern(-1, 0);
-            fillers[(int)Side.Right] = CreateFillerPattern(0, -1);
-            fillers[(int)Side.Diagonal] = CreateFillerPattern(-1, -1);
+            fillers[(int)CliffSide.Left] = CreateFillerPattern(-1, 0);
+            fillers[(int)CliffSide.Right] = CreateFillerPattern(0, -1);
+            fillers[(int)CliffSide.Diagonal] = CreateFillerPattern(-1, -1);
         }
 
         /// <summary>
@@ -75,13 +75,13 @@
         private static void registerTriPattern(int near, int left, int right) {
             ushort id = PrivateMakePolygonID(near, left, right);
             int hp = Geocon.UnitHeightPixel;
-            Side s = Side.Undefined;
+            CliffSide s = CliffSide.Undefined;
             if (!stock.ContainsKey(id)) {
                 Point3D[] pt = new Point3D[3];
                 int idx = 0;
                 int id2 = 0;
                 if (left >= 0) {
-                    s |= Side.Left;
+                    s |= CliffSide.Left;
                     pt[idx++] = new Point3D(0, Geocon.UnitWidthPixel, left * hp);
                     if (left > 0) {
                         id2 = idx;
@@ -96,7 +96,7 @@
                     }
                 }
                 if (right >= 0) {
-                    s |= Side.Right;
+                    s |= CliffSide.Right;
                     pt[idx++] = new Point3D(Geocon.UnitWidthPixel, 0,  right * hp);
                     if (right > 0) {
                         id2 = idx;
@@ -122,12 +122,12 @@
         private static void registerRectPattern(int near, int left, int right) {
             ushort id = PrivateMakePolygonID(near, left, right);
             int hp = Geocon.UnitHeightPixel;
-            Side s = Side.Undefined;
+            CliffSide s = CliffSide.Undefined;
             if (!stock.ContainsKey(id)) {
                 Point3D[] pt = new Point3D[6];
                 int idx = 0;
                 if (left >= 0) {
-                    s |= Side.Left;
+                    s |= CliffSide.Left;
                     pt[idx++] = new Point3D(0, Geocon.UnitWidthPixel, left * hp);
                     pt[idx] = new Point3D(0, Geocon.UnitWidthPixel, 0);
                     idx += 2;
@@ -138,7 +138,7 @@
                     idx += 2;
                 }
                 if (right >= 0) {
-                    s |= Side.Right;
+                    s |= CliffSide.Right;
                     pt[idx++] = new Point3D(Geocon.UnitWidthPixel, 0, right * hp);
                     pt[idx] = new Point3D(Geocon.UnitWidthPixel, 0, 0);
                     idx += 2;
@@ -159,13 +159,13 @@
         /// <param name="right"></param>
         /// <param name="far"></param>
         private static CliffPolygon CreateFillerPattern(int bl_left, int bl_right) {
-            Side s = Side.Undefined;
+            CliffSide s = CliffSide.Undefined;
             const int hmax = 0x7fffffff;
             Point3D[] pt = new Point3D[6];
             int idx = 0;
             
             if (bl_left != 0) {
-                s |= Side.Left;
+                s |= CliffSide.Left;
                 pt[idx++] = new Point3D(0, Geocon.UnitWidthPixel, hmax);
                 pt[idx] = new Point3D(0, Geocon.UnitWidthPixel, 0);
                 idx += 2;
@@ -176,7 +176,7 @@
                 idx += 2;
             }
             if (bl_right != 0) {
-                s |= Side.Right;
+                s |= CliffSide.Right;
                 pt[idx++] = new Point3D(Geocon.UnitWidthPixel, 0, hmax);
                 pt[idx] = new Point3D(Geocon.UnitWidthPixel, 0, 0);
                 idx += 2;
@@ -250,7 +250,7 @@
         protected Point[] verticis;
         protected Point3D[] verticis3d;
         protected Rectangle bounds;
-        protected Side side;
+        protected CliffSide side;
         /// <summary>
         /// Determined by surface normal angle between the sun light. 255 is maximum.
         /// Visible surface has positive value, effected at least by environment light.
@@ -258,7 +258,7 @@
         /// </summary>
         public readonly float Brightness;
 
-        protected CliffPolygon(ushort id, Point3D[] pts, Side s) {
+        protected CliffPolygon(ushort id, Point3D[] pts, CliffSide s) {
             this.id = id;
             this.verticis3d = pts;
             this.side = s;
@@ -276,6 +276,12 @@
             Brightness = (float)l;
         }
 
+        public CliffSide _Side {
+            get {
+                return side;
+            }
+        }
+
         #region ITerrainPolygon メンバ
 
         public ushort ID {
@@ -390,7 +396,7 @@
             return (ushort)((height & 0x03ff)<<2 + (bl_left & 0x02) + (bl_right & 0x01));
         }
 
-        private static ushort PrivateMakeFillerID(int height, Side side) {
+        private static ushort PrivateMakeFillerID(int height, CliffSide side) {
             return (ushort)(((height & 0x03ff)<<2) + side);
         }