ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Platform: add test for multiple applications on one page.

pull/482/head
Pablo Escobar 6 years ago committed by Vladimír Vondruš
parent
673a17fa11
commit
110e45d0ea
3 changed files with 77 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      src/Magnum/Platform/Test/CMakeLists.txt
  2. 4
      src/Magnum/Platform/Test/EmscriptenApplicationTest.cpp
  3. 56
      src/Magnum/Platform/Test/MultipleEmscriptenApplicationTest.html

17
src/Magnum/Platform/Test/CMakeLists.txt
Unescape View File

@ -43,6 +43,8 @@ if(WITH_EMSCRIPTENAPPLICATION)
add_executable(PlatformEmscriptenApplicationTest EmscriptenApplicationTest.cpp)
target_link_libraries(PlatformEmscriptenApplicationTest PRIVATE MagnumEmscriptenApplication MagnumGL)
set_target_properties(PlatformEmscriptenApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
# Test that the canvas and keylistener can be found with both the old and the new Emscripten target behaviors
target_link_libraries(PlatformEmscriptenApplicationTest PRIVATE "-s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=0")
add_custom_command(TARGET PlatformEmscriptenApplicationTest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/../WebApplication.css
@ -51,6 +53,21 @@ if(WITH_EMSCRIPTENAPPLICATION)
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/EmscriptenApplicationTest.html
$<TARGET_FILE_DIR:PlatformEmscriptenApplicationTest>/PlatformEmscriptenApplicationTest.html)
add_executable(PlatformMultipleEmscriptenApplicationTest EmscriptenApplicationTest.cpp)
target_link_libraries(PlatformMultipleEmscriptenApplicationTest PRIVATE MagnumEmscriptenApplication MagnumGL)
set_target_properties(PlatformMultipleEmscriptenApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
target_compile_definitions(PlatformMultipleEmscriptenApplicationTest PRIVATE CUSTOM_CLEAR_COLOR=0.2,0,0.2,1)
target_link_libraries(PlatformMultipleEmscriptenApplicationTest PRIVATE "-s MODULARIZE -s EXPORT_NAME=createModule")
target_link_libraries(PlatformMultipleEmscriptenApplicationTest PRIVATE "-s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1")
add_custom_command(TARGET PlatformMultipleEmscriptenApplicationTest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/../WebApplication.css
${CMAKE_CURRENT_SOURCE_DIR}/../EmscriptenApplication.js
$<TARGET_FILE_DIR:PlatformMultipleEmscriptenApplicationTest>
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/MultipleEmscriptenApplicationTest.html
$<TARGET_FILE_DIR:PlatformMultipleEmscriptenApplicationTest>/PlatformMultipleEmscriptenApplicationTest.html)
endif()
if(WITH_GLFWAPPLICATION)

4
src/Magnum/Platform/Test/EmscriptenApplicationTest.cpp
Unescape View File

@ -31,6 +31,7 @@
#include "Magnum/GL/Renderer.h"
#include "Magnum/GL/DefaultFramebuffer.h"
#include "Magnum/GL/Mesh.h"
#include "Magnum/Math/Color.h"
namespace Magnum { namespace Platform { namespace Test {
@ -40,6 +41,9 @@ struct EmscriptenApplicationTest: Platform::Application {
virtual void drawEvent() override {
Debug() << "draw event";
#ifdef CUSTOM_CLEAR_COLOR
GL::Renderer::setClearColor({ CUSTOM_CLEAR_COLOR });
#endif
GL::defaultFramebuffer.clear(GL::FramebufferClear::Color);
swapBuffers();

56
src/Magnum/Platform/Test/MultipleEmscriptenApplicationTest.html
Unescape View File

@ -0,0 +1,56 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Magnum Multiple EmscriptenApplication Test</title>
<link rel="stylesheet" href="WebApplication.css" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script src="EmscriptenApplication.js"></script>
</head>
<body>
<h1>Magnum Multiple EmscriptenApplication Test</h1>
<div class="mn-container">
<div class="mn-sizer"><div class="mn-expander"><div class="mn-listener">
<canvas class="mn-canvas" id="canvas1" tabindex="0"></canvas>
<div class="mn-status" id="status1">Initialization...</div>
<div class="mn-status-description" id="status-description1"></div>
<script src="PlatformMultipleEmscriptenApplicationTest.js"></script>
<script async="async">
/* This application is compiled with -s MODULARIZE -s EXPORT_NAME=createModule
so it doesn't run until we instantiate it with its own Module object. */
const myModule = createMagnumModule({
canvas: document.getElementById('canvas1'),
status: document.getElementById('status1'),
statusDescription: document.getElementById('status-description1')
});
myModule.keyboardListeningElement = myModule.canvas;
myModule.canvas.addEventListener('mousedown', function(event) {
event.target.focus();
});
createModule(myModule);
</script>
</div></div></div>
</div>
<div class="mn-container">
<div class="mn-sizer"><div class="mn-expander"><div class="mn-listener">
<canvas class="mn-canvas" id="canvas2" tabindex="1"></canvas>
<div class="mn-status" id="status2">Initialization...</div>
<div class="mn-status-description" id="status-description2"></div>
<script>
/* This application is compiled without -s MODULARIZE so it uses the
global Module set by EmscriptenApplication.js and runs instantly.
You'll usually want to use MODULARIZE for all applications but this
makes it easier to reuse the existing EmscriptenApplicationTest */
Module.canvas = document.getElementById('canvas2');
Module.status = document.getElementById('status2');
Module.statusDescription = document.getElementById('status-description2');
Module.keyboardListeningElement = Module.canvas;
Module.canvas.addEventListener('mousedown', function(event) {
event.target.focus();
});
</script>
<script async="async" src="PlatformEmscriptenApplicationTest.js"></script>
</div></div></div>
</div>
</body>
</html>
Write Preview
Loading…
Cancel
Save