mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Compile fixes

Browse Source
This commit is contained in:
Emil Axelsson
2017-01-24 09:35:55 +01:00
parent 2a234befe8
commit e665bca128
6 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/kameleonvolume/rendering/kameleonvolumeraycaster.cpp
View File

@@ -28,6 +28,7 @@
#include <ghoul/opengl/ghoul_gl.h>
#include <sstream>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/textureunit.h>
#include <openspace/util/powerscaledcoordinate.h>
#include <openspace/util/updatestructures.h>
#include <openspace/rendering/renderable.h>

1
modules/kameleonvolume/rendering/kameleonvolumeraycaster.h
View File

@@ -45,6 +45,7 @@ namespace ghoul {
namespace opengl {
class Texture;
class ProgramObject;
class TextureUnit;
}
}

2
modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
View File

@@ -58,7 +58,7 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
, _lowerValueBound("lowerValueBound", "Lower Value Bound", 0.0, 0.0, 1)
, _upperValueBound("upperValueBound", "Upper Value Bound", 1, 0.01, 1)
, _autoValueBounds(false)
, _gridType("gridType", "Grid Type", properties::OptionProperty::DisplayType::DROPDOWN)
, _gridType("gridType", "Grid Type", properties::OptionProperty::DisplayType::Dropdown)
, _autoGridType(false)
, _clipPlanes(nullptr)
, _stepSize("stepSize", "Step Size", 0.02, 0.01, 1)

1
modules/kameleonvolume/rendering/renderablekameleonvolume.h
View File

@@ -27,6 +27,7 @@
#include <openspace/properties/vectorproperty.h>
#include <openspace/properties/optionproperty.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/util/boxgeometry.h>
#include <openspace/util/blockplaneintersectiongeometry.h>

1
modules/volume/CMakeLists.txt
View File

@@ -35,6 +35,7 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl
${CMAKE_CURRENT_SOURCE_DIR}/lrucache.h
${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.h
${CMAKE_CURRENT_SOURCE_DIR}/volumegridtype.h
${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.h
${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl
${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.h

4
modules/volume/volumegridtype.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __VOLUMEGRIDTYPE_H__
#define __VOLUMEGRIDTYPE_H__
#ifndef __OPENSPACE_MODULE_VOLUME___VOLUMEGRIDTYPE_H__
#define __OPENSPACE_MODULE_VOLUME___VOLUMEGRIDTYPE_H__
enum class VolumeGridType : int {
Cartesian = 0,