mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-02-28 16:09:46 -06:00
Some work towards multi-pipe
This commit is contained in:
@@ -83,6 +83,8 @@ private:
|
||||
RenderEngine* _renderEngine;
|
||||
// ScriptEngine* _scriptEngine;
|
||||
ghoul::opencl::CLContext _context;
|
||||
|
||||
sgct::SharedVector<char> _synchronizationBuffer;
|
||||
};
|
||||
|
||||
#define OsEng (openspace::OpenSpaceEngine::ref())
|
||||
|
||||
@@ -44,15 +44,16 @@ public:
|
||||
void setSceneGraph(std::shared_ptr<SceneGraph> sceneGraph);
|
||||
std::shared_ptr<SceneGraph> sceneGraph();
|
||||
|
||||
Camera* camera() const;
|
||||
|
||||
// sgct wrapped functions
|
||||
bool initializeGL();
|
||||
void postSynchronizationPreDraw();
|
||||
void render();
|
||||
void postDraw();
|
||||
|
||||
// object extensions
|
||||
//virtual void encode();
|
||||
//virtual void decode();
|
||||
void serialize(std::vector<char>& dataStream, size_t& offset);
|
||||
void deserialize(const std::vector<char>& dataStream, size_t& offset);
|
||||
|
||||
private:
|
||||
Camera* _mainCamera;
|
||||
|
||||
@@ -58,6 +58,7 @@ public:
|
||||
const glm::quat& rotation() const;
|
||||
|
||||
const glm::vec3& viewDirection() const;
|
||||
|
||||
const float& maxFov() const;
|
||||
const float& sinMaxFov() const;
|
||||
void setMaxFov(float fov);
|
||||
|
||||
@@ -36,9 +36,9 @@ public:
|
||||
const double * value_ptr();
|
||||
const float * value_ptrf();
|
||||
glm::dvec4 getVec4() const;
|
||||
glm::vec4 getVec4f();
|
||||
glm::vec4 getVec4f() const;
|
||||
glm::dvec3 getVec3() const;
|
||||
glm::vec3 getVec3f();
|
||||
glm::vec3 getVec3f() const;
|
||||
pss length() const;
|
||||
glm::dvec3 getDirection() const;
|
||||
glm::vec3 getDirectionf() const;
|
||||
@@ -88,7 +88,7 @@ private:
|
||||
glm::dvec4 vec_;
|
||||
|
||||
// float vector used when returning float values
|
||||
glm::vec4 vecf_;
|
||||
mutable glm::vec4 vecf_;
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user