added paintable demo

eilara · Dec 5, 2011 · 9edb83e · 9edb83e
1 parent 37b3f08
commit 9edb83e
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 21 deletions.
diff --git a/dist.ini b/dist.ini
@@ -31,7 +31,8 @@ aliased = 0.30
 EV = 4.03
 Coro = 6.07
 AnyEvent = 6.11
-
+Math::Vector::Real = 0.06
+Imager = 0.86
 
 
 

diff --git a/eg/04-positionable.pl b/eg/04-positionable.pl
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+
+package Games::CamelDefense::eg_Positionable;
+use Games::CamelDefense::Demo;
+
+has last_click => (is => 'rw', default => sub { [0, 0] });
+
+consume qw(
+    Render::Paintable
+    Event::Handler::SDL
+    Geometry::Positionable
+);
+
+sub on_mouse_button_up {
+    my ($self, $x, $y) = @_;
+    $self->xy([$x, $y]);
+}
+
+sub paint {
+    my ($self, $surface) = @_;
+    $surface->draw_circle($self->pos, 100, 0xFFFFFFFF, 1);
+}
+
+package main;
+use Games::CamelDefense::Demo;
+use Games::CamelDefense::App title => 'Positionable';
+
+my $paintable = Games::CamelDefense::eg_Positionable->new(xy => [320, 200]);
+
+App->run;
+
+
+
diff --git a/eg/Games/CamelDefense/Demo.pm b/eg/Games/CamelDefense/Demo.pm
@@ -7,7 +7,7 @@ use Moose::Util;
 use Games::CamelDefense::MooseX::Util;
 
 sub import {
-    my ($class, %args) = @_;
+    my ($class, @args) = @_;
     my $caller = caller;
     require feature;
     feature->import(':5.10');
@@ -17,7 +17,7 @@ sub import {
     eval "package $caller;use Moose";
     die "Importing Moose error: $@" if @$;
 
-    import_helpers($caller);
+    import_helpers($caller, @args);
 }
 
 1;

diff --git a/lib/Games/CamelDefense/App.pm b/lib/Games/CamelDefense/App.pm
@@ -1,15 +1,16 @@
 package Games::CamelDefense::App;
 
-use Games::CamelDefense::Class;
 use SDL;
 use SDL::Rect;
 use SDL::Events;
 use SDLx::App;
-use Games::CamelDefense::Event::Handler::SDL;
-use Games::CamelDefense::Game::Resources;
-use Games::CamelDefense::Render::Paintable;
-use aliased 'Games::CamelDefense::Render::LayerManager' => 'LayerManager';
-use aliased 'Games::CamelDefense::Game::Controller'     => 'Controller';
+use Games::CamelDefense::Class qw(
+    Event::Handler::SDL
+    Game::Resources
+    Render::Paintable
+    Render::LayerManager
+    Game::Controller
+);
 
 my $Instance;
 sub import { # copied from Avenger

diff --git a/lib/Games/CamelDefense/Class.pm b/lib/Games/CamelDefense/Class.pm
@@ -4,7 +4,7 @@ use Moose;
 use Games::CamelDefense::MooseX::Util;
 
 sub import {
-    my ($class, %args) = @_;
+    my ($class, @args) = @_;
     my $caller = caller;
     require feature;
     feature->import(':5.10');
@@ -20,7 +20,7 @@ IMPORTS
 
     die "Importing Moose error: $@" if @$;
 
-    import_helpers($caller);
+    import_helpers($caller, @args);
 }
 
 

diff --git a/lib/Games/CamelDefense/MooseX/Util.pm b/lib/Games/CamelDefense/MooseX/Util.pm
@@ -17,14 +17,18 @@ sub consume {
 }
 
 sub import_helpers {
-    my ($caller) = @_;
+    my ($caller, @args) = @_;
     eval <<"IMPORTS";
 
 package $caller;
-use MooseX::Types::Moose qw(Bool Int Num Str ArrayRef HashRef);
 use Scalar::Util qw(weaken);
+use Math::Vector::Real;
+use MooseX::Types::Moose qw(Bool Int Num Str ArrayRef HashRef);
 use Games::CamelDefense::MooseX::Compose;
 use Games::CamelDefense::MooseX::Types qw(Vector2D);
+${\( join qq{\n}, map {qq{
+use aliased 'Games::CamelDefense::$_';
+}} @args )}
 
 IMPORTS
     die "Importing Moose error: $@" if @$;

diff --git a/lib/Games/CamelDefense/Render/LayerManager.pm b/lib/Games/CamelDefense/Render/LayerManager.pm
@@ -1,7 +1,6 @@
 package Games::CamelDefense::Render::LayerManager;
 
-use Games::CamelDefense::Class;
-use aliased 'Games::CamelDefense::Render::Layer';
+use Games::CamelDefense::Class qw(Render::Layer);
 
 # layer names in order from front to back
 has layers => (

diff --git a/lib/Games/CamelDefense/Role.pm b/lib/Games/CamelDefense/Role.pm
@@ -4,7 +4,7 @@ use Moose;
 use Games::CamelDefense::MooseX::Util;
 
 sub import {
-    my ($class, %args) = @_;
+    my ($class, @args) = @_;
     my $caller = caller;
     require feature;
     feature->import(':5.10');
@@ -20,7 +20,7 @@ IMPORTS
 
     die "Importing Moose error: $@" if @$;
 
-    import_helpers($caller);
+    import_helpers($caller, @args);
 }
 
 

diff --git a/t/Geometry/Positionable.t b/t/Geometry/Positionable.t
@@ -1,8 +1,8 @@
 
 package Games::CamelDefense::t_Geometry_Positionable;
-use Moose;
+use Games::CamelDefense::Class;
 
-with 'Games::CamelDefense::Geometry::Positionable';
+consume 'Geometry::Positionable';
 
 package main;
 use strict;

diff --git a/t/Geometry/Rectangular.t b/t/Geometry/Rectangular.t
@@ -1,8 +1,8 @@
 
 package Games::CamelDefense::t_Geometry_Rectangular;
-use Moose;
+use Games::CamelDefense::Class;
 
-with 'Games::CamelDefense::Geometry::Rectangular';
+consume 'Geometry::Rectangular';
 
 package main;
 use strict;