aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-04 20:51:30 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-04 20:51:30 -0700
commitd2652c708921fd38253d6e48f67f72d8da35e084 (patch)
tree3ea063343afa81a7b3b325478376284686f934be
parentbae4c91d0acf4fd70e0c17ad178b07d2eb6345d9 (diff)
parent9017c0a8dccf38f128c18ac0e99cda6cb5752c98 (diff)
Merge pull request #1006 from azmeuk/master
Basic GLFW support
-rw-r--r--AUTHORS5
-rw-r--r--src/library_glfw.js586
-rw-r--r--src/modules.js2
-rw-r--r--system/include/GL/glfw.h518
-rw-r--r--tests/glfw.c389
-rwxr-xr-xtests/runner.py6
6 files changed, 1503 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index e5d1ac34..401b408a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,7 +24,7 @@ a license to everyone to use it as detailed in LICENSE.)
* Pierre Renaux <pierre@talansoft.com>
* Brian Anderson <banderson@mozilla.com>
* Jon Bardin <diclophis@gmail.com>
-* Jukka Jylänki <jujjyl@gmail.com>
+* Jukka Jylänki <jujjyl@gmail.com>
* Aleksander Guryanov <caiiiycuk@gmail.com>
* Chad Austin <chad@chadaustin.me> (copyright owned by IMVU)
* nandhp <nandhp@gmail.com>
@@ -46,7 +46,7 @@ a license to everyone to use it as detailed in LICENSE.)
* Anthony Liot <wolfviking0@yahoo.com>
* Michael Riss <Michael.Riss@gmx.de>
* Jasper St. Pierre <jstpierre@mecheye.net>
-* Manuel Schölling <manuel.schoelling@gmx.de>
+* Manuel Schölling <manuel.schoelling@gmx.de>
* Bruce Mitchener, Jr. <bruce.mitchener@gmail.com>
* Michael Bishop <mbtyke@gmail.com>
* Roger Braun <roger@rogerbraun.net>
@@ -56,3 +56,4 @@ a license to everyone to use it as detailed in LICENSE.)
* Martin von Gagern <martin@von-gagern.net>
* Ting-Yuan Huang <thuang@mozilla.com>
* Felix H. Dahlke <fhd@ubercode.de>
+* Éloi Rivard <azmeuk@gmail.com>
diff --git a/src/library_glfw.js b/src/library_glfw.js
new file mode 100644
index 00000000..a709161a
--- /dev/null
+++ b/src/library_glfw.js
@@ -0,0 +1,586 @@
+/*******************************************************************************
+ * EMSCRIPTEN GLFW 2.7.7 emulation.
+ * It tries to emulate the behavior described in
+ * http://www.glfw.org/GLFWReference277.pdf
+ *
+ * What it does:
+ * - Creates a GL context.
+ * - Manage keyboard and mouse events.
+ * - GL Extensions support.
+ *
+ * What it does not but should probably do:
+ * - Transmit events when glfwPollEvents, glfwWaitEvents or glfwSwapBuffers is
+ * called. Events callbacks are called as soon as event are received.
+ * - Thread emulation.
+ * - Joystick support.
+ * - Image/Texture I/O support (that is deleted in GLFW 3).
+ * - Video modes detection.
+ *
+ * Authors:
+ * - Éloi Rivard <eloi.rivard@gmail.com>
+ *
+ ******************************************************************************/
+
+var LibraryGLFW = {
+ $GLFW: {
+
+ keyFunc: null,
+ charFunc: null,
+ mouseButtonFunc: null,
+ mousePosFunc: null,
+ mouseWheelFunc: null,
+ resizeFunc: null,
+ closeFunc: null,
+ refreshFunc: null,
+ mouseFunc: null,
+ params: null,
+ initTime: null,
+ wheelPos: 0,
+ lastX: 0,
+ lastY: 0,
+ buttons: 0,
+ keys: 0,
+ initWindowWidth: 640,
+ initWindowHeight: 480,
+ windowX: 0,
+ windowY: 0,
+ windowWidth: 0,
+ windowHeight: 0,
+
+/*******************************************************************************
+ * DOM EVENT CALLBACKS
+ ******************************************************************************/
+
+ DOMToGLFWKeyCode: function(keycode) {
+ switch (keycode) {
+ case 0x09: return 295 ; //DOM_VK_TAB -> GLFW_KEY_TAB
+ case 0x1B: return 255 ; //DOM_VK_ESCAPE -> GLFW_KEY_ESC
+ case 0x6A: return 313 ; //DOM_VK_MULTIPLY -> GLFW_KEY_KP_MULTIPLY
+ case 0x6B: return 315 ; //DOM_VK_ADD -> GLFW_KEY_KP_ADD
+ case 0x6D: return 314 ; //DOM_VK_SUBTRACT -> GLFW_KEY_KP_SUBTRACT
+ case 0x6E: return 316 ; //DOM_VK_DECIMAL -> GLFW_KEY_KP_DECIMAL
+ case 0x6F: return 312 ; //DOM_VK_DIVIDE -> GLFW_KEY_KP_DIVIDE
+ case 0x70: return 258 ; //DOM_VK_F1 -> GLFW_KEY_F1
+ case 0x71: return 259 ; //DOM_VK_F2 -> GLFW_KEY_F2
+ case 0x72: return 260 ; //DOM_VK_F3 -> GLFW_KEY_F3
+ case 0x73: return 261 ; //DOM_VK_F4 -> GLFW_KEY_F4
+ case 0x74: return 262 ; //DOM_VK_F5 -> GLFW_KEY_F5
+ case 0x75: return 263 ; //DOM_VK_F6 -> GLFW_KEY_F6
+ case 0x76: return 264 ; //DOM_VK_F7 -> GLFW_KEY_F7
+ case 0x77: return 265 ; //DOM_VK_F8 -> GLFW_KEY_F8
+ case 0x78: return 266 ; //DOM_VK_F9 -> GLFW_KEY_F9
+ case 0x79: return 267 ; //DOM_VK_F10 -> GLFW_KEY_F10
+ case 0x7a: return 268 ; //DOM_VK_F11 -> GLFW_KEY_F11
+ case 0x7b: return 269 ; //DOM_VK_F12 -> GLFW_KEY_F12
+ case 0x25: return 285 ; //DOM_VK_LEFT -> GLFW_KEY_LEFT
+ case 0x26: return 283 ; //DOM_VK_UP -> GLFW_KEY_UP
+ case 0x27: return 286 ; //DOM_VK_RIGHT -> GLFW_KEY_RIGHT
+ case 0x28: return 284 ; //DOM_VK_DOWN -> GLFW_KEY_DOWN
+ case 0x21: return 298 ; //DOM_VK_PAGE_UP -> GLFW_KEY_PAGEUP
+ case 0x22: return 299 ; //DOM_VK_PAGE_DOWN -> GLFW_KEY_PAGEDOWN
+ case 0x24: return 300 ; //DOM_VK_HOME -> GLFW_KEY_HOME
+ case 0x23: return 301 ; //DOM_VK_END -> GLFW_KEY_END
+ case 0x2d: return 296 ; //DOM_VK_INSERT -> GLFW_KEY_INSERT
+ case 16 : return 287 ; //DOM_VK_SHIFT -> GLFW_KEY_LSHIFT
+ case 0x05: return 287 ; //DOM_VK_LEFT_SHIFT -> GLFW_KEY_LSHIFT
+ case 0x06: return 288 ; //DOM_VK_RIGHT_SHIFT -> GLFW_KEY_RSHIFT
+ case 17 : return 289 ; //DOM_VK_CONTROL -> GLFW_KEY_LCTRL
+ case 0x03: return 289 ; //DOM_VK_LEFT_CONTROL -> GLFW_KEY_LCTRL
+ case 0x04: return 290 ; //DOM_VK_RIGHT_CONTROL -> GLFW_KEY_RCTRL
+ case 18 : return 291 ; //DOM_VK_ALT -> GLFW_KEY_LALT
+ case 0x02: return 291 ; //DOM_VK_LEFT_ALT -> GLFW_KEY_LALT
+ case 0x01: return 292 ; //DOM_VK_RIGHT_ALT -> GLFW_KEY_RALT
+ case 96 : return 302 ; //GLFW_KEY_KP_0
+ case 97 : return 303 ; //GLFW_KEY_KP_1
+ case 98 : return 304 ; //GLFW_KEY_KP_2
+ case 99 : return 305 ; //GLFW_KEY_KP_3
+ case 100 : return 306 ; //GLFW_KEY_KP_4
+ case 101 : return 307 ; //GLFW_KEY_KP_5
+ case 102 : return 308 ; //GLFW_KEY_KP_6
+ case 103 : return 309 ; //GLFW_KEY_KP_7
+ case 104 : return 310 ; //GLFW_KEY_KP_8
+ case 105 : return 311 ; //GLFW_KEY_KP_9
+ default : return keycode;
+ };
+ },
+
+ //UCS-2 to UTF16 (ISO 10646)
+ getUnicodeChar: function(value) {
+ var output = '';
+ if (value > 0xFFFF) {
+ value -= 0x10000;
+ output += String.fromCharCode(value >>> 10 & 0x3FF | 0xD800);
+ value = 0xDC00 | value & 0x3FF;
+ }
+ output += String.fromCharCode(value);
+ return output;
+ },
+
+ onKeyPress: function(event) {
+ //charCode is only available whith onKeyPress event
+ var char = GLFW.getUnicodeChar(event.charCode);
+
+ if (event.charCode) {
+ var char = GLFW.getUnicodeChar(event.charCode);
+ if (char !== null && GLFW.charFunc) {
+ event.preventDefault();
+ Runtime.dynCall('vii', GLFW.charFunc, [event.charCode, 1]);
+ }
+ }
+ },
+
+ onKeyChanged: function(event, status) {
+ var key = GLFW.DOMToGLFWKeyCode(event.keyCode);
+ if (key && GLFW.keyFunc) {
+ GLFW.keys[key] = status;
+ event.preventDefault();
+ Runtime.dynCall('vii', GLFW.keyFunc, [key, status]);
+ }
+ },
+
+ onKeydown: function(event) {
+ GLFW.onKeyChanged(event, 1);//GLFW_PRESS
+ },
+
+ onKeyup: function(event) {
+ GLFW.onKeyChanged(event, 0);//GLFW_RELEASE
+ },
+
+ savePosition: function(event) {
+ /* TODO maybe loop here ala http://www.quirksmode.org/js/findpos.html */
+ GLFW.lastX = event['clientX'] - Module['canvas'].offsetLeft;
+ GLFW.lastY = event['clientY'] - Module['canvas'].offsetTop;
+ },
+
+ onMousemove: function(event) {
+ /* Send motion event only if the motion changed, prevents
+ * spamming our app with uncessary callback call. It does happen in
+ * Chrome on Windows.
+ */
+ var newX = event['clientX'] - Module['canvas'].offsetLeft;
+ var newY = event['clientY'] - Module['canvas'].offsetTop;
+ if (newX == GLFW.lastX && newY == GLFW.lastY) {
+ return;
+ }
+
+ GLFW.savePosition(event);
+
+ if (event.target == Module["canvas"] && GLFW.mousePosFunc) {
+ event.preventDefault();
+ Runtime.dynCall('vii', GLFW.mousePosFunc, [GLFW.lastX, GLFW.lastY]);
+ }
+ },
+
+ onMouseButtonChanged: function(event, status) {
+ if (GLFW.mouseButtonFunc == null) {
+ return;
+ }
+
+ GLFW.savePosition(event);
+ if (event.target != Module["canvas"]) {
+ return;
+ }
+
+ if (status == 1) {//GLFW_PRESS
+ try {
+ event.target.setCapture();
+ } catch (e) {}
+ }
+
+ event.preventDefault();
+ //DOM and glfw have the same button codes
+ Runtime.dynCall('vii', GLFW.mouseButtonFunc, [event['button'], status]);
+ },
+
+ onMouseButtonDown: function(event) {
+ GLFW.buttons |= (1 << event['button']);
+ GLFW.onMouseButtonChanged(event, 1);//GLFW_PRESS
+ },
+
+ onMouseButtonUp: function(event) {
+ GLFW.buttons &= ~(1 << event['button']);
+ GLFW.onMouseButtonChanged(event, 0);//GLFW_RELEASE
+ },
+
+ onMouseWheel: function(event) {
+ if (event.detail > 0) {
+ GLFW.wheelPos++;
+ }
+
+ if (event.detail < 0) {
+ GLFW.wheelPos--;
+ }
+
+ if (GLFW.mouseWheelFunc && event.target == Module["canvas"]) {
+ Runtime.dynCall('vi', GLFW.mouseWheelFunc, [GLFW.wheelPos]);
+ event.preventDefault();
+ }
+ },
+
+ // TODO add fullscreen API ala:
+ // http://johndyer.name/native-fullscreen-javascript-api-plus-jquery-plugin/
+ onFullScreenEventChange: function(event) {
+ var width;
+ var height;
+ if (document["fullScreen"] || document["mozFullScreen"] || document["webkitIsFullScreen"]) {
+ width = screen["width"];
+ height = screen["height"];
+ }
+ else {
+ width = GLFW.windowWidth;
+ height = GLFW.windowHeight;
+ // TODO set position
+ document.removeEventListener('fullscreenchange', GLFW.onFullScreenEventChange, true);
+ document.removeEventListener('mozfullscreenchange', GLFW.onFullScreenEventChange, true);
+ document.removeEventListener('webkitfullscreenchange', GLFW.onFullScreenEventChange, true);
+ }
+ Browser.setCanvasSize(width, height);
+
+ if (GLFW.resizeFunc) {
+ Runtime.dynCall('vii', GLFW.resizeFunc, [width, height]);
+ }
+ },
+
+ requestFullScreen: function() {
+ var RFS = Module["canvas"]['requestFullscreen'] ||
+ Module["canvas"]['requestFullScreen'] ||
+ Module["canvas"]['mozRequestFullScreen'] ||
+ Module["canvas"]['webkitRequestFullScreen'] ||
+ (function() {});
+ RFS.apply(Module["canvas"], []);
+ },
+
+ cancelFullScreen: function() {
+ var CFS = document['exitFullscreen'] ||
+ document['cancelFullScreen'] ||
+ document['mozCancelFullScreen'] ||
+ document['webkitCancelFullScreen'] ||
+ (function() {});
+ CFS.apply(document, []);
+ }
+ },
+
+/*******************************************************************************
+ * GLFW FUNCTIONS
+ ******************************************************************************/
+
+ /* GLFW initialization, termination and version querying */
+ glfwInit: function() {
+ GLFW.initTime = Date.now() / 1000;
+
+ window.addEventListener("keydown", GLFW.onKeydown, true);
+ window.addEventListener("keypress", GLFW.onKeyPress, true);
+ window.addEventListener("keyup", GLFW.onKeyup, true);
+ window.addEventListener("mousemove", GLFW.onMousemove, true);
+ window.addEventListener("mousedown", GLFW.onMouseButtonDown, true);
+ window.addEventListener("mouseup", GLFW.onMouseButtonUp, true);
+ window.addEventListener('DOMMouseScroll', GLFW.onMouseWheel, true);
+ window.addEventListener('mousewheel', GLFW.onMouseWheel, true);
+
+ __ATEXIT__.push({ func: function() {
+ window.removeEventListener("keydown", GLFW.onKeydown, true);
+ window.removeEventListener("keypress", GLFW.onKeyPress, true);
+ window.removeEventListener("keyup", GLFW.onKeyup, true);
+ window.removeEventListener("mousemove", GLFW.onMousemove, true);
+ window.removeEventListener("mousedown", GLFW.onMouseButtonDown, true);
+ window.removeEventListener("mouseup", GLFW.onMouseButtonUp, true);
+ window.removeEventListener('DOMMouseScroll', GLFW.onMouseWheel, true);
+ window.removeEventListener('mousewheel', GLFW.onMouseWheel, true);
+ Module["canvas"].width = Module["canvas"].height = 1;
+ }});
+
+ //TODO: Init with correct values
+ GLFW.params = new Array();
+ GLFW.params[0x00030001] = true; //GLFW_MOUSE_CURSOR
+ GLFW.params[0x00030002] = false; //GLFW_STICKY_KEYS
+ GLFW.params[0x00030003] = true; //GLFW_STICKY_MOUSE_BUTTONS
+ GLFW.params[0x00030004] = false; //GLFW_SYSTEM_KEYS
+ GLFW.params[0x00030005] = false; //GLFW_KEY_REPEAT
+ GLFW.params[0x00030006] = true; //GLFW_AUTO_POLL_EVENTS
+ GLFW.params[0x00020001] = true; //GLFW_OPENED
+ GLFW.params[0x00020002] = true; //GLFW_ACTIVE
+ GLFW.params[0x00020003] = false; //GLFW_ICONIFIED
+ GLFW.params[0x00020004] = true; //GLFW_ACCELERATED
+ GLFW.params[0x00020005] = 0; //GLFW_RED_BITS
+ GLFW.params[0x00020006] = 0; //GLFW_GREEN_BITS
+ GLFW.params[0x00020007] = 0; //GLFW_BLUE_BITS
+ GLFW.params[0x00020008] = 0; //GLFW_ALPHA_BITS
+ GLFW.params[0x00020009] = 0; //GLFW_DEPTH_BITS
+ GLFW.params[0x0002000A] = 0; //GLFW_STENCIL_BITS
+ GLFW.params[0x0002000B] = 0; //GLFW_REFRESH_RATE
+ GLFW.params[0x0002000C] = 0; //GLFW_ACCUM_RED_BITS
+ GLFW.params[0x0002000D] = 0; //GLFW_ACCUM_GREEN_BITS
+ GLFW.params[0x0002000E] = 0; //GLFW_ACCUM_BLUE_BITS
+ GLFW.params[0x0002000F] = 0; //GLFW_ACCUM_ALPHA_BITS
+ GLFW.params[0x00020010] = 0; //GLFW_AUX_BUFFERS
+ GLFW.params[0x00020011] = 0; //GLFW_STEREO
+ GLFW.params[0x00020012] = 0; //GLFW_WINDOW_NO_RESIZE
+ GLFW.params[0x00020013] = 0; //GLFW_FSAA_SAMPLES
+ GLFW.params[0x00020014] = 0; //GLFW_OPENGL_VERSION_MAJOR
+ GLFW.params[0x00020015] = 0; //GLFW_OPENGL_VERSION_MINOR
+ GLFW.params[0x00020016] = 0; //GLFW_OPENGL_FORWARD_COMPAT
+ GLFW.params[0x00020017] = 0; //GLFW_OPENGL_DEBUG_CONTEXT
+ GLFW.params[0x00020018] = 0; //GLFW_OPENGL_PROFILE
+
+ GLFW.keys = new Array();
+
+ return 1; //GL_TRUE
+ },
+
+ glfwTerminate: function() {},
+
+ glfwGetVersion: function(major, minor, rev) {
+ setValue(major, 2, 'i32');
+ setValue(minor, 7, 'i32');
+ setValue(rev, 7, 'i32');
+ },
+
+ /* Window handling */
+ glfwOpenWindow__deps: ['$Browser'],
+ glfwOpenWindow: function(width, height, redbits, greenbits, bluebits, alphabits, depthbits, stencilbits, mode) {
+ if (width == 0 && height > 0) {
+ width = 4 * height / 3;
+ }
+ if (width > 0 && height == 0) {
+ height = 3 * width / 4;
+ }
+ GLFW.params[0x00020005] = redbits; //GLFW_RED_BITS
+ GLFW.params[0x00020006] = greenbits; //GLFW_GREEN_BITS
+ GLFW.params[0x00020007] = bluebits; //GLFW_BLUE_BITS
+ GLFW.params[0x00020008] = alphabits; //GLFW_ALPHA_BITS
+ GLFW.params[0x00020009] = depthbits; //GLFW_DEPTH_BITS
+ GLFW.params[0x0002000A] = stencilbits; //GLFW_STENCIL_BITS
+
+ if (mode == 0x00010001) {//GLFW_WINDOW
+ Browser.setCanvasSize(GLFW.initWindowWidth = width,
+ GLFW.initWindowHeight = height);
+ GLFW.params[0x00030003] = true; //GLFW_STICKY_MOUSE_BUTTONS
+ }
+ else if (mode == 0x00010002) {//GLFW_FULLSCREEN
+ GLFW.requestFullScreen();
+ GLFW.params[0x00030003] = false; //GLFW_STICKY_MOUSE_BUTTONS
+ }
+ else{
+ throw "Invalid glfwOpenWindow mode.";
+ }
+
+ Module.ctx = Browser.createContext(Module['canvas'], true, true);
+ return 1; //GL_TRUE
+ },
+
+ glfwOpenWindowHint: function(target, hint) {
+ GLFW.params[target] = hint;
+ },
+
+ glfwCloseWindow__deps: ['$Browser'],
+ glfwCloseWindow: function() {
+ if (GLFW.closeFunc) {
+ Runtime.dynCall('v', GLFW.closeFunc, []);
+ }
+ Module.ctx = Browser.destroyContext(Module['canvas'], true, true);
+ },
+
+ glfwSetWindowTitle: function(title) {
+ document.title = Pointer_stringify(title);
+ },
+
+ glfwGetWindowSize: function(width, height) {
+ setValue(width, Module['canvas'].width, 'i32');
+ setValue(height, Module['canvas'].height, 'i32');
+ },
+
+ glfwSetWindowSize: function(width, height) {
+ GLFW.cancelFullScreen();
+ Browser.setCanvasSize(width, height);
+ if (GLFW.resizeFunc) {
+ Runtime.dynCall('vii', GLFW.resizeFunc, [width, height]);
+ }
+ },
+
+ glfwSetWindowPos: function(x, y) {},
+
+ glfwIconifyWindow: function() {},
+
+ glfwRestoreWindow: function() {},
+
+ glfwSwapBuffers: function() {},
+
+ glfwSwapInterval: function(interval) {},
+
+ glfwGetWindowParam: function(param) {
+ return GLFW.params[param];
+ },
+
+ glfwSetWindowSizeCallback: function(cbfun) {
+ GLFW.resizeFunc = cbfun;
+ },
+
+ glfwSetWindowCloseCallback: function(cbfun) {
+ GLFW.closeFunc = cbfun;
+ },
+
+ glfwSetWindowRefreshCallback: function(cbfun) {
+ GLFW.refreshFunc = cbfun;
+ },
+
+ /* Video mode functions */
+ glfwGetVideoModes: function(list, maxcount) { throw "glfwGetVideoModes is not implemented."; },
+
+ glfwGetDesktopMode: function(mode) { throw "glfwGetDesktopMode is not implemented."; },
+
+ /* Input handling */
+ glfwPollEvents: function() {},
+
+ glfwWaitEvents: function() {},
+
+ glfwGetKey: function(key) {
+ return GLFW.keys[key];
+ },
+
+ glfwGetMouseButton: function(button) {
+ return (GLFW.buttons & (1 << button)) > 0;
+ },
+
+ glfwGetMousePos: function(xpos, ypos) {
+ setValue(xpos, GLFW.lastX, 'i32');
+ setValue(ypos, GLFW.lastY, 'i32');
+ },
+
+ //I believe it is not possible to move the mouse with javascript
+ glfwSetMousePos: function(xpos, ypos) {},
+
+ glfwGetMouseWheel: function() {
+ return GLFW.wheelPos;
+ },
+
+ glfwSetMouseWheel: function(pos) {
+ GLFW.wheelPos = pos;
+ },
+
+ glfwSetKeyCallback: function(cbfun) {
+ GLFW.keyFunc = cbfun;
+ },
+
+ glfwSetCharCallback: function(cbfun) {
+ GLFW.charFunc = cbfun;
+ },
+
+ glfwSetMouseButtonCallback: function(cbfun) {
+ GLFW.mouseButtonFunc = cbfun;
+ },
+
+ glfwSetMousePosCallback: function(cbfun) {
+ GLFW.mouse Func = cbfun;
+ },
+
+ glfwSetMouseWheelCallback: function(cbfun) {
+ GLFW.mouseWheelFunc = cbfun;
+ },
+
+ /* Joystick input */
+ glfwGetJoystickParam: function(joy, param) { throw "glfwGetJoystickParam is not implemented."; },
+
+ glfwGetJoystickPos: function(joy, pos, numaxes) { throw "glfwGetJoystickPos is not implemented."; },
+
+ glfwGetJoystickButtons: function(joy, buttons, numbuttons) { throw "glfwGetJoystickButtons is not implemented."; },
+
+ /* Time */
+ glfwGetTime: function() {
+ return (Date.now()/1000) - GLFW.initTime;
+ },
+
+ glfwSetTime: function(time) {
+ GLFW.initTime = Date.now()/1000 + time;
+ },
+
+ glfwSleep__deps: ['sleep'],
+ glfwSleep: function(time) {
+ _sleep(time);
+ },
+
+ /* Extension support */
+ glfwExtensionSupported: function(extension) {
+ return Module.ctx.getSupportedExtensions().indexOf(Pointer_stringify(extension)) > -1;
+ },
+
+ glfwGetProcAddress__deps: ['glfwGetProcAddress'],
+ glfwGetProcAddress: function(procname) {
+ return _getProcAddress(procname);
+ },
+
+ glfwGetGLVersion: function(major, minor, rev) {
+ setValue(major, 0, 'i32');
+ setValue(minor, 0, 'i32');
+ setValue(rev, 1, 'i32');
+ },
+
+ /* Threading support */
+ glfwCreateThread: function(fun, arg) {
+ var str = 'v';
+ for (var i in arg) {
+ str += 'i';
+ }
+ Runtime.dynCall(str, fun, arg);
+ //One single thread
+ return 0;
+ },
+
+ glfwDestroyThread: function(ID) {},
+
+ glfwWaitThread: function(ID, waitmode) {},
+
+ glfwGetThreadID: function() {
+ //One single thread
+ return 0;
+ },
+
+ glfwCreateMutex: function() { throw "glfwCreateMutex is not implemented."; },
+
+ glfwDestroyMutex: function(mutex) { throw "glfwDestroyMutex is not implemented."; },
+
+ glfwLockMutex: function(mutex) { throw "glfwLockMutex is not implemented."; },
+
+ glfwUnlockMutex: function(mutex) { throw "glfwUnlockMutex is not implemented."; },
+
+ glfwCreateCond: function() { throw "glfwCreateCond is not implemented."; },
+
+ glfwDestroyCond: function(cond) { throw "glfwDestroyCond is not implemented."; },
+
+ glfwWaitCond: function(cond, mutex, timeout) { throw "glfwWaitCond is not implemented."; },
+
+ glfwSignalCond: function(cond) { throw "glfwSignalCond is not implemented."; },
+
+ glfwBroadcastCond: function(cond) { throw "glfwBroadcastCond is not implemented."; },
+
+ glfwGetNumberOfProcessors: function() {
+ //Threads are disabled anyway…
+ return 1;
+ },
+
+ /* Enable/disable functions */
+ glfwEnable: function(token) {
+ GLFW.params[token] = false;
+ },
+
+ glfwDisable: function(token) {
+ GLFW.params[token] = true;
+ },
+
+ /* Image/texture I/O support */
+ glfwReadImage: function(name, img, flags) { throw "glfwReadImage is not implemented."; },
+
+ glfwReadMemoryImage: function(data, size, img, flags) { throw "glfwReadMemoryImage is not implemented."; },
+
+ glfwFreeImage: function(img) { throw "glfwFreeImage is not implemented."; },
+
+ glfwLoadTexture2D: function(name, flags) { throw "glfwLoadTexture2D is not implemented."; },
+
+ glfwLoadMemoryTexture2D: function(data, size, flags) { throw "glfwLoadMemoryTexture2D is not implemented."; },
+
+ glfwLoadTextureImage2D: function(img, flags) { throw "glfwLoadTextureImage2D is not implemented."; },
+};
+
+autoAddDeps(LibraryGLFW, '$GLFW');
+mergeInto(LibraryManager.library, LibraryGLFW);
+
+
diff --git a/src/modules.js b/src/modules.js
index bda8a605..f2994ada 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -374,7 +374,7 @@ var LibraryManager = {
load: function() {
if (this.library) return;
- var libraries = ['library.js', 'library_browser.js', 'library_sdl.js', 'library_gl.js', 'library_glut.js', 'library_xlib.js', 'library_egl.js', 'library_gc.js', 'library_jansson.js', 'library_openal.js'].concat(additionalLibraries);
+ var libraries = ['library.js', 'library_browser.js', 'library_sdl.js', 'library_gl.js', 'library_glut.js', 'library_xlib.js', 'library_egl.js', 'library_gc.js', 'library_jansson.js', 'library_openal.js', 'library_glfw.js'].concat(additionalLibraries);
for (var i = 0; i < libraries.length; i++) {
eval(processMacros(preprocess(read(libraries[i]))));
}
diff --git a/system/include/GL/glfw.h b/system/include/GL/glfw.h
new file mode 100644
index 00000000..e20552e4
--- /dev/null
+++ b/system/include/GL/glfw.h
@@ -0,0 +1,518 @@
+/************************************************************************
+ * GLFW - An OpenGL framework
+ * API version: 2.7
+ * WWW: http://www.glfw.org/
+ *------------------------------------------------------------------------
+ * Copyright (c) 2002-2006 Marcus Geelnard
+ * Copyright (c) 2006-2010 Camilla Berglund
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would
+ * be appreciated but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and must not
+ * be misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+ *
+ *************************************************************************/
+
+#ifndef __glfw_h_
+#define __glfw_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*************************************************************************
+ * Global definitions
+ *************************************************************************/
+
+/* We need a NULL pointer from time to time */
+#ifndef NULL
+ #ifdef __cplusplus
+ #define NULL 0
+ #else
+ #define NULL ((void *)0)
+ #endif
+#endif /* NULL */
+
+
+/* ------------------- BEGIN SYSTEM/COMPILER SPECIFIC -------------------- */
+
+/* Please report any probles that you find with your compiler, which may
+ * be solved in this section! There are several compilers that I have not
+ * been able to test this file with yet.
+ *
+ * First: If we are we on Windows, we want a single define for it (_WIN32)
+ * (Note: For Cygwin the compiler flag -mwin32 should be used, but to
+ * make sure that things run smoothly for Cygwin users, we add __CYGWIN__
+ * to the list of "valid Win32 identifiers", which removes the need for
+ * -mwin32)
+ */
+#if !defined(_WIN32) && (defined(__WIN32__) || defined(WIN32) || defined(__CYGWIN__))
+ #define _WIN32
+#endif /* _WIN32 */
+
+/* In order for extension support to be portable, we need to define an
+ * OpenGL function call method. We use the keyword APIENTRY, which is
+ * defined for Win32. (Note: Windows also needs this for <GL/gl.h>)
+ */
+#ifndef APIENTRY
+ #ifdef _WIN32
+ #define APIENTRY __stdcall
+ #else
+ #define APIENTRY
+ #endif
+ #define GL_APIENTRY_DEFINED
+#endif /* APIENTRY */
+
+
+/* The following three defines are here solely to make some Windows-based
+ * <GL/gl.h> files happy. Theoretically we could include <windows.h>, but
+ * it has the major drawback of severely polluting our namespace.
+ */
+
+/* Under Windows, we need WINGDIAPI defined */
+#if !defined(WINGDIAPI) && defined(_WIN32)
+ #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__)
+ /* Microsoft Visual C++, Borland C++ Builder and Pelles C */
+ #define WINGDIAPI __declspec(dllimport)
+ #elif defined(__LCC__)
+ /* LCC-Win32 */
+ #define WINGDIAPI __stdcall
+ #else
+ /* Others (e.g. MinGW, Cygwin) */
+ #define WINGDIAPI extern
+ #endif
+ #define GL_WINGDIAPI_DEFINED
+#endif /* WINGDIAPI */
+
+/* Some <GL/glu.h> files also need CALLBACK defined */
+#if !defined(CALLBACK) && defined(_WIN32)
+ #if defined(_MSC_VER)
+ /* Microsoft Visual C++ */
+ #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
+ #define CALLBACK __stdcall
+ #else
+ #define CALLBACK
+ #endif
+ #else
+ /* Other Windows compilers */
+ #define CALLBACK __stdcall
+ #endif
+ #define GLU_CALLBACK_DEFINED
+#endif /* CALLBACK */
+
+/* Microsoft Visual C++, Borland C++ and Pelles C <GL*glu.h> needs wchar_t */
+#if defined(_WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__)) && !defined(_WCHAR_T_DEFINED)
+ typedef unsigned short wchar_t;
+ #define _WCHAR_T_DEFINED
+#endif /* _WCHAR_T_DEFINED */
+
+
+/* ---------------- GLFW related system specific defines ----------------- */
+
+#if defined(_WIN32) && defined(GLFW_BUILD_DLL)
+
+ /* We are building a Win32 DLL */
+ #define GLFWAPI __declspec(dllexport)
+ #define GLFWAPIENTRY __stdcall
+ #define GLFWCALL __stdcall
+
+#elif defined(_WIN32) && defined(GLFW_DLL)
+
+ /* We are calling a Win32 DLL */
+ #if defined(__LCC__)
+ #define GLFWAPI extern
+ #else
+ #define GLFWAPI __declspec(dllimport)
+ #endif
+ #define GLFWAPIENTRY __stdcall
+ #define GLFWCALL __stdcall
+
+#else
+
+ /* We are either building/calling a static lib or we are non-win32 */
+ #define GLFWAPIENTRY
+ #define GLFWAPI
+ #define GLFWCALL
+
+#endif
+
+/* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */
+
+/* Include standard OpenGL headers: GLFW uses GL_FALSE/GL_TRUE, and it is
+ * convenient for the user to only have to include <GL/glfw.h>. This also
+ * solves the problem with Windows <GL/gl.h> and <GL/glu.h> needing some
+ * special defines which normally requires the user to include <windows.h>
+ * (which is not a nice solution for portable programs).
+ */
+#if defined(__APPLE_CC__)
+ #if defined(GLFW_INCLUDE_GL3)
+ #include <OpenGL/gl3.h>
+ #else
+ #define GL_GLEXT_LEGACY
+ #include <OpenGL/gl.h>
+ #endif
+ #ifndef GLFW_NO_GLU
+ #include <OpenGL/glu.h>
+ #endif
+#else
+ #if defined(GLFW_INCLUDE_GL3)
+ #include <GL3/gl3.h>
+ #else
+ #include <GL/gl.h>
+ #endif
+ #ifndef GLFW_NO_GLU
+ #include <GL/glu.h>
+ #endif
+#endif
+
+
+/*************************************************************************
+ * GLFW version
+ *************************************************************************/
+
+#define GLFW_VERSION_MAJOR 2
+#define GLFW_VERSION_MINOR 7
+#define GLFW_VERSION_REVISION 7
+
+
+/*************************************************************************
+ * Input handling definitions
+ *************************************************************************/
+
+/* Key and button state/action definitions */
+#define GLFW_RELEASE 0
+#define GLFW_PRESS 1
+
+/* Keyboard key definitions: 8-bit ISO-8859-1 (Latin 1) encoding is used
+ * for printable keys (such as A-Z, 0-9 etc), and values above 256
+ * represent special (non-printable) keys (e.g. F1, Page Up etc).
+ */
+#define GLFW_KEY_UNKNOWN -1
+#define GLFW_KEY_SPACE 32
+#define GLFW_KEY_SPECIAL 256
+#define GLFW_KEY_ESC (GLFW_KEY_SPECIAL+1)
+#define GLFW_KEY_F1 (GLFW_KEY_SPECIAL+2)
+#define GLFW_KEY_F2 (GLFW_KEY_SPECIAL+3)
+#define GLFW_KEY_F3 (GLFW_KEY_SPECIAL+4)
+#define GLFW_KEY_F4 (GLFW_KEY_SPECIAL+5)
+#define GLFW_KEY_F5 (GLFW_KEY_SPECIAL+6)
+#define GLFW_KEY_F6 (GLFW_KEY_SPECIAL+7)
+#define GLFW_KEY_F7 (GLFW_KEY_SPECIAL+8)
+#define GLFW_KEY_F8 (GLFW_KEY_SPECIAL+9)
+#define GLFW_KEY_F9 (GLFW_KEY_SPECIAL+10)
+#define GLFW_KEY_F10 (GLFW_KEY_SPECIAL+11)
+#define GLFW_KEY_F11 (GLFW_KEY_SPECIAL+12)
+#define GLFW_KEY_F12 (GLFW_KEY_SPECIAL+13)
+#define GLFW_KEY_F13 (GLFW_KEY_SPECIAL+14)
+#define GLFW_KEY_F14 (GLFW_KEY_SPECIAL+15)
+#define GLFW_KEY_F15 (GLFW_KEY_SPECIAL+16)
+#define GLFW_KEY_F16 (GLFW_KEY_SPECIAL+17)
+#define GLFW_KEY_F17 (GLFW_KEY_SPECIAL+18)
+#define GLFW_KEY_F18 (GLFW_KEY_SPECIAL+19)
+#define GLFW_KEY_F19 (GLFW_KEY_SPECIAL+20)
+#define GLFW_KEY_F20 (GLFW_KEY_SPECIAL+21)
+#define GLFW_KEY_F21 (GLFW_KEY_SPECIAL+22)
+#define GLFW_KEY_F22 (GLFW_KEY_SPECIAL+23)
+#define GLFW_KEY_F23 (GLFW_KEY_SPECIAL+24)
+#define GLFW_KEY_F24 (GLFW_KEY_SPECIAL+25)
+#define GLFW_KEY_F25 (GLFW_KEY_SPECIAL+26)
+#define GLFW_KEY_UP (GLFW_KEY_SPECIAL+27)
+#define GLFW_KEY_DOWN (GLFW_KEY_SPECIAL+28)
+#define GLFW_KEY_LEFT (GLFW_KEY_SPECIAL+29)
+#define GLFW_KEY_RIGHT (GLFW_KEY_SPECIAL+30)
+#define GLFW_KEY_LSHIFT (GLFW_KEY_SPECIAL+31)
+#define GLFW_KEY_RSHIFT (GLFW_KEY_SPECIAL+32)
+#define GLFW_KEY_LCTRL (GLFW_KEY_SPECIAL+33)
+#define GLFW_KEY_RCTRL (GLFW_KEY_SPECIAL+34)
+#define GLFW_KEY_LALT (GLFW_KEY_SPECIAL+35)
+#define GLFW_KEY_RALT (GLFW_KEY_SPECIAL+36)
+#define GLFW_KEY_TAB (GLFW_KEY_SPECIAL+37)
+#define GLFW_KEY_ENTER (GLFW_KEY_SPECIAL+38)
+#define GLFW_KEY_BACKSPACE (GLFW_KEY_SPECIAL+39)
+#define GLFW_KEY_INSERT (GLFW_KEY_SPECIAL+40)
+#define GLFW_KEY_DEL (GLFW_KEY_SPECIAL+41)
+#define GLFW_KEY_PAGEUP (GLFW_KEY_SPECIAL+42)
+#define GLFW_KEY_PAGEDOWN (GLFW_KEY_SPECIAL+43)
+#define GLFW_KEY_HOME (GLFW_KEY_SPECIAL+44)
+#define GLFW_KEY_END (GLFW_KEY_SPECIAL+45)
+#define GLFW_KEY_KP_0 (GLFW_KEY_SPECIAL+46)
+#define GLFW_KEY_KP_1 (GLFW_KEY_SPECIAL+47)
+#define GLFW_KEY_KP_2 (GLFW_KEY_SPECIAL+48)
+#define GLFW_KEY_KP_3 (GLFW_KEY_SPECIAL+49)
+#define GLFW_KEY_KP_4 (GLFW_KEY_SPECIAL+50)
+#define GLFW_KEY_KP_5 (GLFW_KEY_SPECIAL+51)
+#define GLFW_KEY_KP_6 (GLFW_KEY_SPECIAL+52)
+#define GLFW_KEY_KP_7 (GLFW_KEY_SPECIAL+53)
+#define GLFW_KEY_KP_8 (GLFW_KEY_SPECIAL+54)
+#define GLFW_KEY_KP_9 (GLFW_KEY_SPECIAL+55)
+#define GLFW_KEY_KP_DIVIDE (GLFW_KEY_SPECIAL+56)
+#define GLFW_KEY_KP_MULTIPLY (GLFW_KEY_SPECIAL+57)
+#define GLFW_KEY_KP_SUBTRACT (GLFW_KEY_SPECIAL+58)
+#define GLFW_KEY_KP_ADD (GLFW_KEY_SPECIAL+59)
+#define GLFW_KEY_KP_DECIMAL (GLFW_KEY_SPECIAL+60)
+#define GLFW_KEY_KP_EQUAL (GLFW_KEY_SPECIAL+61)
+#define GLFW_KEY_KP_ENTER (GLFW_KEY_SPECIAL+62)
+#define GLFW_KEY_KP_NUM_LOCK (GLFW_KEY_SPECIAL+63)
+#define GLFW_KEY_CAPS_LOCK (GLFW_KEY_SPECIAL+64)
+#define GLFW_KEY_SCROLL_LOCK (GLFW_KEY_SPECIAL+65)
+#define GLFW_KEY_PAUSE (GLFW_KEY_SPECIAL+66)
+#define GLFW_KEY_LSUPER (GLFW_KEY_SPECIAL+67)
+#define GLFW_KEY_RSUPER (GLFW_KEY_SPECIAL+68)
+#define GLFW_KEY_MENU (GLFW_KEY_SPECIAL+69)
+#define GLFW_KEY_LAST GLFW_KEY_MENU
+
+/* Mouse button definitions */
+#define GLFW_MOUSE_BUTTON_1 0
+#define GLFW_MOUSE_BUTTON_2 1
+#define GLFW_MOUSE_BUTTON_3 2
+#define GLFW_MOUSE_BUTTON_4 3
+#define GLFW_MOUSE_BUTTON_5 4
+#define GLFW_MOUSE_BUTTON_6 5
+#define GLFW_MOUSE_BUTTON_7 6
+#define GLFW_MOUSE_BUTTON_8 7
+#define GLFW_MOUSE_BUTTON_LAST GLFW_MOUSE_BUTTON_8
+
+/* Mouse button aliases */
+#define GLFW_MOUSE_BUTTON_LEFT GLFW_MOUSE_BUTTON_1
+#define GLFW_MOUSE_BUTTON_RIGHT GLFW_MOUSE_BUTTON_2
+#define GLFW_MOUSE_BUTTON_MIDDLE GLFW_MOUSE_BUTTON_3
+
+
+/* Joystick identifiers */
+#define GLFW_JOYSTICK_1 0
+#define GLFW_JOYSTICK_2 1
+#define GLFW_JOYSTICK_3 2
+#define GLFW_JOYSTICK_4 3
+#define GLFW_JOYSTICK_5 4
+#define GLFW_JOYSTICK_6 5
+#define GLFW_JOYSTICK_7 6
+#define GLFW_JOYSTICK_8 7
+#define GLFW_JOYSTICK_9 8
+#define GLFW_JOYSTICK_10 9
+#define GLFW_JOYSTICK_11 10
+#define GLFW_JOYSTICK_12 11
+#define GLFW_JOYSTICK_13 12
+#define GLFW_JOYSTICK_14 13
+#define GLFW_JOYSTICK_15 14
+#define GLFW_JOYSTICK_16 15
+#define GLFW_JOYSTICK_LAST GLFW_JOYSTICK_16
+
+
+/*************************************************************************
+ * Other definitions
+ *************************************************************************/
+
+/* glfwOpenWindow modes */
+#define GLFW_WINDOW 0x00010001
+#define GLFW_FULLSCREEN 0x00010002
+
+/* glfwGetWindowParam tokens */
+#define GLFW_OPENED 0x00020001
+#define GLFW_ACTIVE 0x00020002
+#define GLFW_ICONIFIED 0x00020003
+#define GLFW_ACCELERATED 0x00020004
+#define GLFW_RED_BITS 0x00020005
+#define GLFW_GREEN_BITS 0x00020006
+#de