Compile fix in asset and assetloader

include/openspace/scene/asset.h

@@ -39,12 +39,13 @@ class AssetLoader;
 
 class Asset : public properties::PropertyOwner {
 public:
-    struct Optional : public properties::PropertyOwner {
+    class Optional : public properties::PropertyOwner {
     public:
         Optional(Asset* asset, Asset* owner, bool enabled = false);
     private:
         properties::BoolProperty _enabled;
-        Asset* asset;
+        Asset* _asset;
+        Asset* _owner;
     };
 
     enum class ReadyState : unsigned int {
@@ -64,29 +65,30 @@ public:
     */
     Asset(AssetLoader* loader, ghoul::filesystem::Directory baseDirectory, std::string assetPath);
 
-    std::string id();
-    std::string assetFilePath();
-    std::string assetName();
-    std::string assetDirectory();
-    AssetLoader* loader();
-    std::string syncDirectory();
-    ReadyState readyState();
+    std::string id() const;
+    std::string assetFilePath() const;
+    std::string assetName() const;
+    std::string assetDirectory() const;
+    AssetLoader* loader() const;
+    std::string syncDirectory() const;
+    ReadyState readyState() const;
     bool isInitReady() const;
     void initialize();
     void deinitialize();
 
-    bool hasDependency(Asset* asset);
+    bool hasDependency(const Asset* asset) const;
     void addDependency(Asset* asset);
     void removeDependency(Asset* asset);
     void removeDependency(const std::string& assetId);
 
-    bool hasDependants();
-    bool hasInitializedDependants();
+    bool hasDependants() const;
+    bool hasInitializedDependants() const;
 
-    bool hasOptional(Asset* asset);
-    bool setOptionalEnabled(Asset* asset, bool enabled);
-    bool addOptional(Asset* asset, bool enabled);
-    bool removeOptional(Asset* asset);
+    bool hasOptional(Asset* asset) const;
+    bool optionalIsEnabled(Asset* asset) const;
+    void setOptionalEnabled(Asset* asset, bool enabled);
+    void addOptional(Asset* asset, bool enabled);
+    void removeOptional(Asset* asset);
 
     void dependantDidInitialize(Asset* dependant);
     void dependantWillDeinitialize(Asset* dependant);
@@ -96,10 +98,14 @@ public:
 
     bool shouldSynchronize();
     bool shouldInitialize();
-private:
+
     std::string resolveLocalResource(std::string resourceName);
     std::string resolveSyncedResource(std::string resourceName);
 
+    static std::string generateAssetId(std::string directory, std::string name);
+private:
+
+
     ReadyState _readyState;
     AssetLoader* _loader;
 
@@ -109,6 +115,9 @@ private:
     // Asbolute path to directory with the .asset file
     std::string _assetDirectory;
 
+    // Asset id
+    std::string _id;
+
     // Asset dependencies
     std::vector<Asset*> _dependencies;
 

include/openspace/scene/assetloader.h

@@ -92,7 +92,7 @@ public:
     /**
      * Return the root asset
      */
-    Asset* rootAsset();
+    Asset* rootAsset() const;
 
     /**
      * Return the sync root directory
@@ -126,14 +126,18 @@ private:
     ResourceSynchronizer* _resourceSynchronizer;
     std::string _syncRootDirectory;
 
-    friend int assetloader::importDependency(lua_State* state);
-    friend int assetloader::importOptional(lua_State* state);
-    int importAssetLua(
-        std::string assetName,
-        bool togglableInitializationRequirement = false,
-        bool toggleOn = true);
+    int importDependencyLua(std::string assetName);
+    int importOptionalLua(std::string assetName, bool enabled);
+    int resolveLocalResourceLua(Asset* asset);
+    int resolveSyncedResourceLua(Asset* asset);
+    int createLuaTableEntries(const Asset* importer, const Asset* importedAsset);
 
     ghoul::lua::LuaState* _luaState;
+
+    friend int assetloader::importDependency(lua_State* state);
+    friend int assetloader::importOptional(lua_State* state);
+    friend int assetloader::resolveLocalResource(lua_State* state);
+    friend int assetloader::resolveSyncedResource(lua_State* state);
 };