mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 17:30:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

changed how a position is read from default script.

Browse Source
This commit is contained in:
Joakim Kilby
2015-02-10 11:35:50 +01:00
parent 7c2f2f0972
commit b2df005dfe
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scenegraph/scenegraph.cpp
+26 -10
View File
@@ -382,6 +382,10 @@ bool SceneGraph::loadSceneInternal(const std::string& sceneDescriptionFilePath)
Camera* c = OsEng.ref().renderEngine().camera();
auto focusIterator = _allNodes.find(_focus);
glm::vec2 cameraScaling(1);
psc cameraPosition(0,0,1,0);
glm::vec3 cameraDirection = glm::vec3(0, 0, -1);
if (focusIterator != _allNodes.end()) {
LDEBUG("Camera focus is '" << _focus << "'");
SceneGraphNode* focusNode = focusIterator->second;
@@ -395,17 +399,24 @@ bool SceneGraph::loadSceneInternal(const std::string& sceneDescriptionFilePath)
// this part is full of magic!
glm::vec2 boundf = bound.vec2();
glm::vec2 scaling{1.0f, -boundf[1]};
//glm::vec2 scaling{1.0f, -boundf[1]};
cameraScaling = glm::vec2(1.f, -boundf[1]);
boundf[0] *= 5.0f;
psc cameraPosition = focusNode->position();
cameraPosition += psc(glm::vec4(0.f, 0.f, boundf));
//psc cameraPosition = focusNode->position();
//cameraPosition += psc(glm::vec4(0.f, 0.f, boundf));
cameraPosition = psc(glm::vec4(0.f, 0.f, 1.f,0.f));
//cameraPosition = psc(glm::vec4(0.f, 0.f, 1.f,0.f));
c->setPosition(cameraPosition);
c->setCameraDirection(glm::vec3(0, 0, -1));
c->setScaling(scaling);
cameraPosition = focusNode->position();
cameraPosition += psc(glm::vec4(0.f, 0.f, boundf));
//why this line? (JK)
cameraPosition = psc(glm::vec4(0.f, 0.f, 1.f, 0.f));
//c->setPosition(cameraPosition);
// c->setCameraDirection(glm::vec3(0, 0, -1));
// c->setScaling(scaling);
// Set the focus node for the interactionhandler
OsEng.interactionHandler().setFocusNode(focusNode);
@@ -421,15 +432,20 @@ bool SceneGraph::loadSceneInternal(const std::string& sceneDescriptionFilePath)
<< position[2] << ", "
<< position[3] << ")");
c->setPosition(position);
cameraPosition = psc(position);
//c->setPosition(position);
}
// the camera position
const SceneGraphNode* fn = OsEng.interactionHandler().focusNode();
psc relative = fn->worldPosition() - c->position();
//psc relative = fn->worldPosition() - c->position();
psc relative = fn->worldPosition() - cameraPosition;
glm::mat4 la = glm::lookAt(cameraPosition.vec3(), fn->worldPosition().vec3(), c->lookUpVector());
glm::mat4 la = glm::lookAt(c->position().vec3(), fn->worldPosition().vec3(), c->lookUpVector());
c->setRotation(la);
c->setPosition(cameraPosition);
c->setScaling(cameraScaling);
glm::vec3 viewOffset;
if (cameraDictionary.hasKey(constants::scenegraph::keyViewOffset)