mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-30 07:49:31 -05:00
Clean up structure so ScreenSpaceBrowser only executes string for javascript
This commit is contained in:
@@ -72,7 +72,7 @@ public:
|
||||
void update() override;
|
||||
bool isReady() const override;
|
||||
|
||||
void testMessage();
|
||||
void executeJavascript(std::string &script) const;
|
||||
|
||||
private:
|
||||
class ScreenSpaceRenderHandler : public WebRenderHandler {
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
****************************************************************************************/
|
||||
|
||||
#include <modules/webbrowser/include/screenspacebrowser.h>
|
||||
#include <openspace/util/coordinateconversion.h>
|
||||
|
||||
#include <modules/webbrowser/webbrowsermodule.h>
|
||||
#include <modules/webbrowser/include/webkeyboardhandler.h>
|
||||
@@ -57,30 +58,11 @@ namespace {
|
||||
|
||||
namespace openspace {
|
||||
|
||||
void ScreenSpaceBrowser::testMessage() {
|
||||
LINFOC(_loggerCat, "TJOHO");
|
||||
//_browserInstance->reshape(glm::ivec2(1000, 1000));
|
||||
|
||||
std::string mes2 = "var frame = document.getElementsByTagName('iframe')[0].contentWindow; const message : CenterOnCoordinatesMessage = { event: 'center_on_coordinates', ra : Number(50) , dec : Number(70), fov : Number(120), instant : false,}; frame.postMessage(message, 'https://web.wwtassets.org/research/latest/');";
|
||||
|
||||
//std::string thisFrame = "var frame = window.frames[0]; ";
|
||||
//std::string iFrame = "var frame = document.getElementsByTagName('iframe')[0].contentWindow;";
|
||||
std::string mes3 = "var message = {\
|
||||
event: 'center_on_coordinates',\
|
||||
ra : Number(80),\
|
||||
dec : Number(50),\
|
||||
fov : Number(70),\
|
||||
instant : false\
|
||||
};\
|
||||
window.postMessage(message, 'http://localhost:4690');";
|
||||
|
||||
|
||||
void ScreenSpaceBrowser::executeJavascript(std::string &script) const {
|
||||
LINFOC(_loggerCat, "Executing javascript " + script);
|
||||
|
||||
CefRefPtr<CefFrame> frame = _browserInstance->getBrowser()->GetMainFrame();
|
||||
|
||||
frame->ExecuteJavaScript(mes3,
|
||||
frame->GetURL(), 0);
|
||||
|
||||
|
||||
frame->ExecuteJavaScript(script, frame->GetURL(), 0);
|
||||
}
|
||||
|
||||
void ScreenSpaceBrowser::ScreenSpaceRenderHandler::draw() {}
|
||||
|
||||
Reference in New Issue
Block a user