diff options
| author | manny/MADE <nerurkar@made-apps.biz> | 2013-06-22 21:04:28 +0200 |
|---|---|---|
| committer | manny/MADE <nerurkar@made-apps.biz> | 2013-06-22 21:04:28 +0200 |
| commit | 2978204196fa7993490305a2e38598edfa868171 (patch) | |
| tree | c22fc684e0f9df76bd0e52e48bd1899ccf043c4b | |
| parent | 0aceb30743c746a5b3b79b323cd2c3fcd9c73ce1 (diff) | |
IMPROVED: fixed codestyle to match java/js
IMPROVED: handling mouse position when pointer is locked
| -rw-r--r-- | src/library_browser.js | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/library_browser.js b/src/library_browser.js index a5cec337..04c8951d 100644 --- a/src/library_browser.js +++ b/src/library_browser.js @@ -427,15 +427,14 @@ mergeInto(LibraryManager.library, { } // check if SDL is available - if (typeof SDL != "undefined") - { + 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 { + // just add the mouse delta to the current absolut mouse position + // FIXME: ideally this should be clamped against the canvas size and zero + Browser.mouseX += Browser.mouseMovementX; + Browser.mouseY += Browser.mouseMovementY; } } else { // Otherwise, calculate the movement based on the changes @@ -512,10 +511,9 @@ mergeInto(LibraryManager.library, { this.windowedWidth = canvas.width; this.windowedHeight = canvas.height; canvas.width = screen.width; - canvas.height = screen.height; + canvas.height = screen.height; // check if SDL is available - if (typeof SDL != "undefined") - { + 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') }}} @@ -528,8 +526,7 @@ mergeInto(LibraryManager.library, { canvas.width = this.windowedWidth; canvas.height = this.windowedHeight; // check if SDL is available - if (typeof SDL != "undefined") - { + 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') }}} |