# HG changeset patch
# User fred@reichbier.de
# Date 1216473056 -7200
# Node ID 510541745cd12fc0702728f8a2bdede01c0f82d6
# Parent f4b89014ad3966951b78c94bb05869176616ae26
turned myrrdin into package.
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/README
--- a/bin/gfx/README Sat Jul 19 14:33:08 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Most of this graphics are from 'reiners Tileset': http://reinerstileset.4players.de/
-Many thanks, reiner :-)
-
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-1.png
Binary file bin/gfx/f-1.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-10.png
Binary file bin/gfx/f-10.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-11.png
Binary file bin/gfx/f-11.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-12.png
Binary file bin/gfx/f-12.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-2.png
Binary file bin/gfx/f-2.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-3.png
Binary file bin/gfx/f-3.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-4.png
Binary file bin/gfx/f-4.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-5.png
Binary file bin/gfx/f-5.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-6.png
Binary file bin/gfx/f-6.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-7.png
Binary file bin/gfx/f-7.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-8.png
Binary file bin/gfx/f-8.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/f-9.png
Binary file bin/gfx/f-9.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/grass-stone-water-east.png
Binary file bin/gfx/grass-stone-water-east.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/grass-stone-water-l.png
Binary file bin/gfx/grass-stone-water-l.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/grass-stone-water-north.png
Binary file bin/gfx/grass-stone-water-north.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/grass.png
Binary file bin/gfx/grass.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/mountain.png
Binary file bin/gfx/mountain.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/spacecar-normal.png
Binary file bin/gfx/spacecar-normal.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/spacecar-thrust1.png
Binary file bin/gfx/spacecar-thrust1.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/spacecar-thrust2.png
Binary file bin/gfx/spacecar-thrust2.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/gfx/water.png
Binary file bin/gfx/water.png has changed
diff -r f4b89014ad39 -r 510541745cd1 bin/map-example.xml
--- a/bin/map-example.xml Sat Jul 19 14:33:08 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-
diff -r f4b89014ad39 -r 510541745cd1 bin/tileset-example.xml
--- a/bin/tileset-example.xml Sat Jul 19 14:33:08 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-
-
-
-
-
diff -r f4b89014ad39 -r 510541745cd1 dsss.conf
--- a/dsss.conf Sat Jul 19 14:33:08 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-[src/test.d]
-target = bin/test
-buildflags += -Isrc -I/usr/include/d/ -S/usr/lib -L-ldsfml-graphics -L-ldsfml-window -L-ldsfml-system
-
diff -r f4b89014ad39 -r 510541745cd1 import/dsss.conf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/import/dsss.conf Sat Jul 19 15:10:56 2008 +0200
@@ -0,0 +1,4 @@
+[src/test.d]
+target = bin/test
+buildflags += -Isrc -I/usr/include/d/ -S/usr/lib -L-ldsfml-graphics -L-ldsfml-window -L-ldsfml-system
+
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/animatedsprite.d
--- a/import/myrrdin/animatedsprite.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/animatedsprite.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,19 +1,25 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module animatedsprite;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/consumer.d
--- a/import/myrrdin/consumer.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/consumer.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,27 +1,33 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
-module consumer;
+module myrrdin.consumer;
import dsfml.window.all;
import dsfml.system.all;
import dsfml.graphics.all;
-import renderer;
+import myrrdin.renderer;
class Consumer {
protected Renderer renderer;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/imagecache.d
--- a/import/myrrdin/imagecache.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/imagecache.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,19 +1,25 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module imagecache;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/movingfigure.d
--- a/import/myrrdin/movingfigure.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/movingfigure.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,19 +1,25 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module movingfigure;
@@ -23,10 +29,10 @@
import dsfml.system.all;
import dsfml.graphics.all;
-import spriteconsumer;
-import animatedsprite;
-import renderer;
-import imagecache;
+import myrrdin.spriteconsumer;
+import myrrdin.animatedsprite;
+import myrrdin.renderer;
+import myrrdin.imagecache;
class MovingAnimatedFigureConsumer : SpriteConsumer {
private Animation ani_left, ani_right, ani_up, ani_down;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/renderer.d
--- a/import/myrrdin/renderer.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/renderer.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,29 +1,35 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
-module renderer;
+module myrrdin.renderer;
import dsfml.window.all;
import dsfml.system.all;
import dsfml.graphics.all;
-import consumer;
-import imagecache;
-import animatedsprite;
+import myrrdin.consumer;
+import myrrdin.imagecache;
+import myrrdin.animatedsprite;
class Renderer {
public RenderWindow app;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/sprite.d
--- a/import/myrrdin/sprite.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/sprite.d Sat Jul 19 15:10:56 2008 +0200
@@ -4,4 +4,4 @@
import dsfml.system.all;
import dsfml.graphics.all : Sprite = SFSprite;
-import renderer;
+import myrrdin.renderer;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/spriteconsumer.d
--- a/import/myrrdin/spriteconsumer.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/spriteconsumer.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,19 +1,25 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module spriteconsumer;
@@ -21,9 +27,9 @@
import dsfml.system.all;
import dsfml.graphics.all;
-import animatedsprite;
-import consumer;
-import renderer;
+import myrrdin.animatedsprite;
+import myrrdin.consumer;
+import myrrdin.renderer;
class SpriteConsumer : Consumer {
private Sprite[] sprites;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/test.d
--- a/import/myrrdin/test.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/test.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,19 +1,25 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module test;
@@ -21,18 +27,18 @@
import dsfml.system.all;
import dsfml.graphics.all;
-import tileconsumer;
-import renderer;
-import consumer;
-import imagecache;
-import tilemap;
-import tileset;
-import xmlmap;
-import tools;
-import viewconsumer;
-import animatedsprite;
-import spriteconsumer;
-import movingfigure;
+import myrrdin.tileconsumer;
+import myrrdin.renderer;
+import myrrdin.consumer;
+import myrrdin.imagecache;
+import myrrdin.tilemap;
+import myrrdin.tileset;
+import myrrdin.xmlmap;
+import myrrdin.tools;
+import myrrdin.viewconsumer;
+import myrrdin.animatedsprite;
+import myrrdin.spriteconsumer;
+import myrrdin.movingfigure;
int main(char[][] args) {
Cache cache = new Cache("gfx");
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/tileconsumer.d
--- a/import/myrrdin/tileconsumer.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/tileconsumer.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,19 +1,25 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module tileconsumer;
@@ -22,10 +28,10 @@
import dsfml.graphics.all;
import tango.io.Stdout;
-import consumer;
-import renderer;
-import tileset;
-import tilemap;
+import myrrdin.consumer;
+import myrrdin.renderer;
+import myrrdin.tileset;
+import myrrdin.tilemap;
class TileConsumer : Consumer {
public Tilemap map;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/tilemap.d
--- a/import/myrrdin/tilemap.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/tilemap.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,19 +1,25 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module tilemap;
@@ -23,7 +29,7 @@
import dsfml.system.all;
import dsfml.graphics.all;
-import tileset;
+import myrrdin.tileset;
import tango.io.Stdout;
typedef Sprite[] SpriteArray;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/tileset.d
--- a/import/myrrdin/tileset.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/tileset.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,19 +1,25 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module tileset;
@@ -21,7 +27,7 @@
import dsfml.system.all;
import dsfml.graphics.all;
-import imagecache;
+import myrrdin.imagecache;
alias Image[int] TileList;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/tools.d
--- a/import/myrrdin/tools.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/tools.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,19 +1,25 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module tools;
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/viewconsumer.d
--- a/import/myrrdin/viewconsumer.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/viewconsumer.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,19 +1,25 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module viewconsumer;
@@ -21,8 +27,8 @@
import dsfml.system.all;
import dsfml.graphics.all;
-import consumer;
-import renderer;
+import myrrdin.consumer;
+import myrrdin.renderer;
import tango.io.Stdout;
/* That is a consumer which sets and manipulates the render window view */
diff -r f4b89014ad39 -r 510541745cd1 import/myrrdin/xmlmap.d
--- a/import/myrrdin/xmlmap.d Sat Jul 19 14:33:08 2008 +0200
+++ b/import/myrrdin/xmlmap.d Sat Jul 19 15:10:56 2008 +0200
@@ -1,30 +1,36 @@
/*
- This file is part of myrrdin.
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
- myrrdin is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- myrrdin is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- You should have received a copy of the GNU Lesser General Public
- License along with myrrdin. If not, see .
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
module xmlmap;
-import tileset;
-import tilemap;
+import myrrdin.tileset;
+import myrrdin.tilemap;
import tango.text.xml.Document;
import tango.text.convert.Integer;
import tango.io.Stdout; // TODO
-import tools;
-import imagecache;
+import myrrdin.tools;
+import myrrdin.imagecache;
import dsfml.system.all;
import Text = tango.text.Util;
static import tango.core.Exception;
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/bin/gfx/README Sat Jul 19 15:10:56 2008 +0200
@@ -0,0 +1,3 @@
+Most of this graphics are from 'reiners Tileset': http://reinerstileset.4players.de/
+Many thanks, reiner :-)
+
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-1.png
Binary file test/bin/gfx/f-1.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-10.png
Binary file test/bin/gfx/f-10.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-11.png
Binary file test/bin/gfx/f-11.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-12.png
Binary file test/bin/gfx/f-12.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-2.png
Binary file test/bin/gfx/f-2.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-3.png
Binary file test/bin/gfx/f-3.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-4.png
Binary file test/bin/gfx/f-4.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-5.png
Binary file test/bin/gfx/f-5.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-6.png
Binary file test/bin/gfx/f-6.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-7.png
Binary file test/bin/gfx/f-7.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-8.png
Binary file test/bin/gfx/f-8.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/f-9.png
Binary file test/bin/gfx/f-9.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/grass-stone-water-east.png
Binary file test/bin/gfx/grass-stone-water-east.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/grass-stone-water-l.png
Binary file test/bin/gfx/grass-stone-water-l.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/grass-stone-water-north.png
Binary file test/bin/gfx/grass-stone-water-north.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/grass.png
Binary file test/bin/gfx/grass.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/mountain.png
Binary file test/bin/gfx/mountain.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/spacecar-normal.png
Binary file test/bin/gfx/spacecar-normal.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/spacecar-thrust1.png
Binary file test/bin/gfx/spacecar-thrust1.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/spacecar-thrust2.png
Binary file test/bin/gfx/spacecar-thrust2.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/gfx/water.png
Binary file test/bin/gfx/water.png has changed
diff -r f4b89014ad39 -r 510541745cd1 test/bin/map-example.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/bin/map-example.xml Sat Jul 19 15:10:56 2008 +0200
@@ -0,0 +1,10 @@
+
diff -r f4b89014ad39 -r 510541745cd1 test/bin/tileset-example.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/bin/tileset-example.xml Sat Jul 19 15:10:56 2008 +0200
@@ -0,0 +1,5 @@
+
+
+
+
+
diff -r f4b89014ad39 -r 510541745cd1 test/dsss.conf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/dsss.conf Sat Jul 19 15:10:56 2008 +0200
@@ -0,0 +1,3 @@
+[movingfigure/movingfigure.d]
+target=bin/movingfigure
+buildflags += -I../import
diff -r f4b89014ad39 -r 510541745cd1 test/movingfigure/movingfigure.d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/movingfigure/movingfigure.d Sat Jul 19 15:10:56 2008 +0200
@@ -0,0 +1,60 @@
+/*
+ myrrdin, a 2d tile engine
+ Copyright (c) 2008 Friedrich Weber
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+
+module test;
+
+import myrrdin.tileconsumer;
+import myrrdin.renderer;
+import myrrdin.imagecache;
+import myrrdin.tilemap;
+import myrrdin.tileset;
+import myrrdin.xmlmap;
+import myrrdin.tools;
+import myrrdin.animatedsprite;
+import myrrdin.spriteconsumer;
+import myrrdin.movingfigure;
+
+int main(char[][] args) {
+ Cache cache = new Cache("gfx");
+ Tilemap map = parse_map(cache, read_file_contents("map-example.xml"));
+ Renderer render = new Renderer("Blubb", 600, 480, 32);
+// render.add_consumer(new InteractiveViewConsumer(render));
+ TileConsumer consumer = new TileConsumer(render, map);
+ map.set_view(render.app.getView());
+ render.add_consumer(consumer);
+ render.add_consumer(load_charset(render, cache, "f-", ".png", 10));
+/* SpriteConsumer c = new SpriteConsumer(render);
+ AnimatedSprite s = new AnimatedSprite;
+ s.setX(10);
+ s.setY(10);
+ Animation a = new Animation;
+ a.add_frame(map.tileset.tiles[0], 10);
+ a.add_frame(map.tileset.tiles[1], 10);
+// s.setImage(map.tileset.tiles[0]);
+ s.play_animation(a, true);
+ c.add_sprite(s);
+ render.add_consumer(c);*/
+
+ render.mainloop();
+ return 0;
+}