Mercurial > hg > orthanc-stone

annotate OrthancStone/Samples/Sdl/RtViewer/RtViewerSdl.cpp @ 1525:31b0449a163a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
JPEG mode re-enabled in MPR RT viewer + some docs
author Benjamin Golinvaux <bgo@osimis.io>
date Sat, 01 Aug 2020 14:42:31 +0200
parents 307a805d0587
children c7a37c3a0b8e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
1 /**
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
2 * Stone of Orthanc
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
4 * Department, University Hospital of Liege, Belgium
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
6 *
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
7 * This program is free software: you can redistribute it and/or
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
10 * the License, or (at your option) any later version.
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
11 *
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
12 * This program is distributed in the hope that it will be useful, but
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
15 * Affero General Public License for more details.
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
16 *
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
19 **/
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
20
1457
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1434
diff changeset
21 #include "../../Common/RtViewerApp.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1434
diff changeset
22 #include "../../Common/RtViewerView.h"
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
23 #include "../SdlHelpers.h"
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
24
1471
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
25 #include <EmbeddedResources.h>
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
26
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
27 // Stone of Orthanc includes
1512
244ad1e4e76a reorganization of folders
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1507
diff changeset
28 #include "../../../Sources/Loaders/GenericLoadersContext.h"
244ad1e4e76a reorganization of folders
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1507
diff changeset
29 #include "../../../Sources/OpenGL/OpenGLIncludes.h"
244ad1e4e76a reorganization of folders
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1507
diff changeset
30 #include "../../../Sources/OpenGL/SdlOpenGLContext.h"
244ad1e4e76a reorganization of folders
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1507
diff changeset
31 #include "../../../Sources/StoneException.h"
244ad1e4e76a reorganization of folders
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1507
diff changeset
32 #include "../../../Sources/StoneInitialization.h"
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
33
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
34 // Orthanc (a.o. for screenshot capture)
1507
169adf9090a6 replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1471
diff changeset
35 #include <Compatibility.h> // For std::unique_ptr<>
1457
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1434
diff changeset
36 #include <Images/Image.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1434
diff changeset
37 #include <Images/ImageProcessing.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1434
diff changeset
38 #include <Images/PngWriter.h>
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
39
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
40
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
41 #include <boost/program_options.hpp>
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
42 #include <boost/shared_ptr.hpp>
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
43
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
44 // #include <boost/pointer_cast.hpp> this include might be necessary in more recent boost versions
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
45
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
46 #include <SDL.h>
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
47
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
48 #include <string>
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
49
1430
5128b448a6ee yet another try to fix OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1429
diff changeset
50
1431
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
51 #if !defined(__APPLE__)
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
52 /**
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
53 * OpenGL: "OS X does not seem to support debug output functionality
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
54 * (as gathered online)."
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
55 * https://learnopengl.com/In-Practice/Debugging
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
56 **/
1430
5128b448a6ee yet another try to fix OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1429
diff changeset
57 static void GLAPIENTRY
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
58 OpenGLMessageCallback(GLenum source,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
59 GLenum type,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
60 GLuint id,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
61 GLenum severity,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
62 GLsizei length,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
63 const GLchar* message,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
64 const void* userParam)
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
65 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
66 if (severity != GL_DEBUG_SEVERITY_NOTIFICATION)
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
67 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
68 fprintf(stderr, "GL CALLBACK: %s type = 0x%x, severity = 0x%x, message = %s\n",
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
69 (type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : ""),
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
70 type, severity, message);
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
71 }
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
72 }
1431
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
73 #endif
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
74
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
75 namespace OrthancStone
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
76 {
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
77 void RtViewerView::EnableGLDebugOutput()
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
78 {
1431
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
79 #if !defined(__APPLE__)
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
80 glEnable(GL_DEBUG_OUTPUT);
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
81 glDebugMessageCallback(OpenGLMessageCallback, 0);
1431
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
82 #endif
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
83 }
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
84
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
85 boost::shared_ptr<IViewport> RtViewerView::CreateViewport(const std::string& canvasId)
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
86 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
87 // False means we do NOT let Windows treat this as a legacy application that needs to be scaled
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
88 return SdlOpenGLViewport::Create(canvasId, 1024, 1024, false);
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
89 }
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
90
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
91 void RtViewerApp::ProcessOptions(int argc, char* argv[])
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
92 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
93 namespace po = boost::program_options;
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
94 po::options_description desc("Usage:");
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
95
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
96 desc.add_options()
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
97 ("loglevel", po::value<std::string>()->default_value("WARNING"),
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
98 "You can choose WARNING, INFO or TRACE for the logging level: Errors and warnings will always be displayed. (default: WARNING)")
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
99
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
100 ("orthanc", po::value<std::string>()->default_value("http://localhost:8042"),
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
101 "Base URL of the Orthanc instance")
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
102
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
103 ("ctseries", po::value<std::string>()->default_value("a04ecf01-79b2fc33-58239f7e-ad9db983-28e81afa"),
1525
31b0449a163a JPEG mode re-enabled in MPR RT viewer + some docs
Benjamin Golinvaux <bgo@osimis.io>
parents: 1517
diff changeset
104 "Orthanc ID of the CT series to load. This must be supplied.")
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
105
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
106 ("rtdose", po::value<std::string>()->default_value("830a69ff-8e4b5ee3-b7f966c8-bccc20fb-d322dceb"),
1525
31b0449a163a JPEG mode re-enabled in MPR RT viewer + some docs
Benjamin Golinvaux <bgo@osimis.io>
parents: 1517
diff changeset
107 "Orthanc ID of the RTDOSE instance to load. This may be an empty string.")
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
108
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
109 ("rtstruct", po::value<std::string>()->default_value("54460695-ba3885ee-ddf61ac0-f028e31d-a6e474d9"),
1525
31b0449a163a JPEG mode re-enabled in MPR RT viewer + some docs
Benjamin Golinvaux <bgo@osimis.io>
parents: 1517
diff changeset
110 "Orthanc ID of the RTSTRUCT instance to load. This may be an empty string.")
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
111 ;
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
112
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
113 po::variables_map vm;
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
114 try
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
115 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
116 po::store(po::parse_command_line(argc, argv, desc), vm);
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
117 po::notify(vm);
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
118 }
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
119 catch (std::exception& e)
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
120 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
121 std::cerr << "Please check your command line options! (\"" << e.what() << "\")" << std::endl;
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
122 }
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
123
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
124 for (po::variables_map::iterator it = vm.begin(); it != vm.end(); ++it)
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
125 {
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
126 std::string key = it->first;
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
127 const po::variable_value& value = it->second;
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
128 const std::string& strValue = value.as<std::string>();
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
129 SetArgument(key, strValue);
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
130 }
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
131 }
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
132
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
133 void RtViewerApp::RunSdl(int argc, char* argv[])
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
134 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
135 ProcessOptions(argc, argv);
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
136
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
137 /**
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
138 Create the shared loaders context
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
139 */
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
140 loadersContext_.reset(new GenericLoadersContext(1, 4, 1));
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
141
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
142 // we are in SDL --> downcast to concrete type
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
143 boost::shared_ptr<GenericLoadersContext> loadersContext = boost::dynamic_pointer_cast<GenericLoadersContext>(loadersContext_);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
144
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
145 /**
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
146 Url of the Orthanc instance
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
147 Typically, in a native application (Qt, SDL), it will be an absolute URL like "http://localhost:8042". In
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
148 wasm on the browser, it could be an absolute URL, provided you do not have cross-origin problems, or a relative
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
149 URL. In our wasm samples, it is set to "..", because we set up either a reverse proxy or an Orthanc ServeFolders
1517
307a805d0587 rtviewer --> stone-rtviewer
Benjamin Golinvaux <bgo@osimis.io>
parents: 1512
diff changeset
150 plugin that serves the main web application from an URL like "http://localhost:8042/stone-rtviewer" (with ".."
307a805d0587 rtviewer --> stone-rtviewer
Benjamin Golinvaux <bgo@osimis.io>
parents: 1512
diff changeset
151 leading to the main Orthanc root URL)
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
152 */
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
153 std::string orthancUrl = arguments_["orthanc"];
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
154
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
155 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
156 Orthanc::WebServiceParameters p;
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
157 if (HasArgument("orthanc"))
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
158 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
159 p.SetUrl(orthancUrl);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
160 }
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
161 if (HasArgument("user"))
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
162 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
163 ORTHANC_ASSERT(HasArgument("password"));
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
164 p.SetCredentials(GetArgument("user"), GetArgument("password"));
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
165 }
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
166 else
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
167 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
168 ORTHANC_ASSERT(!HasArgument("password"));
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
169 }
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
170 loadersContext->SetOrthancParameters(p);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
171 }
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
172
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
173 loadersContext->StartOracle();
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
174
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
175 CreateLoaders();
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
176
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
177 /**
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
178 Create viewports
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
179 */
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
180 CreateView("RtViewer Axial", VolumeProjection_Axial);
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
181 CreateView("RtViewer Coronal", VolumeProjection_Coronal);
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
182 CreateView("RtViewer Sagittal", VolumeProjection_Sagittal);
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
183
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
184 for (size_t i = 0; i < views_.size(); ++i)
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
185 {
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
186 views_[i]->PrepareViewport();
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
187 views_[i]->EnableGLDebugOutput();
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
188 }
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
189
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
190 DefaultViewportInteractor interactor;
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
191
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
192 /**
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
193 It is very important that the Oracle (responsible for network I/O) be started before creating and firing the
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
194 loaders, for any command scheduled by the loader before the oracle is started will be lost.
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
195 */
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
196 StartLoaders();
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
197
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
198
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
199 SdlRunLoop(views_, interactor);
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
200 loadersContext->StopOracle();
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
201 }
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
202
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
203 void RtViewerView::TakeScreenshot(const std::string& target,
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
204 unsigned int canvasWidth,
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
205 unsigned int canvasHeight)
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
206 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
207 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
208 ViewportController& controller = lock->GetController();
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
209 Scene2D& scene = controller.GetScene();
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
210
1471
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
211 std::string ttf;
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
212 Orthanc::EmbeddedResources::GetFileResource(ttf, Orthanc::EmbeddedResources::UBUNTU_FONT);
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
213
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
214 CairoCompositor compositor(canvasWidth, canvasHeight);
1471
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
215 compositor.SetFont(0, ttf, FONT_SIZE_0, Orthanc::Encoding_Latin1);
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
216 compositor.Refresh(scene);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
217
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
218 Orthanc::ImageAccessor canvas;
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
219 compositor.GetCanvas().GetReadOnlyAccessor(canvas);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
220
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
221 Orthanc::Image png(Orthanc::PixelFormat_RGB24, canvas.GetWidth(), canvas.GetHeight(), false);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
222 Orthanc::ImageProcessing::Convert(png, canvas);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
223
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
224 Orthanc::PngWriter writer;
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
225 writer.WriteToFile(target, png);
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
226 }
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
227
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
228 static boost::shared_ptr<OrthancStone::RtViewerView> GetViewFromWindowId(
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
229 const std::vector<boost::shared_ptr<OrthancStone::RtViewerView> >& views,
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
230 Uint32 windowID)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
231 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
232 using namespace OrthancStone;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
233 for (size_t i = 0; i < views.size(); ++i)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
234 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
235 boost::shared_ptr<OrthancStone::RtViewerView> view = views[i];
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
236 boost::shared_ptr<IViewport> viewport = view->GetViewport();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
237 boost::shared_ptr<SdlViewport> sdlViewport = boost::dynamic_pointer_cast<SdlViewport>(viewport);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
238 Uint32 curWindowID = sdlViewport->GetSdlWindowId();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
239 if (windowID == curWindowID)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
240 return view;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
241 }
1427
cecedf0b1be6 fix for msvc2008
s.jodogne@gmail.com
parents: 1408
diff changeset
242 return boost::shared_ptr<OrthancStone::RtViewerView>();
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
243 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
244
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
245 void RtViewerApp::SdlRunLoop(const std::vector<boost::shared_ptr<OrthancStone::RtViewerView> >& views,
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
246 OrthancStone::IViewportInteractor& interactor)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
247 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
248 using namespace OrthancStone;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
249
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
250 // const std::vector<boost::shared_ptr<OrthancStone::RtViewerView> >& views
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
251 std::vector<boost::shared_ptr<OrthancStone::SdlViewport> > viewports;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
252 for (size_t i = 0; i < views.size(); ++i)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
253 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
254 boost::shared_ptr<RtViewerView> view = views[i];
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
255 boost::shared_ptr<IViewport> viewport = view->GetViewport();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
256 boost::shared_ptr<SdlViewport> sdlViewport =
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
257 boost::dynamic_pointer_cast<SdlViewport>(viewport);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
258 viewports.push_back(sdlViewport);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
259 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
260
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
261 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
262 int scancodeCount = 0;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
263 const uint8_t* keyboardState = SDL_GetKeyboardState(&scancodeCount);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
264
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
265 bool stop = false;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
266 while (!stop)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
267 {
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
268 std::vector<SDL_Event> sdlEvents;
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
269 std::map<Uint32,SDL_Event> userEventsMap;
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
270 SDL_Event sdlEvent;
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
271
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
272 // FIRST: collect all pending events
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
273 while (SDL_PollEvent(&sdlEvent) != 0)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
274 {
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
275 if ( (sdlEvent.type >= SDL_USEREVENT) &&
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
276 (sdlEvent.type < SDL_LASTEVENT) )
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
277 {
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
278 // we don't want to have multiple refresh events ,
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
279 // and since every refresh event is a user event with a special type,
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
280 // we use a map
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
281 userEventsMap[sdlEvent.type] = sdlEvent;
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
282 }
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
283 else
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
284 {
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
285 sdlEvents.push_back(sdlEvent);
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
286 }
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
287 }
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
288
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
289 // SECOND: add all user events to sdlEvents
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
290 for (std::map<Uint32,SDL_Event>::const_iterator it = userEventsMap.begin(); it != userEventsMap.end(); ++it)
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
291 sdlEvents.push_back(it->second);
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
292
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
293 // now process the events
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
294 for (std::vector<SDL_Event>::const_iterator it = sdlEvents.begin(); it != sdlEvents.end(); ++it)
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
295 {
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
296 const SDL_Event& sdlEvent = *it;
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
297
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
298 if (sdlEvent.type == SDL_QUIT)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
299 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
300 stop = true;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
301 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
302 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
303 else if (sdlEvent.type == SDL_WINDOWEVENT &&
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
304 (sdlEvent.window.event == SDL_WINDOWEVENT_RESIZED ||
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
305 sdlEvent.window.event == SDL_WINDOWEVENT_SIZE_CHANGED))
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
306 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
307 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId(
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
308 views, sdlEvent.window.windowID);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
309
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
310 boost::shared_ptr<SdlViewport> sdlViewport =
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
311 boost::dynamic_pointer_cast<SdlViewport>(view->GetViewport());
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
312
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
313 sdlViewport->UpdateSize(sdlEvent.window.data1, sdlEvent.window.data2);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
314 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
315 else if (sdlEvent.type == SDL_WINDOWEVENT &&
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
316 (sdlEvent.window.event == SDL_WINDOWEVENT_SHOWN ||
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
317 sdlEvent.window.event == SDL_WINDOWEVENT_EXPOSED))
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
318 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
319 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId(
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
320 views, sdlEvent.window.windowID);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
321 boost::shared_ptr<SdlViewport> sdlViewport =
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
322 boost::dynamic_pointer_cast<SdlViewport>(view->GetViewport());
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
323 sdlViewport->Paint();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
324 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
325 else if (sdlEvent.type == SDL_KEYDOWN &&
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
326 sdlEvent.key.repeat == 0 /* Ignore key bounce */)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
327 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
328 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId(
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
329 views, sdlEvent.window.windowID);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
330
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
331 switch (sdlEvent.key.keysym.sym)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
332 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
333 case SDLK_f:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
334 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
335 boost::shared_ptr<SdlViewport> sdlViewport =
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
336 boost::dynamic_pointer_cast<SdlViewport>(view->GetViewport());
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
337 sdlViewport->ToggleMaximize();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
338 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
339 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
340
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
341 case SDLK_s:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
342 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
343 std::unique_ptr<OrthancStone::IViewport::ILock> lock(view->GetViewport()->Lock());
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
344 lock->GetCompositor().FitContent(lock->GetController().GetScene());
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
345 lock->Invalidate();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
346 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
347 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
348
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
349 case SDLK_q:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
350 stop = true;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
351 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
352
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
353 default:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
354 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
355 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
356 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
357 else if (sdlEvent.type == SDL_MOUSEBUTTONDOWN ||
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
358 sdlEvent.type == SDL_MOUSEMOTION ||
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
359 sdlEvent.type == SDL_MOUSEBUTTONUP)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
360 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
361 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId(
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
362 views, sdlEvent.window.windowID);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
363
1507
169adf9090a6 replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1471
diff changeset
364 std::unique_ptr<OrthancStone::IViewport::ILock> lock(view->GetViewport()->Lock());
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
365 if (lock->HasCompositor())
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
366 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
367 OrthancStone::PointerEvent p;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
368 OrthancStoneHelpers::GetPointerEvent(p, lock->GetCompositor(),
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
369 sdlEvent, keyboardState, scancodeCount);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
370
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
371 switch (sdlEvent.type)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
372 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
373 case SDL_MOUSEBUTTONDOWN:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
374 lock->GetController().HandleMousePress(interactor, p,
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
375 lock->GetCompositor().GetCanvasWidth(),
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
376 lock->GetCompositor().GetCanvasHeight());
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
377 lock->Invalidate();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
378 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
379
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
380 case SDL_MOUSEMOTION:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
381 if (lock->GetController().HandleMouseMove(p))
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
382 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
383 lock->Invalidate();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
384 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
385 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
386
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
387 case SDL_MOUSEBUTTONUP:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
388 lock->GetController().HandleMouseRelease(p);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
389 lock->Invalidate();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
390 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
391
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
392 default:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
393 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
394 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
395 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
396 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
397 else if (sdlEvent.type == SDL_MOUSEWHEEL)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
398 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
399 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId(
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
400 views, sdlEvent.window.windowID);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
401
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
402 int delta = 0;
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
403 if (sdlEvent.wheel.y < 0)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
404 delta = -1;
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
405 if (sdlEvent.wheel.y > 0)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
406 delta = 1;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
407
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
408 view->Scroll(delta);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
409 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
410 else
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
411 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
412 for (size_t i = 0; i < views.size(); ++i)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
413 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
414 boost::shared_ptr<SdlViewport> sdlViewport =
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
415 boost::dynamic_pointer_cast<SdlViewport>(views[i]->GetViewport());
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
416 if (sdlViewport->IsRefreshEvent(sdlEvent))
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
417 {
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
418 sdlViewport->Paint();
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
419 }
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
420 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
421 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
422 }
1408
875c9a28236e Fixed busy CPU in RtViewer
Benjamin Golinvaux <bgo@osimis.io>
parents: 1406
diff changeset
423 // Small delay to avoid using 100% of CPU
875c9a28236e Fixed busy CPU in RtViewer
Benjamin Golinvaux <bgo@osimis.io>
parents: 1406
diff changeset
424 SDL_Delay(1);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
425 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
426 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
427 }
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
428 }
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
429
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
430 boost::weak_ptr<OrthancStone::RtViewerApp> g_app;
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
431
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
432 /**
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
433 * IMPORTANT: The full arguments to "main()" are needed for SDL on
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
434 * Windows. Otherwise, one gets the linking error "undefined reference
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
435 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
436 **/
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
437 int main(int argc, char* argv[])
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
438 {
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
439 using namespace OrthancStone;
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
440
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
441 StoneInitialize();
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
442
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
443 try
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
444 {
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
445 boost::shared_ptr<RtViewerApp> app = RtViewerApp::Create();
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
446 g_app = app;
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
447 app->RunSdl(argc,argv);
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
448 }
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
449 catch (Orthanc::OrthancException& e)
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
450 {
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
451 LOG(ERROR) << "EXCEPTION: " << e.What();
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
452 }
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
453
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
454 StoneFinalize();
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
455
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
456 return 0;
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
457 }
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
458