mirror of
				https://github.com/godotengine/godot.git
				synced 2025-10-31 13:41:03 +00:00 
			
		
		
		
	[HTML5] Refactor display/input JS library code.
This commit is contained in:
		
							parent
							
								
									204822ed45
								
							
						
					
					
						commit
						c494e442bc
					
				
					 4 changed files with 435 additions and 414 deletions
				
			
		|  | @ -28,8 +28,313 @@ | |||
| /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */ | ||||
| /*************************************************************************/ | ||||
| 
 | ||||
| /* | ||||
|  * Gamepad API helper. | ||||
|  */ | ||||
| const GodotInputGamepads = { | ||||
| 	$GodotInputGamepads__deps: ['$GodotRuntime', '$GodotDisplayListeners'], | ||||
| 	$GodotInputGamepads: { | ||||
| 		samples: [], | ||||
| 
 | ||||
| 		get_pads: function () { | ||||
| 			try { | ||||
| 				// Will throw in iframe when permission is denied.
 | ||||
| 				// Will throw/warn in the future for insecure contexts.
 | ||||
| 				// See https://github.com/w3c/gamepad/pull/120
 | ||||
| 				const pads = navigator.getGamepads(); | ||||
| 				if (pads) { | ||||
| 					return pads; | ||||
| 				} | ||||
| 				return []; | ||||
| 			} catch (e) { | ||||
| 				return []; | ||||
| 			} | ||||
| 		}, | ||||
| 
 | ||||
| 		get_samples: function () { | ||||
| 			return GodotInputGamepads.samples; | ||||
| 		}, | ||||
| 
 | ||||
| 		get_sample: function (index) { | ||||
| 			const samples = GodotInputGamepads.samples; | ||||
| 			return index < samples.length ? samples[index] : null; | ||||
| 		}, | ||||
| 
 | ||||
| 		sample: function () { | ||||
| 			const pads = GodotInputGamepads.get_pads(); | ||||
| 			const samples = []; | ||||
| 			for (let i = 0; i < pads.length; i++) { | ||||
| 				const pad = pads[i]; | ||||
| 				if (!pad) { | ||||
| 					samples.push(null); | ||||
| 					continue; | ||||
| 				} | ||||
| 				const s = { | ||||
| 					standard: pad.mapping === 'standard', | ||||
| 					buttons: [], | ||||
| 					axes: [], | ||||
| 					connected: pad.connected, | ||||
| 				}; | ||||
| 				for (let b = 0; b < pad.buttons.length; b++) { | ||||
| 					s.buttons.push(pad.buttons[b].value); | ||||
| 				} | ||||
| 				for (let a = 0; a < pad.axes.length; a++) { | ||||
| 					s.axes.push(pad.axes[a]); | ||||
| 				} | ||||
| 				samples.push(s); | ||||
| 			} | ||||
| 			GodotInputGamepads.samples = samples; | ||||
| 		}, | ||||
| 
 | ||||
| 		init: function (onchange) { | ||||
| 			GodotDisplayListeners.samples = []; | ||||
| 			function add(pad) { | ||||
| 				const guid = GodotInputGamepads.get_guid(pad); | ||||
| 				const c_id = GodotRuntime.allocString(pad.id); | ||||
| 				const c_guid = GodotRuntime.allocString(guid); | ||||
| 				onchange(pad.index, 1, c_id, c_guid); | ||||
| 				GodotRuntime.free(c_id); | ||||
| 				GodotRuntime.free(c_guid); | ||||
| 			} | ||||
| 			const pads = GodotInputGamepads.get_pads(); | ||||
| 			for (let i = 0; i < pads.length; i++) { | ||||
| 				// Might be reserved space.
 | ||||
| 				if (pads[i]) { | ||||
| 					add(pads[i]); | ||||
| 				} | ||||
| 			} | ||||
| 			GodotDisplayListeners.add(window, 'gamepadconnected', function (evt) { | ||||
| 				add(evt.gamepad); | ||||
| 			}, false); | ||||
| 			GodotDisplayListeners.add(window, 'gamepaddisconnected', function (evt) { | ||||
| 				onchange(evt.gamepad.index, 0); | ||||
| 			}, false); | ||||
| 		}, | ||||
| 
 | ||||
| 		get_guid: function (pad) { | ||||
| 			if (pad.mapping) { | ||||
| 				return pad.mapping; | ||||
| 			} | ||||
| 			const ua = navigator.userAgent; | ||||
| 			let os = 'Unknown'; | ||||
| 			if (ua.indexOf('Android') >= 0) { | ||||
| 				os = 'Android'; | ||||
| 			} else if (ua.indexOf('Linux') >= 0) { | ||||
| 				os = 'Linux'; | ||||
| 			} else if (ua.indexOf('iPhone') >= 0) { | ||||
| 				os = 'iOS'; | ||||
| 			} else if (ua.indexOf('Macintosh') >= 0) { | ||||
| 				// Updated iPads will fall into this category.
 | ||||
| 				os = 'MacOSX'; | ||||
| 			} else if (ua.indexOf('Windows') >= 0) { | ||||
| 				os = 'Windows'; | ||||
| 			} | ||||
| 
 | ||||
| 			const id = pad.id; | ||||
| 			// Chrom* style: NAME (Vendor: xxxx Product: xxxx)
 | ||||
| 			const exp1 = /vendor: ([0-9a-f]{4}) product: ([0-9a-f]{4})/i; | ||||
| 			// Firefox/Safari style (safari may remove leading zeores)
 | ||||
| 			const exp2 = /^([0-9a-f]+)-([0-9a-f]+)-/i; | ||||
| 			let vendor = ''; | ||||
| 			let product = ''; | ||||
| 			if (exp1.test(id)) { | ||||
| 				const match = exp1.exec(id); | ||||
| 				vendor = match[1].padStart(4, '0'); | ||||
| 				product = match[2].padStart(4, '0'); | ||||
| 			} else if (exp2.test(id)) { | ||||
| 				const match = exp2.exec(id); | ||||
| 				vendor = match[1].padStart(4, '0'); | ||||
| 				product = match[2].padStart(4, '0'); | ||||
| 			} | ||||
| 			if (!vendor || !product) { | ||||
| 				return `${os}Unknown`; | ||||
| 			} | ||||
| 			return os + vendor + product; | ||||
| 		}, | ||||
| 	}, | ||||
| }; | ||||
| mergeInto(LibraryManager.library, GodotInputGamepads); | ||||
| 
 | ||||
| /* | ||||
|  * Drag and drop helper. | ||||
|  * This is pretty big, but basically detect dropped files on GodotConfig.canvas, | ||||
|  * process them one by one (recursively for directories), and copies them to | ||||
|  * the temporary FS path '/tmp/drop-[random]/' so it can be emitted as a godot | ||||
|  * event (that requires a string array of paths). | ||||
|  * | ||||
|  * NOTE: The temporary files are removed after the callback. This means that | ||||
|  * deferred callbacks won't be able to access the files. | ||||
|  */ | ||||
| const GodotInputDragDrop = { | ||||
| 	$GodotInputDragDrop__deps: ['$FS', '$GodotFS'], | ||||
| 	$GodotInputDragDrop: { | ||||
| 		promises: [], | ||||
| 		pending_files: [], | ||||
| 
 | ||||
| 		add_entry: function (entry) { | ||||
| 			if (entry.isDirectory) { | ||||
| 				GodotInputDragDrop.add_dir(entry); | ||||
| 			} else if (entry.isFile) { | ||||
| 				GodotInputDragDrop.add_file(entry); | ||||
| 			} else { | ||||
| 				GodotRuntime.error('Unrecognized entry...', entry); | ||||
| 			} | ||||
| 		}, | ||||
| 
 | ||||
| 		add_dir: function (entry) { | ||||
| 			GodotInputDragDrop.promises.push(new Promise(function (resolve, reject) { | ||||
| 				const reader = entry.createReader(); | ||||
| 				reader.readEntries(function (entries) { | ||||
| 					for (let i = 0; i < entries.length; i++) { | ||||
| 						GodotInputDragDrop.add_entry(entries[i]); | ||||
| 					} | ||||
| 					resolve(); | ||||
| 				}); | ||||
| 			})); | ||||
| 		}, | ||||
| 
 | ||||
| 		add_file: function (entry) { | ||||
| 			GodotInputDragDrop.promises.push(new Promise(function (resolve, reject) { | ||||
| 				entry.file(function (file) { | ||||
| 					const reader = new FileReader(); | ||||
| 					reader.onload = function () { | ||||
| 						const f = { | ||||
| 							'path': file.relativePath || file.webkitRelativePath, | ||||
| 							'name': file.name, | ||||
| 							'type': file.type, | ||||
| 							'size': file.size, | ||||
| 							'data': reader.result, | ||||
| 						}; | ||||
| 						if (!f['path']) { | ||||
| 							f['path'] = f['name']; | ||||
| 						} | ||||
| 						GodotInputDragDrop.pending_files.push(f); | ||||
| 						resolve(); | ||||
| 					}; | ||||
| 					reader.onerror = function () { | ||||
| 						GodotRuntime.print('Error reading file'); | ||||
| 						reject(); | ||||
| 					}; | ||||
| 					reader.readAsArrayBuffer(file); | ||||
| 				}, function (err) { | ||||
| 					GodotRuntime.print('Error!'); | ||||
| 					reject(); | ||||
| 				}); | ||||
| 			})); | ||||
| 		}, | ||||
| 
 | ||||
| 		process: function (resolve, reject) { | ||||
| 			if (GodotInputDragDrop.promises.length === 0) { | ||||
| 				resolve(); | ||||
| 				return; | ||||
| 			} | ||||
| 			GodotInputDragDrop.promises.pop().then(function () { | ||||
| 				setTimeout(function () { | ||||
| 					GodotInputDragDrop.process(resolve, reject); | ||||
| 				}, 0); | ||||
| 			}); | ||||
| 		}, | ||||
| 
 | ||||
| 		_process_event: function (ev, callback) { | ||||
| 			ev.preventDefault(); | ||||
| 			if (ev.dataTransfer.items) { | ||||
| 				// Use DataTransferItemList interface to access the file(s)
 | ||||
| 				for (let i = 0; i < ev.dataTransfer.items.length; i++) { | ||||
| 					const item = ev.dataTransfer.items[i]; | ||||
| 					let entry = null; | ||||
| 					if ('getAsEntry' in item) { | ||||
| 						entry = item.getAsEntry(); | ||||
| 					} else if ('webkitGetAsEntry' in item) { | ||||
| 						entry = item.webkitGetAsEntry(); | ||||
| 					} | ||||
| 					if (entry) { | ||||
| 						GodotInputDragDrop.add_entry(entry); | ||||
| 					} | ||||
| 				} | ||||
| 			} else { | ||||
| 				GodotRuntime.error('File upload not supported'); | ||||
| 			} | ||||
| 			new Promise(GodotInputDragDrop.process).then(function () { | ||||
| 				const DROP = `/tmp/drop-${parseInt(Math.random() * (1 << 30), 10)}/`; | ||||
| 				const drops = []; | ||||
| 				const files = []; | ||||
| 				FS.mkdir(DROP); | ||||
| 				GodotInputDragDrop.pending_files.forEach((elem) => { | ||||
| 					const path = elem['path']; | ||||
| 					GodotFS.copy_to_fs(DROP + path, elem['data']); | ||||
| 					let idx = path.indexOf('/'); | ||||
| 					if (idx === -1) { | ||||
| 						// Root file
 | ||||
| 						drops.push(DROP + path); | ||||
| 					} else { | ||||
| 						// Subdir
 | ||||
| 						const sub = path.substr(0, idx); | ||||
| 						idx = sub.indexOf('/'); | ||||
| 						if (idx < 0 && drops.indexOf(DROP + sub) === -1) { | ||||
| 							drops.push(DROP + sub); | ||||
| 						} | ||||
| 					} | ||||
| 					files.push(DROP + path); | ||||
| 				}); | ||||
| 				GodotInputDragDrop.promises = []; | ||||
| 				GodotInputDragDrop.pending_files = []; | ||||
| 				callback(drops); | ||||
| 				if (GodotConfig.persistent_drops) { | ||||
| 					// Delay removal at exit.
 | ||||
| 					GodotOS.atexit(function (resolve, reject) { | ||||
| 						GodotInputDragDrop.remove_drop(files, DROP); | ||||
| 						resolve(); | ||||
| 					}); | ||||
| 				} else { | ||||
| 					GodotInputDragDrop.remove_drop(files, DROP); | ||||
| 				} | ||||
| 			}); | ||||
| 		}, | ||||
| 
 | ||||
| 		remove_drop: function (files, drop_path) { | ||||
| 			const dirs = [drop_path.substr(0, drop_path.length - 1)]; | ||||
| 			// Remove temporary files
 | ||||
| 			files.forEach(function (file) { | ||||
| 				FS.unlink(file); | ||||
| 				let dir = file.replace(drop_path, ''); | ||||
| 				let idx = dir.lastIndexOf('/'); | ||||
| 				while (idx > 0) { | ||||
| 					dir = dir.substr(0, idx); | ||||
| 					if (dirs.indexOf(drop_path + dir) === -1) { | ||||
| 						dirs.push(drop_path + dir); | ||||
| 					} | ||||
| 					idx = dir.lastIndexOf('/'); | ||||
| 				} | ||||
| 			}); | ||||
| 			// Remove dirs.
 | ||||
| 			dirs.sort(function (a, b) { | ||||
| 				const al = (a.match(/\//g) || []).length; | ||||
| 				const bl = (b.match(/\//g) || []).length; | ||||
| 				if (al > bl) { | ||||
| 					return -1; | ||||
| 				} else if (al < bl) { | ||||
| 					return 1; | ||||
| 				} | ||||
| 				return 0; | ||||
| 			}).forEach(function (dir) { | ||||
| 				FS.rmdir(dir); | ||||
| 			}); | ||||
| 		}, | ||||
| 
 | ||||
| 		handler: function (callback) { | ||||
| 			return function (ev) { | ||||
| 				GodotInputDragDrop._process_event(ev, callback); | ||||
| 			}; | ||||
| 		}, | ||||
| 	}, | ||||
| }; | ||||
| mergeInto(LibraryManager.library, GodotInputDragDrop); | ||||
| 
 | ||||
| /* | ||||
|  * Godot exposed input functions. | ||||
|  */ | ||||
| const GodotInput = { | ||||
| 	$GodotInput__deps: ['$GodotRuntime', '$GodotConfig', '$GodotDisplayListeners'], | ||||
| 	$GodotInput__deps: ['$GodotRuntime', '$GodotConfig', '$GodotDisplayListeners', '$GodotInputGamepads', '$GodotInputDragDrop'], | ||||
| 	$GodotInput: { | ||||
| 		getModifiers: function (evt) { | ||||
| 			return (evt.shiftKey + 0) + ((evt.altKey + 0) << 1) + ((evt.ctrlKey + 0) << 2) + ((evt.metaKey + 0) << 3); | ||||
|  | @ -44,8 +349,11 @@ const GodotInput = { | |||
| 		}, | ||||
| 	}, | ||||
| 
 | ||||
| 	godot_js_display_mouse_move_cb__sig: 'vi', | ||||
| 	godot_js_display_mouse_move_cb: function (callback) { | ||||
| 	/* | ||||
| 	 * Mouse API | ||||
| 	 */ | ||||
| 	godot_js_input_mouse_move_cb__sig: 'vi', | ||||
| 	godot_js_input_mouse_move_cb: function (callback) { | ||||
| 		const func = GodotRuntime.get_func(callback); | ||||
| 		const canvas = GodotConfig.canvas; | ||||
| 		function move_cb(evt) { | ||||
|  | @ -62,8 +370,8 @@ const GodotInput = { | |||
| 		GodotDisplayListeners.add(window, 'mousemove', move_cb, false); | ||||
| 	}, | ||||
| 
 | ||||
| 	godot_js_display_mouse_wheel_cb__sig: 'vi', | ||||
| 	godot_js_display_mouse_wheel_cb: function (callback) { | ||||
| 	godot_js_input_mouse_wheel_cb__sig: 'vi', | ||||
| 	godot_js_input_mouse_wheel_cb: function (callback) { | ||||
| 		const func = GodotRuntime.get_func(callback); | ||||
| 		function wheel_cb(evt) { | ||||
| 			if (func(evt['deltaX'] || 0, evt['deltaY'] || 0)) { | ||||
|  | @ -73,8 +381,8 @@ const GodotInput = { | |||
| 		GodotDisplayListeners.add(GodotConfig.canvas, 'wheel', wheel_cb, false); | ||||
| 	}, | ||||
| 
 | ||||
| 	godot_js_display_mouse_button_cb__sig: 'vi', | ||||
| 	godot_js_display_mouse_button_cb: function (callback) { | ||||
| 	godot_js_input_mouse_button_cb__sig: 'vi', | ||||
| 	godot_js_input_mouse_button_cb: function (callback) { | ||||
| 		const func = GodotRuntime.get_func(callback); | ||||
| 		const canvas = GodotConfig.canvas; | ||||
| 		function button_cb(p_pressed, evt) { | ||||
|  | @ -89,8 +397,11 @@ const GodotInput = { | |||
| 		GodotDisplayListeners.add(window, 'mouseup', button_cb.bind(null, 0), false); | ||||
| 	}, | ||||
| 
 | ||||
| 	godot_js_display_touch_cb__sig: 'viii', | ||||
| 	godot_js_display_touch_cb: function (callback, ids, coords) { | ||||
| 	/* | ||||
| 	 * Touch API | ||||
| 	 */ | ||||
| 	godot_js_input_touch_cb__sig: 'viii', | ||||
| 	godot_js_input_touch_cb: function (callback, ids, coords) { | ||||
| 		const func = GodotRuntime.get_func(callback); | ||||
| 		const canvas = GodotConfig.canvas; | ||||
| 		function touch_cb(type, evt) { | ||||
|  | @ -114,8 +425,11 @@ const GodotInput = { | |||
| 		GodotDisplayListeners.add(canvas, 'touchmove', touch_cb.bind(null, 2), false); | ||||
| 	}, | ||||
| 
 | ||||
| 	godot_js_display_key_cb__sig: 'viii', | ||||
| 	godot_js_display_key_cb: function (callback, code, key) { | ||||
| 	/* | ||||
| 	 * Key API | ||||
| 	 */ | ||||
| 	godot_js_input_key_cb__sig: 'viii', | ||||
| 	godot_js_input_key_cb: function (callback, code, key) { | ||||
| 		const func = GodotRuntime.get_func(callback); | ||||
| 		function key_cb(pressed, evt) { | ||||
| 			const modifiers = GodotInput.getModifiers(evt); | ||||
|  | @ -127,6 +441,85 @@ const GodotInput = { | |||
| 		GodotDisplayListeners.add(GodotConfig.canvas, 'keydown', key_cb.bind(null, 1), false); | ||||
| 		GodotDisplayListeners.add(GodotConfig.canvas, 'keyup', key_cb.bind(null, 0), false); | ||||
| 	}, | ||||
| 
 | ||||
| 	/* | ||||
| 	 * Gamepad API | ||||
| 	 */ | ||||
| 	godot_js_input_gamepad_cb__sig: 'vi', | ||||
| 	godot_js_input_gamepad_cb: function (change_cb) { | ||||
| 		const onchange = GodotRuntime.get_func(change_cb); | ||||
| 		GodotInputGamepads.init(onchange); | ||||
| 	}, | ||||
| 
 | ||||
| 	godot_js_input_gamepad_sample_count__sig: 'i', | ||||
| 	godot_js_input_gamepad_sample_count: function () { | ||||
| 		return GodotInputGamepads.get_samples().length; | ||||
| 	}, | ||||
| 
 | ||||
| 	godot_js_input_gamepad_sample__sig: 'i', | ||||
| 	godot_js_input_gamepad_sample: function () { | ||||
| 		GodotInputGamepads.sample(); | ||||
| 		return 0; | ||||
| 	}, | ||||
| 
 | ||||
| 	godot_js_input_gamepad_sample_get__sig: 'iiiiiii', | ||||
| 	godot_js_input_gamepad_sample_get: function (p_index, r_btns, r_btns_num, r_axes, r_axes_num, r_standard) { | ||||
| 		const sample = GodotInputGamepads.get_sample(p_index); | ||||
| 		if (!sample || !sample.connected) { | ||||
| 			return 1; | ||||
| 		} | ||||
| 		const btns = sample.buttons; | ||||
| 		const btns_len = btns.length < 16 ? btns.length : 16; | ||||
| 		for (let i = 0; i < btns_len; i++) { | ||||
| 			GodotRuntime.setHeapValue(r_btns + (i << 2), btns[i], 'float'); | ||||
| 		} | ||||
| 		GodotRuntime.setHeapValue(r_btns_num, btns_len, 'i32'); | ||||
| 		const axes = sample.axes; | ||||
| 		const axes_len = axes.length < 10 ? axes.length : 10; | ||||
| 		for (let i = 0; i < axes_len; i++) { | ||||
| 			GodotRuntime.setHeapValue(r_axes + (i << 2), axes[i], 'float'); | ||||
| 		} | ||||
| 		GodotRuntime.setHeapValue(r_axes_num, axes_len, 'i32'); | ||||
| 		const is_standard = sample.standard ? 1 : 0; | ||||
| 		GodotRuntime.setHeapValue(r_standard, is_standard, 'i32'); | ||||
| 		return 0; | ||||
| 	}, | ||||
| 
 | ||||
| 	/* | ||||
| 	 * Drag/Drop API | ||||
| 	 */ | ||||
| 	godot_js_input_drop_files_cb__sig: 'vi', | ||||
| 	godot_js_input_drop_files_cb: function (callback) { | ||||
| 		const func = GodotRuntime.get_func(callback); | ||||
| 		const dropFiles = function (files) { | ||||
| 			const args = files || []; | ||||
| 			if (!args.length) { | ||||
| 				return; | ||||
| 			} | ||||
| 			const argc = args.length; | ||||
| 			const argv = GodotRuntime.allocStringArray(args); | ||||
| 			func(argv, argc); | ||||
| 			GodotRuntime.freeStringArray(argv, argc); | ||||
| 		}; | ||||
| 		const canvas = GodotConfig.canvas; | ||||
| 		GodotDisplayListeners.add(canvas, 'dragover', function (ev) { | ||||
| 			// Prevent default behavior (which would try to open the file(s))
 | ||||
| 			ev.preventDefault(); | ||||
| 		}, false); | ||||
| 		GodotDisplayListeners.add(canvas, 'drop', GodotInputDragDrop.handler(dropFiles)); | ||||
| 	}, | ||||
| 
 | ||||
| 	/* Paste API */ | ||||
| 	godot_js_input_paste_cb__sig: 'vi', | ||||
| 	godot_js_input_paste_cb: function (callback) { | ||||
| 		const func = GodotRuntime.get_func(callback); | ||||
| 		GodotDisplayListeners.add(window, 'paste', function (evt) { | ||||
| 			const text = evt.clipboardData.getData('text'); | ||||
| 			const ptr = GodotRuntime.allocString(text); | ||||
| 			func(ptr); | ||||
| 			GodotRuntime.free(ptr); | ||||
| 		}, false); | ||||
| 	}, | ||||
| }; | ||||
| 
 | ||||
| autoAddDeps(GodotInput, '$GodotInput'); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Fabio Alessandrelli
						Fabio Alessandrelli