Minor compile fixes

This commit is contained in:
Alexander Bock
2017-10-10 11:27:29 -04:00
parent 23f9f3714d
commit 45d5676177
3 changed files with 4 additions and 2 deletions

View File

@@ -158,7 +158,7 @@ void RenderableGalaxy::initialize() {
_aspect = static_cast<glm::vec3>(_volumeDimensions);
_aspect = _aspect / std::max(std::max(_aspect.x, _aspect.y), _aspect.z);
RawVolumeReader<glm::tvec4<GLfloat>> reader(_volumeFilename, _volumeDimensions);
volume::RawVolumeReader<glm::tvec4<GLfloat>> reader(_volumeFilename, _volumeDimensions);
_volume = reader.read();
_texture = std::make_unique<ghoul::opengl::Texture>(

View File

@@ -63,7 +63,7 @@ private:
std::string _pointsFilename;
std::unique_ptr<GalaxyRaycaster> _raycaster;
std::unique_ptr<RawVolume<glm::tvec4<GLfloat>>> _volume;
std::unique_ptr<volume::RawVolume<glm::tvec4<GLfloat>>> _volume;
std::unique_ptr<ghoul::opengl::Texture> _texture;
glm::mat4 _pointTransform;
glm::vec3 _aspect;

View File

@@ -83,6 +83,8 @@ std::string MilkywayConversionTask::description()
}
void MilkywayConversionTask::perform(const Task::ProgressCallback& progressCallback) {
using namespace openspace::volume;
std::vector<std::string> filenames;
for (int i = 0; i < _inNSlices; i++) {
filenames.push_back(_inFilenamePrefix + std::to_string(i + _inFirstIndex) + _inFilenameSuffix);