Windows compile fix

This commit is contained in:
Alexander Bock
2017-02-16 18:19:52 +01:00
parent 0d03177d43
commit 2da100c001
9 changed files with 8 additions and 21 deletions
@@ -31,7 +31,7 @@
namespace openspace {
namespace globebrowsing {
class TileIndex;
struct TileIndex;
class GeodeticPatch {
public:
@@ -40,6 +40,7 @@
#include <modules/globebrowsing/rendering/layer/layergroup.h>
#include <modules/globebrowsing/rendering/layer/layermanager.h>
#include <modules/debugging/rendering/debugrenderer.h>
#include <modules/globebrowsing/tile/tileindex.h>
#include <openspace/util/time.h>
@@ -47,7 +47,7 @@ namespace culling {
class Chunk;
class ChunkNode;
class ChunkRenderer;
class Geodetic2;
struct Geodetic2;
class LayerManager;
class RenderableGlobe;
@@ -45,7 +45,7 @@ class LayerRenderSettings;
struct TileDepthTransform;
struct TileUvTransform;
class LayerGroup;
struct LayerGroup;
struct TileIndex;
/**
@@ -32,7 +32,7 @@
namespace openspace {
namespace globebrowsing {
class LayerGroup;
struct LayerGroup;
/**
* Manages multiple LayerGroups.
+1
View File
@@ -29,6 +29,7 @@
#include <ghoul/glm.h>
#include <memory>
#include <sstream>
#include <cpl_error.h>
@@ -77,21 +77,6 @@ std::ostream& operator<<(std::ostream& os, const PixelRegion& pr) {
return os << pr.start.x << ", " << pr.start.y << " with size " << pr.numPixels.x << ", " << pr.numPixels.y;
}
TileDataLayout::TileDataLayout() {}
TileDataLayout::TileDataLayout(GDALDataset* dataSet, GLuint preferredGlType) {
// Assume all raster bands have the same data type
gdalType =preferredGlType != 0 ?
tiledatatype::getGdalDataType(preferredGlType) :
dataSet->GetRasterBand(1)->GetRasterDataType();
glType = tiledatatype::getOpenGLDataType(gdalType);
numRasters = dataSet->GetRasterCount();
bytesPerDatum = tiledatatype::numberOfBytes(gdalType);
bytesPerPixel = bytesPerDatum * numRasters;
textureFormat = tiledatatype::getTextureFormat(numRasters, gdalType);
}
TileDataset::IODescription TileDataset::IODescription::cut(PixelRegion::Side side, int pos) {
PixelRegion readPreCut = read.region;
PixelRegion writePreCut = write.region;
+1 -1
View File
@@ -37,7 +37,7 @@ namespace ghoul {
namespace openspace {
namespace globebrowsing {
class Geodetic2;
struct Geodetic2;
enum CardinalDirection {
WEST = 0,