X-Git-Url: http://git.rot13.org/?p=perl-landing-airplanes.git;a=blobdiff_plain;f=trace-path.pl;h=05dccdd3694239aee03d5574069dfd883ceb05ae;hp=de5d4935e5c544bed222c9b6b96e73d19481330e;hb=c65020320bcddc9ef88d6dd6604b4e28ef5a6c88;hpb=490c8eba299baf39c1a0b72b68d01500c8a6b812

diff --git a/trace-path.pl b/trace-path.pl
index de5d493..05dccdd 100755
--- a/trace-path.pl
+++ b/trace-path.pl
@@ -9,19 +9,21 @@ use SDL::Color;
 use SDL::Constants;
 use SDL::Event;
 use Math::CatmullRom;
-#use Algorithm::Line::Bresenham;
+use Algorithm::Line::Bresenham qw(line);
 
-use Carp qw/confess/;
-use Data::Dump qw/dump/;
+use Carp qw(cluck);
+use Data::Dump qw(dump);
 
-my $debug = 0;
+our $debug = 0;
 
 my ( $w, $h ) = ( 800, 480 );
 my $mouse_trashold = 10;
 my $max_path_length = 200;
 
 sub debug {
-	warn '#', dump @_ if $debug;
+	return unless $debug;
+	my ($package, $filename, $line) = caller;
+	warn '# ', dump( @_ ), " $filename +$line\n";
 }
 
 our $app = SDL::App->new(
@@ -36,26 +38,35 @@ our $event = SDL::Event->new;
 
 our $mouse_down = 0;
 
-our $white = SDL::Color->new( 0xff, 0xff, 0xff );
-our $red   = SDL::Color->new( 0xff, 0x00, 0x00 );
-our $black = SDL::Color->new( 0x00, 0x00, 0x00 );
+our $mouse_color = SDL::Color->new( 0x00, 0x80, 0x00 );
+our $path_color  = SDL::Color->new( 0xff, 0x00, 0x00 );
+our $black       = SDL::Color->new( 0x00, 0x00, 0x00 );
 
 my ( $last_x, $last_y ) = ( 0,0 );
 
-my @path;
+our @path;
 
 sub curve {
 	return unless $#path > 4;
 	my $curve = Math::CatmullRom->new( splice @path, 0, $#path + $#path / 2 );
-	my @curve = $curve->curve( $mouse_trashold * $max_path_length / 2 );
+	my @curve = $curve->curve( $mouse_trashold * 10 );
 	debug 'curve' => @curve;
 
 	my $i = 0;
 	while ( $i < $#curve ) {
-		my $rect = SDL::Rect->new( -x => int($curve[$i++]), -y => int($curve[$i++]), -w => 1, -h => 1 );
-		$app->fill( $rect, $red );
-		$app->update( $rect );
+		my $from_x = int($curve[$i++]);
+		my $from_y = int($curve[$i++]);
+		my $to_x   = int($curve[$i++]);
+		my $to_y   = int($curve[$i++]);
+		line(
+			int($curve[$i++]),
+			int($curve[$i++]),
+			int($curve[$i++]),
+			int($curve[$i++]),
+			sub { $app->pixel( @_, $path_color ) }
+		);
 	}
+	$app->sync;
 }
 
 sub handle_events {
@@ -76,13 +87,18 @@ sub handle_events {
 			my $key = $event->key_name;
 			debug 'key down', $key;
 			exit if $key =~ m/^[xq]$/;
-			if ( $key eq 's' ) {
+			if ( $key eq 's' ) { # XXX draw curve
 				curve;
-			} elsif ( $key eq 'd' ) {
+			} elsif ( $key eq 'backspace' ) { # XXX clean screen
 				@path = ();
 				my $rect = SDL::Rect->new( -x => 0, -y => 0, -w => $w, -h => $h );
 				$app->fill( $rect, $black );
 				$app->update( $rect );
+			} elsif ( $key eq 'd' ) { # XXX toggle debug
+				$debug = ! $debug;
+				warn "debug $debug\n";
+			} else {
+				warn "unknown key $key";
 			}
 		} elsif ( $type == SDL_KEYUP() ) {
 			debug 'key up', $event->key_name;
@@ -94,8 +110,8 @@ sub handle_events {
 			if ( $mouse_down && ( $dx > $mouse_trashold || $dy > $mouse_trashold ) ) {
 				if ( $#path < $max_path_length ) {
 					push @path, $x, $y;
-					my $rect = SDL::Rect->new( -x => $event->motion_x, -y => $event->motion_y, -w => 3, -h => 3 );
-					$app->fill( $rect, $white );
+					my $rect = SDL::Rect->new( -x => $event->motion_x - 1, -y => $event->motion_y -1 , -w => 3, -h => 3 );
+					$app->fill( $rect, $mouse_color );
 					$app->update( $rect );
 					$last_x = $x;
 					$last_y = $y;
@@ -105,7 +121,7 @@ sub handle_events {
 				}
 			}
 		} else {
-			debug 'unknown', $type;
+			warn "unknown type $type\n";
 		}
 	}
 };