mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-28 15:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing

Browse Source
This commit is contained in:
Kalle Bladin
2016-05-25 18:03:21 -04:00
parent 3925c30b43 128ee57538
commit f525eb53cc
7 changed files with 9 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/globebrowsing/CMakeLists.txt
View File

@@ -49,7 +49,6 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rendering/aabb.h
${CMAKE_CURRENT_SOURCE_DIR}/other/distanceswitch.h
${CMAKE_CURRENT_SOURCE_DIR}/other/texturetileset.h
${CMAKE_CURRENT_SOURCE_DIR}/other/patchcoverageprovider.h
${CMAKE_CURRENT_SOURCE_DIR}/other/tileprovider.h
${CMAKE_CURRENT_SOURCE_DIR}/other/texturedataprovider.h
@@ -86,7 +85,6 @@ set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rendering/aabb.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/distanceswitch.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/texturetileset.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/patchcoverageprovider.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/tileprovider.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/texturedataprovider.cpp

2
modules/globebrowsing/other/TileProviderManager.cpp
View File

@@ -31,7 +31,7 @@ namespace {
namespace openspace {
ThreadPool TileProviderManager::tileRequestThreadPool(1);
ThreadPool TileProviderManager::tileRequestThreadPool(15);
TileProviderManager::TileProviderManager()

185
modules/globebrowsing/other/texturetileset.cpp
View File

@@ -1,185 +0,0 @@
/*****************************************************************************************
* *
* 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 <modules/globebrowsing/other/texturetileset.h>
#include <modules/globebrowsing/geodetics/ellipsoid.h>
#include <modules/globebrowsing/other/texturedataprovider.h>
#include <ghoul/opengl/texturemanager.h>
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/logging/logmanager.h>
#include "gdal_priv.h"
#include "cpl_conv.h" // for CPLMalloc()
#include <glm/glm.hpp>
namespace {
const std::string _loggerCat = "TextureTileSet";
}
namespace openspace {
TextureTileSet::TextureTileSet(
Geodetic2 sizeLevel0,
Geodetic2 offsetLevel0,
int depth)
: _sizeLevel0(sizeLevel0)
, _offsetLevel0(offsetLevel0)
, _depth(depth)
{
/*
// Read using GDAL
//std::string testFile = absPath("map_service_configs/TERRA_CR_B143_2016-04-12.wms");
//std::string testFile = absPath("map_service_configs/TERRAIN.wms");
std::string testFile = absPath("textures/earth_bluemarble.jpg");
GDALDataset *poDataset;
GDALAllRegister();
poDataset = (GDALDataset *)GDALOpen(testFile.c_str(), GA_ReadOnly);
assert(poDataset != nullptr, "Unable to read dataset" << testFile);
TextureDataProvider conv;
GeodeticTileIndex ti(0, 0, 0);
_testTexture = conv.convertToOpenGLTexture(poDataset, ti, GL_UNSIGNED_BYTE);
_testTexture->uploadTexture();
_testTexture->setFilter(ghoul::opengl::Texture::FilterMode::Linear);
*/
/*
// Set e texture to test
std::string fileName = "textures/earth_bluemarble.jpg";
//std::string fileName = "../../../build/tiles/tile5_8_12.png";
//std::string fileName = "tile5_8_12.png";
_testTexture = std::move(ghoul::io::TextureReader::ref().loadTexture(absPath(fileName)));
if (_testTexture) {
LDEBUG("Loaded texture from '" << "textures/earth_bluemarble.jpg" << "'");
_testTexture->uploadTexture();
// Textures of planets looks much smoother with AnisotropicMipMap rather than linear
// TODO: AnisotropicMipMap crashes on ATI cards ---abock
//_testTexture->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
_testTexture->setFilter(ghoul::opengl::Texture::FilterMode::Linear);
}
*/
}
TextureTileSet::~TextureTileSet(){
}
ChunkIndex TextureTileSet::getChunkIndex(const GeodeticPatch& patch) {
// Calculate the level of the index depanding on the size of the incoming patch.
// The level is as big as possible (as far down as possible) but it can't be
// too big since at maximum four tiles should be used to cover a patch
int level = log2(static_cast<int>(glm::max(
_sizeLevel0.lat / (patch.size().lat),
_sizeLevel0.lon / (patch.size().lon))));
// If the depth is not big enough, the level must be clamped.
level = glm::min(level, _depth);
// Calculate the index in x y where the tile should be positioned
Vec2 tileSize = _sizeLevel0.toLonLatVec2() / pow(2, level);
Vec2 nw = patch.northWestCorner().toLonLatVec2();
Vec2 offset = _offsetLevel0.toLonLatVec2();
glm::ivec2 tileIndexXY = (nw - offset) / tileSize;
// Flip y since indices increase from top to bottom
//tileIndexXY.y = pow(2, level - 1) - tileIndexXY.y;
// Create the tileindex
ChunkIndex chunkIndex = { tileIndexXY.x, tileIndexXY.y, level };
return chunkIndex;
}
std::shared_ptr<Texture> TextureTileSet::getTile(const GeodeticPatch& patch) {
return getTile(getChunkIndex(patch));
}
std::shared_ptr<Texture> TextureTileSet::getTile(const ChunkIndex& chunkIndex) {
return _testTexture;
}
GeodeticPatch TextureTileSet::getTilePositionAndScale(
const ChunkIndex& chunkIndex) {
Geodetic2 tileSize = Geodetic2(
_sizeLevel0.lat / pow(2, chunkIndex.level),
_sizeLevel0.lon / pow(2, chunkIndex.level));
Geodetic2 northWest = Geodetic2(
_offsetLevel0.lat + chunkIndex.y * tileSize.lat,
_offsetLevel0.lon + chunkIndex.x * tileSize.lon);
return GeodeticPatch(
Geodetic2(northWest.lat - tileSize.lat / 2, northWest.lon + tileSize.lon / 2),
Geodetic2(tileSize.lat / 2, tileSize.lon / 2));
}
glm::mat3 TextureTileSet::getUvTransformationPatchToTile(
GeodeticPatch patch,
const ChunkIndex& chunkIndex)
{
GeodeticPatch tile = getTilePositionAndScale(chunkIndex);
return getUvTransformationPatchToTile(patch, tile);
}
glm::mat3 TextureTileSet::getUvTransformationPatchToTile(
GeodeticPatch patch,
GeodeticPatch tile)
{
Vec2 posDiff =
patch.southWestCorner().toLonLatVec2() -
tile.southWestCorner().toLonLatVec2();
glm::mat3 invTileScale = glm::mat3(
{ 1 / (tile.size().lon), 0, 0,
0, 1 / (tile.size().lat), 0,
0, 0, 1 });
glm::mat3 globalTranslation = glm::mat3(
{ 1, 0, 0,
0, 1, 0,
posDiff.x, posDiff.y, 1 });
glm::mat3 patchScale = glm::mat3(
{ (patch.halfSize().lon * 2), 0, 0,
0, (patch.halfSize().lat * 2), 0,
0, 0, 1 });
return invTileScale * globalTranslation * patchScale;
}
} // namespace openspace

105
modules/globebrowsing/other/texturetileset.h
View File

@@ -1,105 +0,0 @@
/*****************************************************************************************
* *
* 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 __TEXTURETILESET_H__
#define __TEXTURETILESET_H__
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/texture.h>
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/geodetics/ellipsoid.h>
#include <modules/globebrowsing/other/tileprovider.h>
//////////////////////////////////////////////////////////////////////////////////////////
// TEXTURE TILE SET //
//////////////////////////////////////////////////////////////////////////////////////////
namespace openspace {
using namespace ghoul::opengl;
class TextureTileSet
{
public:
TextureTileSet(
Geodetic2 sizeLevel0,
Geodetic2 offsetLevel0,
int depth);
~TextureTileSet();
/**
Returns the index of the tile at an appropriate level.
Appropriate meaning that the tile should be at as high level as possible
Without the tile being smaller than the patch in lat-lon space.
The tile is at least as big as the patch.
*/
ChunkIndex getChunkIndex(const GeodeticPatch& patch);
/**
Returns a texture that can be used for the specified patch
*/
std::shared_ptr<Texture> getTile(const GeodeticPatch& patch);
/**
Returns the texture for the given tile index. The indices reaches from left
to right and top to bottom while the texture coordinates and the latlon
coordinates reaches from left to right and bottom to top.
*/
std::shared_ptr<Texture> getTile(const ChunkIndex& chunkIndex);
/**
A tile can be defined with a tile index or a LatLonPatch which defines
the position and the size of the tile.
*/
GeodeticPatch getTilePositionAndScale(
const ChunkIndex& chunkIndex);
/**
A transformation (translation and scaling) from the texture space of a patch
to the texture space of a tile.
*/
glm::mat3 getUvTransformationPatchToTile(
GeodeticPatch patch,
const ChunkIndex& chunkIndex);
/**
Overloaded function
*/
glm::mat3 getUvTransformationPatchToTile(
GeodeticPatch patch,
GeodeticPatch tile);
private:
Geodetic2 _sizeLevel0;
Geodetic2 _offsetLevel0;
int _depth;
std::shared_ptr<Texture> _testTexture;
};
} // namespace openspace
#endif // __TEXTURETILESET_H__

1
modules/globebrowsing/rendering/patchrenderer.h
View File

@@ -36,7 +36,6 @@
#include <modules/globebrowsing/meshes/grid.h>
#include <modules/globebrowsing/meshes/clipmapgrid.h>
//#include <modules/globebrowsing/rendering/frustumculler.h>
#include <modules/globebrowsing/other/texturetileset.h>
#include <modules/globebrowsing/other/patchcoverageprovider.h>
#include <modules/globebrowsing/other/tileprovidermanager.h>
#include <modules/globebrowsing/other/layeredtextureshaderprovider.h>

2
src/rendering/renderengine.cpp
View File

@@ -187,8 +187,6 @@ bool RenderEngine::initialize() {
// init camera and set temporary position and scaling
_mainCamera = new Camera();
_mainCamera->setScaling(glm::vec2(1.0, -8.0));
_mainCamera->setPosition(psc(0.5f, 0.f, 1.499823f, 11.f));
OsEng.interactionHandler().setCamera(_mainCamera);
if (_renderer) {

11
src/scene/scene.cpp
View File

@@ -301,9 +301,10 @@ bool Scene::loadSceneInternal(const std::string& sceneDescriptionFilePath) {
if (!fn) {
throw ghoul::RuntimeError("Could not find focus node");
}
// Check crash for when fn == nullptr
glm::mat4 la = glm::lookAt(glm::vec3(0,0,0), fn->worldPosition().vec3() - cameraPosition.vec3(), c->lookUpVectorCameraSpace());
//glm::mat4 la = glm::lookAt(cameraPosition.vec3(), fn->worldPosition().vec3(), glm::vec3(c->lookUpVectorCameraSpace()));
// Check crash for when fn == nullptr
glm::vec3 target = glm::normalize(fn->worldPosition().vec3() - cameraPosition.vec3());
glm::mat4 la = glm::lookAt(glm::vec3(0, 0, 0), target, glm::vec3(c->lookUpVectorCameraSpace()));
c->setRotation(glm::quat_cast(la));
c->setPosition(cameraPosition);
@@ -316,6 +317,10 @@ bool Scene::loadSceneInternal(const std::string& sceneDescriptionFilePath) {
c->rotate(rot);
}
// explicitly update and sync the camera
c->preSynchronization();
c->postSynchronizationPreDraw();
for (SceneGraphNode* node : _graph.nodes()) {
std::vector<properties::Property*> properties = node->propertiesRecursive();