提交: 14ea65770041af24848df65f8efb9cc3d9246f22 - hengband (git)

変愚蛮怒のメインリポジトリです

Commit MetaInfo

• 修订版: 14ea65770041af24848df65f8efb9cc3d9246f22 (tree)
• 时间: 2020-03-29 16:06:41
• 作者: shimitei <shimitei@gmai...>
• Commiter: shimitei

Log Message

receive keydown message

更改概述

• add: src/lib.js
• modified: src/main-wasm-term.c
• modified: src/main-wasm.c
• modified: src/makefile.em
• modified: src/util.c
• delete: src/{worker.message.js => pre.js}

差异

--- /dev/null
+++ b/src/lib.js
@@ -0,0 +1,9 @@
+mergeInto(LibraryManager.library, {
+  mysleep: function(interval) {
+    Asyncify.handleSleep(function(wakeUp) {
+      setTimeout(function() {
+        wakeUp();
+      }, interval);
+    });
+  },
+});
\ No newline at end of file

--- a/src/main-wasm-term.c
+++ b/src/main-wasm-term.c
@@ -70,7 +70,6 @@ static void Term_nuke_wasm(term* t)
  */
 static errr Term_text_wasm(int x, int y, int n, byte a, concptr s)
 {
-	printf("%s", s);
 	EM_ASM({
       var s = UTF8ToString($0);
 	  console.log(s);
@@ -124,6 +123,15 @@ static errr Term_xtra_wasm(int n, int v)
 	return (1);
 }
 
+EMSCRIPTEN_KEEPALIVE void Term_wasm_keypress(int k)
+{
+	EM_ASM({
+	  console.log($0);
+	}, k);
+
+	Term_keypress(k);
+}
+
 /*
  * Prepare this file for Angband usage
  */

--- a/src/main-wasm.c
+++ b/src/main-wasm.c
@@ -8,9 +8,9 @@
  * are included in all such copies.
  */
 
+#include <emscripten.h>
 #include "angband.h"
 
-
 /*
  * A hook for "quit()".
  *

--- a/src/makefile.em
+++ b/src/makefile.em
@@ -2,50 +2,51 @@
 
 CC = emcc
 LD = emcc
-CFLAGS = -fPIC -s ASYNCIFY=1
-LDFLAGS = -v -s EXIT_RUNTIME=1 -s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY=1
+CFLAGS = -fPIC
+LDFLAGS = -v -s VERBOSE -s EXIT_RUNTIME -s ALLOW_MEMORY_GROWTH -s SINGLE_FILE
 DEFINES =
+DEFASYNCIFY = -s ASYNCIFY -s 'ASYNCIFY_IMPORTS=["emscripten_sleep", "mysleep"]'
 
-TARGET_FILE = hengband.html
+TARGET_FILE = hengband.js
 
 OBJS = \
-	main-wasm.bc main-wasm-term.bc \
-	artifact.bc autopick.bc avatar.bc \
-	birth.bc bldg.bc \
-	chest.bc chuukei.bc cmd2.bc cmd4.bc cmd-activate.bc cmd-eat.bc \
-	cmd-hissatsu.bc cmd-item.bc cmd-magiceat.bc cmd-mane.bc cmd-pet.bc \
-	cmd-quaff.bc cmd-read.bc cmd-smith.bc cmd-spell.bc cmd-usestaff.bc \
-	cmd-zaprod.bc cmd-zapwand.bc \
-	dungeon.bc \
-	effects.bc \
-	feature.bc files.bc flavor.bc floor-events.bc floor-generate.bc \
-	floor-save.bc floor-streams.bc \
-	gameoption.bc geometry.bc grid.bc \
-	history.bc \
-	inet.bc init1.bc init2.bc \
-	japanese.bc \
-	load.bc \
-	melee1.bc mind.bc monster1.bc monster2.bc monster-process.bc \
-	monsterrace-hook.bc monster-status.bc mspells1.bc mspells2.bc mspells3.bc \
-	mspells4.bc mutation.bc \
-	object1.bc object2.bc object-boost.bc object-broken.bc object-curse.bc \
-	object-hook.bc objectkind-hook.bc \
-	patron.bc player-damage.bc player-move.bc player-status.bc projection.bc \
-	quest.bc \
-	racial.bc realm-arcane.bc realm-chaos.bc realm-craft.bc realm-crusade.bc \
-	realm-daemon.bc realm-death.bc realm-hex.bc realm-hissatsu.bc \
-	realm-life.bc realm-nature.bc realm-song.bc realm-sorcery.bc \
-	realm-trump.bc report.bc rooms.bc rooms-city.bc rooms-fractal.bc \
-	rooms-normal.bc rooms-pitnest.bc rooms-special.bc rooms-trap.bc \
-	rooms-vault.bc rumor.bc \
-	save.bc scores.bc selfinfo.bc shoot.bc snipe.bc sort.bc spells1.bc \
-	spells2.bc spells3.bc spells-diceroll.bc spells-floor.bc spells-object.bc \
-	spells-status.bc spells-summon.bc spells-world.bc store.bc \
-	tables.bc term.bc trap.bc \
-	util.bc \
-	variable.bc view-mainwindow.bc \
-	warning.bc wild.bc wizard1.bc wizard2.bc world.bc xtra2.bc \
-	z-form.bc z-rand.bc z-term.bc z-util.bc z-virt.bc
+	main-wasm.o main-wasm-term.o \
+	artifact.o autopick.o avatar.o \
+	birth.o bldg.o \
+	chest.o chuukei.o cmd2.o cmd4.o cmd-activate.o cmd-eat.o \
+	cmd-hissatsu.o cmd-item.o cmd-magiceat.o cmd-mane.o cmd-pet.o \
+	cmd-quaff.o cmd-read.o cmd-smith.o cmd-spell.o cmd-usestaff.o \
+	cmd-zaprod.o cmd-zapwand.o \
+	dungeon.o \
+	effects.o \
+	feature.o files.o flavor.o floor-events.o floor-generate.o \
+	floor-save.o floor-streams.o \
+	gameoption.o geometry.o grid.o \
+	history.o \
+	inet.o init1.o init2.o \
+	japanese.o \
+	load.o \
+	melee1.o mind.o monster1.o monster2.o monster-process.o \
+	monsterrace-hook.o monster-status.o mspells1.o mspells2.o mspells3.o \
+	mspells4.o mutation.o \
+	object1.o object2.o object-boost.o object-broken.o object-curse.o \
+	object-hook.o objectkind-hook.o \
+	patron.o player-damage.o player-move.o player-status.o projection.o \
+	quest.o \
+	racial.o realm-arcane.o realm-chaos.o realm-craft.o realm-crusade.o \
+	realm-daemon.o realm-death.o realm-hex.o realm-hissatsu.o \
+	realm-life.o realm-nature.o realm-song.o realm-sorcery.o \
+	realm-trump.o report.o rooms.o rooms-city.o rooms-fractal.o \
+	rooms-normal.o rooms-pitnest.o rooms-special.o rooms-trap.o \
+	rooms-vault.o rumor.o \
+	save.o scores.o selfinfo.o shoot.o snipe.o sort.o spells1.o \
+	spells2.o spells3.o spells-diceroll.o spells-floor.o spells-object.o \
+	spells-status.o spells-summon.o spells-world.o store.o \
+	tables.o term.o trap.o \
+	util.o \
+	variable.o view-mainwindow.o \
+	warning.o wild.o wizard1.o wizard2.o world.o xtra2.o \
+	z-form.o z-rand.o z-term.o z-util.o z-virt.o
 
 .PHONY: all
 all : $(TARGET_FILE)
@@ -57,12 +58,12 @@ prebuild :
 #	ln -s ../lib lib
 
 $(TARGET_FILE): $(OBJS)
-	$(LD) $(LDFLAGS) $(OBJS) --js-library worker.message.js --preload-file lib -o $(TARGET_FILE)
+	$(LD) $(LDFLAGS) $(DEFASYNCIFY) $(OBJS) --pre-js pre.js --js-library lib.js --preload-file lib -o $(TARGET_FILE)
 
-.SUFFIXES: .c .bc
-.c.bc:
-	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+.SUFFIXES: .c .o
+.c.o:
+	$(CC) $(CFLAGS) $(DEFINES) $(DEFASYNCIFY) -c $< -o $@
 
 .PHONY: clean
 clean:
-	$(RM) hengband.* *.bc
+	$(RM) hengband.* *.o

--- a/src/worker.message.js
+++ b/src/pre.js
@@ -1,3 +1,4 @@
 onmessage = function(e) {
     console.log('worker:', e);
+    _Term_wasm_keypress(e.data.keyCode);
 }

--- a/src/util.c
+++ b/src/util.c
@@ -12,6 +12,9 @@
 
 #include "angband.h"
 #include "monsterrace-hook.h"
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+#endif
 
 
 static int num_more = 0;
@@ -2114,6 +2117,8 @@ char inkey(void)
 	/* Get a key */
 	while (!ch)
 	{
+		emscripten_sleep(10);
+
 		/* Hack -- Handle "inkey_scan" */
 		if (!inkey_base && inkey_scan &&
 			(0 != Term_inkey(&kk, FALSE, FALSE)))