+#include <cmath>
#include <msp/geometry/box.h>
#include <msp/geometry/transformedshape.h>
#include "layout.h"
void Terrain::set_position(const Vector &p)
{
position = p;
+ float eg = type.get_elevation_granularity();
+ position.z = int(position.z/eg+0.5)*eg;
signal_moved.emit();
}
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));
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)
{
void Terrain::save(list<DataFile::Statement> &st) const
{
+ st.push_back((DataFile::Statement("position"), position.x, position.y, position.z));
+ st.push_back((DataFile::Statement("rotation"), rotation.radians()));
st.push_back((DataFile::Statement("size"), width, height));
for(vector<Tile>::const_iterator i=tiles.begin(); i!=tiles.end(); ++i)
{
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),