mirror of
https://github.com/XProger/OpenLara.git
synced 2025-02-24 23:42:49 +01:00
#15 "Go fullscreen" button for Web version, maximized canvas for iOS, fix touch overflow
This commit is contained in:
XProger
parent
2d82f6efd8
commit
148da6d35b
@ -8,9 +8,10 @@
|
||||
}
|
||||
body {
|
||||
margin: 0px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.game_fs {
|
||||
position: absolute;
|
||||
position: fixed;
|
||||
top: 0px;
|
||||
left: 0px;
|
||||
margin: 0px;
|
||||
@ -25,14 +26,24 @@
|
||||
<meta name="viewport" content="width=854, user-scalable=no">
|
||||
</head>
|
||||
<body>
|
||||
<button id="goFS">Go fullscreen</button>
|
||||
<canvas class="game" id="canvas" width="854" height="480" oncontextmenu="event.preventDefault()"></canvas><br>
|
||||
<div id="status">Starting...</div>
|
||||
<script type='text/javascript'>
|
||||
window.onload = function() { window.focus(); }
|
||||
|
||||
var statusElement = document.getElementById('status');
|
||||
var canvasElement = document.getElementById('canvas');
|
||||
var proc;
|
||||
|
||||
function fullscreen(container) {
|
||||
Module.ccall('change_fs_mode', 'null', [], []);
|
||||
canvasElement.focus();
|
||||
}
|
||||
|
||||
var goFS = document.getElementById("goFS");
|
||||
document.getElementById("goFS").style.display = 'block';
|
||||
goFS.addEventListener("click", function() { fullscreen(canvasElement); }, false);
|
||||
|
||||
window.onload = function() { window.focus(); }
|
||||
|
||||
var Module = {
|
||||
TOTAL_MEMORY: 64*1024*1024,
|
||||
@ -97,12 +108,12 @@
|
||||
if (audioContext) {
|
||||
audioContext.resume();
|
||||
window.removeEventListener('touchstart', userAction, false);
|
||||
window.removeEventListener('click', userAction, false);
|
||||
console.log("resume playback");
|
||||
window.removeEventListener('click', userAction, false);
|
||||
console.log("resume playback");
|
||||
}
|
||||
};
|
||||
window.addEventListener('touchstart', userAction, false);
|
||||
window.addEventListener('click', userAction, false);
|
||||
window.addEventListener('click', userAction, false);
|
||||
|
||||
var gl = canvasElement.getContext("webgl", {antialias:false, premultipliedAlpha: false}) || canvasElement.getContext("experimental-webgl", {antialias:false, premultipliedAlpha: false});
|
||||
|
||||
@ -148,9 +159,8 @@
|
||||
return "Really want to quit the game?";
|
||||
};
|
||||
|
||||
var isMobile = false;
|
||||
(function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) isMobile = true;})(navigator.userAgent||navigator.vendor||window.opera);
|
||||
|
||||
var isMobile = !!navigator.platform && /iPad|iPhone|iPod/.test(navigator.platform);
|
||||
|
||||
if (isMobile) {
|
||||
canvasElement.className = "game_fs";
|
||||
statusElement.style.display = 'none';
|
||||
|
||||
@ -94,16 +94,6 @@ void osLoadGame(Stream *stream) {
|
||||
return osCacheRead(stream);
|
||||
}
|
||||
|
||||
extern "C" {
|
||||
void EMSCRIPTEN_KEEPALIVE snd_fill(Sound::Frame *frames, int count) {
|
||||
Sound::fill(frames, count);
|
||||
}
|
||||
|
||||
void EMSCRIPTEN_KEEPALIVE game_level_load(char *data, int size) {
|
||||
Game::startLevel(new Stream(NULL, data, size));
|
||||
}
|
||||
}
|
||||
|
||||
JoyKey joyToInputKey(int code) {
|
||||
static const JoyKey keys[16] = {
|
||||
jkA, jkB, jkX, jkY, jkLB, jkRB, jkLT, jkRT, jkSelect, jkStart, jkL, jkR, jkUp, jkDown, jkLeft, jkRight,
|
||||
@ -238,16 +228,31 @@ bool isFullScreen() {
|
||||
return status.isFullscreen;
|
||||
}
|
||||
|
||||
void changeWindowMode() {
|
||||
if (!isFullScreen()) {
|
||||
EmscriptenFullscreenStrategy s;
|
||||
s.scaleMode = EMSCRIPTEN_FULLSCREEN_SCALE_STRETCH;
|
||||
s.canvasResolutionScaleMode = EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_HIDEF;
|
||||
s.filteringMode = EMSCRIPTEN_FULLSCREEN_FILTERING_DEFAULT;
|
||||
s.canvasResizedCallback = fullscreenCallback;
|
||||
emscripten_request_fullscreen_strategy(NULL, 1, &s);
|
||||
} else
|
||||
emscripten_exit_fullscreen();
|
||||
extern "C" {
|
||||
void EMSCRIPTEN_KEEPALIVE snd_fill(Sound::Frame *frames, int count) {
|
||||
Sound::fill(frames, count);
|
||||
}
|
||||
|
||||
void EMSCRIPTEN_KEEPALIVE game_level_load(char *data, int size) {
|
||||
Game::startLevel(new Stream(NULL, data, size));
|
||||
}
|
||||
|
||||
void EMSCRIPTEN_KEEPALIVE change_fs_mode() {
|
||||
EM_ASM(JSEvents.inEventHandler = true);
|
||||
EM_ASM(JSEvents.currentEventHandler = {allowsDeferredCalls:true});
|
||||
|
||||
if (!isFullScreen()) {
|
||||
EmscriptenFullscreenStrategy s;
|
||||
s.scaleMode = EMSCRIPTEN_FULLSCREEN_SCALE_STRETCH;
|
||||
s.canvasResolutionScaleMode = EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_HIDEF;
|
||||
s.filteringMode = EMSCRIPTEN_FULLSCREEN_FILTERING_DEFAULT;
|
||||
s.canvasResizedCallback = fullscreenCallback;
|
||||
emscripten_request_fullscreen_strategy(NULL, 0, &s);
|
||||
} else {
|
||||
LOG("exit fs\n");
|
||||
emscripten_exit_fullscreen();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
InputKey keyToInputKey(int code) {
|
||||
@ -269,7 +274,7 @@ EM_BOOL keyCallback(int eventType, const EmscriptenKeyboardEvent *e, void *userD
|
||||
case EMSCRIPTEN_EVENT_KEYDOWN:
|
||||
case EMSCRIPTEN_EVENT_KEYUP:
|
||||
if (eventType == EMSCRIPTEN_EVENT_KEYDOWN && e->altKey && e->keyCode == 0x0D) { // Alt + Enter
|
||||
changeWindowMode();
|
||||
change_fs_mode();
|
||||
break;
|
||||
}
|
||||
Input::setDown(keyToInputKey(e->keyCode), eventType == EMSCRIPTEN_EVENT_KEYDOWN);
|
||||
@ -288,7 +293,7 @@ EM_BOOL touchCallback(int eventType, const EmscriptenTouchEvent *e, void *userDa
|
||||
if (eventType == EMSCRIPTEN_EVENT_TOUCHSTART || eventType == EMSCRIPTEN_EVENT_TOUCHEND || eventType == EMSCRIPTEN_EVENT_TOUCHCANCEL)
|
||||
Input::setDown(key, eventType == EMSCRIPTEN_EVENT_TOUCHSTART);
|
||||
}
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
EM_BOOL mouseCallback(int eventType, const EmscriptenMouseEvent *e, void *userData) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user