X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fterrain.cpp;h=ccfd912a2fd65e5e1048aa5c14b759fe7382bc3c;hb=f7ab597d035a053311c1a8c5baa51b090262f045;hp=7b8f9f5778c3d0fe84f73f5c9cac2bd04d2029b2;hpb=f459a73d543b663afeb5a7b4796b04f76860e383;p=r2c2.git

diff --git a/source/libr2c2/terrain.cpp b/source/libr2c2/terrain.cpp
index 7b8f9f5..ccfd912 100644
--- a/source/libr2c2/terrain.cpp
+++ b/source/libr2c2/terrain.cpp
@@ -1,3 +1,4 @@
+#include <cmath>
 #include <msp/geometry/box.h>
 #include <msp/geometry/transformedshape.h>
 #include "layout.h"
@@ -37,6 +38,8 @@ Terrain *Terrain::clone(Layout *to_layout) const
 void Terrain::set_position(const Vector &p)
 {
 	position = p;
+	float eg = type.get_elevation_granularity();
+	position.z = round(position.z/eg)*eg;
 	signal_moved.emit();
 }
 
@@ -62,7 +65,7 @@ void Terrain::set_size(unsigned w, unsigned h)
 
 	delete shape;
 	float ts = type.get_tile_size();
-	Vector dim(width*ts, height*ts, ts);
+	Vector dim(width*ts, height*ts, ts/10.0f);
 	shape = new Geometry::TransformedShape<float, 3>(
 		Geometry::Box<float>(dim),
 		Transform::translation(dim/2.0f));
@@ -83,7 +86,7 @@ void Terrain::set_node_elevation(const NodeCoordinates &c, float elev, bool join
 		throw out_of_range("Terrain::set_node_elevation");
 
 	float eg = type.get_elevation_granularity();
-	elev = int(elev/eg+0.5)*eg;
+	elev = floor(elev/eg+0.5)*eg;
 
 	if(joined)
 	{
@@ -201,26 +204,38 @@ void Terrain::Tile::update_axis()
 
 void Terrain::Tile::save(list<DataFile::Statement> &st) const
 {
-	bool flat = true;
-	for(unsigned i=1; (flat && i<4); ++i)
-		flat = (nodes[i].elevation==nodes[0].elevation && nodes[i].ground==nodes[0].ground && nodes[i].wall==nodes[0].wall);
-	if(flat)
-	{
-		st.push_back((DataFile::Statement("elevation"), nodes[0].elevation));
-		st.push_back((DataFile::Statement("ground"), nodes[0].ground));
-	}
-	else
+	float elevation_mode = find_mode(&Node::elevation);
+	unsigned ground_mode = find_mode(&Node::ground);
+	if(elevation_mode)
+		st.push_back((DataFile::Statement("elevation"), elevation_mode));
+	if(ground_mode)
+		st.push_back((DataFile::Statement("ground"), ground_mode));
+
+	for(unsigned i=0; i<4; ++i)
 	{
-		for(unsigned i=0; i<4; ++i)
-		{
-			DataFile::Statement ss("node");
-			ss.append(i);
-			nodes[i].save(ss.sub);
-			st.push_back(ss);
-		}
+		if(nodes[i].elevation==elevation_mode && nodes[i].ground==ground_mode)
+			continue;
+
+		DataFile::Statement ss("node");
+		ss.append(i);
+		if(nodes[i].elevation!=elevation_mode)
+			ss.sub.push_back((DataFile::Statement("elevation"), nodes[i].elevation));
+		if(nodes[i].ground!=ground_mode)
+			ss.sub.push_back((DataFile::Statement("ground"), nodes[i].ground));
+		st.push_back(ss);
 	}
 }
 
+template<typename T>
+T Terrain::Tile::find_mode(T Node::*member) const
+{
+	for(unsigned i=0; i<3; ++i)
+		for(unsigned j=i+1; j<4; ++j)
+			if(nodes[i].*member==nodes[j].*member)
+				return nodes[i].*member;
+	return T();
+}
+
 
 Terrain::NodeCoordinates::NodeCoordinates():
 	x(0),