mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-11 22:10:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Solve problems with building on OSX.

Browse Source
This commit is contained in:
Kalle Bladin
2016-05-08 21:46:28 -04:00
parent b63f427cff
commit 47fa0efed8
8 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libgdal.dylib
Symlink
+1
View File
@@ -0,0 +1 @@
libgdal.1.dylib
modules/globebrowsing/geodetics/angle.inl
+1 -1
View File
@@ -85,7 +85,7 @@ Angle<T> Angle<T>::fromDegrees(T degrees) {
template <typename T>
Angle<T> Angle<T>::fromRevolutions(T revs) {
return Angle<T>(asDegrees * 2 * PI);
return Angle<T>(revs * 2 * PI);
}
modules/globebrowsing/geodetics/geodetic2.h
+1 -1
View File
@@ -135,7 +135,7 @@ public:
GeodeticPatch(const GeodeticPatch& patch);
GeodeticPatch::GeodeticPatch(const GeodeticTileIndex& tileIndex);
GeodeticPatch(const GeodeticTileIndex& tileIndex);
void setCenter(const Geodetic2&);
modules/globebrowsing/globes/clipmapglobe.cpp
+2 -2
View File
@@ -53,11 +53,11 @@ namespace openspace {
{
// init Renderer
auto outerPatchRenderer = new ClipMapPatchRenderer(
shared_ptr<OuterClipMapGrid>(new OuterClipMapGrid(512)),
shared_ptr<OuterClipMapGrid>(new OuterClipMapGrid(256)),
tileProviderManager);
_outerPatchRenderer.reset(outerPatchRenderer);
auto innerPatchRenderer = new ClipMapPatchRenderer(
shared_ptr<InnerClipMapGrid>(new InnerClipMapGrid(512)),
shared_ptr<InnerClipMapGrid>(new InnerClipMapGrid(256)),
tileProviderManager);
_innerPatchRenderer.reset(innerPatchRenderer);
}
modules/globebrowsing/globes/renderableglobe.cpp
+3 -3
View File
@@ -76,7 +76,7 @@ namespace openspace {
colorTextureDictionary.getValue("FilePath", path);
std::shared_ptr<TileProvider> colorTextureProvider =
std::shared_ptr<TileProvider>(new TileProvider(
path, 5000, 512));
path, 5000, 1024));
_tileProviderManager->addColorTexture(name, colorTextureProvider);
}
@@ -97,8 +97,8 @@ namespace openspace {
_tileProviderManager->addHeightMap(name, heightMapProvider);
}
//addSwitchValue(std::shared_ptr<ClipMapGlobe>(
// new ClipMapGlobe(_ellipsoid, _tileProviderManager)), 1e8);
addSwitchValue(std::shared_ptr<ClipMapGlobe>(
new ClipMapGlobe(_ellipsoid, _tileProviderManager)), 1e8);
addSwitchValue(std::shared_ptr<ChunkLodGlobe>(
new ChunkLodGlobe(_ellipsoid, _tileProviderManager)), 1e9);
addSwitchValue(std::shared_ptr<GlobeMesh>(new GlobeMesh()), 1e10);
modules/globebrowsing/other/TileProviderManager.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef __TILE_PROVIDER_MANAGER_H__
#define __TILE_PROVIDER_MANAGER_H__
#include "modules\globebrowsing\other\tileprovider.h"
#include "modules/globebrowsing/other/tileprovider.h"
#include <memory>
#include <vector>
modules/globebrowsing/other/gdaldataconverter.inl
+3 -3
View File
@@ -114,7 +114,7 @@ namespace openspace {
0); // Line spacing
if (err != CE_None) {
LERROR("There was a IO error (" << err << ") for: " << dataSet->GetDescription());
//LERROR("There was a IO error (" << err << ") for: " << dataSet->GetDescription());
}
}
// GDAL reads image data top to bottom. We want the opposite.
@@ -206,7 +206,7 @@ namespace openspace {
format.glFormat = GL_RGBA;
break;
default:
LERROR("Too many channels for OpenGL.");
//LERROR("Too many channels for OpenGL.");
break;
}
return format;
@@ -239,7 +239,7 @@ namespace openspace {
return GL_DOUBLE;
break;
default:
LERROR("GDAL data type unknown to OpenGL: " << gdalType);
//LERROR("GDAL data type unknown to OpenGL: " << gdalType);
return GL_UNSIGNED_BYTE;
}
}
modules/globebrowsing/rendering/patchrenderer.cpp
+16 -16
View File
@@ -311,10 +311,10 @@ namespace openspace {
uvec2 texture00DimensionsHeight = patchCoverageHeight.textureTransformPairs[0].first->dimensions().xy;
uvec2 texture10DimensionsHeight = patchCoverageHeight.textureTransformPairs[1].first->dimensions().xy;
uvec2 texture01DimensionsHeight = patchCoverageHeight.textureTransformPairs[2].first->dimensions().xy;
uvec2 texture11DimensionsHeight = patchCoverageHeight.textureTransformPairs[3].first->dimensions().xy;
uvec2 texture00DimensionsHeight = patchCoverageHeight.textureTransformPairs[0].first->dimensions().xy();
uvec2 texture10DimensionsHeight = patchCoverageHeight.textureTransformPairs[1].first->dimensions().xy();
uvec2 texture01DimensionsHeight = patchCoverageHeight.textureTransformPairs[2].first->dimensions().xy();
uvec2 texture11DimensionsHeight = patchCoverageHeight.textureTransformPairs[3].first->dimensions().xy();
_programObjectGlobalRendering->setUniform("texture00DimensionsHeight", texture00DimensionsHeight);
_programObjectGlobalRendering->setUniform("texture10DimensionsHeight", texture10DimensionsHeight);
@@ -364,10 +364,10 @@ namespace openspace {
patchCoverageColor.textureTransformPairs[3].second);
uvec2 texture00DimensionsColor = patchCoverageColor.textureTransformPairs[0].first->dimensions().xy;
uvec2 texture10DimensionsColor = patchCoverageColor.textureTransformPairs[1].first->dimensions().xy;
uvec2 texture01DimensionsColor = patchCoverageColor.textureTransformPairs[2].first->dimensions().xy;
uvec2 texture11DimensionsColor = patchCoverageColor.textureTransformPairs[3].first->dimensions().xy;
uvec2 texture00DimensionsColor = patchCoverageColor.textureTransformPairs[0].first->dimensions().xy();
uvec2 texture10DimensionsColor = patchCoverageColor.textureTransformPairs[1].first->dimensions().xy();
uvec2 texture01DimensionsColor = patchCoverageColor.textureTransformPairs[2].first->dimensions().xy();
uvec2 texture11DimensionsColor = patchCoverageColor.textureTransformPairs[3].first->dimensions().xy();
_programObjectGlobalRendering->setUniform("texture00DimensionsColor", texture00DimensionsColor);
_programObjectGlobalRendering->setUniform("texture10DimensionsColor", texture10DimensionsColor);
@@ -497,10 +497,10 @@ namespace openspace {
uvec2 texture00DimensionsHeight = patchCoverageHeight.textureTransformPairs[0].first->dimensions().xy;
uvec2 texture10DimensionsHeight = patchCoverageHeight.textureTransformPairs[1].first->dimensions().xy;
uvec2 texture01DimensionsHeight = patchCoverageHeight.textureTransformPairs[2].first->dimensions().xy;
uvec2 texture11DimensionsHeight = patchCoverageHeight.textureTransformPairs[3].first->dimensions().xy;
uvec2 texture00DimensionsHeight = patchCoverageHeight.textureTransformPairs[0].first->dimensions().xy();
uvec2 texture10DimensionsHeight = patchCoverageHeight.textureTransformPairs[1].first->dimensions().xy();
uvec2 texture01DimensionsHeight = patchCoverageHeight.textureTransformPairs[2].first->dimensions().xy();
uvec2 texture11DimensionsHeight = patchCoverageHeight.textureTransformPairs[3].first->dimensions().xy();
_programObjectLocalRendering->setUniform("texture00DimensionsHeight", texture00DimensionsHeight);
_programObjectLocalRendering->setUniform("texture10DimensionsHeight", texture10DimensionsHeight);
@@ -552,10 +552,10 @@ namespace openspace {
patchCoverageColor.textureTransformPairs[3].second);
uvec2 texture00DimensionsColor = patchCoverageColor.textureTransformPairs[0].first->dimensions().xy;
uvec2 texture10DimensionsColor = patchCoverageColor.textureTransformPairs[1].first->dimensions().xy;
uvec2 texture01DimensionsColor = patchCoverageColor.textureTransformPairs[2].first->dimensions().xy;
uvec2 texture11DimensionsColor = patchCoverageColor.textureTransformPairs[3].first->dimensions().xy;
uvec2 texture00DimensionsColor = patchCoverageColor.textureTransformPairs[0].first->dimensions().xy();
uvec2 texture10DimensionsColor = patchCoverageColor.textureTransformPairs[1].first->dimensions().xy();
uvec2 texture01DimensionsColor = patchCoverageColor.textureTransformPairs[2].first->dimensions().xy();
uvec2 texture11DimensionsColor = patchCoverageColor.textureTransformPairs[3].first->dimensions().xy();
_programObjectLocalRendering->setUniform("texture00DimensionsColor", texture00DimensionsColor);
_programObjectLocalRendering->setUniform("texture10DimensionsColor", texture10DimensionsColor);