mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 00:38:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

More code cleanup, force inclusion of swizzling for GLM

Browse Source
This commit is contained in:
Alexander Bock
2014-09-19 17:44:33 +02:00
parent 51be4b1788
commit dd629db53d
11 changed files with 1241 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

211
include/openspace/rendering/renderablevolumecl.h
View File

@@ -1,105 +1,106 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __RENDERABLEVOLUMECL_H__
#define __RENDERABLEVOLUMECL_H__
// open space includes
#include <openspace/rendering/renderablevolume.h>
// ghoul includes
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
#include <ghoul/opengl/framebufferobject.h>
#include <ghoul/opencl/clcontext.h>
#include <ghoul/opencl/clcommandqueue.h>
#include <ghoul/opencl/clprogram.h>
#include <ghoul/opencl/clkernel.h>
#include <ghoul/opencl/clworksize.h>
#include <ghoul/io/rawvolumereader.h>
#include <ghoul/filesystem/file.h>
#define SGCT_WINDOWS_INCLUDE
#include <sgct.h>
namespace sgct_utils {
class SGCTBox;
}
//#include <vector>
//#include <string>
#ifdef __APPLE__
#include <memory>
#else
#include <mutex>
#endif
namespace openspace {
class RenderableVolumeCL: public RenderableVolume {
public:
// constructors & destructor
RenderableVolumeCL(const ghoul::Dictionary& dictionary);
~RenderableVolumeCL();
bool initialize();
bool deinitialize();
virtual void render(const Camera *camera, const psc& thisPosition);
virtual void update();
private:
void safeKernelCompilation();
std::string _filename;
ghoul::RawVolumeReader::ReadHints _hints;
float _stepSize;
ghoul::opengl::FramebufferObject* _fbo;
ghoul::opengl::Texture* _backTexture;
ghoul::opengl::Texture* _frontTexture;
ghoul::opengl::Texture* _volume;
ghoul::opengl::Texture* _output;
ghoul::opengl::ProgramObject *_fboProgram;
ghoul::opengl::ProgramObject *_quadProgram;
sgct_utils::SGCTBox* _boundingBox;
GLuint _screenQuad;
ghoul::opencl::CLContext _context;
ghoul::opencl::CLCommandQueue _commands;
ghoul::opencl::CLProgram _program;
ghoul::opencl::CLKernel _kernel;
ghoul::opencl::CLWorkSize* _ws;
cl_mem _clBackTexture, _clFrontTexture, _clVolume, _clOutput;
ghoul::filesystem::File* _kernelSourceFile;
bool _kernelUpdateOnSave;
std::mutex* _kernelMutex;
};
} // namespace openspace
#endif
// This is still in the repository to be cannibalized for a possible rewrite (ab)
///*****************************************************************************************
// * *
// * OpenSpace *
// * *
// * Copyright (c) 2014 *
// * *
// * Permission is hereby granted, free of charge, to any person obtaining a copy of this *
// * software and associated documentation files (the "Software"), to deal in the Software *
// * without restriction, including without limitation the rights to use, copy, modify, *
// * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
// * permit persons to whom the Software is furnished to do so, subject to the following *
// * conditions: *
// * *
// * The above copyright notice and this permission notice shall be included in all copies *
// * or substantial portions of the Software. *
// * *
// * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
// * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
// * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
// * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
// * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
// * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
// ****************************************************************************************/
//
//#ifndef __RENDERABLEVOLUMECL_H__
//#define __RENDERABLEVOLUMECL_H__
//
//// open space includes
//#include <openspace/rendering/renderablevolume.h>
//
//// ghoul includes
//#include <ghoul/opengl/programobject.h>
//#include <ghoul/opengl/texture.h>
//#include <ghoul/opengl/framebufferobject.h>
//#include <ghoul/opencl/clcontext.h>
//#include <ghoul/opencl/clcommandqueue.h>
//#include <ghoul/opencl/clprogram.h>
//#include <ghoul/opencl/clkernel.h>
//#include <ghoul/opencl/clworksize.h>
//#include <ghoul/io/rawvolumereader.h>
//#include <ghoul/filesystem/file.h>
//
//#define SGCT_WINDOWS_INCLUDE
//#include <sgct.h>
//
//namespace sgct_utils {
// class SGCTBox;
//}
//
////#include <vector>
////#include <string>
//#ifdef __APPLE__
// #include <memory>
//#else
// #include <mutex>
//#endif
//
//namespace openspace {
//
//class RenderableVolumeCL: public RenderableVolume {
//public:
//
// // constructors & destructor
// RenderableVolumeCL(const ghoul::Dictionary& dictionary);
// ~RenderableVolumeCL();
//
// bool initialize();
// bool deinitialize();
//
// virtual void render(const Camera *camera, const psc& thisPosition);
// virtual void update();
//
//private:
//
// void safeKernelCompilation();
//
// std::string _filename;
// ghoul::RawVolumeReader::ReadHints _hints;
// float _stepSize;
// ghoul::opengl::FramebufferObject* _fbo;
// ghoul::opengl::Texture* _backTexture;
// ghoul::opengl::Texture* _frontTexture;
// ghoul::opengl::Texture* _volume;
// ghoul::opengl::Texture* _output;
// ghoul::opengl::ProgramObject *_fboProgram;
// ghoul::opengl::ProgramObject *_quadProgram;
// sgct_utils::SGCTBox* _boundingBox;
// GLuint _screenQuad;
//
// ghoul::opencl::CLContext _context;
// ghoul::opencl::CLCommandQueue _commands;
// ghoul::opencl::CLProgram _program;
// ghoul::opencl::CLKernel _kernel;
// ghoul::opencl::CLWorkSize* _ws;
// cl_mem _clBackTexture, _clFrontTexture, _clVolume, _clOutput;
//
// ghoul::filesystem::File* _kernelSourceFile;
// bool _kernelUpdateOnSave;
// std::mutex* _kernelMutex;
//
//};
//
//} // namespace openspace
//
//#endif

237
include/openspace/rendering/renderablevolumeexpert.h
View File

@@ -1,118 +1,119 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __RENDERABLEVOLUMEEXPERT_H__
#define __RENDERABLEVOLUMEEXPERT_H__
// open space includes
#include <openspace/rendering/renderablevolume.h>
#include <openspace/rendering/volumeraycasterbox.h>
// ghoul includes
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
#include <ghoul/opengl/framebufferobject.h>
#include <ghoul/opencl/clcontext.h>
#include <ghoul/opencl/clcommandqueue.h>
#include <ghoul/opencl/clprogram.h>
#include <ghoul/opencl/clkernel.h>
#include <ghoul/filesystem/file.h>
#ifdef __APPLE__
#include <memory>
#else
#include <mutex>
#endif
namespace ghoul {
namespace opencl {
class CLWorkSize;
}
}
namespace openspace {
class RenderableVolumeExpert: public RenderableVolume {
public:
// constructors & destructor
RenderableVolumeExpert(const ghoul::Dictionary& dictionary);
~RenderableVolumeExpert();
bool initialize();
bool deinitialize();
virtual void render(const Camera *camera, const psc& thisPosition);
virtual void update();
private:
// private methods
void safeKernelCompilation();
void safeUpdateTexture(const ghoul::filesystem::File& file);
// Volumes
std::vector<std::string> _volumePaths;
std::vector<ghoul::Dictionary> _volumeHints;
// Textures
ghoul::opengl::Texture* _output;
std::vector<ghoul::opengl::Texture*> _volumes;
std::vector<ghoul::opengl::Texture*> _transferFunctions;
std::vector<ghoul::filesystem::File*> _transferFunctionsFiles;
// opencl texture memory pointers
cl_mem _clBackTexture;
cl_mem _clFrontTexture;
cl_mem _clOutput;
std::vector<cl_mem> _clVolumes;
std::vector<cl_mem> _clTransferFunctions;
// opencl program
ghoul::opencl::CLContext _context;
ghoul::opencl::CLCommandQueue _commands;
ghoul::opencl::CLProgram _program;
ghoul::opencl::CLKernel _kernel;
ghoul::opencl::CLWorkSize* _ws;
ghoul::filesystem::File* _kernelSourceFile;
std::vector<std::pair<ghoul::opencl::CLProgram::Option, bool> > _kernelOptions;
std::vector<std::string> _kernelIncludes;
std::vector<std::pair<std::string,std::string> > _kernelDefinitions;
bool _programUpdateOnSave;
// mutexes to prevent inconsistencies
std::mutex* _kernelLock;
std::mutex* _textureLock;
ghoul::opengl::ProgramObject *_quadProgram;
GLuint _screenQuad;
VolumeRaycasterBox* _colorBoxRenderer;
glm::vec3 _boxScaling;
};
} // namespace openspace
#endif
// This is still in the repository to be cannibalized for a possible rewrite (ab)
///*****************************************************************************************
// * *
// * OpenSpace *
// * *
// * Copyright (c) 2014 *
// * *
// * Permission is hereby granted, free of charge, to any person obtaining a copy of this *
// * software and associated documentation files (the "Software"), to deal in the Software *
// * without restriction, including without limitation the rights to use, copy, modify, *
// * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
// * permit persons to whom the Software is furnished to do so, subject to the following *
// * conditions: *
// * *
// * The above copyright notice and this permission notice shall be included in all copies *
// * or substantial portions of the Software. *
// * *
// * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
// * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
// * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
// * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
// * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
// * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
// ****************************************************************************************/
//
//#ifndef __RENDERABLEVOLUMEEXPERT_H__
//#define __RENDERABLEVOLUMEEXPERT_H__
//
//// open space includes
//#include <openspace/rendering/renderablevolume.h>
//#include <openspace/rendering/volumeraycasterbox.h>
//
//// ghoul includes
//#include <ghoul/opengl/programobject.h>
//#include <ghoul/opengl/texture.h>
//#include <ghoul/opengl/framebufferobject.h>
//#include <ghoul/opencl/clcontext.h>
//#include <ghoul/opencl/clcommandqueue.h>
//#include <ghoul/opencl/clprogram.h>
//#include <ghoul/opencl/clkernel.h>
//#include <ghoul/filesystem/file.h>
//
//#ifdef __APPLE__
// #include <memory>
//#else
// #include <mutex>
//#endif
//
//namespace ghoul {
// namespace opencl {
// class CLWorkSize;
// }
//}
//
//namespace openspace {
//
//class RenderableVolumeExpert: public RenderableVolume {
//public:
//
// // constructors & destructor
// RenderableVolumeExpert(const ghoul::Dictionary& dictionary);
// ~RenderableVolumeExpert();
//
// bool initialize();
// bool deinitialize();
//
// virtual void render(const Camera *camera, const psc& thisPosition);
// virtual void update();
//
//private:
//
// // private methods
// void safeKernelCompilation();
// void safeUpdateTexture(const ghoul::filesystem::File& file);
//
// // Volumes
// std::vector<std::string> _volumePaths;
// std::vector<ghoul::Dictionary> _volumeHints;
//
// // Textures
// ghoul::opengl::Texture* _output;
// std::vector<ghoul::opengl::Texture*> _volumes;
// std::vector<ghoul::opengl::Texture*> _transferFunctions;
// std::vector<ghoul::filesystem::File*> _transferFunctionsFiles;
//
// // opencl texture memory pointers
// cl_mem _clBackTexture;
// cl_mem _clFrontTexture;
// cl_mem _clOutput;
// std::vector<cl_mem> _clVolumes;
// std::vector<cl_mem> _clTransferFunctions;
//
// // opencl program
// ghoul::opencl::CLContext _context;
// ghoul::opencl::CLCommandQueue _commands;
// ghoul::opencl::CLProgram _program;
// ghoul::opencl::CLKernel _kernel;
// ghoul::opencl::CLWorkSize* _ws;
// ghoul::filesystem::File* _kernelSourceFile;
// std::vector<std::pair<ghoul::opencl::CLProgram::Option, bool> > _kernelOptions;
// std::vector<std::string> _kernelIncludes;
// std::vector<std::pair<std::string,std::string> > _kernelDefinitions;
// bool _programUpdateOnSave;
//
// // mutexes to prevent inconsistencies
// std::mutex* _kernelLock;
// std::mutex* _textureLock;
//
// ghoul::opengl::ProgramObject *_quadProgram;
// GLuint _screenQuad;
//
// VolumeRaycasterBox* _colorBoxRenderer;
// glm::vec3 _boxScaling;
//
//};
//
//} // namespace openspace
//
//#endif

2
include/openspace/rendering/renderablevolumegl.h
View File

@@ -25,7 +25,6 @@
#ifndef __RENDERABLEVOLUMEGL_H__
#define __RENDERABLEVOLUMEGL_H__
// open space includes
#include <openspace/rendering/renderablevolume.h>
// ghoul includes
@@ -39,7 +38,6 @@ namespace openspace {
class RenderableVolumeGL: public RenderableVolume {
public:
// constructors & destructor
RenderableVolumeGL(const ghoul::Dictionary& dictionary);
~RenderableVolumeGL();

10
include/openspace/util/constants.h
View File

@@ -61,6 +61,16 @@ namespace renderableplanet {
const std::string keyGeometry = "Geometry";
} // namespace renderableplanet
namespace renderablevolumegl {
const std::string keyVolume = "Volume";
const std::string keyHints = "Hints";
const std::string keyTransferFunction = "TransferFunction";
const std::string keySampler = "Sampler";
const std::string keyBoxScaling = "BoxScaling";
const std::string keyVolumeName = "VolumeName";
const std::string keyTransferFunctionName = "TransferFunctionName";
} // namespace renderablevolumegl
namespace planetgeometry {
const std::string keyType = "Type";
} // namespace planetgeometry