Some work towards multi-pipe

This commit is contained in:
Alexander Bock
2014-05-04 18:35:23 +02:00
parent 8a7bcc0036
commit 56f22d79c3
9 changed files with 210 additions and 11 deletions

View File

@@ -83,6 +83,8 @@ private:
RenderEngine* _renderEngine;
// ScriptEngine* _scriptEngine;
ghoul::opencl::CLContext _context;
sgct::SharedVector<char> _synchronizationBuffer;
};
#define OsEng (openspace::OpenSpaceEngine::ref())

View File

@@ -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;

View File

@@ -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);

View File

@@ -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_;
};