feat: add support for LDtk tilemap

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.cpp

@@ -121,9 +121,7 @@ bool SpriteObject::UpdateProperty(const gd::String& name,
   return true;
 }
 
-void SpriteObject::ExposeResources(
-    gd::ArbitraryResourceWorker& worker,
-    gd::ResourcesManager* resourcesManager) {
+void SpriteObject::ExposeResources(gd::ArbitraryResourceWorker& worker) {
   for (std::size_t j = 0; j < GetAnimationsCount(); j++) {
     for (std::size_t k = 0; k < GetAnimation(j).GetDirectionsCount(); k++) {
       for (std::size_t l = 0;

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h

@@ -44,8 +44,7 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
     return gd::make_unique<SpriteObject>(*this);
   }
 
-  void ExposeResources(gd::ArbitraryResourceWorker& worker,
-                       gd::ResourcesManager* resourcesManager) override;
+  void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
   bool UpdateProperty(const gd::String& name,

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -97,11 +97,11 @@ void ArbitraryResourceWorker::ExposeResources(
   }
 }
 
-void ArbitraryResourceWorker::ExposeEmbeddeds(
-    gd::String& resourceName,
-    gd::ResourcesManager* resourcesManager) {
-  if (!resourcesManager) return;
+void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
+  if (resourcesManagers.empty()) return;
+  gd::ResourcesManager* resourcesManager = resourcesManagers[0];
 
+  // TODO: can this be avoided?
   gd::Resource& resource = resourcesManager->GetResource(resourceName);
 
   if (!resource.GetMetadata().empty()) {

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -102,10 +102,9 @@ class GD_CORE_API ArbitraryResourceWorker {
   virtual void ExposeFile(gd::String &resourceFileName) = 0;
 
   /**
-   * \brief Expose the embedded resources
+   * \brief Expose the embedded resources of the specified resource.
    */
-  virtual void ExposeEmbeddeds(gd::String &resourceName,
-                               gd::ResourcesManager *resourcesManager);
+  virtual void ExposeEmbeddeds(gd::String &resourceName);
 
  protected:
   const std::vector<gd::ResourcesManager *> &GetResources() {

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -38,7 +38,7 @@ gd::ObjectConfiguration &CustomObjectConfiguration::GetChildObjectConfiguration(
     return badObjectConfiguration;
   }
   const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
-  
+
   if (!eventsBasedObject.HasObjectNamed(objectName)) {
     gd::LogError("Tried to get the configuration of a child-object:" + objectName
                 + " that doesn't exist in the event-based object: " + GetType());
@@ -78,7 +78,7 @@ bool CustomObjectConfiguration::UpdateProperty(const gd::String& propertyName,
     }
     const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
     const auto &properties = eventsBasedObject.GetPropertyDescriptors();
-    
+
     return gd::CustomConfigurationHelper::UpdateProperty(
         properties,
         objectContent,
@@ -125,9 +125,7 @@ void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
   }
 }
 
-void CustomObjectConfiguration::ExposeResources(
-    gd::ArbitraryResourceWorker& worker,
-    gd::ResourcesManager* resourcesManager) {
+void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& worker) {
   std::map<gd::String, gd::PropertyDescriptor> properties = GetProperties();
 
   for (auto& property : properties) {
@@ -169,6 +167,6 @@ void CustomObjectConfiguration::ExposeResources(
 
   for (auto& childObject : eventsBasedObject.GetObjects()) {
     auto &configuration = GetChildObjectConfiguration(childObject->GetName());
-    configuration.ExposeResources(worker, resourcesManager);
+    configuration.ExposeResources(worker);
   }
 }

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -68,8 +68,7 @@ class CustomObjectConfiguration : public gd::ObjectConfiguration {
                                      gd::Project& project,
                                      gd::Layout& scene) override;
 
-  void ExposeResources(gd::ArbitraryResourceWorker& worker,
-                       gd::ResourcesManager* resourcesManager) override;
+  void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
 
   gd::ObjectConfiguration &GetChildObjectConfiguration(const gd::String& objectName);
 
@@ -88,9 +87,9 @@ class CustomObjectConfiguration : public gd::ObjectConfiguration {
   /**
    * Initialize configuration using another configuration. Used by copy-ctor
    * and assign-op.
-   * 
+   *
    * Don't forget to update me if members were changed!
-   * 
+   *
    * It's needed because there is no default copy for childObjectConfigurations
    * and it must be a deep copy.
    */

Core/GDCore/Project/ObjectConfiguration.h

@@ -147,8 +147,7 @@ class GD_CORE_API ObjectConfiguration {
    *
    * \see ArbitraryResourceWorker
    */
-  virtual void ExposeResources(gd::ArbitraryResourceWorker& worker,
-                               gd::ResourcesManager* resourcesManager) { return; };
+  virtual void ExposeResources(gd::ArbitraryResourceWorker& worker) { return; };
   ///@}
 
 /** \name Serialization

Core/GDCore/Project/Project.cpp

@@ -992,7 +992,7 @@ void Project::ExposeResources(gd::ArbitraryResourceWorker& worker) {
   for (std::size_t s = 0; s < GetLayoutsCount(); s++) {
     for (std::size_t j = 0; j < GetLayout(s).GetObjectsCount();
          ++j) { // Add objects resources
-      GetLayout(s).GetObject(j).GetConfiguration().ExposeResources(worker, resourcesManager);
+      GetLayout(s).GetObject(j).GetConfiguration().ExposeResources(worker);
     }
 
     LaunchResourceWorkerOnEvents(*this, GetLayout(s).GetEvents(), worker);
@@ -1012,7 +1012,7 @@ void Project::ExposeResources(gd::ArbitraryResourceWorker& worker) {
 
   // Add global objects resources
   for (std::size_t j = 0; j < GetObjectsCount(); ++j) {
-    GetObject(j).GetConfiguration().ExposeResources(worker, resourcesManager);
+    GetObject(j).GetConfiguration().ExposeResources(worker);
   }
 
   // Add loading screen background image if present

Extensions/PanelSpriteObject/PanelSpriteObject.cpp

@@ -55,8 +55,7 @@ void PanelSpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
 }
 
 void PanelSpriteObject::ExposeResources(
-    gd::ArbitraryResourceWorker& worker,
-    gd::ResourcesManager *resourcesManager) {
+    gd::ArbitraryResourceWorker& worker) {
   worker.ExposeImage(textureName);
 }
 #endif

Extensions/PanelSpriteObject/PanelSpriteObject.h

@@ -28,10 +28,7 @@ class GD_EXTENSION_API PanelSpriteObject : public gd::ObjectConfiguration {
         new PanelSpriteObject(*this));
   }
 
-#if defined(GD_IDE_ONLY)
-  virtual void ExposeResources(gd::ArbitraryResourceWorker &worker,
-                               gd::ResourcesManager *resourcesManager);
-#endif
+  virtual void ExposeResources(gd::ArbitraryResourceWorker &worker);
 
   double GetWidth() const { return width; };
   double GetHeight() const { return height; };

Extensions/ParticleSystem/ParticleEmitterObject.cpp

@@ -171,8 +171,7 @@ void ParticleEmitterBase::SerializeParticleEmitterBaseTo(
 ParticleEmitterBase::~ParticleEmitterBase() {}
 
 void ParticleEmitterObject::ExposeResources(
-    gd::ArbitraryResourceWorker& worker,
-    gd::ResourcesManager *resourcesManager) {
+    gd::ArbitraryResourceWorker& worker) {
   gd::String texture = GetParticleTexture();
   worker.ExposeImage(texture);
   SetParticleTexture(texture);

Extensions/ParticleSystem/ParticleEmitterObject.h

@@ -193,8 +193,7 @@ class GD_EXTENSION_API ParticleEmitterObject : public gd::ObjectConfiguration,
     return gd::make_unique<ParticleEmitterObject>(*this);
   }
 
-  virtual void ExposeResources(gd::ArbitraryResourceWorker& worker,
-                               gd::ResourcesManager *resourcesManager);
+  virtual void ExposeResources(gd::ArbitraryResourceWorker& worker);
 
  private:
   virtual void DoUnserializeFrom(gd::Project& project,

Extensions/TextObject/TextObject.cpp

@@ -72,8 +72,7 @@ void TextObject::DoSerializeTo(gd::SerializerElement& element) const {
 }
 
 void TextObject::ExposeResources(
-    gd::ArbitraryResourceWorker& worker,
-    gd::ResourcesManager *resourcesManager) {
+    gd::ArbitraryResourceWorker& worker) {
   worker.ExposeFont(fontName);
 }
 #endif

Extensions/TextObject/TextObject.h

@@ -25,10 +25,7 @@ class GD_EXTENSION_API TextObject : public gd::ObjectConfiguration {
     return gd::make_unique<TextObject>(*this);
   }
 
-#if defined(GD_IDE_ONLY)
-  virtual void ExposeResources(gd::ArbitraryResourceWorker& worker,
-                               gd::ResourcesManager *resourcesManager);
-#endif
+  virtual void ExposeResources(gd::ArbitraryResourceWorker& worker);
 
   /** \brief Change the text.
    */