mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 11:18:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clean up asset related code

Browse Source
This commit is contained in:
Emil Axelsson
2017-12-16 12:51:46 +01:00
parent 814de72bc2
commit 84dfbe7b80
5 changed files with 109 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/scene/asset.h
+2 -3
View File
@@ -82,8 +82,7 @@ public:
void addSynchronization(std::shared_ptr<ResourceSynchronization> synchronization);
std::vector<std::shared_ptr<ResourceSynchronization>> ownSynchronizations() const;
void syncStateChanged(std::shared_ptr<ResourceSynchronization> sync,
ResourceSynchronization::State s);
void syncStateChanged(ResourceSynchronization::State s);
bool hasLoadedParent() const;
void load();
@@ -136,7 +135,7 @@ public:
private:
void setState(State state);
void requiredAssetChangedState(std::shared_ptr<Asset> a, Asset::State state);
void requiredAssetChangedState(Asset::State state);
void requestedAssetChangedState(std::shared_ptr<Asset> a, Asset::State state);
bool isSyncResolveReady();