mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-19 08:41:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolve

Browse Source
This commit is contained in:
Ylva Selling
2021-03-03 11:39:16 +01:00
parent df5719f39f f444fcfa80
commit f3de15de59
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/skybrowser/skybrowsermodule_lua.inl
View File

@@ -42,6 +42,7 @@ namespace openspace::skybrowser::luascriptfunctions {
//SkybrowserModule* module = global::moduleEngine->module<SkybrowserModule>();
// module->skyBrowser()->translate(glm::vec3(-0.8, -0.4, 0.0));
ScreenSpaceBrowser* browser = dynamic_cast<ScreenSpaceBrowser*>(global::renderEngine->screenSpaceRenderable("ScreenSpaceBowser"));
browser->setFaceCameraPropertyToFalse();
browser->translate(glm::vec3(-0.8, -0.4, 0.0));
return 1;
}
@@ -52,6 +53,7 @@ namespace openspace::skybrowser::luascriptfunctions {
SkybrowserModule* module = global::moduleEngine->module<SkybrowserModule>();
//std::string _url = "https://wallpaperaccess.com/full/3010132.jpg";
// 'https://cdn.wallpapersafari.com/6/92/0nbCPw.jpg'
@@ -61,7 +63,8 @@ namespace openspace::skybrowser::luascriptfunctions {
node.setValue("Type", "ScreenSpaceBrowser"s);
node.setValue("Identifier", "ScreenSpaceBowser"s);
node.setValue("Name", "Screen Space Bowser"s);
node.setValue("Url", "http://localhost:8000/index.html"s);
node.setValue("Url", "http://localhost:8000/"s);
// node.setValue("Dimensions", "glm::ivec2(1000, 1000)");
openspace::global::scriptEngine->queueScript(

1
modules/webbrowser/include/screenspacebrowser.h
View File

@@ -74,6 +74,7 @@ public:
void executeJavascript(std::string &script) const;
void translate(glm::vec3 translation);
void setFaceCameraPropertyToFalse();
private:
class ScreenSpaceRenderHandler : public WebRenderHandler {

4
modules/webbrowser/src/screenspacebrowser.cpp
View File

@@ -71,6 +71,10 @@ void ScreenSpaceBrowser::translate(glm::vec3 translation) {
_cartesianPosition = glm::translate(glm::mat4(1.f), translation) * glm::vec4(position, 1.0f);
}
void ScreenSpaceBrowser::setFaceCameraPropertyToFalse() {
_faceCamera = false;
}
void ScreenSpaceBrowser::ScreenSpaceRenderHandler::draw() {}
void ScreenSpaceBrowser::ScreenSpaceRenderHandler::render() {}