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

Updated file structure and removed unused class GlobeMesh

Browse Source
This commit is contained in:
Erik Broberg
2016-06-10 11:53:26 -04:00
parent b7f4398f33
commit 795846f6ee
38 changed files with 137 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
modules/globebrowsing/CMakeLists.txt
View File

@@ -27,70 +27,74 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/globes/renderableglobe.h
${CMAKE_CURRENT_SOURCE_DIR}/globes/globemesh.h
${CMAKE_CURRENT_SOURCE_DIR}/globes/chunkedlodglobe.h
${CMAKE_CURRENT_SOURCE_DIR}/globes/chunknode.h
${CMAKE_CURRENT_SOURCE_DIR}/globes/chunkindex.h
${CMAKE_CURRENT_SOURCE_DIR}/globes/chunk.h
${CMAKE_CURRENT_SOURCE_DIR}/chunk/chunkedlodglobe.h
${CMAKE_CURRENT_SOURCE_DIR}/chunk/chunknode.h
${CMAKE_CURRENT_SOURCE_DIR}/chunk/chunkindex.h
${CMAKE_CURRENT_SOURCE_DIR}/chunk/chunk.h
${CMAKE_CURRENT_SOURCE_DIR}/chunk/chunkrenderer.h
${CMAKE_CURRENT_SOURCE_DIR}/chunk/culling.h
${CMAKE_CURRENT_SOURCE_DIR}/meshes/trianglesoup.h
${CMAKE_CURRENT_SOURCE_DIR}/meshes/grid.h
${CMAKE_CURRENT_SOURCE_DIR}/meshes/basicgrid.h
${CMAKE_CURRENT_SOURCE_DIR}/meshes/skirtedgrid.h
${CMAKE_CURRENT_SOURCE_DIR}/geodetics/geodetic2.h
${CMAKE_CURRENT_SOURCE_DIR}/geodetics/angle.h
${CMAKE_CURRENT_SOURCE_DIR}/geodetics/ellipsoid.h
${CMAKE_CURRENT_SOURCE_DIR}/geometry/geodetic2.h
${CMAKE_CURRENT_SOURCE_DIR}/geometry/angle.h
${CMAKE_CURRENT_SOURCE_DIR}/geometry/ellipsoid.h
${CMAKE_CURRENT_SOURCE_DIR}/geometry/aabb.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/chunkrenderer.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/culling.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/aabb.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/temporaltileprovider.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/tileprovider.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/tiledataset.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/asynctilereader.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/tileprovidermanager.h
${CMAKE_CURRENT_SOURCE_DIR}/tile/layeredtextureshaderprovider.h
${CMAKE_CURRENT_SOURCE_DIR}/other/distanceswitch.h
${CMAKE_CURRENT_SOURCE_DIR}/other/temporaltileprovider.h
${CMAKE_CURRENT_SOURCE_DIR}/other/tileprovider.h
${CMAKE_CURRENT_SOURCE_DIR}/other/tiledataset.h
${CMAKE_CURRENT_SOURCE_DIR}/other/asynctilereader.h
${CMAKE_CURRENT_SOURCE_DIR}/other/lrucache.h
${CMAKE_CURRENT_SOURCE_DIR}/other/concurrentjobmanager.h
${CMAKE_CURRENT_SOURCE_DIR}/other/threadpool.h
${CMAKE_CURRENT_SOURCE_DIR}/other/concurrentqueue.h
${CMAKE_CURRENT_SOURCE_DIR}/other/tileprovidermanager.h
${CMAKE_CURRENT_SOURCE_DIR}/other/layeredtextureshaderprovider.h
)
set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/globes/renderableglobe.cpp
${CMAKE_CURRENT_SOURCE_DIR}/globes/globemesh.cpp
${CMAKE_CURRENT_SOURCE_DIR}/globes/chunkedlodglobe.cpp
${CMAKE_CURRENT_SOURCE_DIR}/globes/chunknode.cpp
${CMAKE_CURRENT_SOURCE_DIR}/globes/chunkindex.cpp
${CMAKE_CURRENT_SOURCE_DIR}/globes/chunk.cpp
${CMAKE_CURRENT_SOURCE_DIR}/chunk/chunkedlodglobe.cpp
${CMAKE_CURRENT_SOURCE_DIR}/chunk/chunknode.cpp
${CMAKE_CURRENT_SOURCE_DIR}/chunk/chunkindex.cpp
${CMAKE_CURRENT_SOURCE_DIR}/chunk/chunk.cpp
${CMAKE_CURRENT_SOURCE_DIR}/chunk/chunkrenderer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/chunk/culling.cpp
${CMAKE_CURRENT_SOURCE_DIR}/meshes/trianglesoup.cpp
${CMAKE_CURRENT_SOURCE_DIR}/meshes/grid.cpp
${CMAKE_CURRENT_SOURCE_DIR}/meshes/basicgrid.cpp
${CMAKE_CURRENT_SOURCE_DIR}/meshes/skirtedgrid.cpp
${CMAKE_CURRENT_SOURCE_DIR}/geodetics/geodetic2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/geodetics/angle.inl
${CMAKE_CURRENT_SOURCE_DIR}/geodetics/ellipsoid.cpp
${CMAKE_CURRENT_SOURCE_DIR}/geometry/geodetic2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/geometry/angle.inl
${CMAKE_CURRENT_SOURCE_DIR}/geometry/ellipsoid.cpp
${CMAKE_CURRENT_SOURCE_DIR}/geometry/aabb.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/chunkrenderer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/culling.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/aabb.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/temporaltileprovider.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/tileprovider.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/tiledataset.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/asynctilereader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/tileprovidermanager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile/layeredtextureshaderprovider.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/distanceswitch.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/temporaltileprovider.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/tileprovider.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/tiledataset.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/asynctilereader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/lrucache.inl
${CMAKE_CURRENT_SOURCE_DIR}/other/concurrentjobmanager.inl
${CMAKE_CURRENT_SOURCE_DIR}/other/threadpool.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/tileprovidermanager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/other/layeredtextureshaderprovider.cpp
)
source_group("Source Files" FILES ${SOURCE_FILES})

4
modules/globebrowsing/globes/chunk.cpp → modules/globebrowsing/chunk/chunk.cpp
View File

@@ -27,8 +27,8 @@
#include <openspace/engine/openspaceengine.h>
#include <modules/globebrowsing/globes/chunk.h>
#include <modules/globebrowsing/globes/chunkedlodglobe.h>
#include <modules/globebrowsing/chunk/chunk.h>
#include <modules/globebrowsing/chunk/chunkedlodglobe.h>
#include <algorithm>

8
modules/globebrowsing/globes/chunk.h → modules/globebrowsing/chunk/chunk.h
View File

@@ -30,11 +30,11 @@
#include <memory>
#include <ostream>
#include <modules/globebrowsing/rendering/culling.h>
#include <modules/globebrowsing/chunk/culling.h>
#include <modules/globebrowsing/chunk/chunkindex.h>
#include <modules/globebrowsing/globes/chunkindex.h>
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/geodetics/angle.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/geometry/angle.h>
namespace openspace {

4
modules/globebrowsing/globes/chunkedlodglobe.cpp → modules/globebrowsing/chunk/chunkedlodglobe.cpp
View File

@@ -22,10 +22,10 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/globebrowsing/globes/chunkedlodglobe.h>
#include <modules/globebrowsing/chunk/chunkedlodglobe.h>
#include <modules/globebrowsing/meshes/skirtedgrid.h>
#include <modules/globebrowsing/rendering/culling.h>
#include <modules/globebrowsing/chunk/culling.h>
// open space includes
#include <openspace/engine/openspaceengine.h>

10
modules/globebrowsing/globes/chunkedlodglobe.h → modules/globebrowsing/chunk/chunkedlodglobe.h
View File

@@ -38,10 +38,12 @@
#include <openspace/util/updatestructures.h>
#include <modules/globebrowsing/geodetics/ellipsoid.h>
#include <modules/globebrowsing/globes/chunknode.h>
#include <modules/globebrowsing/rendering/chunkrenderer.h>
#include <modules/globebrowsing/other/tileprovider.h>
#include <modules/globebrowsing/geometry/ellipsoid.h>
#include <modules/globebrowsing/chunk/chunknode.h>
#include <modules/globebrowsing/chunk/chunkrenderer.h>
#include <modules/globebrowsing/tile/tileprovider.h>
namespace ghoul {
namespace opengl {

4
modules/globebrowsing/globes/chunkindex.cpp → modules/globebrowsing/chunk/chunkindex.cpp
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/globebrowsing/globes/chunkindex.h>
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/chunk/chunkindex.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
namespace {

0
modules/globebrowsing/globes/chunkindex.h → modules/globebrowsing/chunk/chunkindex.h
View File

6
modules/globebrowsing/globes/chunknode.cpp → modules/globebrowsing/chunk/chunknode.cpp
View File

@@ -29,9 +29,9 @@
#include <openspace/engine/wrapper/windowwrapper.h>
#include <openspace/engine/openspaceengine.h>
#include <modules/globebrowsing/globes/chunknode.h>
#include <modules/globebrowsing/globes/chunkedlodglobe.h>
#include <modules/globebrowsing/rendering/culling.h>
#include <modules/globebrowsing/chunk/chunknode.h>
#include <modules/globebrowsing/chunk/chunkedlodglobe.h>
#include <modules/globebrowsing/chunk/culling.h>
namespace {

10
modules/globebrowsing/globes/chunknode.h → modules/globebrowsing/chunk/chunknode.h
View File

@@ -31,10 +31,12 @@
#include <memory>
#include <ostream>
#include <modules/globebrowsing/globes/chunkindex.h>
#include <modules/globebrowsing/globes/chunk.h>
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/rendering/chunkrenderer.h>
#include <modules/globebrowsing/chunk/chunkindex.h>
#include <modules/globebrowsing/chunk/chunk.h>
#include <modules/globebrowsing/chunk/chunkrenderer.h>
#include <modules/globebrowsing/geometry/geodetic2.h>

4
modules/globebrowsing/rendering/chunkrenderer.cpp → modules/globebrowsing/chunk/chunkrenderer.cpp
View File

@@ -23,8 +23,8 @@
****************************************************************************************/
#include <modules/globebrowsing/rendering/chunkrenderer.h>
#include <modules/globebrowsing/globes/chunkedlodglobe.h>
#include <modules/globebrowsing/chunk/chunkrenderer.h>
#include <modules/globebrowsing/chunk/chunkedlodglobe.h>
// open space includes
#include <openspace/engine/wrapper/windowwrapper.h>

10
modules/globebrowsing/rendering/chunkrenderer.h → modules/globebrowsing/chunk/chunkrenderer.h
View File

@@ -31,15 +31,15 @@
// open space includes
#include <openspace/rendering/renderable.h>
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/geodetics/ellipsoid.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/geometry/ellipsoid.h>
#include <modules/globebrowsing/meshes/grid.h>
#include <modules/globebrowsing/other/tileprovidermanager.h>
#include <modules/globebrowsing/other/layeredtextureshaderprovider.h>
#include <modules/globebrowsing/tile/tileprovidermanager.h>
#include <modules/globebrowsing/tile/layeredtextureshaderprovider.h>
#include <modules/globebrowsing/globes/chunknode.h>
#include <modules/globebrowsing/chunk/chunknode.h>
namespace ghoul {
namespace opengl {

14
modules/globebrowsing/rendering/culling.cpp → modules/globebrowsing/chunk/culling.cpp
View File

@@ -23,10 +23,16 @@
****************************************************************************************/
#include <modules/globebrowsing/rendering/culling.h>
#include <modules/globebrowsing/globes/chunkedlodglobe.h>
#include <modules/globebrowsing/geodetics/ellipsoid.h>
#include <modules/globebrowsing/globes/chunk.h>
#include <modules/globebrowsing/chunk/culling.h>
#include <modules/globebrowsing/chunk/chunkedlodglobe.h>
#include <modules/globebrowsing/chunk/chunk.h>
#include <modules/globebrowsing/geometry/ellipsoid.h>
#include <modules/globebrowsing/meshes/trianglesoup.h>
namespace {

6
modules/globebrowsing/rendering/culling.h → modules/globebrowsing/chunk/culling.h
View File

@@ -31,9 +31,9 @@
// open space includes
#include <openspace/rendering/renderable.h>
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/geodetics/ellipsoid.h>
#include <modules/globebrowsing/rendering/aabb.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/geometry/ellipsoid.h>
#include <modules/globebrowsing/geometry/aabb.h>

2
modules/globebrowsing/rendering/aabb.cpp → modules/globebrowsing/geometry/aabb.cpp
View File

@@ -23,7 +23,7 @@
****************************************************************************************/
#include <modules/globebrowsing/rendering/aabb.h>
#include <modules/globebrowsing/geometry/aabb.h>
#include <string>

0
modules/globebrowsing/rendering/aabb.h → modules/globebrowsing/geometry/aabb.h
View File

2
modules/globebrowsing/geodetics/angle.h → modules/globebrowsing/geometry/angle.h
View File

@@ -177,7 +177,7 @@ using fAngle = Angle<float>;
#include <modules/globebrowsing/geodetics/angle.inl>
#include <modules/globebrowsing/geometry/angle.inl>

2
modules/globebrowsing/geodetics/angle.inl → modules/globebrowsing/geometry/angle.inl
View File

@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/globebrowsing/geodetics/angle.h>
#include <modules/globebrowsing/geometry/angle.h>

2
modules/globebrowsing/geodetics/ellipsoid.cpp → modules/globebrowsing/geometry/ellipsoid.cpp
View File

@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/globebrowsing/geodetics/ellipsoid.h>
#include <modules/globebrowsing/geometry/ellipsoid.h>
#define _USE_MATH_DEFINES
#include <math.h>

2
modules/globebrowsing/geodetics/ellipsoid.h → modules/globebrowsing/geometry/ellipsoid.h
View File

@@ -25,7 +25,7 @@
#ifndef __ELLIPSOID_H__
#define __ELLIPSOID_H__
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
namespace openspace {

6
modules/globebrowsing/geodetics/geodetic2.cpp → modules/globebrowsing/geometry/geodetic2.cpp
View File

@@ -22,9 +22,9 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/geodetics/angle.h>
#include <modules/globebrowsing/geodetics/ellipsoid.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/geometry/angle.h>
#include <modules/globebrowsing/geometry/ellipsoid.h>
#include <ghoul/misc/assert.h>

2
modules/globebrowsing/geodetics/geodetic2.h → modules/globebrowsing/geometry/geodetic2.h
View File

@@ -33,7 +33,7 @@
#define _USE_MATH_DEFINES
#include <math.h>
#include <modules/globebrowsing/globes/chunkindex.h>
#include <modules/globebrowsing/chunk/chunkindex.h>
#include <ghoul/misc/assert.h>

2
modules/globebrowsing/globebrowsingmodule.cpp
View File

@@ -26,7 +26,6 @@
#include <modules/globebrowsing/globes/renderableglobe.h>
#include <modules/globebrowsing/other/distanceswitch.h>
#include <modules/globebrowsing/globes/globemesh.h>
#include <openspace/rendering/renderable.h>
#include <openspace/util/factorymanager.h>
@@ -63,7 +62,6 @@ void GlobeBrowsingModule::internalInitialize() {
ghoul_assert(fRenderable, "Renderable factory was not created");
fRenderable->registerClass<RenderableGlobe>("RenderableGlobe");
fRenderable->registerClass<GlobeMesh>("GlobeMesh");
}
} // namespace openspace

115
modules/globebrowsing/globes/globemesh.cpp
View File

@@ -1,115 +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/globes/globemesh.h>
// open space includes
#include <openspace/engine/openspaceengine.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/util/spicemanager.h>
#include <openspace/scene/scenegraphnode.h>
// ghoul includes
#include <ghoul/misc/assert.h>
#define _USE_MATH_DEFINES
#include <math.h>
namespace {
const std::string _loggerCat = "GlobeMesh";
}
namespace openspace {
GlobeMesh::GlobeMesh()
: _programObject(nullptr)
, _grid(10, 10, TriangleSoup::Positions::Yes, TriangleSoup::TextureCoordinates::No, TriangleSoup::Normals::No)
{
}
GlobeMesh::~GlobeMesh() {
}
bool GlobeMesh::initialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
if (_programObject == nullptr) {
_programObject = renderEngine.buildRenderProgram(
"simpleTextureProgram",
"${MODULE_GLOBEBROWSING}/shaders/simple_vs.glsl",
"${MODULE_GLOBEBROWSING}/shaders/simple_fs.glsl");
if (!_programObject) return false;
}
using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
_programObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes);
return isReady();
}
bool GlobeMesh::deinitialize() {
RenderEngine& renderEngine = OsEng.renderEngine();
if (_programObject) {
renderEngine.removeRenderProgram(_programObject);
_programObject = nullptr;
}
return true;
}
bool GlobeMesh::isReady() const {
bool ready = true;
ready &= (_programObject != nullptr);
return ready;
}
void GlobeMesh::render(const RenderData& data)
{
// activate shader
_programObject->activate();
// scale the planet to appropriate size since the planet is a unit sphere. Ehm no?
glm::mat4 transform = glm::mat4(1);
// setup the data to the shader
// _programObject->setUniform("camdir", camSpaceEye);
_programObject->setUniform("ViewProjection", data.camera.viewProjectionMatrix());
_programObject->setUniform("ModelTransform", transform);
setPscUniforms(*_programObject.get(), data.camera, data.position);
glDisable(GL_CULL_FACE);
//glCullFace(GL_BACK);
// render
_grid.geometry().drawUsingActiveProgram();
// disable shader
_programObject->deactivate();
}
void GlobeMesh::update(const UpdateData& data) {
}
} // namespace openspace

66
modules/globebrowsing/globes/globemesh.h
View File

@@ -1,66 +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 __GLOBEMESH_H__
#define __GLOBEMESH_H__
// open space includes
#include <openspace/rendering/renderable.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/util/updatestructures.h>
#include <modules/globebrowsing/meshes/trianglesoup.h>
#include <modules/globebrowsing/meshes/basicgrid.h>
#include <modules/globebrowsing/other/distanceswitch.h>
namespace ghoul {
namespace opengl {
class ProgramObject;
}
}
namespace openspace {
class GlobeMesh : public Renderable {
public:
GlobeMesh();
virtual ~GlobeMesh();
bool initialize() override;
bool deinitialize() override;
bool isReady() const override;
void render(const RenderData& data) override;
void update(const UpdateData& data) override;
private:
std::unique_ptr<ghoul::opengl::ProgramObject> _programObject;
BasicGrid _grid;
};
} // namespace openspace
#endif // __GLOBEMESH_H__

4
modules/globebrowsing/globes/renderableglobe.cpp
View File

@@ -23,9 +23,9 @@
****************************************************************************************/
#include <modules/globebrowsing/globes/renderableglobe.h>
#include <modules/globebrowsing/globes/globemesh.h>
#include <modules/globebrowsing/other/threadpool.h>
#include <modules/globebrowsing/other/temporaltileprovider.h>
#include <modules/globebrowsing/tile/temporaltileprovider.h>
// open space includes
#include <openspace/engine/openspaceengine.h>

12
modules/globebrowsing/globes/renderableglobe.h
View File

@@ -35,13 +35,15 @@
#include <openspace/util/updatestructures.h>
#include <modules/globebrowsing/meshes/trianglesoup.h>
#include <modules/globebrowsing/other/distanceswitch.h>
#include <modules/globebrowsing/globes/globemesh.h>
#include <modules/globebrowsing/globes/chunkedlodglobe.h>
#include <modules/globebrowsing/geodetics/ellipsoid.h>
#include <modules/globebrowsing/other/tileprovidermanager.h>
#include <modules/globebrowsing/chunk/chunkedlodglobe.h>
#include <modules/globebrowsing/geometry/ellipsoid.h>
#include <modules/globebrowsing/tile/tileprovidermanager.h>
#include <modules/globebrowsing/other/threadpool.h>
#include <modules/globebrowsing/other/distanceswitch.h>
namespace ghoul {
namespace opengl {

3
modules/globebrowsing/other/TileProviderManager.cpp → modules/globebrowsing/tile/TileProviderManager.cpp
View File

@@ -22,7 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/globebrowsing/other/tileprovidermanager.h>
#include <modules/globebrowsing/tile/tileprovidermanager.h>
#include <ghoul/logging/logmanager.h>
#include "cpl_minixml.h"

5
modules/globebrowsing/other/TileProviderManager.h → modules/globebrowsing/tile/TileProviderManager.h
View File

@@ -26,8 +26,9 @@
#define __TILE_PROVIDER_MANAGER_H__
#include <modules/globebrowsing/other/temporaltileprovider.h>
#include <modules/globebrowsing/other/tileprovider.h>
#include <modules/globebrowsing/tile/temporaltileprovider.h>
#include <modules/globebrowsing/tile/tileprovider.h>
#include <modules/globebrowsing/other/threadpool.h>
#include <ghoul/misc/dictionary.h>

7
modules/globebrowsing/other/asynctilereader.cpp → modules/globebrowsing/tile/asynctilereader.cpp
View File

@@ -27,9 +27,10 @@
#include <ghoul/filesystem/filesystem.h> // abspath
#include <ghoul/misc/assert.h>
#include <modules/globebrowsing/other/asynctilereader.h>
#include <modules/globebrowsing/other/tileprovider.h>
#include <modules/globebrowsing/geodetics/angle.h>
#include <modules/globebrowsing/tile/asynctilereader.h>
#include <modules/globebrowsing/tile/tileprovider.h>
#include <modules/globebrowsing/geometry/angle.h>
namespace {
const std::string _loggerCat = "AsyncTextureDataProvider";

5
modules/globebrowsing/other/asynctilereader.h → modules/globebrowsing/tile/asynctilereader.h
View File

@@ -30,11 +30,12 @@
#include <ghoul/opengl/texture.h>
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/other/concurrentjobmanager.h>
#include <modules/globebrowsing/other/threadpool.h>
#include <modules/globebrowsing/other/tiledataset.h>
#include <modules/globebrowsing/tile/tiledataset.h>
#include <memory>
#include <queue>

2
modules/globebrowsing/other/layeredtextureshaderprovider.cpp → modules/globebrowsing/tile/layeredtextureshaderprovider.cpp
View File

@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/globebrowsing/other/layeredtextureshaderprovider.h>
#include <modules/globebrowsing/tile/layeredtextureshaderprovider.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/engine/openspaceengine.h>

0
modules/globebrowsing/other/layeredtextureshaderprovider.h → modules/globebrowsing/tile/layeredtextureshaderprovider.h
View File

7
modules/globebrowsing/other/temporaltileprovider.cpp → modules/globebrowsing/tile/temporaltileprovider.cpp
View File

@@ -22,10 +22,11 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/other/temporaltileprovider.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/globes/chunkindex.h>
#include <modules/globebrowsing/tile/temporaltileprovider.h>
#include <modules/globebrowsing/chunk/chunkindex.h>
#include <openspace/engine/downloadmanager.h>

6
modules/globebrowsing/other/temporaltileprovider.h → modules/globebrowsing/tile/temporaltileprovider.h
View File

@@ -28,8 +28,10 @@
#include <ghoul/opengl/texture.h>
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/other/tileprovider.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/tile/tileprovider.h>
#include <openspace/util/time.h>
#include <unordered_map>

7
modules/globebrowsing/other/tiledataset.cpp → modules/globebrowsing/tile/tiledataset.cpp
View File

@@ -27,9 +27,10 @@
#include <ghoul/filesystem/filesystem.h> // abspath
#include <ghoul/misc/assert.h>
#include <modules/globebrowsing/other/tiledataset.h>
#include <modules/globebrowsing/other/tileprovider.h>
#include <modules/globebrowsing/geodetics/angle.h>
#include <modules/globebrowsing/tile/tiledataset.h>
#include <modules/globebrowsing/tile/tileprovider.h>
#include <modules/globebrowsing/geometry/angle.h>
#include <float.h>

2
modules/globebrowsing/other/tiledataset.h → modules/globebrowsing/tile/tiledataset.h
View File

@@ -29,7 +29,7 @@
#include <ghoul/opengl/texture.h>
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/other/threadpool.h>
#include "gdal_priv.h"

9
modules/globebrowsing/other/tileprovider.cpp → modules/globebrowsing/tile/tileprovider.cpp
View File

@@ -22,11 +22,12 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/other/tileprovider.h>
#include <modules/globebrowsing/other/tileprovidermanager.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/globes/chunkindex.h>
#include <modules/globebrowsing/tile/tileprovider.h>
#include <modules/globebrowsing/tile/tileprovidermanager.h>
#include <modules/globebrowsing/chunk/chunkindex.h>
#include <openspace/engine/downloadmanager.h>

7
modules/globebrowsing/other/tileprovider.h → modules/globebrowsing/tile/tileprovider.h
View File

@@ -35,9 +35,12 @@
#include <ghoul/opengl/texture.h>
#include <ghoul/io/texture/texturereader.h>
#include <modules/globebrowsing/geodetics/geodetic2.h>
#include <modules/globebrowsing/geometry/geodetic2.h>
#include <modules/globebrowsing/tile/asynctilereader.h>
#include <modules/globebrowsing/other/lrucache.h>
#include <modules/globebrowsing/other/asynctilereader.h>
//////////////////////////////////////////////////////////////////////////////////////////
// TILE PROVIDER //