Working map

Author: ecrips

emscripten-pre.js

@@ -1,9 +1,9 @@
 "use strict";
 
 if (!window.Float64Array) {
-	window.Float64Array = Float32Array;
+	window.Float64Array = window.Float32Array;
 }
 
-var Module = {};
-
 (function(){
+
+var Module = {};

emscripten.c

@@ -14,6 +14,16 @@ void canvas_text(int,int,int,int,char*,char*,int,char*);
 void canvas_rect(int,int,int,int,int);
 void set_canvas_size(int,int);
 void canvas_circle(int,int,int,int,int);
+void canvas_blitter_save(int,int,int,int,int);
+void canvas_blitter_load(int,int,int);
+void canvas_blitter_free(int);
+void canvas_clip(int,int,int,int);
+void canvas_unclip(void);
+void canvas_beginPath(void);
+void canvas_moveTo(int,int);
+void canvas_lineTo(int,int);
+void canvas_strokeandfill(int,int);
+int is_selected_game(const char*);
 
 struct frontend
 {
@@ -52,7 +62,13 @@ static void em_draw_line(void *hande, int x1, int y1, int x2, int y2,
 static void em_draw_polygon(void *handle, int *coords, int npoints,
 			int fillcolour, int outlinecolour)
 {
-	printf("TODO: draw polygon\n");
+	int i;
+	canvas_beginPath();
+	canvas_moveTo(coords[0], coords[1]);
+	for(i=1;i<npoints;i++) {
+		canvas_lineTo(coords[i*2], coords[i*2+1]);
+	}
+	canvas_strokeandfill(fillcolour, outlinecolour);
 }
 
 static void em_draw_circle(void *handle, int cx, int cy, int radius,
@@ -67,12 +83,12 @@ static void em_draw_update(void *handle, int x, int y, int w, int h)
 
 static void em_clip(void *handle, int x, int y, int w, int h)
 {
-	printf("TODO: clip\n");
+	canvas_clip(x, y, w, h);
 }
 
 static void em_unclip(void *handle)
 {
-	printf("TODO: unclip\n");
+	canvas_unclip();
 }
 
 static void em_start_draw(void *handle)
@@ -90,29 +106,38 @@ static void em_status_bar(void *handle, char *text)
 
 struct blitter
 {
-	int dummy;
+	int id;
+	int x, y, w, h;
 };
 
 static blitter *em_blitter_new(void *handle, int w, int h)
 {
-	printf("TODO: blitter new\n");
-	return snew(blitter);
+	struct blitter *b = snew(blitter);
+	b->w = w;
+	b->h = h;
+	b->id = (int)b;
+	return b;
 }
 
 static void em_blitter_free(void *handle, blitter *bl)
 {
-	printf("TODO: blitter free\n");
+	canvas_blitter_free(bl->id);
 	sfree(bl);
 }
 
 static void em_blitter_save(void *handle, blitter *bl, int x, int y)
 {
-	printf("TODO: blitter save\n");
+	canvas_blitter_save(bl->id, x, y, bl->w, bl->h);
+	bl->x = x;
+	bl->y = y;
 }
 
 static void em_blitter_load(void *handle, blitter *bl, int x, int y)
 {
-	printf("TODO: blitter load\n");
+	if (x == BLITTER_FROMSAVED && y == BLITTER_FROMSAVED) {
+		x = bl->x; y = bl->y;
+	}
+	canvas_blitter_load(bl->id, x, y);
 }
 
 static void em_begin_doc(void *handle, int pages)
@@ -202,7 +227,7 @@ static const game *pick_game(void)
 {
 	int i;
 	for(i=0;i<gamecount;i++) {
-		if (!strcmp(gamelist[i]->name, "Bridges")) {
+		if (is_selected_game(gamelist[i]->name)) {
 			return gamelist[i];
 		}
 	}

emscripten.js

@@ -91,6 +91,15 @@ function puzzle_init() {
 	setup_menu();
 }
 
+function _is_selected_game(game) {
+	game = Pointer_stringify(game);
+	var hash = location.hash;
+	if ("#"+game == hash) {
+		return true;
+	}
+	return false;
+}
+
 function _init_colour(id, r, g, b)
 {
 	colourStyle[id] = "rgb("+r+","+g+","+b+")";
@@ -147,6 +156,70 @@ function _canvas_circle(x, y, radius, fillcolour, outlinecolour)
 	ctx.fill();
 }
 
+var blitters = [];
+
+function _canvas_blitter_save(id, x, y, w, h)
+{
+	var imagedata = ctx.getImageData(x, y, w, h);
+	blitters[id] = imagedata;
+}
+
+function _canvas_blitter_load(id, x, y)
+{
+	ctx.putImageData(blitters[id], x, y);
+}
+
+function _canvas_blitter_free(id)
+{
+	blitters[id] = 0;
+	delete blitters[id];
+}
+
+function _canvas_clip(x, y, w, h)
+{
+	ctx.save();
+	ctx.beginPath();
+	ctx.rect(x,y,w,h);
+	ctx.clip();
+}
+
+function _canvas_unclip()
+{
+	ctx.restore();
+	/*
+	ctx.beginPath();
+	ctx.rect(0,0,thecanvas.width,thecanvas.height);
+	ctx.clip();
+	*/
+	//ctx.resetClip();
+}
+
+function _canvas_beginPath()
+{
+	ctx.beginPath();
+}
+
+function _canvas_moveTo(x, y)
+{
+	ctx.moveTo(x,y);
+}
+
+function _canvas_lineTo(x, y)
+{
+	ctx.lineTo(x,y);
+}
+
+function _canvas_strokeandfill(fillcolour, outlinecolour)
+{
+	ctx.closePath();
+	ctx.strokeStyle = colourStyle[outlinecolour];
+	ctx.stroke();
+	if (fillcolour != -1) {
+		ctx.fillStyle = colourStyle[fillcolour];
+		ctx.fill();
+	}
+}
+
 var timer_active = false;
 var timer_last;
 
@@ -175,7 +248,7 @@ function _deactivate_timer()
 
 }
 window['em'] = {
-	'puzzle_init' : puzzle_init,
+	'puzzle_init' : puzzle_init
 };
 
 }).call({});

mkfiles.pl

@@ -1680,7 +1680,7 @@ sub manpages {
       $objstr =~ s/osx\.o/emscripten\.o/;
       print &splitline("\$(BINPREFIX)" . $prog . ".js: emscripten.js emscripten-pre.js " . $objstr), "\n";
       $libstr = &objects($p, undef, undef, "-lX");
-      print &splitline("\t\$(CC) -o \$@ $objstr $libstr --jcache --post-js emscripten.js --pre-js emscripten-pre.js -O2", 69),
+      print &splitline("\tEMCC_CLOSURE_ARGS=\"--compilation_level SIMPLE_OPTIMIZATIONS\" \$(CC) -o \$@ $objstr $libstr --jcache --post-js emscripten.js --pre-js emscripten-pre.js -O2", 69),
 	  "\n\n";
     }
     foreach $d (&deps("X.o", undef, $dirpfx, "/")) {