separate images/anims/maps into dedicated files.

r043v · Mar 17, 2012 · 822315d · 822315d
1 parent 7b648c6
commit 822315d
Show file tree

Hide file tree

Showing 8 changed files with 738 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -4,9 +4,10 @@ LDLIBS=lua/src/liblua.a -lm `pkg-config --libs $(PKGS)`
 
 all: load81 
 
-load81: load81.o editor.o framebuffer.o lua/src/liblua.a
+load81: load81.o editor.o framebuffer.o gdl.o lua/src/liblua.a
 editor.o: editor.c editor.h framebuffer.h
 framebuffer.o: framebuffer.c framebuffer.h bitfont.h
+gdl.o: gdl.c gdl.h framebuffer.h
 load81.o: load81.c framebuffer.h editor.h load81.h
 
 lua/src/liblua.a:

diff --git a/examples/falldown.lua b/examples/falldown.lua
@@ -1,13 +1,12 @@
 -- falldown, lua edition \o/
 -- © 2k12 r043v/dph
 
-
 -- init function, launched at start
 function setup()
  -- game option
  game = { map  = { data = {}, sizey = 6000, speed = 450, scroll = 0, bg = {255,0,255}, tile = { size = { x=50, y=50 }, color  = { {255,0,0},{0,255,0},{0,0,255},{255,255,0},{0,255,255} } } },
           hero = { isFall=1, color = {255,0,0}, size = { x=32, y=32 }, pos = { x=0, y=0 } },
-          screen = { size = { x=0, y=0 }, fps = 30 },
+          screen = { size = { x=0, y=0 }, fps = 60 },
         }
 
  -- init hero position
@@ -32,7 +31,9 @@ function setup()
 
  -- generate a random map
  generateMap()
-
+
+ setFPS(60)
+
  -- get ready for action!
 end
 
@@ -44,7 +45,7 @@ end
 function draw()
  -- clear screen
  background(game.map.bg[1],game.map.bg[2],game.map.bg[3]);
- 
+
  -- detect speed change and change current map/hero speed
  if game.map.oldSpeed ~= game.speed or game.hero.oldSpeed ~= hero.speed then
   game.map.oldSpeed = game.map.speed
@@ -92,7 +93,7 @@ function draw()
  end
 
  -- blit the map
- drawMap();
+ zdrawMap();
 
  -- blit hero²
  fill(game.hero.color[1],game.hero.color[2],game.hero.color[3],1);
@@ -130,6 +131,8 @@ function draw()
 
  -- some debug
 -- fill(0,255,0,1)
+-- text(100,40,string.format("tick %d",getTick()))
+-- text(100,70,string.format("image size %d %d",game.testSizex, game.testSizey))
 -- text(100,100,string.format("scroll %d",game.map.scroll))
 -- text(100,130,string.format("screen %d*%d => %d*%d",WIDTH,HEIGHT,game.screen.size.x,game.screen.size.y))
 -- text(100,160,string.format("speed %d px/s current %d frame %d ratio %f",game.map.speed,game.map.currentSpeed,game.screen.frameFlip,game.map.speedRatio))
@@ -188,7 +191,7 @@ function generateMap()
   end
 end
 
-function drawMap()
+function zdrawMap()
  -- compute y start tile position, pixels -> tiles
  local starty = math.floor(game.map.scroll/game.map.tile.size.y)+1
 

diff --git a/examples/map.lua b/examples/map.lua
@@ -0,0 +1,82 @@
+function setup()
+ game = { }
+ setFPS(60)
+ game.tileset = loadImage("examples/map/tileset.bmp");
+
+ game.mymap = newMap(
+	{
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 12, 10, 9, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 7, 15, 5, 1, 1, 9, 12, 12, 12, 12, 12, 12, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 3, 12, 12, 12, 12, 15, 12, 12, 12, 11, 1, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 15, 12, 10, 1, 14, 1, 1, 1, 6, 1, 1, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 12, 8, 1, 1, 7, 5, 14, 1, 1, 1, 13, 12, 12, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 3, 15, 5, 1, 3, 15, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 3, 15, 5, 1, 1, 2, 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 20, 1, 1, 13, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 5, 1, 13, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 14, 1, 1, 13, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 19, 17, 12, 12, 12, 12, 12, 17, 17, 17, 17, 17, 17, 17, 17, 17, 12, 12, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 3, 15, 17, 17, 17, 17, 15, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 3, 8, 1, 1, 1, 1, 13, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 15, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 3, 10, 1, 1, 1, 1, 13, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 3, 15, 16, 16, 16, 16, 15, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+      },game.tileset,21,16,16,40,40)
+
+	setMapOutZone(game.mymap,100,100,320,240);
+
+	game.scrollway_v = SCROLL_DOWN;
+	game.scrollway_h = SCROLL_RIGHT;
+	game.scrollway = mapScrollGetWay(game.scrollway_v,game.scrollway_h);
+	game.animtest = newAnim(game.tileset,16,21,300,0);
+	setMapAnimatedTile(game.mymap,6,game.animtest)
+
+  -- get ready for action!
+end
+
+-- loop function
+function draw()
+ -- clear screen
+ background(255,255,255);
+ drawMap(game.mymap)
+ up,down,left,right = mapScroll(game.mymap,game.scrollway,1);
+
+ if game.scrollway_v == SCROLL_DOWN then
+   if down == 1 then game.scrollway_v = SCROLL_UP end
+ else
+   if up == 1 then game.scrollway_v = SCROLL_DOWN end
+ end
+
+ if game.scrollway_h == SCROLL_LEFT then
+   if left == 1 then game.scrollway_h = SCROLL_RIGHT end
+ else
+   if right == 1 then game.scrollway_h = SCROLL_LEFT end
+ end
+
+ game.scrollway = mapScrollGetWay(game.scrollway_v,game.scrollway_h); 
+
+end
diff --git a/examples/map/tileset.bmp b/examples/map/tileset.bmp