Merge branch 'main' of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1
This commit is contained in:
@@ -56,6 +56,7 @@ if(${PLATFORM} MATCHES "Web")
|
|||||||
|
|
||||||
add_library(png INTERFACE IMPORTED)
|
add_library(png INTERFACE IMPORTED)
|
||||||
set_target_properties(png PROPERTIES
|
set_target_properties(png PROPERTIES
|
||||||
|
INTERFACE_COMPILE_OPTIONS "-sUSE_LIBPNG=1"
|
||||||
INTERFACE_LINK_OPTIONS "-sUSE_LIBPNG=1"
|
INTERFACE_LINK_OPTIONS "-sUSE_LIBPNG=1"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -331,7 +332,7 @@ if(${PLATFORM} MATCHES "Web")
|
|||||||
|
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EM_FLAGS}")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EM_FLAGS}")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EM_FLAGS}")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EM_FLAGS}")
|
||||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EM_FLAGS} --preload-file ${CMAKE_SOURCE_DIR}/data@/data -sPROXY_TO_PTHREAD")
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EM_FLAGS} --preload-file ${CMAKE_SOURCE_DIR}/data@/data")
|
||||||
|
|
||||||
target_compile_options(${PROJECT_NAME} PUBLIC
|
target_compile_options(${PROJECT_NAME} PUBLIC
|
||||||
"-Os"
|
"-Os"
|
||||||
|
|||||||
@@ -1,143 +1,43 @@
|
|||||||
<!doctype html>
|
<!DOCTYPE html>
|
||||||
<html lang="en-us">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="UTF-8">
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
<title>MCPE 0.6.1</title>
|
||||||
<title>Emscripten-Generated Code</title>
|
<style>
|
||||||
<style>
|
html, body {
|
||||||
.emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
|
margin: 0;
|
||||||
textarea.emscripten { font-family: monospace; width: 80%; }
|
padding: 0;
|
||||||
div.emscripten { text-align: center; }
|
height: 100%;
|
||||||
div.emscripten_border { border: 1px solid black; }
|
background: black;
|
||||||
/* the canvas *must not* have any border or padding, or mouse coords will be wrong */
|
overflow: hidden;
|
||||||
canvas.emscripten { border: 0px none; background-color: black; }
|
}
|
||||||
|
|
||||||
.spinner {
|
#canvas {
|
||||||
height: 50px;
|
width: 100vw;
|
||||||
width: 50px;
|
height: 100vh;
|
||||||
margin: 0px auto;
|
display: block;
|
||||||
-webkit-animation: rotation .8s linear infinite;
|
}
|
||||||
-moz-animation: rotation .8s linear infinite;
|
</style>
|
||||||
-o-animation: rotation .8s linear infinite;
|
</head>
|
||||||
animation: rotation 0.8s linear infinite;
|
<body>
|
||||||
border-left: 10px solid rgb(0,150,240);
|
|
||||||
border-right: 10px solid rgb(0,150,240);
|
|
||||||
border-bottom: 10px solid rgb(0,150,240);
|
|
||||||
border-top: 10px solid rgb(100,0,200);
|
|
||||||
border-radius: 100%;
|
|
||||||
background-color: rgb(200,100,250);
|
|
||||||
}
|
|
||||||
@-webkit-keyframes rotation {
|
|
||||||
from {-webkit-transform: rotate(0deg);}
|
|
||||||
to {-webkit-transform: rotate(360deg);}
|
|
||||||
}
|
|
||||||
@-moz-keyframes rotation {
|
|
||||||
from {-moz-transform: rotate(0deg);}
|
|
||||||
to {-moz-transform: rotate(360deg);}
|
|
||||||
}
|
|
||||||
@-o-keyframes rotation {
|
|
||||||
from {-o-transform: rotate(0deg);}
|
|
||||||
to {-o-transform: rotate(360deg);}
|
|
||||||
}
|
|
||||||
@keyframes rotation {
|
|
||||||
from {transform: rotate(0deg);}
|
|
||||||
to {transform: rotate(360deg);}
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
<canvas id="canvas"></canvas>
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<hr/>
|
|
||||||
<figure style="overflow:visible;" id="spinner"><div class="spinner"></div><center style="margin-top:0.5em"><strong>emscripten</strong></center></figure>
|
|
||||||
<div class="emscripten" id="status">Downloading...</div>
|
|
||||||
<div class="emscripten">
|
|
||||||
<progress value="0" max="100" id="progress" hidden=1></progress>
|
|
||||||
</div>
|
|
||||||
<div class="emscripten_border">
|
|
||||||
<canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()" tabindex=-1></canvas>
|
|
||||||
</div>
|
|
||||||
<hr/>
|
|
||||||
<div class="emscripten">
|
|
||||||
<input type="checkbox" id="resize">Resize canvas
|
|
||||||
<input type="checkbox" id="pointerLock" checked>Lock/hide mouse pointer
|
|
||||||
|
|
||||||
<input type="button" value="Fullscreen" onclick="Module.requestFullscreen(document.getElementById('pointerLock').checked,
|
|
||||||
document.getElementById('resize').checked)">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<hr/>
|
<script>
|
||||||
<textarea class="emscripten" id="output" rows="8"></textarea>
|
var Module = {
|
||||||
<hr>
|
canvas: document.getElementById('canvas'),
|
||||||
<script type='text/javascript'>
|
onRuntimeInitialized: function () { resizeCanvas() }
|
||||||
var statusElement = document.getElementById('status');
|
};
|
||||||
var progressElement = document.getElementById('progress');
|
|
||||||
var spinnerElement = document.getElementById('spinner');
|
|
||||||
var canvasElement = document.getElementById('canvas');
|
|
||||||
var outputElement = document.getElementById('output');
|
|
||||||
if (outputElement) outputElement.value = ''; // clear browser cache
|
|
||||||
|
|
||||||
// As a default initial behavior, pop up an alert when webgl context is lost. To make your
|
function resizeCanvas() {
|
||||||
// application robust, you may want to override this behavior before shipping!
|
const canvas = Module.canvas;
|
||||||
// See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
|
canvas.width = window.innerWidth;
|
||||||
canvasElement.addEventListener("webglcontextlost", (e) => {
|
canvas.height = window.innerHeight;
|
||||||
alert('WebGL context lost. You will need to reload the page.');
|
}
|
||||||
e.preventDefault();
|
|
||||||
}, false);
|
|
||||||
|
|
||||||
function setStatus(text) {
|
window.addEventListener('resize', resizeCanvas);
|
||||||
if (!setStatus.last) setStatus.last = { time: Date.now(), text: '' };
|
</script>
|
||||||
if (text === setStatus.last.text) return;
|
|
||||||
var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
|
|
||||||
var now = Date.now();
|
|
||||||
if (m && now - setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
|
|
||||||
setStatus.last.time = now;
|
|
||||||
setStatus.last.text = text;
|
|
||||||
if (m) {
|
|
||||||
text = m[1];
|
|
||||||
progressElement.value = parseInt(m[2])*100;
|
|
||||||
progressElement.max = parseInt(m[4])*100;
|
|
||||||
progressElement.hidden = false;
|
|
||||||
spinnerElement.hidden = false;
|
|
||||||
} else {
|
|
||||||
progressElement.value = null;
|
|
||||||
progressElement.max = null;
|
|
||||||
progressElement.hidden = true;
|
|
||||||
if (!text) spinnerElement.hidden = true;
|
|
||||||
}
|
|
||||||
statusElement.innerHTML = text;
|
|
||||||
}
|
|
||||||
|
|
||||||
var Module = {
|
<script src="MinecraftPE.js"></script>
|
||||||
print(...args) {
|
</body>
|
||||||
// These replacements are necessary if you render to raw HTML
|
|
||||||
//text = text.replace(/&/g, "&");
|
|
||||||
//text = text.replace(/</g, "<");
|
|
||||||
//text = text.replace(/>/g, ">");
|
|
||||||
//text = text.replace('\n', '<br>', 'g');
|
|
||||||
console.log(...args);
|
|
||||||
if (outputElement) {
|
|
||||||
var text = args.join(' ');
|
|
||||||
outputElement.value += text + "\n";
|
|
||||||
outputElement.scrollTop = outputElement.scrollHeight; // focus on bottom
|
|
||||||
}
|
|
||||||
},
|
|
||||||
canvas: canvasElement,
|
|
||||||
setStatus: setStatus,
|
|
||||||
totalDependencies: 0,
|
|
||||||
monitorRunDependencies(left) {
|
|
||||||
this.totalDependencies = Math.max(this.totalDependencies, left);
|
|
||||||
setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
setStatus('Downloading...');
|
|
||||||
window.onerror = () => {
|
|
||||||
setStatus('Exception thrown, see JavaScript console');
|
|
||||||
spinnerElement.style.display = 'none';
|
|
||||||
setStatus = (text) => {
|
|
||||||
if (text) console.error('[post-exception status] ' + text);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
<script src="MinecraftPE.js"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
</html>
|
||||||
@@ -20,6 +20,10 @@
|
|||||||
#include <shellapi.h>
|
#include <shellapi.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __EMSCRIPTEN__
|
||||||
|
#include <emscripten/html5.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
static void png_funcReadFile(png_structp pngPtr, png_bytep data, png_size_t length) {
|
static void png_funcReadFile(png_structp pngPtr, png_bytep data, png_size_t length) {
|
||||||
((std::istream*)png_get_io_ptr(pngPtr))->read((char*)data, length);
|
((std::istream*)png_get_io_ptr(pngPtr))->read((char*)data, length);
|
||||||
}
|
}
|
||||||
@@ -102,8 +106,27 @@ public:
|
|||||||
return std::string(mbstr);
|
return std::string(mbstr);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual int getScreenWidth() override { return 854; };
|
virtual int getScreenWidth() override {
|
||||||
virtual int getScreenHeight() override { return 480; };
|
#ifdef __EMSCRIPTEN__
|
||||||
|
int w, h;
|
||||||
|
emscripten_get_canvas_element_size("canvas", &w, &h);
|
||||||
|
|
||||||
|
return w;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return 854;
|
||||||
|
};
|
||||||
|
|
||||||
|
virtual int getScreenHeight() override {
|
||||||
|
#ifdef __EMSCRIPTEN__
|
||||||
|
int w, h;
|
||||||
|
emscripten_get_canvas_element_size("canvas", &w, &h);
|
||||||
|
|
||||||
|
return h;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return 480;
|
||||||
|
};
|
||||||
|
|
||||||
virtual float getPixelsPerMillimeter() override;
|
virtual float getPixelsPerMillimeter() override;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user