diff options
| author | manny/MADE <nerurkar@made-apps.biz> | 2013-06-12 13:27:35 +0200 |
|---|---|---|
| committer | manny/MADE <nerurkar@made-apps.biz> | 2013-06-19 13:12:03 +0200 |
| commit | 824d5ce83528914f54c1e43563e98c4e1b1e371c (patch) | |
| tree | cfe10153501809aab8fa941fc539049a2f8be832 | |
| parent | 6d6490e61ef9a63cbf314faa19e152796a21f3d3 (diff) | |
BUGFIX: several SDL related bugfixes
| -rw-r--r-- | src/library_browser.js | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/src/library_browser.js b/src/library_browser.js index 9800fedf..7e99054b 100644 --- a/src/library_browser.js +++ b/src/library_browser.js @@ -425,8 +425,18 @@ mergeInto(LibraryManager.library, { Browser.mouseMovementX = Browser.getMovementX(event); Browser.mouseMovementY = Browser.getMovementY(event); } - Browser.mouseX = SDL.mouseX + Browser.mouseMovementX; - Browser.mouseY = SDL.mouseY + Browser.mouseMovementY; + + // MADE: FIX: check for SDL + if (typeof SDL != "undefined") + { + Browser.mouseX = SDL.mouseX + Browser.mouseMovementX; + Browser.mouseY = SDL.mouseY + Browser.mouseMovementY; + } + else + { + Browser.mouseX = Browser.mouseMovementX; + Browser.mouseY = Browser.mouseMovementY; + } } else { // Otherwise, calculate the movement based on the changes // in the coordinates. @@ -502,10 +512,14 @@ mergeInto(LibraryManager.library, { this.windowedWidth = canvas.width; this.windowedHeight = canvas.height; canvas.width = screen.width; - canvas.height = screen.height; - var flags = {{{ makeGetValue('SDL.screen+Runtime.QUANTUM_SIZE*0', '0', 'i32', 0, 1) }}}; - flags = flags | 0x00800000; // set SDL_FULLSCREEN flag - {{{ makeSetValue('SDL.screen+Runtime.QUANTUM_SIZE*0', '0', 'flags', 'i32') }}} + canvas.height = screen.height; + // MADE: FIX: check if SDL is available + if (typeof SDL != "undefined") + { + var flags = {{{ makeGetValue('SDL.screen+Runtime.QUANTUM_SIZE*0', '0', 'i32', 0, 1) }}}; + flags = flags | 0x00800000; // set SDL_FULLSCREEN flag + {{{ makeSetValue('SDL.screen+Runtime.QUANTUM_SIZE*0', '0', 'flags', 'i32') }}} + } Browser.updateResizeListeners(); }, @@ -513,9 +527,13 @@ mergeInto(LibraryManager.library, { var canvas = Module['canvas']; canvas.width = this.windowedWidth; canvas.height = this.windowedHeight; - var flags = {{{ makeGetValue('SDL.screen+Runtime.QUANTUM_SIZE*0', '0', 'i32', 0, 1) }}}; - flags = flags & ~0x00800000; // clear SDL_FULLSCREEN flag - {{{ makeSetValue('SDL.screen+Runtime.QUANTUM_SIZE*0', '0', 'flags', 'i32') }}} + // MADE: FIX: check if SDL is available + if (typeof SDL != "undefined") + { + var flags = {{{ makeGetValue('SDL.screen+Runtime.QUANTUM_SIZE*0', '0', 'i32', 0, 1) }}}; + flags = flags & ~0x00800000; // clear SDL_FULLSCREEN flag + {{{ makeSetValue('SDL.screen+Runtime.QUANTUM_SIZE*0', '0', 'flags', 'i32') }}} + } Browser.updateResizeListeners(); } |