mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clang compile fixes

Browse Source
This commit is contained in:
Alexander Bock
2016-04-11 11:18:50 -04:00
parent 4ff0205eae
commit e4f8f8c830
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/fieldlines/rendering/renderablefieldlines.cpp
View File

@@ -225,7 +225,7 @@ void RenderableFieldlines::render(const RenderData& data) {
_program->setUniform("modelViewProjection", data.camera.viewProjectionMatrix());
_program->setUniform("modelTransform", glm::mat4(1.0));
_program->setUniform("cameraViewDir", data.camera.viewDirection());
setPscUniforms(_program.get(), &data.camera, data.position);
setPscUniforms(*_program, data.camera, data.position);
_program->setUniform("classification", _classification);
if (!_classification)

2
modules/multiresvolume/rendering/renderablemultiresvolume.h
View File

@@ -80,7 +80,7 @@ public:
bool isReady() const override;
virtual void update(const UpdateData& data) override;
virtual void RenderableMultiresVolume::render(const RenderData& data, RendererTasks& tasks);
virtual void render(const RenderData& data, RendererTasks& tasks);
//virtual void preResolve(ghoul::opengl::ProgramObject* program) override;
//virtual std::string getHeaderPath() override;
//virtual std::string getHelperPath() override;

4
modules/multiresvolume/rendering/tsp.cpp
View File

@@ -22,16 +22,18 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <sgct.h>
//#include <sgct.h>
#include <modules/multiresvolume/rendering/tsp.h>
// ghoul
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/filesystem/cachemanager.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/glm.h>
// std
#include <algorithm>
#include <math.h>
#include <queue>
namespace {