Improve tile axis calculation

[r2c2.git] / source / libr2c2 / terrain.cpp

diff --git a/source/libr2c2/terrain.cpp b/source/libr2c2/terrain.cpp
index 5a317747e74f96f57f3b598e934ee2e2773a012e..502a8c7e5a24e4b1eeba8da56ad26628245e3456 100644 (file)
--- a/source/libr2c2/terrain.cpp
+++ b/source/libr2c2/terrain.cpp
@@ -97,7 +97,7 @@ void Terrain::set_node_elevation(const NodeCoordinates &c, float elev, bool join
                                Tile &tile = tiles[x+y*width];
                                if(tile.nodes[i].elevation==ref)
                                {
-                                       tile.nodes[i].elevation = elev;
+                                       tile.set_node_elevation(i, elev);
                                        signal_tile_changed.emit(x, y);
                                }
                        }
@@ -105,7 +105,7 @@ void Terrain::set_node_elevation(const NodeCoordinates &c, float elev, bool join
        }
        else
        {
-               tiles[c.x+c.y*width].nodes[c.i].elevation = elev;
+               tiles[c.x+c.y*width].set_node_elevation(c.i, elev);
                signal_tile_changed.emit(c.x, c.y);
        }
 }
@@ -186,6 +186,17 @@ Terrain::Tile::Tile():
        secondary_axis(false)
 { }
 
+void Terrain::Tile::set_node_elevation(unsigned i, float e)
+{
+       nodes[i].elevation = e;
+       update_axis();
+}
+
+void Terrain::Tile::update_axis()
+{
+       secondary_axis = (abs(nodes[1].elevation-nodes[2].elevation) < abs(nodes[0].elevation-nodes[3].elevation));
+}
+
 void Terrain::Tile::save(list<DataFile::Statement> &st) const
 {
        bool flat = true;
@@ -256,6 +267,7 @@ void Terrain::Loader::tile()
        Tile &t = obj.tiles[next_tile];
        Tile::Loader ldr(obj, t);
        load_sub_with(ldr);
+       t.update_axis();
        unsigned x = next_tile%obj.width;
        unsigned y = next_tile/obj.width;
        ++next_tile;