mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-18 10:59:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add function to disable faceCamera prpoerty

Browse Source
This commit is contained in:
Ester Lindgren
2021-03-03 10:24:13 +01:00
parent 8eadcafce3
commit f444fcfa80
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/skybrowser/skybrowsermodule_lua.inl
View File

@@ -29,16 +29,17 @@ namespace openspace::skybrowser::luascriptfunctions {
int followCamera(lua_State* L) {
ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::followCamera");
const SkybrowserModule* module = global::moduleEngine->module<SkybrowserModule>();
module->WWTfollowCamera();
ScreenSpaceBrowser* browser = dynamic_cast<ScreenSpaceBrowser*>(global::renderEngine->screenSpaceRenderable("ScreenSpaceBowser"));
module->WWTfollowCamera();
return 1;
}
int moveBrowser(lua_State* L) {
ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::moveBrowser");
ScreenSpaceBrowser* browser = dynamic_cast<ScreenSpaceBrowser*>(global::renderEngine->screenSpaceRenderable("ScreenSpaceBowser"));
browser->setFaceCameraPropertyToFalse();
browser->translate(glm::vec3(-0.8, -0.4, 0.0));
return 1;
}
@@ -47,7 +48,7 @@ namespace openspace::skybrowser::luascriptfunctions {
ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::createBrowser");
ghoul::lua::value<std::string>(L, 1);
const SkybrowserModule* module = global::moduleEngine->module<SkybrowserModule>();
const SkybrowserModule* module = global::moduleEngine->module<SkybrowserModule>();
//std::string _url = "https://wallpaperaccess.com/full/3010132.jpg";
// 'https://cdn.wallpapersafari.com/6/92/0nbCPw.jpg'
@@ -58,7 +59,7 @@ 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:7800/sky_browser/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() {}