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

Feature/volume tools (#614)

Browse Source 
* Create volume generation task

* Change domain bounds into a non-optional parameter

* Work on volume generation and rendering

* Example generation of time varying volume

* Example generation of time varying volume

* Compile fix in RenderableKameleonVolume

* Fix copy and paste error

* Enable spherical raycasting again

* Uniform naming

* Add some documentation and remove dead code
This commit is contained in:
Emil Axelsson
2018-06-08 09:47:24 -04:00
committed by micahnyc
parent 0d870f7c9d
commit 5de728442d
29 changed files with 858 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/toyvolume/rendering/toyvolumeraycaster.cpp
+13 -10
View File
@@ -24,18 +24,21 @@
#include <modules/toyvolume/rendering/toyvolumeraycaster.h>
#include <ghoul/glm.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <sstream>
#include <ghoul/opengl/programobject.h>
#include <openspace/util/powerscaledcoordinate.h>
#include <openspace/util/updatestructures.h>
#include <openspace/rendering/renderable.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/glm.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/filesystem/filesystem.h>
#include <sstream>
namespace {
const char* GlslRaycastPath = "${MODULES}/toyvolume/shaders/raycast.glsl";
const char* GlslBoundsVsPath = "${MODULES}/toyvolume/shaders/boundsvs.glsl";
const char* GlslBoundsFsPath = "${MODULES}/toyvolume/shaders/boundsfs.glsl";
const char* GlslRaycastPath = "${MODULE_TOYVOLUME}/shaders/raycast.glsl";
const char* GlslBoundsVsPath = "${MODULE_TOYVOLUME}/shaders/boundsvs.glsl";
const char* GlslBoundsFsPath = "${MODULE_TOYVOLUME}/shaders/boundsfs.glsl";
} // namespace
namespace openspace {
@@ -125,15 +128,15 @@ bool ToyVolumeRaycaster::cameraIsInside(const RenderData& data,
}
std::string ToyVolumeRaycaster::getBoundsVsPath() const {
return GlslBoundsVsPath;
return absPath(GlslBoundsVsPath);
}
std::string ToyVolumeRaycaster::getBoundsFsPath() const {
return GlslBoundsFsPath;
return absPath(GlslBoundsFsPath);
}
std::string ToyVolumeRaycaster::getRaycastPath() const {
return GlslRaycastPath;
return absPath(GlslRaycastPath);
}
std::string ToyVolumeRaycaster::getHelperPath() const {