mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-10 05:32:18 -06:00
4f903ac030
Layer support for globe browsing: Add layers using the function openspace.globebrowsing.addLayer Delete layers using openspace.globebrowsing.deleteLayer Layer type does not necessarily have to be of tile type. For example solidcolor does not use tiles Blend modes for layers are Normal, Add, Subtract, Multiply, Color Layer adjustments to affect layers. The current only active one is chroma key to cut out a color from the layer. Transfer functions or clipping masks are examples of layer adjustments for the future. Support for adding layer specifications for quickly accessing GIBS layers: openspace.globebrowsing.createGibsGdalXml openspace.globebrowsing.createTemporalGibsGdalXml The arguments for these functions are currently strings. Would it be better to use a lua dictionary? No data values for height layers are correctly regarded (can be seen on Earth. No longer bumps on the poles) Other minor things: Worked a bit on point globe to render globes at large distances. Currently not in use and doesn't have anything to do with the other things. Concurrent job manager takes a thread pool as argument and not a pointer to one. This is because the concurrent job manager needs to have ownership of the thread pool for correct deinitialization. Will cause breaking change for users of concurrent job manager if merged in to master. * Add ability to add layers programatically. * Clean up * Fix order of deletion in concurrent job manager and clean up * Can create by level tile provider with empty dictionary. * Add script to add GIBS datasets. * Start working with layer adjustment * Update mod files * More work on point globe * Add script to create temporal GIBS datasets. * Update temporal tile provider to be able to take gdal descriptions without file path. * Add adjustment property to layers. * Rename adjustment layer * Add adjustment code to all layer groups * Remove caching of gdal datasets due to cluttering of folders * Document layer support * Update Mars mod * Make Mercury great again. * Cleanup and add blend mode Color * Enable setting of layeradjustment and blend mode from mod files. * No more use for grayscale color overlays. Use grayscale layer with color blend mode instead. * Clean up mod files * Clean up * Clean up * No need for grayscale layers. Reading grayscale in to rgb instead for color layers. * Remove unused layer groups * Correctly read to grayscale layers * Update globe mod files * Rename ColorOverlays to Overlays. * Clean up * Clean up * Solve compilation error
101 lines
4.6 KiB
C++
101 lines
4.6 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. *
|
|
****************************************************************************************/
|
|
|
|
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___LAYER___H__
|
|
#define __OPENSPACE_MODULE_GLOBEBROWSING___LAYER___H__
|
|
|
|
#include <modules/globebrowsing/tile/chunktile.h>
|
|
|
|
#include <modules/globebrowsing/rendering/layer/layeradjustment.h>
|
|
#include <modules/globebrowsing/rendering/layer/layergroupid.h>
|
|
#include <modules/globebrowsing/rendering/layer/layerrendersettings.h>
|
|
|
|
#include <openspace/properties/optionproperty.h>
|
|
#include <openspace/properties/propertyowner.h>
|
|
#include <openspace/properties/scalar/boolproperty.h>
|
|
#include <openspace/properties/triggerproperty.h>
|
|
#include <openspace/properties/vectorproperty.h>
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
namespace tileprovider {
|
|
class TileProvider;
|
|
}
|
|
|
|
class Layer : public properties::PropertyOwner {
|
|
public:
|
|
/**
|
|
* Properties used when the layer type is not a tile type layer. These properties
|
|
* can be added or removed depending on the layer type.
|
|
*/
|
|
struct OtherTypesProperties {
|
|
properties::Vec3Property color;
|
|
};
|
|
|
|
Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict);
|
|
|
|
ChunkTilePile getChunkTilePile(const TileIndex& tileIndex, int pileSize) const;
|
|
Tile::Status getTileStatus(const TileIndex& index) const;
|
|
|
|
layergroupid::TypeID type() const;
|
|
layergroupid::BlendModeID blendMode() const;
|
|
TileDepthTransform depthTransform() const;
|
|
bool enabled() const;
|
|
tileprovider::TileProvider* tileProvider() const;
|
|
const OtherTypesProperties& otherTypesProperties() const;
|
|
const LayerRenderSettings& renderSettings() const;
|
|
const LayerAdjustment& layerAdjustment() const;
|
|
|
|
void onChange(std::function<void(void)> callback);
|
|
|
|
void update();
|
|
|
|
private:
|
|
layergroupid::TypeID parseTypeIdFromDictionary(const ghoul::Dictionary& initDict) const;
|
|
void initializeBasedOnType(layergroupid::TypeID typeId, ghoul::Dictionary initDict);
|
|
void addVisibleProperties();
|
|
void removeVisibleProperties();
|
|
|
|
properties::OptionProperty _typeOption;
|
|
properties::OptionProperty _blendModeOption;
|
|
properties::BoolProperty _enabled;
|
|
properties::TriggerProperty _reset;
|
|
|
|
layergroupid::TypeID _type;
|
|
std::shared_ptr<tileprovider::TileProvider> _tileProvider;
|
|
OtherTypesProperties _otherTypesProperties;
|
|
LayerRenderSettings _renderSettings;
|
|
LayerAdjustment _layerAdjustment;
|
|
|
|
const layergroupid::GroupID _layerGroupId;
|
|
|
|
std::function<void(void)> _onChangeCallback;
|
|
};
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|
|
|
|
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYER___H__
|