mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-06 04:18:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move TileIOResult to separate file

Browse Source
This commit is contained in:
Erik Broberg
2016-06-28 11:18:57 -04:00
parent ddf7342563
commit 81676ed98f
5 changed files with 237 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/globebrowsing/CMakeLists.txt
View File

@@ -53,6 +53,7 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/tile/tileselector.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/tilediskcache.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/tiledataset.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/tileioresult.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/asynctilereader.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/tileprovidermanager.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/layeredtextureshaderprovider.h
@@ -96,6 +97,7 @@ set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/tile/tileselector.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/tilediskcache.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/tiledataset.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/tileioresult.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/asynctilereader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/tileprovidermanager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/layeredtextureshaderprovider.cpp

94
modules/globebrowsing/tile/tiledataset.cpp
View File

@@ -50,99 +50,7 @@ namespace {
namespace openspace {
void TilePreprocessData::serialize(std::ostream& os) {
os << maxValues.size() << std::endl;
for (float f : maxValues) {
os << f << " ";
}
os << std::endl;
for (float f : minValues) {
os << f << " ";
}
os << std::endl;
}
TilePreprocessData TilePreprocessData::deserialize(std::istream& is) {
TilePreprocessData res;
int n; is >> n;
res.maxValues.resize(n);
for (int i = 0; i < n; i++) {
is >> res.maxValues[i];
}
res.minValues.resize(n);
for (int i = 0; i < n; i++) {
is >> res.minValues[i];
}
return std::move(res);
}
TileIOResult::TileIOResult()
: imageData(nullptr)
, dimensions(0, 0, 0)
, preprocessData(nullptr)
, chunkIndex(0, 0, 0)
, error(CE_None)
, nBytesImageData(0)
{
}
TileIOResult TileIOResult::createDefaultRes() {
TileIOResult defaultRes;
int w = 8;
int h = 8;
defaultRes.dimensions = glm::uvec3(w, h, 1);
defaultRes.nBytesImageData = w * h * 1 * 3 * 4; // assume max 3 channels, max 4 bytes per pixel
defaultRes.imageData = new char[defaultRes.nBytesImageData];
std::fill_n((char*)defaultRes.imageData, defaultRes.nBytesImageData, 0);
return std::move(defaultRes);
}
void TileIOResult::serializeMetaData(std::ostream& os) {
os << dimensions.x << " " << dimensions.y << " " << dimensions.z << std::endl;
os << chunkIndex.x << " " << chunkIndex.y << " " << chunkIndex.level << std::endl;
os << error << std::endl;
// preprocess data
os << (preprocessData != nullptr) << std::endl;
if (preprocessData != nullptr) {
preprocessData->serialize(os);
}
os << nBytesImageData << std::endl;
}
TileIOResult TileIOResult::deserializeMetaData(std::istream& is) {
TileIOResult res;
is >> res.dimensions.x >> res.dimensions.y >> res.dimensions.z;
is >> res.chunkIndex.x >> res.chunkIndex.y >> res.chunkIndex.level;
int err; is >> err; res.error = (CPLErr) err;
res.preprocessData = nullptr;
bool hasPreprocessData;
is >> hasPreprocessData;
if (hasPreprocessData) {
TilePreprocessData preprocessData = TilePreprocessData::deserialize(is);
res.preprocessData = std::make_shared<TilePreprocessData>(preprocessData);
}
is >> res.nBytesImageData;
char binaryDataSeparator;
is >> binaryDataSeparator; // not used
char* buffer = new char[res.nBytesImageData]();
return std::move(res);
}
// INIT THIS TO FALSE AFTER REMOVED FROM TILEPROVIDER
bool TileDataset::GdalHasBeenInitialized = false;

43
modules/globebrowsing/tile/tiledataset.h
View File

@@ -28,7 +28,7 @@
//#include <modules/globebrowsing/other/tileprovider.h>
#include <ghoul/opengl/texture.h>
#include <modules/globebrowsing/tile/tileioresult.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/other/threadpool.h>
@@ -49,47 +49,6 @@ namespace openspace {
using namespace ghoul::opengl;
using namespace ghoul::filesystem;
struct TilePreprocessData {
std::vector<float> maxValues;
std::vector<float> minValues;
void serialize(std::ostream& s);
static TilePreprocessData deserialize(std::istream& s);
};
struct TextureFormat {
Texture::Format ghoulFormat;
GLuint glFormat;
};
struct TileIOResult {
TileIOResult();
void* imageData;
glm::uvec3 dimensions;
std::shared_ptr<TilePreprocessData> preprocessData;
ChunkIndex chunkIndex;
CPLErr error;
size_t nBytesImageData;
void serializeMetaData(std::ostream& s);
static TileIOResult deserializeMetaData(std::istream& s);
static TileIOResult createDefaultRes();
};
struct TileDepthTransform {
float depthScale;
float depthOffset;
};
class TileDataset {
public:

145
modules/globebrowsing/tile/tileioresult.cpp Normal file
View File

@@ -0,0 +1,145 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* 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. *
****************************************************************************************/
#include <ogr_featurestyle.h>
#include <ogr_spatialref.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/filesystem/filesystem.h> // abspath
#include <ghoul/misc/assert.h>
#include <modules/globebrowsing/tile/tileprovider.h>
#include <modules/globebrowsing/geometry/angle.h>
#include <float.h>
#include <sstream>
#include <algorithm>
namespace {
const std::string _loggerCat = "TileIOResult";
}
namespace openspace {
void TilePreprocessData::serialize(std::ostream& os) {
os << maxValues.size() << std::endl;
for (float f : maxValues) {
os << f << " ";
}
os << std::endl;
for (float f : minValues) {
os << f << " ";
}
os << std::endl;
}
TilePreprocessData TilePreprocessData::deserialize(std::istream& is) {
TilePreprocessData res;
int n; is >> n;
res.maxValues.resize(n);
for (int i = 0; i < n; i++) {
is >> res.maxValues[i];
}
res.minValues.resize(n);
for (int i = 0; i < n; i++) {
is >> res.minValues[i];
}
return std::move(res);
}
TileIOResult::TileIOResult()
: imageData(nullptr)
, dimensions(0, 0, 0)
, preprocessData(nullptr)
, chunkIndex(0, 0, 0)
, error(CE_None)
, nBytesImageData(0)
{
}
TileIOResult TileIOResult::createDefaultRes() {
TileIOResult defaultRes;
int w = 8;
int h = 8;
defaultRes.dimensions = glm::uvec3(w, h, 1);
defaultRes.nBytesImageData = w * h * 1 * 3 * 4; // assume max 3 channels, max 4 bytes per pixel
defaultRes.imageData = new char[defaultRes.nBytesImageData];
std::fill_n((char*)defaultRes.imageData, defaultRes.nBytesImageData, 0);
return std::move(defaultRes);
}
void TileIOResult::serializeMetaData(std::ostream& os) {
os << dimensions.x << " " << dimensions.y << " " << dimensions.z << std::endl;
os << chunkIndex.x << " " << chunkIndex.y << " " << chunkIndex.level << std::endl;
os << error << std::endl;
// preprocess data
os << (preprocessData != nullptr) << std::endl;
if (preprocessData != nullptr) {
preprocessData->serialize(os);
}
os << nBytesImageData << std::endl;
}
TileIOResult TileIOResult::deserializeMetaData(std::istream& is) {
TileIOResult res;
is >> res.dimensions.x >> res.dimensions.y >> res.dimensions.z;
is >> res.chunkIndex.x >> res.chunkIndex.y >> res.chunkIndex.level;
int err; is >> err; res.error = (CPLErr) err;
res.preprocessData = nullptr;
bool hasPreprocessData;
is >> hasPreprocessData;
if (hasPreprocessData) {
TilePreprocessData preprocessData = TilePreprocessData::deserialize(is);
res.preprocessData = std::make_shared<TilePreprocessData>(preprocessData);
}
is >> res.nBytesImageData;
char binaryDataSeparator;
is >> binaryDataSeparator; // not used
char* buffer = new char[res.nBytesImageData]();
return std::move(res);
}
} // namespace openspace

88
modules/globebrowsing/tile/tileioresult.h Normal file
View File

@@ -0,0 +1,88 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* 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 __TILE_IO_RESULT_H__
#define __TILE_IO_RESULT_H__
#include <ghoul/opengl/texture.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <ghoul/filesystem/file.h>
#include "gdal_priv.h"
#include <memory>
#include <iostream>
namespace openspace {
using namespace ghoul::opengl;
using namespace ghoul::filesystem;
struct TilePreprocessData {
std::vector<float> maxValues;
std::vector<float> minValues;
void serialize(std::ostream& s);
static TilePreprocessData deserialize(std::istream& s);
};
struct TextureFormat {
Texture::Format ghoulFormat;
GLuint glFormat;
};
struct TileIOResult {
TileIOResult();
void* imageData;
glm::uvec3 dimensions;
std::shared_ptr<TilePreprocessData> preprocessData;
ChunkIndex chunkIndex;
CPLErr error;
size_t nBytesImageData;
void serializeMetaData(std::ostream& s);
static TileIOResult deserializeMetaData(std::istream& s);
static TileIOResult createDefaultRes();
};
struct TileDepthTransform {
float depthScale;
float depthOffset;
};
} // namespace openspace
#endif // __TILE_IO_RESULT_H__