# HG changeset patch
# User fred@reichbier.de
# Date 1218645070 -7200
# Node ID 5866d9f2ca75b4817e4b664accca3516d3328b06
# Parent  79b534bbda658764d5ea2954afa6d83ca4517f7c
fixed director + tilemap stuff

diff -r 79b534bbda65 -r 5866d9f2ca75 import/myrrdin/tilemap.d
--- a/import/myrrdin/tilemap.d	Sat Jul 19 19:29:00 2008 +0200
+++ b/import/myrrdin/tilemap.d	Wed Aug 13 18:31:10 2008 +0200
@@ -29,7 +29,9 @@
 import dsfml.system.all;
 import dsfml.graphics.all;
 
+import myrrdin.director;
 import myrrdin.tileset;
+
 import tango.io.Stdout;
 
 typedef Sprite[] SpriteArray;
@@ -47,11 +49,7 @@
 	this.height = height;
 	this.tilewidth = tilewidth;
 	this.tileheight = tileheight;
-    }
-
-    /* set the view. you should do this if you use a sf::View */
-    void set_view(View view) {
-	this.view = view;
+	this.view = Director.renderer.app.getView();
     }
 
     /* translate On-Screen -> With-View */
diff -r 79b534bbda65 -r 5866d9f2ca75 test/director/testdirector.d
--- a/test/director/testdirector.d	Sat Jul 19 19:29:00 2008 +0200
+++ b/test/director/testdirector.d	Wed Aug 13 18:31:10 2008 +0200
@@ -21,9 +21,20 @@
     THE SOFTWARE.
  */
 
+module testdirector;
+
 import myrrdin.director;
+import myrrdin.scenes.tilescene;
+import myrrdin.tools;
+import myrrdin.xmlmap;
 
 void main() {
-    CreateDirector("gfx", 600, 480, 32);
-     
+    /* first: create the director */
+    CreateDirector("gfx", "Titel", 600, 480, 32);
+    /* then: create a scene */
+    auto scene = new TileScene(parse_map(read_file_contents("map-example.xml")));
+    /* insert the scene ... Director is a global variable which is defined in myrrdin.director */
+    Director.set_scene(scene);
+    /* and run the stuff. */
+    Director.run();
 }
diff -r 79b534bbda65 -r 5866d9f2ca75 test/dsss.conf
--- a/test/dsss.conf	Sat Jul 19 19:29:00 2008 +0200
+++ b/test/dsss.conf	Wed Aug 13 18:31:10 2008 +0200
@@ -5,3 +5,7 @@
 [view/viewconsumer.d]
 target=bin/viewconsumer
 buildflags += -I../import
+
+[director/testdirector.d]
+target=bin/director
+buildflags += -I../import
diff -r 79b534bbda65 -r 5866d9f2ca75 test/movingfigure/movingfigure.d
--- a/test/movingfigure/movingfigure.d	Sat Jul 19 19:29:00 2008 +0200
+++ b/test/movingfigure/movingfigure.d	Wed Aug 13 18:31:10 2008 +0200
@@ -38,7 +38,6 @@
     CreateDirector("gfx", "Blubb", 600, 480, 32);
     Tilemap map = parse_map(read_file_contents("map-example.xml"));
     TileConsumer consumer = new TileConsumer(map);
-    map.set_view(Director.renderer.app.getView());
     auto render = Director.renderer;
     render.add_consumer(consumer);
     render.add_consumer(load_charset("f-", ".png", 10)); 
diff -r 79b534bbda65 -r 5866d9f2ca75 test/view/viewconsumer.d
--- a/test/view/viewconsumer.d	Sat Jul 19 19:29:00 2008 +0200
+++ b/test/view/viewconsumer.d	Wed Aug 13 18:31:10 2008 +0200
@@ -44,7 +44,6 @@
     TileConsumer consumer = new TileConsumer(map);
     auto render = Director.renderer;
     render.add_consumer(new InteractiveViewConsumer);
-    map.set_view(render.app.getView());
     render.add_consumer(consumer);
     render.mainloop();
     return 0;