comparison Platforms/Wasm/Defaults.cpp @ 255:65562a28fe05 am-2

fixes for WASM
author am@osimis.io
date Tue, 03 Jul 2018 13:19:56 +0200
parents 8ff70c04c6df
children d7d91d96b9d8
comparison
equal deleted inserted replaced
254:abc1c6231947 255:65562a28fe05
65 void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle viewport) { 65 void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle viewport) {
66 66
67 printf("CreateWasmApplication\n"); 67 printf("CreateWasmApplication\n");
68 68
69 application.reset(CreateUserApplication(broker)); 69 application.reset(CreateUserApplication(broker));
70 WasmWebService::SetBroker(broker);
70 71
71 startupParametersBuilder.Clear(); 72 startupParametersBuilder.Clear();
72 } 73 }
73 74
74 void EMSCRIPTEN_KEEPALIVE SetStartupParameter(const char* keyc, 75 void EMSCRIPTEN_KEEPALIVE SetStartupParameter(const char* keyc,
84 boost::program_options::variables_map parameters; 85 boost::program_options::variables_map parameters;
85 boost::program_options::options_description options; 86 boost::program_options::options_description options;
86 application->DeclareStartupOptions(options); 87 application->DeclareStartupOptions(options);
87 startupParametersBuilder.GetStartupParameters(parameters, options); 88 startupParametersBuilder.GetStartupParameters(parameters, options);
88 89
89 WasmWebService::SetBroker(broker);
90 context.reset(new OrthancStone::BasicApplicationContext(OrthancStone::WasmWebService::GetInstance())); 90 context.reset(new OrthancStone::BasicApplicationContext(OrthancStone::WasmWebService::GetInstance()));
91 application->Initialize(context.get(), statusBar_, parameters); 91 application->Initialize(context.get(), statusBar_, parameters);
92 application->InitializeWasm(); 92 application->InitializeWasm();
93 93
94 // viewport->SetSize(width_, height_); 94 // viewport->SetSize(width_, height_);