mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-09 13:12:58 -06:00
2e4f31ded8
* Interaction speed is not dependent on framerate * Split up interaction code in files and perform smooth interpolation when changing focus * Abstract interaction code in to functions. * Interpolation time is dependent on angle to focus node. * Use correct delta time when interpolating * Fix bug regarding decomposition of camera rotation. * Make orbital interaction mode behave as globe browsing and no longer use interactiondepth below ellipsoid. * Do not always rotate with object. Depending on distance * Remove interaction depth below ellipsoid. Now able to interact without renderable * Remove specification of interactionDepthBelowEllipsoid and cameraMinHeight * Remove GlobeBrowsingInteractionMode * Rename OrbitalInteractionMode to OrbitalNavigator and no longer extend interactionmode. * Move properties from interaction handler to orbital navigator * Use smooth step for follow rotation interpolator * Rename KeyframeInteractionMode to KeyframeNavigator * Rename files * Clean up. * Separate mousestate from orbitalnavigator * Clean up * Split keybindingmanager from interactionhandler interactionhandler * Rename interactionhandler to navigationhandler * Rename files * Clean up * Take back usage of gotochunk and gotogeo * Rename lua library navigation * Move functionality from navigationhandler to keyframenavigator * Update scripts for navigation * Comment code * Clean up * Solve but that caused NaN values for camera position when being in center of globe and setting focus to the globe. * Update jenkins file to remove build folder before building. * Fix error in jenkins script * Update jenkins file * Update jenkins file * Revert jenkins file * I hope this makes Jenkins happy. * Line endings God damnit * Line endings * Clean up * Fix compilation issue * Take back default scene. * Fix indentation * Move functions goToGeo and goToChunk to GlobeBrowsingModule. * Include algorithm for std::find * Remove auto and other clean up
82 lines
3.9 KiB
C++
82 lines
3.9 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2017 *
|
|
* *
|
|
* 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/rendering/gpu/gpulayergroup.h>
|
|
|
|
#include <modules/globebrowsing/rendering/layer/layergroup.h>
|
|
#include <modules/globebrowsing/rendering/layer/layermanager.h>
|
|
#include <modules/globebrowsing/rendering/gpu/gpuheightlayer.h>
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
void GPULayerGroup::setValue(ghoul::opengl::ProgramObject* programObject,
|
|
const LayerGroup& layerGroup, const TileIndex& tileIndex)
|
|
{
|
|
auto& activeLayers = layerGroup.activeLayers();
|
|
ghoul_assert(
|
|
activeLayers.size() == _gpuActiveLayers.size(),
|
|
"GPU and CPU active layers must have same size!"
|
|
);
|
|
for (unsigned int i = 0; i < activeLayers.size(); ++i) {
|
|
_gpuActiveLayers[i]->setValue(
|
|
programObject,
|
|
*activeLayers[i],
|
|
tileIndex,
|
|
layerGroup.pileSize()
|
|
);
|
|
}
|
|
}
|
|
|
|
void GPULayerGroup::bind(ghoul::opengl::ProgramObject* programObject,
|
|
const LayerGroup& layerGroup, const std::string& nameBase,
|
|
int category)
|
|
{
|
|
auto activeLayers = layerGroup.activeLayers();
|
|
_gpuActiveLayers.resize(activeLayers.size());
|
|
int pileSize = layerGroup.pileSize();
|
|
for (size_t i = 0; i < _gpuActiveLayers.size(); ++i) {
|
|
// should maybe a proper GPULayer factory
|
|
_gpuActiveLayers[i] = (category == layergroupid::GroupID::HeightLayers) ?
|
|
std::make_unique<GPUHeightLayer>() :
|
|
std::make_unique<GPULayer>();
|
|
std::string nameExtension = "[" + std::to_string(i) + "].";
|
|
_gpuActiveLayers[i]->bind(
|
|
programObject,
|
|
*activeLayers[i],
|
|
nameBase + nameExtension,
|
|
pileSize
|
|
);
|
|
}
|
|
}
|
|
|
|
void GPULayerGroup::deactivate() {
|
|
for (std::unique_ptr<GPULayer>& l : _gpuActiveLayers) {
|
|
l->deactivate();
|
|
}
|
|
}
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|