X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fterraintool.cpp;h=5dddb8247ead42f667844f07c29e6a2ef9663cb1;hb=90015ce8f2b5d10135c3386c2771ee29395e3b37;hp=46076ec03c0679573161853c1485145a2aa4fce5;hpb=6b90a1c8bb9efff7f660e352bf69a02992d620cc;p=r2c2.git

diff --git a/source/designer/terraintool.cpp b/source/designer/terraintool.cpp
index 46076ec..5dddb82 100644
--- a/source/designer/terraintool.cpp
+++ b/source/designer/terraintool.cpp
@@ -12,25 +12,13 @@ TerrainTool::TerrainTool(Designer &d, Input::Keyboard &k, Input::Mouse &m, Terra
 	Tool(d, k, m),
 	terrain(t),
 	marker((GL::VERTEX3, GL::COLOR4_UBYTE)),
+	marker_orientation(0),
 	dragging(false),
 	drag_start(0)
 {
 	designer.get_layout_3d().get_scene().add(*this);
 
-	float ts = terrain.get_type().get_tile_size();
-	GL::MeshBuilder bld(marker);
-	bld.begin(GL::TRIANGLE_STRIP);
-	bld.vertex(-ts/2, 0, -ts/4);
-	bld.vertex(ts/2, 0, -ts/4);
-	bld.vertex(-ts/2, 0, ts/4);
-	bld.vertex(ts/2, 0, ts/4);
-	bld.end();
-	bld.begin(GL::TRIANGLE_STRIP);
-	bld.vertex(0, -ts/2, -ts/4);
-	bld.vertex(0, ts/2, -ts/4);
-	bld.vertex(0, -ts/2, ts/4);
-	bld.vertex(0, ts/2, ts/4);
-	bld.end();
+	update_marker();
 }
 
 TerrainTool::~TerrainTool()
@@ -38,6 +26,56 @@ TerrainTool::~TerrainTool()
 	designer.get_layout_3d().get_scene().remove(*this);
 }
 
+void TerrainTool::update_marker()
+{
+	marker.clear();
+	GL::MeshBuilder bld(marker);
+
+	float ts = terrain.get_type().get_tile_size();
+	if(shift_held)
+	{
+		bld.begin(GL::TRIANGLE_STRIP);
+		bld.vertex(0, ts/2, ts/4);
+		bld.vertex(0, ts/2, -ts/4);
+		bld.vertex(0, 0, ts/4);
+		bld.vertex(0, 0, -ts/4);
+		bld.vertex(ts/2, 0, ts/4);
+		bld.vertex(ts/2, 0, -ts/4);
+		bld.end();
+	}
+	else
+	{
+		bld.begin(GL::TRIANGLE_STRIP);
+		bld.vertex(-ts/2, 0, ts/4);
+		bld.vertex(-ts/2, 0, -ts/4);
+		bld.vertex((edit_size+0.5)*ts, 0, ts/4);
+		bld.vertex((edit_size+0.5)*ts, 0, -ts/4);
+		bld.end();
+		bld.begin(GL::TRIANGLE_STRIP);
+		bld.vertex(0, -ts/2, ts/4);
+		bld.vertex(0, -ts/2, -ts/4);
+		bld.vertex(0, (edit_size+0.5)*ts, ts/4);
+		bld.vertex(0, (edit_size+0.5)*ts, -ts/4);
+		bld.end();
+	}
+}
+
+void TerrainTool::key_press(unsigned key)
+{
+	bool shift_was_held = shift_held;
+	Tool::key_press(key);
+	if(shift_held!=shift_was_held)
+		update_marker();
+}
+
+void TerrainTool::key_release(unsigned key)
+{
+	bool shift_was_held = shift_held;
+	Tool::key_release(key);
+	if(shift_held!=shift_was_held)
+		update_marker();
+}
+
 void TerrainTool::button_press(unsigned btn)
 {
 	if(btn==1)
@@ -64,7 +102,7 @@ void TerrainTool::pointer_motion()
 			float elev = terrain.get_node_elevation(highlight_node);
 			float eg = terrain.get_type().get_elevation_granularity();
 			elev += eg*d;
-			terrain.set_node_elevation(highlight_node, elev, true);
+			terrain.set_node_elevation(highlight_node, elev, !shift_held);
 			marker_position = terrain.get_node_position(highlight_node);
 
 			drag_start = pointer.y;
@@ -75,6 +113,7 @@ void TerrainTool::pointer_motion()
 		Ray ray = designer.get_view().create_ray(pointer.x, pointer.y);
 		highlight_node = terrain.get_closest_node(ray);
 		marker_position = terrain.get_node_position(highlight_node);
+		marker_orientation = highlight_node.i^(highlight_node.i>>1);
 	}
 }
 
@@ -86,5 +125,6 @@ void TerrainTool::render(GL::Renderer &renderer, const GL::Tag &tag) const
 	GL::Renderer::Push push(renderer);
 
 	renderer.matrix_stack() *= GL::Matrix::translation(marker_position);
+	renderer.matrix_stack() *= GL::Matrix::rotation(Angle::from_turns(marker_orientation*0.25), 0, 0, 1);
 	marker.draw(renderer);
 }