mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-26 14:58:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in asset management

Browse Source
This commit is contained in:
Emil Axelsson
2017-12-15 18:51:22 +01:00
parent 603078af53
commit 814de72bc2
6 changed files with 46 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/openspace/properties/numericalproperty.inl
View File

@@ -367,12 +367,12 @@ void NumericalProperty<T>::setMaxValue(T value) {
template <typename T>
T NumericalProperty<T>::steppingValue() const {
return _steppingValue;
return _stepping;
}
template <typename T>
void NumericalProperty<T>::setSteppingValue(T value) {
_steppingValue = std::move(value);
_stepping = std::move(value);
}
template <typename T>

4
include/openspace/scene/asset.h
View File

@@ -136,8 +136,8 @@ public:
private:
void setState(State state);
void requiredAssetChangedState(std::shared_ptr<Asset> a);
void requestedAssetChangedState(std::shared_ptr<Asset> a);
void requiredAssetChangedState(std::shared_ptr<Asset> a, Asset::State state);
void requestedAssetChangedState(std::shared_ptr<Asset> a, Asset::State state);
bool isSyncResolveReady();