Fix autosave not launched before preview and protect against potential data loss on save

Don't show in changelog

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -31,12 +31,17 @@ vector<gd::InstructionsList*> ForEachEvent::GetAllActionsVectors() {
   return allActions;
 }
 
-vector<gd::Expression*> ForEachEvent::GetAllExpressions() {
-  vector<gd::Expression*> allExpressions;
-  allExpressions.push_back(&objectsToPick);
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    ForEachEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&objectsToPick, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
+
 vector<const gd::InstructionsList*> ForEachEvent::GetAllConditionsVectors()
     const {
   vector<const gd::InstructionsList*> allConditions;
@@ -52,11 +57,15 @@ vector<const gd::InstructionsList*> ForEachEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<const gd::Expression*> ForEachEvent::GetAllExpressions() const {
-  vector<const gd::Expression*> allExpressions;
-  allExpressions.push_back(&objectsToPick);
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    ForEachEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&objectsToPick, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 void ForEachEvent::SerializeTo(SerializerElement& element) const {

Core/GDCore/Events/Builtin/ForEachEvent.h

@@ -50,10 +50,13 @@ class GD_CORE_API ForEachEvent : public gd::BaseEvent {
   virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
       const;
   virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
-  virtual std::vector<const gd::Expression*> GetAllExpressions() const;
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const;
+
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
-  virtual std::vector<gd::Expression*> GetAllExpressions();
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata();
 
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,

Core/GDCore/Events/Builtin/RepeatEvent.cpp

@@ -31,11 +31,15 @@ vector<gd::InstructionsList*> RepeatEvent::GetAllActionsVectors() {
   return allActions;
 }
 
-vector<gd::Expression*> RepeatEvent::GetAllExpressions() {
-  vector<gd::Expression*> allExpressions;
-  allExpressions.push_back(&repeatNumberExpression);
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    RepeatEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("expression");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&repeatNumberExpression, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 vector<const gd::InstructionsList*> RepeatEvent::GetAllConditionsVectors()
@@ -53,11 +57,15 @@ vector<const gd::InstructionsList*> RepeatEvent::GetAllActionsVectors() const {
   return allActions;
 }
 
-vector<const gd::Expression*> RepeatEvent::GetAllExpressions() const {
-  vector<const gd::Expression*> allExpressions;
-  allExpressions.push_back(&repeatNumberExpression);
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    RepeatEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("expression");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&repeatNumberExpression, metadata));
 
-  return allExpressions;
+  return allExpressionsWithMetadata;
 }
 
 void RepeatEvent::SerializeTo(SerializerElement& element) const {

Core/GDCore/Events/Builtin/RepeatEvent.h

@@ -45,11 +45,14 @@ class GD_CORE_API RepeatEvent : public gd::BaseEvent {
 
   virtual std::vector<gd::InstructionsList*> GetAllConditionsVectors();
   virtual std::vector<gd::InstructionsList*> GetAllActionsVectors();
-  virtual std::vector<gd::Expression*> GetAllExpressions();
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata();
+
   virtual std::vector<const gd::InstructionsList*> GetAllConditionsVectors()
       const;
   virtual std::vector<const gd::InstructionsList*> GetAllActionsVectors() const;
-  virtual std::vector<const gd::Expression*> GetAllExpressions() const;
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const;
 
   virtual void SerializeTo(SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -1,6 +1,8 @@
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+
 #include <algorithm>
 #include <utility>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/Events/CodeGeneration/ExpressionCodeGenerator.h"
@@ -539,6 +541,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   if (MetadataProvider::HasBehaviorAction(
           platform, behaviorType, action.GetType()) &&
       instrInfos.parameters.size() >= 2) {
+
     std::vector<gd::String> realObjects =
         ExpandObjectsName(objectName, context);
     for (std::size_t i = 0; i < realObjects.size(); ++i) {
@@ -628,7 +631,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
 
     argOutput = "\"" + argOutput + "\"";
   } else if (ParameterMetadata::IsBehavior(metadata.type)) {
-    argOutput = "\"" + ConvertToString(parameter) + "\"";
+    argOutput = GenerateGetBehaviorNameCode(parameter);
   } else if (metadata.type == "key") {
     argOutput = "\"" + ConvertToString(parameter) + "\"";
   } else if (metadata.type == "password" || metadata.type == "musicfile" ||

Core/GDCore/Events/Event.h

@@ -12,6 +12,7 @@
 #include <vector>
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/Events/InstructionsList.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
 namespace gd {
 class EventsList;
@@ -127,15 +128,17 @@ class GD_CORE_API BaseEvent {
   };
 
   /**
-   * \brief Return a list of all expressions of the event.
-   * \note Used to preprocess or search in the expressions.
+   * \brief Return a list of all expressions of the event, each with their associated metadata.
+   * \note Used to preprocess or search in the expressions of the event.
    */
-  virtual std::vector<gd::Expression*> GetAllExpressions() {
-    std::vector<gd::Expression*> noExpr;
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() {
+    std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> > noExpr;
     return noExpr;
   };
-  virtual std::vector<const gd::Expression*> GetAllExpressions() const {
-    std::vector<const gd::Expression*> noExpr;
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const {
+    std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> > noExpr;
     return noExpr;
   };
 

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -279,6 +279,43 @@ bool EventsRefactorer::RenameObjectInConditions(
   return somethingModified;
 }
 
+bool EventsRefactorer::RenameObjectInEventParameters(
+    const gd::Platform& platform,
+    gd::ObjectsContainer& project,
+    gd::ObjectsContainer& layout,
+    gd::Expression& expression,
+    gd::ParameterMetadata parameterMetadata,
+    gd::String oldName,
+    gd::String newName) {
+  bool somethingModified = false;
+
+  if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType()) &&
+      expression.GetPlainString() == oldName)
+    expression = gd::Expression(newName);
+  // Replace object's name in expressions
+  else if (ParameterMetadata::IsExpression(
+               "number", parameterMetadata.GetType())) {
+    gd::ExpressionParser2 parser(platform, project, layout);
+    auto node = parser.ParseExpression("number", expression.GetPlainString());
+
+    if (ExpressionObjectRenamer::Rename(*node, oldName, newName)) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+  // Replace object's name in text expressions
+  else if (ParameterMetadata::IsExpression(
+               "string", parameterMetadata.GetType())) {
+    gd::ExpressionParser2 parser(platform, project, layout);
+    auto node = parser.ParseExpression("string", expression.GetPlainString());
+
+    if (ExpressionObjectRenamer::Rename(*node, oldName, newName)) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+
+  return somethingModified;
+}
+
 void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
                                             gd::ObjectsContainer& project,
                                             gd::ObjectsContainer& layout,
@@ -300,6 +337,15 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
           platform, project, layout, *actionsVectors[j], oldName, newName);
     }
 
+    vector<pair<gd::Expression*, gd::ParameterMetadata>> expressionsWithMetadata =
+        events[i].GetAllExpressionsWithMetadata();
+    for (std::size_t j = 0; j < expressionsWithMetadata.size(); ++j) {
+      gd::Expression* expression = expressionsWithMetadata[j].first;
+      gd::ParameterMetadata parameterMetadata = expressionsWithMetadata[j].second;
+      bool somethingModified = RenameObjectInEventParameters(
+        platform, project, layout, *expression, parameterMetadata, oldName, newName);
+    }
+
     if (events[i].CanHaveSubEvents())
       RenameObjectInEvents(platform,
                            project,

Core/GDCore/IDE/Events/EventsRefactorer.h

@@ -8,6 +8,7 @@
 #include <memory>
 #include <vector>
 #include "GDCore/Events/Instruction.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
 namespace gd {
 class EventsList;
@@ -146,6 +147,20 @@ class GD_CORE_API EventsRefactorer {
                                        gd::InstructionsList& instructions,
                                        gd::String oldName,
                                        gd::String newName);
+   /**
+   * Replace all occurrences of an object name by another name in an expression
+   * with the specified metadata
+   * ( include : objects or objects in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInEventParameters(const gd::Platform& platform,
+                                            gd::ObjectsContainer& project,
+                                            gd::ObjectsContainer& layout,
+                                            gd::Expression& expression,
+                                            gd::ParameterMetadata parameterMetadata,
+                                            gd::String oldName,
+                                            gd::String newName);
 
   /**
    * Remove all conditions of the list using an object

Core/GDCore/IDE/ProjectStripper.cpp

@@ -4,6 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 #include "ProjectStripper.h"
+
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/ExternalLayout.h"
 #include "GDCore/Project/Layout.h"
@@ -20,61 +21,8 @@ void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project& project) {
     project.GetLayout(i).GetObjectGroups().Clear();
     project.GetLayout(i).GetEvents().Clear();
   }
-}
 
-void GD_CORE_API ProjectStripper::StripProjectForLayoutEdition(
-    gd::Project& project, const gd::String& layoutName) {
-  while (project.GetExternalEventsCount() > 0)
-    project.RemoveExternalEvents(project.GetExternalEvents(0).GetName());
-
-  for (unsigned int i = 0; i < project.GetLayoutsCount(); ++i) {
-    auto& layout = project.GetLayout(i);
-    if (layoutName == layout.GetName()) continue;
-
-    project.GetLayout(i).GetEvents().Clear();
-    project.GetLayout(i).GetInitialInstances().Clear();
-  }
-
-  for (unsigned int i = 0; i < project.GetExternalEventsCount(); ++i) {
-    project.GetExternalEvents(i).GetEvents().Clear();
-  }
-
-  for (unsigned int i = 0; i < project.GetExternalLayoutsCount(); ++i) {
-    project.GetExternalLayout(i).GetInitialInstances().Clear();
-  }
-}
-
-void GD_CORE_API ProjectStripper::StripProjectForExternalLayoutEdition(
-    gd::Project& project, const gd::String& externalLayoutName) {
-  while (project.GetExternalEventsCount() > 0)
-    project.RemoveExternalEvents(project.GetExternalEvents(0).GetName());
-
-  gd::String associatedLayoutName;
-  if (project.HasExternalLayoutNamed(externalLayoutName)) {
-    associatedLayoutName =
-        project.GetExternalLayout(externalLayoutName).GetAssociatedLayout();
-  }
-
-  for (unsigned int i = 0; i < project.GetLayoutsCount(); ++i) {
-    auto& layout = project.GetLayout(i);
-    if (!associatedLayoutName.empty() &&
-        associatedLayoutName == layout.GetName())
-      continue;
-
-    project.GetLayout(i).GetEvents().Clear();
-    project.GetLayout(i).GetInitialInstances().Clear();
-  }
-
-  for (unsigned int i = 0; i < project.GetExternalEventsCount(); ++i) {
-    project.GetExternalEvents(i).GetEvents().Clear();
-  }
-
-  for (unsigned int i = 0; i < project.GetExternalLayoutsCount(); ++i) {
-    auto& externalLayout = project.GetExternalLayout(i);
-    if (externalLayoutName == externalLayout.GetName()) continue;
-
-    externalLayout.GetInitialInstances().Clear();
-  }
+  project.ClearEventsFunctionsExtensions();
 }
 
 }  // namespace gd

Core/GDCore/IDE/ProjectStripper.h

@@ -28,23 +28,6 @@ class GD_CORE_API ProjectStripper {
    */
   static void StripProjectForExport(gd::Project& project);
 
-  /**
-   * \brief Strip project to keep only the full content of the specified
-   * layout. The content of other layouts, external events and external layouts
-   * is removed.
-   */
-  static void StripProjectForLayoutEdition(gd::Project& project,
-                                           const gd::String& layoutName);
-
-  /**
-   * \brief Strip project to keep only the full content of the specified
-   * external layout and the associated layout.
-   * The content of other layouts, external events and external layouts is
-   * removed.
-   */
-  static void StripProjectForExternalLayoutEdition(
-      gd::Project& project, const gd::String& externalLayoutName);
-
  private:
   ProjectStripper(){};
   virtual ~ProjectStripper(){};

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -181,7 +181,7 @@ class GD_CORE_API WholeProjectRefactorer {
       bool isObjectGroup);
 
   /**
-   * \brief Refactor the events function after an object or group is renamed
+   * \brief Refactor the events function after an object or group is removed
    *
    * This will update the events of the function and groups.
    */

Core/GDCore/Project/Project.cpp

@@ -521,6 +521,9 @@ void Project::RemoveEventsFunctionsExtension(const gd::String& name) {
 
   eventsFunctionsExtensions.erase(eventsFunctionExtension);
 }
+void Project::ClearEventsFunctionsExtensions() {
+  eventsFunctionsExtensions.clear();
+}
 #endif
 
 void Project::UnserializeFrom(const SerializerElement& element) {

Core/GDCore/Project/Project.h

@@ -8,6 +8,7 @@
 #define GDCORE_PROJECT_H
 #include <memory>
 #include <vector>
+
 #include "GDCore/Project/LoadingScreen.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/Project/ObjectsContainer.h"
@@ -460,22 +461,27 @@ class GD_CORE_API Project : public ObjectsContainer {
   std::size_t GetLayoutsCount() const;
 
   /**
-   * \brief \brief Adds a new empty layout called "name" at the specified
+   * \brief Add a new empty layout called "name" at the specified
    * position in the layout list.
    */
   gd::Layout& InsertNewLayout(const gd::String& name, std::size_t position);
 
   /**
-   * \brief \brief Adds a new layout constructed from the layout passed as
-   * parameter. \note No pointer or reference must be kept on the layout passed
-   * as parameter. \param layout The layout that must be copied and inserted
-   * into the project \param position Insertion position. Even if the position
+   * \brief Add a new layout constructed from the layout passed as
+   * parameter.
+   * \param layout The layout that must be copied and inserted
+   * into the project
+   * \param position Insertion position. Even if the position
    * is invalid, the layout must be inserted at the end of the layout list.
+   *
+   * \note No pointer or reference must be kept on the layout passed
+   * as parameter.
+   *
    */
   gd::Layout& InsertLayout(const Layout& layout, std::size_t position);
 
   /**
-   * Must delete layout named "name".
+   * \brief Delete layout named "name".
    */
   void RemoveLayout(const gd::String& name);
 
@@ -592,7 +598,7 @@ class GD_CORE_API Project : public ObjectsContainer {
                                        std::size_t position);
 
   /**
-   * Must delete external events named "name".
+   * \brief Delete external events named "name".
    */
   void RemoveExternalEvents(const gd::String& name);
 #endif
@@ -673,7 +679,7 @@ class GD_CORE_API Project : public ObjectsContainer {
                                            std::size_t position);
 
   /**
-   * Must delete external layout named "name".
+   * \brief Delete external layout named "name".
    */
   void RemoveExternalLayout(const gd::String& name);
 
@@ -694,37 +700,37 @@ class GD_CORE_API Project : public ObjectsContainer {
 ///@{
 #if defined(GD_IDE_ONLY)
   /**
-   * Return true if events functions extension called "name" exists.
+   * \brief  Check if events functions extension called "name" exists.
    */
   bool HasEventsFunctionsExtensionNamed(const gd::String& name) const;
 
   /**
-   * Return a reference to the events functions extension called "name".
+   * \brief Return a reference to the events functions extension called "name".
    */
   EventsFunctionsExtension& GetEventsFunctionsExtension(const gd::String& name);
 
   /**
-   * Return a reference to the events functions extension called "name".
+   * \brief Return a reference to the events functions extension called "name".
    */
   const EventsFunctionsExtension& GetEventsFunctionsExtension(
       const gd::String& name) const;
 
   /**
-   * Return a reference to the events functions extension at position "index" in
-   * the list
+   * \brief Return a reference to the events functions extension at position
+   * "index" in the list
    */
   EventsFunctionsExtension& GetEventsFunctionsExtension(std::size_t index);
 
   /**
-   * Return a reference to the events functions extension at position "index" in
-   * the list
+   * \brief Return a reference to the events functions extension at position
+   * "index" in the list
    */
   const EventsFunctionsExtension& GetEventsFunctionsExtension(
       std::size_t index) const;
 
   /**
-   * Return the position of the events functions extension called "name" in the
-   * list
+   * \brief Return the position of the events functions extension called "name"
+   * in the list.
    */
   std::size_t GetEventsFunctionsExtensionPosition(const gd::String& name) const;
 
@@ -736,7 +742,7 @@ class GD_CORE_API Project : public ObjectsContainer {
   void SwapEventsFunctionsExtensions(std::size_t first, std::size_t second);
 
   /**
-   * Return the number of events functions extension.
+   * \brief Returns the number of events functions extension.
    */
   std::size_t GetEventsFunctionsExtensionsCount() const;
 
@@ -759,9 +765,14 @@ class GD_CORE_API Project : public ObjectsContainer {
       std::size_t position);
 
   /**
-   * Must delete the events functions extension named "name".
+   * \brief Delete the events functions extension named "name".
    */
   void RemoveEventsFunctionsExtension(const gd::String& name);
+
+  /**
+   * \brief Remove all the events functions extensions.
+   */
+  void ClearEventsFunctionsExtensions();
 #endif
   ///@}
 

Core/GDCore/Project/Variable.cpp

@@ -5,7 +5,9 @@
  */
 
 #include "GDCore/Project/Variable.h"
+
 #include <sstream>
+
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/String.h"
 #include "GDCore/TinyXml/tinyxml.h"
@@ -19,9 +21,7 @@ namespace gd {
  */
 double Variable::GetValue() const {
   if (!isNumber) {
-    stringstream ss;
-    ss << str;
-    ss >> value;
+    value = str.To<double>();
     isNumber = true;
   }
 
@@ -30,9 +30,7 @@ double Variable::GetValue() const {
 
 const gd::String& Variable::GetString() const {
   if (isNumber) {
-    stringstream s;
-    s << (value);
-    str = s.str();
+    str = gd::String::From(value);
     isNumber = false;
   }
 
@@ -76,6 +74,7 @@ const Variable& Variable::GetChild(const gd::String& name) const {
 void Variable::RemoveChild(const gd::String& name) {
   if (!isStructure) return;
   children.erase(name);
+  isStructure = !children.empty();
 }
 
 bool Variable::RenameChild(const gd::String& oldName,
@@ -190,6 +189,7 @@ void Variable::RemoveRecursively(const gd::Variable& variableToRemove) {
       it++;
     }
   }
+  isStructure = !children.empty();
 }
 
 Variable::Variable(const Variable& other)

Extensions/BBText/JsExtension.js

@@ -35,6 +35,8 @@ module.exports = {
       if (propertyName in objectContent) {
         if (typeof objectContent[propertyName] === 'boolean')
           objectContent[propertyName] = newValue === '1';
+        else if (typeof objectContent[propertyName] === 'number')
+          objectContent[propertyName] = parseFloat(newValue);
         else objectContent[propertyName] = newValue;
         return true;
       }
@@ -67,7 +69,7 @@ module.exports = {
 
       objectProperties.set(
         'fontSize',
-        new gd.PropertyDescriptor(objectContent.fontSize)
+        new gd.PropertyDescriptor(objectContent.fontSize.toString())
           .setType('number')
           .setLabel(_('Base size'))
       );
@@ -111,7 +113,7 @@ module.exports = {
         text:
           '[b]bold[/b] [i]italic[/i] [size=15]smaller[/size] [font=times]times[/font] font\n[spacing=12]spaced out[/spacing]\n[outline=yellow]outlined[/outline] [shadow=red]DropShadow[/shadow] ',
         opacity: 255,
-        fontSize: '20',
+        fontSize: 20,
         visible: true,
         color: '#000000',
         fontFamily: 'Arial',
@@ -410,7 +412,7 @@ module.exports = {
     objectsEditorService.registerEditorConfiguration(
       'BBText::BBText',
       objectsEditorService.getDefaultObjectJsImplementationPropertiesEditor({
-        helpPagePath: '/objects/bbtext_object',
+        helpPagePath: '/objects/bbtext',
       })
     );
   },

Extensions/BBText/bbtextruntimeobject-pixi-renderer.js

@@ -76,6 +76,7 @@ gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateText = function() {
 
 gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateColor = function() {
   this._pixiObject.textStyles.default.fill = this._object._color;
+  this._pixiObject.dirty = true;
 };
 
 gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateAlignment = function() {
@@ -83,10 +84,12 @@ gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateAlignment = function() {
   this._pixiObject.dirty = true;
 };
 gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateFontFamily = function() {
-  this._pixiObject.textStyles.default.fontFamily = this._object._fontFamily;
+  this._pixiObject.textStyles.default.fontFamily = this._object._runtimeScene.getGame().getFontManager().getFontFamily(this._object._fontFamily);
+  this._pixiObject.dirty = true;
 };
 gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updateFontSize = function() {
   this._pixiObject.textStyles.default.fontSize = this._object._fontSize + 'px';
+  this._pixiObject.dirty = true;
 };
 
 gdjs.BBTextRuntimeObjectPixiRenderer.prototype.updatePosition = function() {

Extensions/BBText/bbtextruntimeobject.js

@@ -25,7 +25,8 @@ gdjs.BBTextRuntimeObject = function(runtimeScene, objectData) {
   gdjs.RuntimeObject.call(this, runtimeScene, objectData);
 
   /** @type {number} */
-  this._opacity = objectData.content.opacity;
+  this._opacity = parseFloat(objectData.content.opacity);
+  // parseFloat should not be required, but GDevelop 5.0 beta 92 and below were storing it as a string.
   /** @type {boolean} */
   this._visible = objectData.content.visible;
   /** @type {string} */
@@ -35,7 +36,8 @@ gdjs.BBTextRuntimeObject = function(runtimeScene, objectData) {
   /** @type {string} */
   this._fontFamily = objectData.content.fontFamily;
   /** @type {number} */
-  this._fontSize = objectData.content.fontSize;
+  this._fontSize = parseFloat(objectData.content.fontSize);
+  // parseFloat should not be required, but GDevelop 5.0 beta 92 and below were storing it as a string.
   /** @type {boolean} */
   this._wordWrap = objectData.content.wordWrap;
   /** @type {number} */

Extensions/DialogueTree/JsExtension.js

@@ -45,7 +45,7 @@ module.exports = {
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/DialogueTree/dialoguetools.js')
-      .addIncludeFile('Extensions/DialogueTree/bondage.min.js')
+      .addIncludeFile('Extensions/DialogueTree/bondage.js/dist/bondage.min.js')
       .setFunctionName('gdjs.dialogueTree.loadFromSceneVariable');
 
     extension
@@ -69,7 +69,7 @@ module.exports = {
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/DialogueTree/dialoguetools.js')
-      .addIncludeFile('Extensions/DialogueTree/bondage.min.js')
+      .addIncludeFile('Extensions/DialogueTree/bondage.js/dist/bondage.min.js')
       .setFunctionName('gdjs.dialogueTree.loadFromJsonFile');
 
     extension
@@ -168,15 +168,14 @@ module.exports = {
         _(
           'Select option by number. Use this when the dialogue line is of type "options" and the player has pressed a button to change selected option.'
         ),
-        _('Select option by number'),
+        _('Select option at index _PARAM0_'),
         _('Dialogue Tree (experimental)'),
         'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('expression', _('Option index number'), '', false)
-      .setDefaultValue('0')
       .getCodeExtraInformation()
-      .setFunctionName('gdjs.dialogueTree.selectPreviousOption');
+      .setFunctionName('gdjs.dialogueTree.selectOption');
 
     extension
       .addAction(
@@ -210,21 +209,55 @@ module.exports = {
 
     extension
       .addAction(
-        'SetVariable',
-        _('Set dialogue state variable'),
+        'SetStringVariable',
+        _('Set dialogue state string variable'),
         _(
-          'Set dialogue state variable. Use this to set a variable that the dialogue data is using.'
+          'Set dialogue state string variable. Use this to set a variable that the dialogue data is using.'
         ),
-        _('Set dialogue state variable _PARAM0_ to _PARAM1_'),
+        _('Set dialogue state string variable _PARAM0_ to _PARAM1_'),
         _('Dialogue Tree (experimental)'),
         'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
       )
       .addParameter('string', _('State Variable Name'), '', false)
-      .addParameter('expression', _('Variable Value'), '', false)
+      .addParameter('string', _('Variable string value'), '', false)
       .getCodeExtraInformation()
       .setFunctionName('gdjs.dialogueTree.setVariable');
 
+    extension
+      .addAction(
+        'SetNumberVariable',
+        _('Set dialogue state number variable'),
+        _(
+          'Set dialogue state number variable. Use this to set a variable that the dialogue data is using.'
+        ),
+        _('Set dialogue state number variable _PARAM0_ to _PARAM1_'),
+        _('Dialogue Tree (experimental)'),
+        'JsPlatform/Extensions/yarn24.png',
+        'JsPlatform/Extensions/yarn32.png'
+      )
+      .addParameter('string', _('State Variable Name'), '', false)
+      .addParameter('expression', _('Variable number value'), '', true)
+      .getCodeExtraInformation()
+      .setFunctionName('gdjs.dialogueTree.setVariable');
+      
+    extension
+      .addAction(
+        'SetBooleanVariable',
+        _('Set dialogue state boolean variable'),
+        _(
+          'Set dialogue state boolean variable. Use this to set a variable that the dialogue data is using.'
+        ),
+        _('Set dialogue state boolean variable _PARAM0_ to _PARAM1_'),
+        _('Dialogue Tree (experimental)'),
+        'JsPlatform/Extensions/yarn24.png',
+        'JsPlatform/Extensions/yarn32.png'
+      )
+      .addParameter('string', _('State Variable Name'), '', false)
+      .addParameter('trueorfalse', _('Variable boolean value'), '', false)
+      .getCodeExtraInformation()
+      .setFunctionName('gdjs.dialogueTree.setVariable');
+            
     extension
       .addAction(
         'SaveState',
@@ -257,6 +290,21 @@ module.exports = {
       .getCodeExtraInformation()
       .setFunctionName('gdjs.dialogueTree.loadState');
 
+    extension
+      .addAction(
+        'ClearState',
+        _('Clear dialogue state'),
+        _(
+          'Clear dialogue state. This resets all dialogue state accumulated by the player choices. Useful when the player is starting a new game.'
+        ),
+        _('Clear dialogue state'),
+        _('Dialogue Tree (experimental)'),
+        'JsPlatform/Extensions/yarn24.png',
+        'JsPlatform/Extensions/yarn32.png'
+      )
+      .getCodeExtraInformation()
+      .setFunctionName('gdjs.dialogueTree.clearState');
+
     extension
       .addStrExpression(
         'LineText',
@@ -592,9 +640,9 @@ module.exports = {
     extension
       .addCondition(
         'WasBranchVisited',
-        _('Branch title has been visited before'),
-        _('Check if the current branch has been visited before'),
-        _('Branch title _PARAM0_ has been visited before'),
+        _('Branch title has been visited'),
+        _('Check if a branch has been visited'),
+        _('Branch title _PARAM0_ has been visited'),
         _('Dialogue Tree (experimental)'),
         'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
@@ -605,12 +653,12 @@ module.exports = {
 
     extension
       .addCondition(
-        'CompareDialogueStateVariable',
-        _('Compare dialogue state variable'),
+        'CompareDialogueStateStringVariable',
+        _('Compare dialogue state string variable'),
         _(
-          'Compare dialogue state variable. Use this to trigger game events via dialogue variables.'
+          'Compare dialogue state string variable. Use this to trigger game events via dialogue variables.'
         ),
-        _('Dialogue state variable _PARAM0_ is equal to _PARAM1_'),
+        _('Dialogue state string variable _PARAM0_ is equal to _PARAM1_'),
         _('Dialogue Tree (experimental)'),
         'JsPlatform/Extensions/yarn24.png',
         'JsPlatform/Extensions/yarn32.png'
@@ -620,6 +668,40 @@ module.exports = {
       .getCodeExtraInformation()
       .setFunctionName('gdjs.dialogueTree.compareVariable');
 
+    extension
+      .addCondition(
+        'CompareDialogueStateNumberVariable',
+        _('Compare dialogue state number variable'),
+        _(
+          'Compare dialogue state number variable. Use this to trigger game events via dialogue variables.'
+        ),
+        _('Dialogue state number variable _PARAM0_ is equal to _PARAM1_'),
+        _('Dialogue Tree (experimental)'),
+        'JsPlatform/Extensions/yarn24.png',
+        'JsPlatform/Extensions/yarn32.png'
+      )
+      .addParameter('string', _('State variable'), '', false)
+      .addParameter('expression', _('Equal to'), '', false)
+      .getCodeExtraInformation()
+      .setFunctionName('gdjs.dialogueTree.compareVariable');
+
+    extension
+      .addCondition(
+        'CompareDialogueStateBooleanVariable',
+        _('Compare dialogue state boolean variable'),
+        _(
+          'Compare dialogue state variable. Use this to trigger game events via dialogue variables.'
+        ),
+        _('Dialogue state boolean variable _PARAM0_ is equal to _PARAM1_'),
+        _('Dialogue Tree (experimental)'),
+        'JsPlatform/Extensions/yarn24.png',
+        'JsPlatform/Extensions/yarn32.png'
+      )
+      .addParameter('string', _('State variable'), '', false)
+      .addParameter('trueorfalse', _('Equal to'), '', false)
+      .getCodeExtraInformation()
+      .setFunctionName('gdjs.dialogueTree.compareVariable');
+
     extension
       .addCondition(
         'HasClippedTextScrollingCompleted',

Extensions/DialogueTree/bondage.js/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 j hayley
+
+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.

Extensions/DialogueTree/bondage.js/README.md

@@ -0,0 +1,66 @@
+# bondage.js [![Build Status](https://travis-ci.org/jhayley/bondage.js.svg?branch=master)](https://travis-ci.org/jhayley/bondage.js)
+[Yarn](https://github.com/InfiniteAmmoInc/Yarn) parser for Javascript, in the same vein as [YarnSpinner](https://github.com/thesecretlab/YarnSpinner).
+
+# Usage
+
+#### As a Web Tool
+
+To run through your yarn files in your browser, go to http://hayley.zone/bondage.js, paste your yarn data in the field, then hit "compile".
+
+#### As a Command Line Tool
+Installation: `npm install -g bondage`
+
+Now you can use the `bondage` command to run through Yarn files from the command line. You can load one or multiple files at a time. If you load multiple files and a two nodes are encountered with the same name, the node will be overwritten.
+
+**Examples**
+
+* Running a single file from the default start node (named "Start"): `bondage run yarnfile.json`
+* Running a single file from the specified node name: `bondage run -s StartNode yarnfile.json`
+* Running multiple files from the specified node name: `bondage run -s StartNode yarnfile1.json yarnfile2.json ...`
+* See the compiled ast: `bondage compile --ast yarnfile.json`
+* See the tokenized input: `bondage compile --tokens yarnfile.json`
+
+#### As a Library
+
+**Web**
+
+Include [dist/bondage.min.js](https://github.com/jhayley/bondage.js/blob/master/dist/bondage.min.js) somewhere in your html, and the `bondage` variable will be added to the global scope. You can then access everything in the example below (such as `bondage.Runner`) through that variable.
+
+**Node**
+
+Installation: `npm install bondage`
+
+```javascript
+const fs = require('fs');
+const bondage = require('bondage');
+
+const runner = new bondage.Runner();
+const yarnData = JSON.parse(fs.readFileSync('yarnFile.json'));
+
+runner.load(yarnData);
+
+// Loop over the dialogue from the node titled 'Start'
+for (const result of runner.run('Start')) {
+  // Do something else with the result
+  if (result instanceof bondage.TextResult) {
+    console.log(result.text);
+  } else if (result instanceof bondage.OptionsResult) {
+    // This works for both links between nodes and shortcut options
+    console.log(result.options);
+
+    // Select based on the option's index in the array (if you don't select an option, the dialog will continue past them)
+    result.select(1);
+  } else if (result instanceof bondage.CommandResult) {
+     // If the text was inside <<here>>, it will get returned as a CommandResult string, which you can use in any way you want
+    console.log(result.text);
+  }
+}
+
+// Advance the dialogue manually from the node titled 'Start'
+const d = runner.run('Start')
+let result = d.next().value;
+let nextResult = d.next().value;
+// And so on
+```
+
+For usage of the yarn format itself, please see the [YarnSpinner Documentation](https://github.com/thesecretlab/YarnSpinner/tree/master/Documentation), everything there should carry here too (if something does not match up, please open an issue).

Extensions/DialogueTree/bondage.js/version.txt

@@ -0,0 +1,5 @@
+This extension is using bondage.js library to parse yarn syntax.
+https://github.com/hylyh/bondage.js
+
+The current build used is built from commit 3c63e21
+

Extensions/DialogueTree/dialoguetools.js

@@ -101,7 +101,20 @@ gdjs.dialogueTree.isRunning = function() {
 gdjs.dialogueTree.scrollClippedText = function() {
   if (this.pauseScrolling || !this.dialogueIsRunning) return;
 
-  if (this.dialogueText) {
+  // Autoscroll commands so the user doesnt have to press again
+  if (
+    gdjs.dialogueTree._isLineTypeCommand() &&
+    this.dialogueDataType === 'text' &&
+    this.dialogueBranchTitle === this.dialogueData.data.title &&
+    this.lineNum === this.dialogueData.lineNum &&
+    gdjs.dialogueTree.hasClippedScrollingCompleted()
+  ) {
+    gdjs.dialogueTree.goToNextDialogueLine();
+    return
+  }
+
+  // Increment scrolling of clipped text
+  if (this.dialogueText && this.dialogueDataType === 'text' && this.clipTextEnd < this.dialogueText.length) {
     this.clipTextEnd += 1;
   }
 };
@@ -110,7 +123,7 @@ gdjs.dialogueTree.scrollClippedText = function() {
  * Scroll the clipped text to its end, so the entire text is printed. This can be useful in keeping the event sheet logic simpler, while supporting more variation.
  */
 gdjs.dialogueTree.completeClippedTextScrolling = function() {
-  if (this.pauseScrolling || !this.dialogueIsRunning || !this.dialogueText)
+  if (this.pauseScrolling || !this.dialogueIsRunning || !this.dialogueText || this.dialogueDataType !== 'text')
     return;
   this.clipTextEnd = this.dialogueText.length;
 };
@@ -120,9 +133,11 @@ gdjs.dialogueTree.completeClippedTextScrolling = function() {
  * Useful to prevent the user from skipping to next line before the current one has been printed fully.
  */
 gdjs.dialogueTree.hasClippedScrollingCompleted = function() {
-  if (!this.dialogueIsRunning) return false;
-  if (this.dialogueData && this.dialogueText.length) {
-    return this.clipTextEnd >= this.dialogueText.length;
+  if (!this.dialogueIsRunning || this.dialogueDataType  === '') return false;
+  
+  if (this.dialogueData && this.dialogueText.length > 0 && this.clipTextEnd >= this.dialogueText.length) {
+    if (gdjs.dialogueTree.getVariable('debug')) console.warn('Scroll completed:', this.clipTextEnd,'/', this.dialogueText.length);
+    return true;
   }
   return false;
 };
@@ -142,7 +157,6 @@ gdjs.dialogueTree.getClippedLineText = function() {
  * Note that using this instead getClippedLineText will skip any <<wait>> commands entirely.
  */
 gdjs.dialogueTree.getLineText = function() {
-  this.completeClippedTextScrolling();
   return this.dialogueIsRunning && this.dialogueText.length
     ? this.dialogueText
     : '';
@@ -163,6 +177,7 @@ gdjs.dialogueTree.commandParametersCount = function() {
  * @param {number} paramIndex The index of the parameter to get.
  */
 gdjs.dialogueTree.getCommandParameter = function(paramIndex) {
+  if (paramIndex === -1 && this.commandParameters.length > 0) return this.commandParameters[0];
   if (
     this.commandParameters &&
     this.commandParameters.length >= paramIndex + 1
@@ -188,17 +203,20 @@ gdjs.dialogueTree.isCommandCalled = function(command) {
 
   if (this.pauseScrolling || !commandCalls) return false;
   return this.commandCalls.some(function(call, index) {
-    if (clipTextEnd < call.time) return false;
-    if (call.cmd === 'wait' && clipTextEnd !== dialogueText.length) {
+    if (clipTextEnd !== 0 && clipTextEnd < call.time) return false;
+    if (call.cmd === 'wait' && (clipTextEnd === 0 || clipTextEnd !== dialogueText.length)) {
       gdjs.dialogueTree.pauseScrolling = true;
       setTimeout(function() {
         gdjs.dialogueTree.pauseScrolling = false;
         commandCalls.splice(index, 1);
+        if (gdjs.dialogueTree.getVariable('debug')) console.info('CMD:', call);
       }, parseInt(call.params[1], 10));
     }
     if (call.cmd === command) {
       gdjs.dialogueTree.commandParameters = call.params;
       commandCalls.splice(index, 1);
+      if (gdjs.dialogueTree.getVariable('debug')) console.info('CMD:', call);
+
       return true;
     }
   });
@@ -339,7 +357,7 @@ gdjs.dialogueTree.selectOption = function(optionIndex) {
   if (!this.dialogueIsRunning) return;
   if (this.dialogueData.select) {
     this.selectedOption = gdjs.dialogueTree._normalizedOptionIndex(
-      this.selectedOption
+      optionIndex
     );
     this.selectedOptionUpdated = true;
   }
@@ -384,16 +402,21 @@ gdjs.dialogueTree.hasSelectedOptionChanged = function() {
  * @param {string} type The type you want to check for ( one of the three above )
  */
 gdjs.dialogueTree.isDialogueLineType = function(type) {
-  if (
-    this.commandCalls &&
-    this.commandCalls.some(function(call) {
-      return gdjs.dialogueTree.clipTextEnd > call.time && call.cmd === 'wait';
-    })
-  ) {
-    return !this.pauseScrolling;
+  if (!this.dialogueIsRunning) return false;
+  if (this.commandCalls && type === 'command') {
+    if (
+      this.commandCalls.some(function(call) {
+        return gdjs.dialogueTree.clipTextEnd > call.time && call.cmd === 'wait';
+      })
+    ) {
+      return !this.pauseScrolling;
+    }
+    if (this.commandCalls.length > 0 && this.commandParameters.length > 0) {
+      return true;
+    }
   }
 
-  return this.dialogueIsRunning ? this.dialogueDataType === type : false;
+  return this.dialogueDataType === type;
 };
 
 /**
@@ -420,19 +443,27 @@ gdjs.dialogueTree.startFrom = function(startDialogueNode) {
   if (!this.hasDialogueBranch(startDialogueNode)) return;
   this.optionsCount = 0;
   this.options = [];
-  this.dialogueBranchTitle = '';
-  this.dialogueBranchBody = '';
-  this.dialogueBranchTags = [];
   this.tagParameters = [];
   this.dialogue = this.runner.run(startDialogueNode);
-  this.dialogueData = null;
-  this.dialogueDataType = '';
   this.dialogueText = '';
   this.clipTextEnd = 0;
   this.commandCalls = [];
   this.commandParameters = [];
   this.pauseScrolling = false;
+
   this.dialogueData = this.dialogue.next().value;
+  this.dialogueBranchTags = this.dialogueData.data.tags;
+  this.dialogueBranchTitle = this.dialogueData.data.title;
+  this.dialogueBranchBody = this.dialogueData.data.body;
+  this.lineNum = this.dialogueData.lineNum;
+  if (gdjs.dialogueTree._isLineTypeText()){
+    this.dialogueDataType = 'text';
+  } else if (gdjs.dialogueTree._isLineTypeOptions()){
+    this.dialogueDataType = 'options';
+  } else {
+    this.dialogueDataType = 'command';
+  };
+
   this.dialogueIsRunning = true;
   gdjs.dialogueTree.goToNextDialogueLine();
 };
@@ -462,26 +493,29 @@ gdjs.dialogueTree.goToNextDialogueLine = function() {
   this.selectedOption = -1;
   this.selectedOptionUpdated = false;
 
-  if (gdjs.dialogueTree._isLineTypeText()) {
-    if (
-      this.dialogueDataType === 'options' ||
-      this.dialogueDataType === 'text' ||
-      !this.dialogueDataType
-    ) {
-      this.clipTextEnd = 0;
-      this.dialogueText = this.dialogueData.text;
-      this.commandCalls = [];
-    } else {
+  if (gdjs.dialogueTree.getVariable('debug')) console.info('parsing:', this.dialogueData);
+
+  if (!this.dialogueData) {
+    gdjs.dialogueTree.stopRunningDialogue();
+  } else if (gdjs.dialogueTree._isLineTypeText()) {
+    if (this.lineNum === this.dialogueData.lineNum && this.dialogueBranchTitle === this.dialogueData.data.title){
+      this.clipTextEnd = this.dialogueText.length - 1;
       this.dialogueText +=
         (this.dialogueText === '' ? '' : ' ') + this.dialogueData.text;
+    } else {
+      this.clipTextEnd = 0;
+      this.dialogueText = this.dialogueData.text;
     }
 
-    this.dialogueDataType = 'text';
     this.dialogueBranchTags = this.dialogueData.data.tags;
     this.dialogueBranchTitle = this.dialogueData.data.title;
     this.dialogueBranchBody = this.dialogueData.data.body;
+    this.lineNum = this.dialogueData.lineNum;
+    this.dialogueDataType = 'text';
+
     this.dialogueData = this.dialogue.next().value;
   } else if (gdjs.dialogueTree._isLineTypeOptions()) {
+    this.commandCalls = [];
     this.dialogueDataType = 'options';
     this.dialogueText = '';
     this.clipTextEnd = 0;
@@ -490,8 +524,6 @@ gdjs.dialogueTree.goToNextDialogueLine = function() {
     this.selectedOptionUpdated = true;
   } else if (gdjs.dialogueTree._isLineTypeCommand()) {
     this.dialogueDataType = 'command';
-    this.clipTextEnd = 0;
-
     var command = this.dialogueData.text.split(' ');
     // If last command was to wait, increase time by one
     var offsetTime =
@@ -509,11 +541,6 @@ gdjs.dialogueTree.goToNextDialogueLine = function() {
   } else {
     this.dialogueDataType = 'unknown';
   }
-
-  if (gdjs.dialogueTree._isLineTypeCommand()) {
-    this.dialogueDataType = 'command';
-    gdjs.dialogueTree.goToNextDialogueLine();
-  }
 };
 
 /**
@@ -631,7 +658,7 @@ gdjs.dialogueTree.getBranchText = function() {
  */
 gdjs.dialogueTree.getVariable = function(key) {
   if (this.dialogueIsRunning && key in this.runner.variables.data) {
-    return this.runner.variables.data[key];
+    return this.runner.variables.get(key);
   }
   return '';
 };
@@ -639,11 +666,11 @@ gdjs.dialogueTree.getVariable = function(key) {
 /**
  * Check if a specific variable created by the Dialogue parses exists and is equal to a specific value.
  * @param {string} key The name of the variable you want to check the value of
- * @param {string} value The value you want to check against
+ * @param {string|boolean|number} value The value you want to check against
  */
 gdjs.dialogueTree.compareVariable = function(key, value) {
   if (this.dialogueIsRunning && key in this.runner.variables.data) {
-    return this.runner.variables.data[key].toString() === value;
+    return this.runner.variables.get(key) === value;
   }
   return false;
 };
@@ -651,11 +678,11 @@ gdjs.dialogueTree.compareVariable = function(key, value) {
 /**
  * Set a specific variable created by the Dialogue parser to a specific value.
  * @param {string} key The name of the variable you want to set the value of
- * @param {string} value The value you want to set
+ * @param {string|boolean|number} value The value you want to set
  */
 gdjs.dialogueTree.setVariable = function(key, value) {
-  if (this.dialogueIsRunning && this.runner.variables.data) {
-    this.runner.variables.data[key] = value;
+  if (this.runner.variables) {
+    this.runner.variables.set(key, value);
   }
 };
 
@@ -666,7 +693,7 @@ gdjs.dialogueTree.setVariable = function(key, value) {
  * @param {gdjs.Variable} outputVariable The variable where to store the State
  */
 gdjs.dialogueTree.saveState = function(outputVariable) {
-  const dialogueState = {
+  var dialogueState = {
     variables: gdjs.dialogueTree.runner.variables.data,
     visited: gdjs.dialogueTree.runner.visited,
   };
@@ -677,17 +704,32 @@ gdjs.dialogueTree.saveState = function(outputVariable) {
  * Load the current State of the Dialogue Parser from a specified variable.
  * Can be used to implement persistence in dialogue through your game's Load/Save function.
  * That way you can later load all the dialogue choices the player has made.
- * @param {gdjs.Variable} inputVariable The variable where to load the State from.
+ * @param {gdjs.Variable} inputVariable The structured variable where to load the State from.
  */
 gdjs.dialogueTree.loadState = function(inputVariable) {
-  const jsonData = gdjs.evtTools.network.variableStructureToJSON(inputVariable);
+  var loadedState = JSON.parse(
+    gdjs.evtTools.network.variableStructureToJSON(inputVariable)
+  );
+  if (!loadedState) {
+    console.error('Load state variable is empty:', inputVariable);
+    return
+  }
   try {
-    const loadedState = JSON.parse(
-      gdjs.evtTools.network.variableStructureToJSON(inputVariable)
-    );
     gdjs.dialogueTree.runner.visited = loadedState.visited;
-    gdjs.dialogueTree.runner.variables.data = loadedState.variables;
+    gdjs.dialogueTree.runner.variables.data = {};
+    Object.keys(loadedState.variables).forEach(function(key) {
+      var value = loadedState.variables[key];
+      gdjs.dialogueTree.runner.variables.set(key, value);
+    });
   } catch (e) {
-    console.error(e);
+    console.error('Failed to load state from variable:', inputVariable, e);
   }
 };
+
+/**
+ * Clear the current State of the Dialogue Parser.
+ */
+gdjs.dialogueTree.clearState = function() {
+  gdjs.dialogueTree.runner.visited = {};
+  gdjs.dialogueTree.runner.variables.data = {};
+};

Extensions/DraggableBehavior/tests/draggableruntimeautomatism.spec.js

@@ -1,6 +1,11 @@
-
+// @ts-check
 describe('gdjs.DraggableRuntimeBehavior', function() {
-	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}});
+	var runtimeGame = new gdjs.RuntimeGame({
+		variables: [],
+		resources: {resources: []},
+		// @ts-ignore
+		properties: {windowWidth: 800, windowHeight: 600}
+	});
 	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
 	runtimeScene.loadFromScene({
 		layers:[{name:"", visibility: true}],
@@ -10,8 +15,8 @@ describe('gdjs.DraggableRuntimeBehavior', function() {
 		instances: []
 	});
 
-	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{type: "DraggableBehavior::Draggable"}]});
-	var object2 = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{type: "DraggableBehavior::Draggable"}]});
+	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{name: "Behavior1", type: "DraggableBehavior::Draggable"}], variables: []});
+	var object2 = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{name: "Behavior1", type: "DraggableBehavior::Draggable"}], variables: []});
 	runtimeScene.addObject(object);
 	runtimeScene.addObject(object2);
 

Extensions/Effects/JsExtension.js

@@ -90,6 +90,7 @@ module.exports = {
       .addEffect('AdvancedBloom')
       .setFullName(_('Advanced bloom'))
       .setDescription(_('Applies a bloom effect.'))
+      .addIncludeFile('Extensions/Effects/pixi-filters/filter-kawase-blur.js')
       .addIncludeFile(
         'Extensions/Effects/pixi-filters/filter-advanced-bloom.js'
       )

Extensions/Effects/pixi-filters/filter-adjustment.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],n):n(t.__filters={},t.PIXI)}(this,function(t,n){"use strict";var r="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",e="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform float gamma;\nuniform float contrast;\nuniform float saturation;\nuniform float brightness;\nuniform float red;\nuniform float green;\nuniform float blue;\nuniform float alpha;\n\nvoid main(void)\n{\n    vec4 c = texture2D(uSampler, vTextureCoord);\n\n    if (c.a > 0.0) {\n        c.rgb /= c.a;\n\n        vec3 rgb = pow(c.rgb, vec3(1. / gamma));\n        rgb = mix(vec3(.5), mix(vec3(dot(vec3(.2125, .7154, .0721), rgb)), rgb, saturation), contrast);\n        rgb.r *= red;\n        rgb.g *= green;\n        rgb.b *= blue;\n        c.rgb = rgb * brightness;\n\n        c.rgb *= c.a;\n    }\n\n    gl_FragColor = c * alpha;\n}\n",i=function(t){function n(n){t.call(this,r,e),Object.assign(this,{gamma:1,saturation:1,contrast:1,brightness:1,red:1,green:1,blue:1,alpha:1},n)}return t&&(n.__proto__=t),n.prototype=Object.create(t&&t.prototype),n.prototype.constructor=n,n.prototype.apply=function(t,n,r,e){this.uniforms.gamma=Math.max(this.gamma,1e-4),this.uniforms.saturation=this.saturation,this.uniforms.contrast=this.contrast,this.uniforms.brightness=this.brightness,this.uniforms.red=this.red,this.uniforms.green=this.green,this.uniforms.blue=this.blue,this.uniforms.alpha=this.alpha,t.applyFilter(this,n,r,e)},n}(n.Filter);t.AdjustmentFilter=i,Object.defineProperty(t,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-adjustment.js.map

Extensions/Effects/pixi-filters/filter-advanced-bloom.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("pixi.js"),require("@pixi/filter-kawase-blur")):"function"==typeof define&&define.amd?define(["exports","pixi.js","@pixi/filter-kawase-blur"],t):t(e.__filters={},e.PIXI,e.PIXI.filters)}(this,function(e,t,r){"use strict";var o="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",i="\nuniform sampler2D uSampler;\nvarying vec2 vTextureCoord;\n\nuniform float threshold;\n\nvoid main() {\n    vec4 color = texture2D(uSampler, vTextureCoord);\n\n    // A simple & fast algorithm for getting brightness.\n    // It's inaccuracy , but good enought for this feature.\n    float _max = max(max(color.r, color.g), color.b);\n    float _min = min(min(color.r, color.g), color.b);\n    float brightness = (_max + _min) * 0.5;\n\n    if(brightness > threshold) {\n        gl_FragColor = color;\n    } else {\n        gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);\n    }\n}\n",n=function(e){function t(t){void 0===t&&(t=.5),e.call(this,o,i),this.threshold=t}e&&(t.__proto__=e),t.prototype=Object.create(e&&e.prototype),t.prototype.constructor=t;var r={threshold:{configurable:!0}};return r.threshold.get=function(){return this.uniforms.threshold},r.threshold.set=function(e){this.uniforms.threshold=e},Object.defineProperties(t.prototype,r),t}(t.Filter),l="uniform sampler2D uSampler;\nvarying vec2 vTextureCoord;\n\nuniform sampler2D bloomTexture;\nuniform float bloomScale;\nuniform float brightness;\n\nvoid main() {\n    vec4 color = texture2D(uSampler, vTextureCoord);\n    color.rgb *= brightness;\n    vec4 bloomColor = vec4(texture2D(bloomTexture, vTextureCoord).rgb, 0.0);\n    bloomColor.rgb *= bloomScale;\n    gl_FragColor = color + bloomColor;\n}\n",s=function(e){function i(i){e.call(this,o,l),"number"==typeof i&&(i={threshold:i}),i=Object.assign({threshold:.5,bloomScale:1,brightness:1,kernels:null,blur:8,quality:4,pixelSize:1,resolution:t.settings.RESOLUTION},i),this.bloomScale=i.bloomScale,this.brightness=i.brightness;var s=i.kernels,u=i.blur,a=i.quality,c=i.pixelSize,h=i.resolution;this._extractFilter=new n(i.threshold),this._extractFilter.resolution=h,this._blurFilter=s?new r.KawaseBlurFilter(s):new r.KawaseBlurFilter(u,a),this.pixelSize=c,this.resolution=h}e&&(i.__proto__=e),i.prototype=Object.create(e&&e.prototype),i.prototype.constructor=i;var s={resolution:{configurable:!0},threshold:{configurable:!0},kernels:{configurable:!0},blur:{configurable:!0},quality:{configurable:!0},pixelSize:{configurable:!0}};return i.prototype.apply=function(e,t,r,o,i){var n=e.getRenderTarget(!0);this._extractFilter.apply(e,t,n,!0,i);var l=e.getRenderTarget(!0);this._blurFilter.apply(e,n,l,!0,i),this.uniforms.bloomScale=this.bloomScale,this.uniforms.brightness=this.brightness,this.uniforms.bloomTexture=l,e.applyFilter(this,t,r,o),e.returnRenderTarget(l),e.returnRenderTarget(n)},s.resolution.get=function(){return this._resolution},s.resolution.set=function(e){this._resolution=e,this._extractFilter&&(this._extractFilter.resolution=e),this._blurFilter&&(this._blurFilter.resolution=e)},s.threshold.get=function(){return this._extractFilter.threshold},s.threshold.set=function(e){this._extractFilter.threshold=e},s.kernels.get=function(){return this._blurFilter.kernels},s.kernels.set=function(e){this._blurFilter.kernels=e},s.blur.get=function(){return this._blurFilter.blur},s.blur.set=function(e){this._blurFilter.blur=e},s.quality.get=function(){return this._blurFilter.quality},s.quality.set=function(e){this._blurFilter.quality=e},s.pixelSize.get=function(){return this._blurFilter.pixelSize},s.pixelSize.set=function(e){this._blurFilter.pixelSize=e},Object.defineProperties(i.prototype,s),i}(t.Filter);e.AdvancedBloomFilter=s,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-advanced-bloom.js.map

Extensions/Effects/pixi-filters/filter-alpha.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 this.PIXI=this.PIXI||{},this.PIXI.filters=this.PIXI.filters||{};var _pixi_filter_alpha=function(t,r){"use strict";var e="varying vec2 vTextureCoord;\n\nuniform sampler2D uSampler;\nuniform float uAlpha;\n\nvoid main(void)\n{\n   gl_FragColor = texture2D(uSampler, vTextureCoord) * uAlpha;\n}\n",i=function(t){function i(i){void 0===i&&(i=1),t.call(this,r.defaultVertex,e,{uAlpha:1}),this.alpha=i}t&&(i.__proto__=t),i.prototype=Object.create(t&&t.prototype),i.prototype.constructor=i;var a={alpha:{configurable:!0}};return a.alpha.get=function(){return this.uniforms.uAlpha},a.alpha.set=function(t){this.uniforms.uAlpha=t},Object.defineProperties(i.prototype,a),i}(r.Filter);return t.AlphaFilter=i,t}({},PIXI);Object.assign(this.PIXI.filters,_pixi_filter_alpha);
-//# sourceMappingURL=filter-alpha.min.js.map

Extensions/Effects/pixi-filters/filter-ascii.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],n):n(e.__filters={},e.PIXI)}(this,function(e,n){"use strict";var o="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="varying vec2 vTextureCoord;\n\nuniform vec4 filterArea;\nuniform float pixelSize;\nuniform sampler2D uSampler;\n\nvec2 mapCoord( vec2 coord )\n{\n    coord *= filterArea.xy;\n    coord += filterArea.zw;\n\n    return coord;\n}\n\nvec2 unmapCoord( vec2 coord )\n{\n    coord -= filterArea.zw;\n    coord /= filterArea.xy;\n\n    return coord;\n}\n\nvec2 pixelate(vec2 coord, vec2 size)\n{\n    return floor( coord / size ) * size;\n}\n\nvec2 getMod(vec2 coord, vec2 size)\n{\n    return mod( coord , size) / size;\n}\n\nfloat character(float n, vec2 p)\n{\n    p = floor(p*vec2(4.0, -4.0) + 2.5);\n    if (clamp(p.x, 0.0, 4.0) == p.x && clamp(p.y, 0.0, 4.0) == p.y)\n    {\n        if (int(mod(n/exp2(p.x + 5.0*p.y), 2.0)) == 1) return 1.0;\n    }\n    return 0.0;\n}\n\nvoid main()\n{\n    vec2 coord = mapCoord(vTextureCoord);\n\n    // get the rounded color..\n    vec2 pixCoord = pixelate(coord, vec2(pixelSize));\n    pixCoord = unmapCoord(pixCoord);\n\n    vec4 color = texture2D(uSampler, pixCoord);\n\n    // determine the character to use\n    float gray = (color.r + color.g + color.b) / 3.0;\n\n    float n =  65536.0;             // .\n    if (gray > 0.2) n = 65600.0;    // :\n    if (gray > 0.3) n = 332772.0;   // *\n    if (gray > 0.4) n = 15255086.0; // o\n    if (gray > 0.5) n = 23385164.0; // &\n    if (gray > 0.6) n = 15252014.0; // 8\n    if (gray > 0.7) n = 13199452.0; // @\n    if (gray > 0.8) n = 11512810.0; // #\n\n    // get the mod..\n    vec2 modd = getMod(coord, vec2(pixelSize));\n\n    gl_FragColor = color * character( n, vec2(-1.0) + modd * 2.0);\n\n}",t=function(e){function n(n){void 0===n&&(n=8),e.call(this,o,r),this.size=n}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var t={size:{configurable:!0}};return t.size.get=function(){return this.uniforms.pixelSize},t.size.set=function(e){this.uniforms.pixelSize=e},Object.defineProperties(n.prototype,t),n}(n.Filter);e.AsciiFilter=t,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-ascii.js.map

Extensions/Effects/pixi-filters/filter-bevel.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(o,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],t):t(o.__filters={},o.PIXI)}(this,function(o,t){"use strict";var r="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",i="precision mediump float;\n\nvarying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec4 filterArea;\n\nuniform float transformX;\nuniform float transformY;\nuniform vec3 lightColor;\nuniform float lightAlpha;\nuniform vec3 shadowColor;\nuniform float shadowAlpha;\n\nvoid main(void) {\n    vec2 transform = vec2(1.0 / filterArea) * vec2(transformX, transformY);\n    vec4 color = texture2D(uSampler, vTextureCoord);\n    float light = texture2D(uSampler, vTextureCoord - transform).a;\n    float shadow = texture2D(uSampler, vTextureCoord + transform).a;\n\n    color.rgb = mix(color.rgb, lightColor, clamp((color.a - light) * lightAlpha, 0.0, 1.0));\n    color.rgb = mix(color.rgb, shadowColor, clamp((color.a - shadow) * shadowAlpha, 0.0, 1.0));\n    gl_FragColor = vec4(color.rgb * color.a, color.a);\n}\n",n=function(o){function n(t){void 0===t&&(t={}),o.call(this,r,i),this.uniforms.lightColor=new Float32Array(3),this.uniforms.shadowColor=new Float32Array(3),t=Object.assign({rotation:45,thickness:2,lightColor:16777215,lightAlpha:.7,shadowColor:0,shadowAlpha:.7},t),this.rotation=t.rotation,this.thickness=t.thickness,this.lightColor=t.lightColor,this.lightAlpha=t.lightAlpha,this.shadowColor=t.shadowColor,this.shadowAlpha=t.shadowAlpha}o&&(n.__proto__=o),n.prototype=Object.create(o&&o.prototype),n.prototype.constructor=n;var e={rotation:{configurable:!0},thickness:{configurable:!0},lightColor:{configurable:!0},lightAlpha:{configurable:!0},shadowColor:{configurable:!0},shadowAlpha:{configurable:!0}};return n.prototype._updateTransform=function(){this.uniforms.transformX=this._thickness*Math.cos(this._angle),this.uniforms.transformY=this._thickness*Math.sin(this._angle)},e.rotation.get=function(){return this._angle/t.DEG_TO_RAD},e.rotation.set=function(o){this._angle=o*t.DEG_TO_RAD,this._updateTransform()},e.thickness.get=function(){return this._thickness},e.thickness.set=function(o){this._thickness=o,this._updateTransform()},e.lightColor.get=function(){return t.utils.rgb2hex(this.uniforms.lightColor)},e.lightColor.set=function(o){t.utils.hex2rgb(o,this.uniforms.lightColor)},e.lightAlpha.get=function(){return this.uniforms.lightAlpha},e.lightAlpha.set=function(o){this.uniforms.lightAlpha=o},e.shadowColor.get=function(){return t.utils.rgb2hex(this.uniforms.shadowColor)},e.shadowColor.set=function(o){t.utils.hex2rgb(o,this.uniforms.shadowColor)},e.shadowAlpha.get=function(){return this.uniforms.shadowAlpha},e.shadowAlpha.set=function(o){this.uniforms.shadowAlpha=o},Object.defineProperties(n.prototype,e),n}(t.Filter);o.BevelFilter=n,Object.defineProperty(o,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-bevel.js.map

Extensions/Effects/pixi-filters/filter-bulge-pinch.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],n):n((e=e||self).__filters={},e.PIXI)}(this,function(e,n){"use strict";var t="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="uniform float radius;\nuniform float strength;\nuniform vec2 center;\nuniform sampler2D uSampler;\nvarying vec2 vTextureCoord;\n\nuniform vec4 filterArea;\nuniform vec4 filterClamp;\nuniform vec2 dimensions;\n\nvoid main()\n{\n    vec2 coord = vTextureCoord * filterArea.xy;\n    coord -= center * dimensions.xy;\n    float distance = length(coord);\n    if (distance < radius) {\n        float percent = distance / radius;\n        if (strength > 0.0) {\n            coord *= mix(1.0, smoothstep(0.0, radius / distance, percent), strength * 0.75);\n        } else {\n            coord *= mix(1.0, pow(percent, 1.0 + strength * 0.75) * radius / distance, 1.0 - percent);\n        }\n    }\n    coord += center * dimensions.xy;\n    coord /= filterArea.xy;\n    vec2 clampedCoord = clamp(coord, filterClamp.xy, filterClamp.zw);\n    vec4 color = texture2D(uSampler, clampedCoord);\n    if (coord != clampedCoord) {\n        color *= max(0.0, 1.0 - length(coord - clampedCoord));\n    }\n\n    gl_FragColor = color;\n}\n",o=function(e){function n(n,o,i){e.call(this,t,r),this.uniforms.dimensions=new Float32Array(2),this.center=n||[.5,.5],this.radius="number"==typeof o?o:100,this.strength="number"==typeof i?i:1}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var o={radius:{configurable:!0},strength:{configurable:!0},center:{configurable:!0}};return n.prototype.apply=function(e,n,t,r){this.uniforms.dimensions[0]=n.sourceFrame.width,this.uniforms.dimensions[1]=n.sourceFrame.height,e.applyFilter(this,n,t,r)},o.radius.get=function(){return this.uniforms.radius},o.radius.set=function(e){this.uniforms.radius=e},o.strength.get=function(){return this.uniforms.strength},o.strength.set=function(e){this.uniforms.strength=e},o.center.get=function(){return this.uniforms.center},o.center.set=function(e){this.uniforms.center=e},Object.defineProperties(n.prototype,o),n}(n.Filter);e.BulgePinchFilter=o,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-bulge-pinch.js.map

Extensions/Effects/pixi-filters/filter-color-map.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 var __filters=function(e,i,t){"use strict";var o="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform sampler2D colorMap;\nuniform float _mix;\nuniform float _size;\nuniform float _sliceSize;\nuniform float _slicePixelSize;\nuniform float _sliceInnerSize;\nvoid main() {\n    vec4 color = texture2D(uSampler, vTextureCoord.xy);\n\n    vec4 adjusted;\n    if (color.a > 0.0) {\n        color.rgb /= color.a;\n        float innerWidth = _size - 1.0;\n        float zSlice0 = min(floor(color.b * innerWidth), innerWidth);\n        float zSlice1 = min(zSlice0 + 1.0, innerWidth);\n        float xOffset = _slicePixelSize * 0.5 + color.r * _sliceInnerSize;\n        float s0 = xOffset + (zSlice0 * _sliceSize);\n        float s1 = xOffset + (zSlice1 * _sliceSize);\n        float yOffset = _sliceSize * 0.5 + color.g * (1.0 - _sliceSize);\n        vec4 slice0Color = texture2D(colorMap, vec2(s0,yOffset));\n        vec4 slice1Color = texture2D(colorMap, vec2(s1,yOffset));\n        float zOffset = fract(color.b * innerWidth);\n        adjusted = mix(slice0Color, slice1Color, zOffset);\n\n        color.rgb *= color.a;\n    }\n    gl_FragColor = vec4(mix(color, adjusted, _mix).rgb, color.a);\n\n}",s=function(e){function s(i,t,s){void 0===t&&(t=!1),void 0===s&&(s=1),e.call(this,o,r),this._size=0,this._sliceSize=0,this._slicePixelSize=0,this._sliceInnerSize=0,this._scaleMode=null,this._nearest=!1,this.nearest=t,this.mix=s,this.colorMap=i}e&&(s.__proto__=e),s.prototype=Object.create(e&&e.prototype),s.prototype.constructor=s;var n={colorSize:{configurable:!0},colorMap:{configurable:!0},nearest:{configurable:!0}};return s.prototype.apply=function(e,i,t,o){this.uniforms._mix=this.mix,e.applyFilter(this,i,t,o)},n.colorSize.get=function(){return this._size},n.colorMap.get=function(){return this._colorMap},n.colorMap.set=function(e){e instanceof i.Texture||(e=i.Texture.from(e)),e&&e.baseTexture&&(e.baseTexture.scaleMode=this._scaleMode,e.baseTexture.mipmap=!1,this._size=e.height,this._sliceSize=1/this._size,this._slicePixelSize=this._sliceSize/this._size,this._sliceInnerSize=this._slicePixelSize*(this._size-1),this.uniforms._size=this._size,this.uniforms._sliceSize=this._sliceSize,this.uniforms._slicePixelSize=this._slicePixelSize,this.uniforms._sliceInnerSize=this._sliceInnerSize,this.uniforms.colorMap=e),this._colorMap=e},n.nearest.get=function(){return this._nearest},n.nearest.set=function(e){this._nearest=e,this._scaleMode=e?t.SCALE_MODES.NEAREST:t.SCALE_MODES.LINEAR;var i=this._colorMap;i&&i.baseTexture&&(i.baseTexture._glTextures={},i.baseTexture.scaleMode=this._scaleMode,i.baseTexture.mipmap=!1,i._updateID++,i.baseTexture.emit("update",i.baseTexture))},s.prototype.updateColorMap=function(){var e=this._colorMap;e&&e.baseTexture&&(e._updateID++,e.baseTexture.emit("update",e.baseTexture),this.colorMap=e)},s.prototype.destroy=function(i){this._colorMap&&this._colorMap.destroy(i),e.prototype.destroy.call(this)},Object.defineProperties(s.prototype,n),s}(i.Filter);return e.ColorMapFilter=s,e}({},PIXI,PIXI);Object.assign(PIXI.filters,__filters);
-//# sourceMappingURL=filter-color-map.js.map

Extensions/Effects/pixi-filters/filter-color-replace.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(o,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],r):r((o=o||self).__filters={},o.PIXI)}(this,function(o,r){"use strict";var e="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",i="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec3 originalColor;\nuniform vec3 newColor;\nuniform float epsilon;\nvoid main(void) {\n    vec4 currentColor = texture2D(uSampler, vTextureCoord);\n    vec3 colorDiff = originalColor - (currentColor.rgb / max(currentColor.a, 0.0000000001));\n    float colorDistance = length(colorDiff);\n    float doReplace = step(colorDistance, epsilon);\n    gl_FragColor = vec4(mix(currentColor.rgb, (newColor + colorDiff) * currentColor.a, doReplace), currentColor.a);\n}\n",n=function(o){function n(r,n,t){void 0===r&&(r=16711680),void 0===n&&(n=0),void 0===t&&(t=.4),o.call(this,e,i),this.uniforms.originalColor=new Float32Array(3),this.uniforms.newColor=new Float32Array(3),this.originalColor=r,this.newColor=n,this.epsilon=t}o&&(n.__proto__=o),n.prototype=Object.create(o&&o.prototype),n.prototype.constructor=n;var t={originalColor:{configurable:!0},newColor:{configurable:!0},epsilon:{configurable:!0}};return t.originalColor.set=function(o){var e=this.uniforms.originalColor;"number"==typeof o?(r.utils.hex2rgb(o,e),this._originalColor=o):(e[0]=o[0],e[1]=o[1],e[2]=o[2],this._originalColor=r.utils.rgb2hex(e))},t.originalColor.get=function(){return this._originalColor},t.newColor.set=function(o){var e=this.uniforms.newColor;"number"==typeof o?(r.utils.hex2rgb(o,e),this._newColor=o):(e[0]=o[0],e[1]=o[1],e[2]=o[2],this._newColor=r.utils.rgb2hex(e))},t.newColor.get=function(){return this._newColor},t.epsilon.set=function(o){this.uniforms.epsilon=o},t.epsilon.get=function(){return this.uniforms.epsilon},Object.defineProperties(n.prototype,t),n}(r.Filter);o.ColorReplaceFilter=n,Object.defineProperty(o,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-color-replace.js.map

Extensions/Effects/pixi-filters/filter-crt.js

@@ -10,4 +10,3 @@
   * Modified the minified file to work on pixi4 by renaming filterFrame to sourceFrame below 
   */
 var __filters=function(n,i){"use strict";var t="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",e="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec4 filterArea;\nuniform vec2 dimensions;\n\nconst float SQRT_2 = 1.414213;\n\nconst float light = 1.0;\n\nuniform float curvature;\nuniform float lineWidth;\nuniform float lineContrast;\nuniform bool verticalLine;\nuniform float noise;\nuniform float noiseSize;\n\nuniform float vignetting;\nuniform float vignettingAlpha;\nuniform float vignettingBlur;\n\nuniform float seed;\nuniform float time;\n\nfloat rand(vec2 co) {\n    return fract(sin(dot(co.xy, vec2(12.9898, 78.233))) * 43758.5453);\n}\n\nvoid main(void)\n{\n    vec2 pixelCoord = vTextureCoord.xy * filterArea.xy;\n    vec2 coord = pixelCoord / dimensions;\n\n    vec2 dir = vec2(coord - vec2(0.5, 0.5));\n\n    float _c = curvature > 0. ? curvature : 1.;\n    float k = curvature > 0. ?(length(dir * dir) * 0.25 * _c * _c + 0.935 * _c) : 1.;\n    vec2 uv = dir * k;\n\n    gl_FragColor = texture2D(uSampler, vTextureCoord);\n    vec3 rgb = gl_FragColor.rgb;\n\n\n    if (noise > 0.0 && noiseSize > 0.0)\n    {\n        pixelCoord.x = floor(pixelCoord.x / noiseSize);\n        pixelCoord.y = floor(pixelCoord.y / noiseSize);\n        float _noise = rand(pixelCoord * noiseSize * seed) - 0.5;\n        rgb += _noise * noise;\n    }\n\n    if (lineWidth > 0.0) {\n        float v = (verticalLine ? uv.x * dimensions.x : uv.y * dimensions.y) * min(1.0, 2.0 / lineWidth ) / _c;\n        float j = 1. + cos(v * 1.2 - time) * 0.5 * lineContrast;\n        rgb *= j;\n        float segment = verticalLine ? mod((dir.x + .5) * dimensions.x, 4.) : mod((dir.y + .5) * dimensions.y, 4.);\n        rgb *= 0.99 + ceil(segment) * 0.015;\n    }\n\n    if (vignetting > 0.0)\n    {\n        float outter = SQRT_2 - vignetting * SQRT_2;\n        float darker = clamp((outter - length(dir) * SQRT_2) / ( 0.00001 + vignettingBlur * SQRT_2), 0.0, 1.0);\n        rgb *= darker + (1.0 - darker) * (1.0 - vignettingAlpha);\n    }\n\n    gl_FragColor.rgb = rgb;\n}\n",r=function(n){function i(i){n.call(this,t,e),this.uniforms.dimensions=new Float32Array(2),this.time=0,this.seed=0,Object.assign(this,{curvature:1,lineWidth:1,lineContrast:.25,verticalLine:!1,noise:0,noiseSize:1,seed:0,vignetting:.3,vignettingAlpha:1,vignettingBlur:.3,time:0},i)}n&&(i.__proto__=n),i.prototype=Object.create(n&&n.prototype),i.prototype.constructor=i;var r={curvature:{configurable:!0},lineWidth:{configurable:!0},lineContrast:{configurable:!0},verticalLine:{configurable:!0},noise:{configurable:!0},noiseSize:{configurable:!0},vignetting:{configurable:!0},vignettingAlpha:{configurable:!0},vignettingBlur:{configurable:!0}};return i.prototype.apply=function(n,i,t,e){this.uniforms.dimensions[0]=i.sourceFrame.width,this.uniforms.dimensions[1]=i.sourceFrame.height,this.uniforms.seed=this.seed,this.uniforms.time=this.time,n.applyFilter(this,i,t,e)},r.curvature.set=function(n){this.uniforms.curvature=n},r.curvature.get=function(){return this.uniforms.curvature},r.lineWidth.set=function(n){this.uniforms.lineWidth=n},r.lineWidth.get=function(){return this.uniforms.lineWidth},r.lineContrast.set=function(n){this.uniforms.lineContrast=n},r.lineContrast.get=function(){return this.uniforms.lineContrast},r.verticalLine.set=function(n){this.uniforms.verticalLine=n},r.verticalLine.get=function(){return this.uniforms.verticalLine},r.noise.set=function(n){this.uniforms.noise=n},r.noise.get=function(){return this.uniforms.noise},r.noiseSize.set=function(n){this.uniforms.noiseSize=n},r.noiseSize.get=function(){return this.uniforms.noiseSize},r.vignetting.set=function(n){this.uniforms.vignetting=n},r.vignetting.get=function(){return this.uniforms.vignetting},r.vignettingAlpha.set=function(n){this.uniforms.vignettingAlpha=n},r.vignettingAlpha.get=function(){return this.uniforms.vignettingAlpha},r.vignettingBlur.set=function(n){this.uniforms.vignettingBlur=n},r.vignettingBlur.get=function(){return this.uniforms.vignettingBlur},Object.defineProperties(i.prototype,r),i}(i.Filter);return n.CRTFilter=r,n}({},PIXI);Object.assign(PIXI.filters,__filters);
-//# sourceMappingURL=filter-crt.js.map

Extensions/Effects/pixi-filters/filter-dot.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],n):n((e=e||self).__filters={},e.PIXI)}(this,function(e,n){"use strict";var t="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",o="precision mediump float;\n\nvarying vec2 vTextureCoord;\nvarying vec4 vColor;\n\nuniform vec4 filterArea;\nuniform sampler2D uSampler;\n\nuniform float angle;\nuniform float scale;\n\nfloat pattern()\n{\n   float s = sin(angle), c = cos(angle);\n   vec2 tex = vTextureCoord * filterArea.xy;\n   vec2 point = vec2(\n       c * tex.x - s * tex.y,\n       s * tex.x + c * tex.y\n   ) * scale;\n   return (sin(point.x) * sin(point.y)) * 4.0;\n}\n\nvoid main()\n{\n   vec4 color = texture2D(uSampler, vTextureCoord);\n   float average = (color.r + color.g + color.b) / 3.0;\n   gl_FragColor = vec4(vec3(average * 10.0 - 5.0 + pattern()), color.a);\n}\n",r=function(e){function n(n,r){void 0===n&&(n=1),void 0===r&&(r=5),e.call(this,t,o),this.scale=n,this.angle=r}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var r={scale:{configurable:!0},angle:{configurable:!0}};return r.scale.get=function(){return this.uniforms.scale},r.scale.set=function(e){this.uniforms.scale=e},r.angle.get=function(){return this.uniforms.angle},r.angle.set=function(e){this.uniforms.angle=e},Object.defineProperties(n.prototype,r),n}(n.Filter);e.DotFilter=r,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-dot.js.map

Extensions/Effects/pixi-filters/filter-drop-shadow.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(t,i){"object"==typeof exports&&"undefined"!=typeof module?i(exports,require("@pixi/filter-kawase-blur"),require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","@pixi/filter-kawase-blur","pixi.js"],i):i(t.__filters={},t.PIXI.filters,t.PIXI)}(this,function(t,i,e){"use strict";var r="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",n="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform float alpha;\nuniform vec3 color;\nvoid main(void){\n    vec4 sample = texture2D(uSampler, vTextureCoord);\n\n    // Un-premultiply alpha before applying the color\n    if (sample.a > 0.0) {\n        sample.rgb /= sample.a;\n    }\n\n    // Premultiply alpha again\n    sample.rgb = color.rgb * sample.a;\n\n    // alpha user alpha\n    sample *= alpha;\n\n    gl_FragColor = sample;\n}",o=function(t){function o(o){o&&o.constructor!==Object&&(console.warn("DropShadowFilter now uses options instead of (rotation, distance, blur, color, alpha)"),o={rotation:o},void 0!==arguments[1]&&(o.distance=arguments[1]),void 0!==arguments[2]&&(o.blur=arguments[2]),void 0!==arguments[3]&&(o.color=arguments[3]),void 0!==arguments[4]&&(o.alpha=arguments[4])),o=Object.assign({rotation:45,distance:5,color:0,alpha:.5,shadowOnly:!1,kernels:null,blur:2,quality:3,pixelSize:1,resolution:e.settings.RESOLUTION},o),t.call(this);var l=o.kernels,a=o.blur,s=o.quality,u=o.pixelSize,c=o.resolution;this._tintFilter=new e.Filter(r,n),this._tintFilter.uniforms.color=new Float32Array(4),this._tintFilter.resolution=c,this._blurFilter=l?new i.KawaseBlurFilter(l):new i.KawaseBlurFilter(a,s),this.pixelSize=u,this.resolution=c,this.targetTransform=new e.Matrix;var p=o.shadowOnly,h=o.rotation,f=o.distance,d=o.alpha,g=o.color;this.shadowOnly=p,this.rotation=h,this.distance=f,this.alpha=d,this.color=g,this._updatePadding()}t&&(o.__proto__=t),o.prototype=Object.create(t&&t.prototype),o.prototype.constructor=o;var l={resolution:{configurable:!0},distance:{configurable:!0},rotation:{configurable:!0},alpha:{configurable:!0},color:{configurable:!0},kernels:{configurable:!0},blur:{configurable:!0},quality:{configurable:!0},pixelSize:{configurable:!0}};return o.prototype.apply=function(t,i,e,r){var n=t.getRenderTarget();n.transform=this.targetTransform,this._tintFilter.apply(t,i,n,!0),n.transform=null,this._blurFilter.apply(t,n,e,r),!0!==this.shadowOnly&&t.applyFilter(this,i,e,!1),t.returnRenderTarget(n)},o.prototype._updatePadding=function(){this.padding=this.distance+2*this.blur},o.prototype._updateTargetTransform=function(){this.targetTransform.tx=this.distance*Math.cos(this.angle),this.targetTransform.ty=this.distance*Math.sin(this.angle)},l.resolution.get=function(){return this._resolution},l.resolution.set=function(t){this._resolution=t,this._tintFilter&&(this._tintFilter.resolution=t),this._blurFilter&&(this._blurFilter.resolution=t)},l.distance.get=function(){return this._distance},l.distance.set=function(t){this._distance=t,this._updatePadding(),this._updateTargetTransform()},l.rotation.get=function(){return this.angle/e.DEG_TO_RAD},l.rotation.set=function(t){this.angle=t*e.DEG_TO_RAD,this._updateTargetTransform()},l.alpha.get=function(){return this._tintFilter.uniforms.alpha},l.alpha.set=function(t){this._tintFilter.uniforms.alpha=t},l.color.get=function(){return e.utils.rgb2hex(this._tintFilter.uniforms.color)},l.color.set=function(t){e.utils.hex2rgb(t,this._tintFilter.uniforms.color)},l.kernels.get=function(){return this._blurFilter.kernels},l.kernels.set=function(t){this._blurFilter.kernels=t},l.blur.get=function(){return this._blurFilter.blur},l.blur.set=function(t){this._blurFilter.blur=t,this._updatePadding()},l.quality.get=function(){return this._blurFilter.quality},l.quality.set=function(t){this._blurFilter.quality=t},l.pixelSize.get=function(){return this._blurFilter.pixelSize},l.pixelSize.set=function(t){this._blurFilter.pixelSize=t},Object.defineProperties(o.prototype,l),o}(e.Filter);t.DropShadowFilter=o,Object.defineProperty(t,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-drop-shadow.js.map

Extensions/Effects/pixi-filters/filter-glow.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(o,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],t):t(o.__filters={},o.PIXI)}(this,function(o,t){"use strict";var n="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",e="varying vec2 vTextureCoord;\nvarying vec4 vColor;\n\nuniform sampler2D uSampler;\n\nuniform float distance;\nuniform float outerStrength;\nuniform float innerStrength;\nuniform vec4 glowColor;\nuniform vec4 filterArea;\nuniform vec4 filterClamp;\nconst float PI = 3.14159265358979323846264;\n\nvoid main(void) {\n    vec2 px = vec2(1.0 / filterArea.x, 1.0 / filterArea.y);\n    vec4 ownColor = texture2D(uSampler, vTextureCoord);\n    vec4 curColor;\n    float totalAlpha = 0.0;\n    float maxTotalAlpha = 0.0;\n    float cosAngle;\n    float sinAngle;\n    vec2 displaced;\n    for (float angle = 0.0; angle <= PI * 2.0; angle += %QUALITY_DIST%) {\n       cosAngle = cos(angle);\n       sinAngle = sin(angle);\n       for (float curDistance = 1.0; curDistance <= %DIST%; curDistance++) {\n           displaced.x = vTextureCoord.x + cosAngle * curDistance * px.x;\n           displaced.y = vTextureCoord.y + sinAngle * curDistance * px.y;\n           curColor = texture2D(uSampler, clamp(displaced, filterClamp.xy, filterClamp.zw));\n           totalAlpha += (distance - curDistance) * curColor.a;\n           maxTotalAlpha += (distance - curDistance);\n       }\n    }\n    maxTotalAlpha = max(maxTotalAlpha, 0.0001);\n\n    ownColor.a = max(ownColor.a, 0.0001);\n    ownColor.rgb = ownColor.rgb / ownColor.a;\n    float outerGlowAlpha = (totalAlpha / maxTotalAlpha)  * outerStrength * (1. - ownColor.a);\n    float innerGlowAlpha = ((maxTotalAlpha - totalAlpha) / maxTotalAlpha) * innerStrength * ownColor.a;\n    float resultAlpha = (ownColor.a + outerGlowAlpha);\n    gl_FragColor = vec4(mix(mix(ownColor.rgb, glowColor.rgb, innerGlowAlpha / ownColor.a), glowColor.rgb, outerGlowAlpha / resultAlpha) * resultAlpha, resultAlpha);\n}\n",r=function(o){function r(t,r,i,l,a){void 0===t&&(t=10),void 0===r&&(r=4),void 0===i&&(i=0),void 0===l&&(l=16777215),void 0===a&&(a=.1),o.call(this,n,e.replace(/%QUALITY_DIST%/gi,""+(1/a/t).toFixed(7)).replace(/%DIST%/gi,""+t.toFixed(7))),this.uniforms.glowColor=new Float32Array([0,0,0,1]),this.distance=t,this.color=l,this.outerStrength=r,this.innerStrength=i}o&&(r.__proto__=o),r.prototype=Object.create(o&&o.prototype),r.prototype.constructor=r;var i={color:{configurable:!0},distance:{configurable:!0},outerStrength:{configurable:!0},innerStrength:{configurable:!0}};return i.color.get=function(){return t.utils.rgb2hex(this.uniforms.glowColor)},i.color.set=function(o){t.utils.hex2rgb(o,this.uniforms.glowColor)},i.distance.get=function(){return this.uniforms.distance},i.distance.set=function(o){this.uniforms.distance=o},i.outerStrength.get=function(){return this.uniforms.outerStrength},i.outerStrength.set=function(o){this.uniforms.outerStrength=o},i.innerStrength.get=function(){return this.uniforms.innerStrength},i.innerStrength.set=function(o){this.uniforms.innerStrength=o},Object.defineProperties(r.prototype,i),r}(t.Filter);o.GlowFilter=r,Object.defineProperty(o,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-glow.js.map

Extensions/Effects/pixi-filters/filter-kawase-blur.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],t):t(e.__filters={},e.PIXI)}(this,function(e,t){"use strict";var r="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",i="\nvarying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec2 uOffset;\n\nvoid main(void)\n{\n    vec4 color = vec4(0.0);\n\n    // Sample top left pixel\n    color += texture2D(uSampler, vec2(vTextureCoord.x - uOffset.x, vTextureCoord.y + uOffset.y));\n\n    // Sample top right pixel\n    color += texture2D(uSampler, vec2(vTextureCoord.x + uOffset.x, vTextureCoord.y + uOffset.y));\n\n    // Sample bottom right pixel\n    color += texture2D(uSampler, vec2(vTextureCoord.x + uOffset.x, vTextureCoord.y - uOffset.y));\n\n    // Sample bottom left pixel\n    color += texture2D(uSampler, vec2(vTextureCoord.x - uOffset.x, vTextureCoord.y - uOffset.y));\n\n    // Average\n    color *= 0.25;\n\n    gl_FragColor = color;\n}",o="\nvarying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec2 uOffset;\nuniform vec4 filterClamp;\n\nvoid main(void)\n{\n    vec4 color = vec4(0.0);\n\n    // Sample top left pixel\n    color += texture2D(uSampler, clamp(vec2(vTextureCoord.x - uOffset.x, vTextureCoord.y + uOffset.y), filterClamp.xy, filterClamp.zw));\n\n    // Sample top right pixel\n    color += texture2D(uSampler, clamp(vec2(vTextureCoord.x + uOffset.x, vTextureCoord.y + uOffset.y), filterClamp.xy, filterClamp.zw));\n\n    // Sample bottom right pixel\n    color += texture2D(uSampler, clamp(vec2(vTextureCoord.x + uOffset.x, vTextureCoord.y - uOffset.y), filterClamp.xy, filterClamp.zw));\n\n    // Sample bottom left pixel\n    color += texture2D(uSampler, clamp(vec2(vTextureCoord.x - uOffset.x, vTextureCoord.y - uOffset.y), filterClamp.xy, filterClamp.zw));\n\n    // Average\n    color *= 0.25;\n\n    gl_FragColor = color;\n}\n",n=function(e){function n(n,l,u){void 0===n&&(n=4),void 0===l&&(l=3),void 0===u&&(u=!1),e.call(this,r,u?o:i),this.uniforms.uOffset=new Float32Array(2),this._pixelSize=new t.Point,this.pixelSize=1,this._clamp=u,this._kernels=null,Array.isArray(n)?this.kernels=n:(this._blur=n,this.quality=l)}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var l={kernels:{configurable:!0},clamp:{configurable:!0},pixelSize:{configurable:!0},quality:{configurable:!0},blur:{configurable:!0}};return n.prototype.apply=function(e,t,r,i){var o,n=this.pixelSize.x/t.size.width,l=this.pixelSize.y/t.size.height;if(1===this._quality||0===this._blur)o=this._kernels[0]+.5,this.uniforms.uOffset[0]=o*n,this.uniforms.uOffset[1]=o*l,e.applyFilter(this,t,r,i);else{for(var u,s=e.getRenderTarget(!0),f=t,a=s,p=this._quality-1,x=0;x<p;x++)o=this._kernels[x]+.5,this.uniforms.uOffset[0]=o*n,this.uniforms.uOffset[1]=o*l,e.applyFilter(this,f,a,!0),u=f,f=a,a=u;o=this._kernels[p]+.5,this.uniforms.uOffset[0]=o*n,this.uniforms.uOffset[1]=o*l,e.applyFilter(this,f,r,i),e.returnRenderTarget(s)}},n.prototype._generateKernels=function(){var e=this._blur,t=this._quality,r=[e];if(e>0)for(var i=e,o=e/t,n=1;n<t;n++)i-=o,r.push(i);this._kernels=r},l.kernels.get=function(){return this._kernels},l.kernels.set=function(e){Array.isArray(e)&&e.length>0?(this._kernels=e,this._quality=e.length,this._blur=Math.max.apply(Math,e)):(this._kernels=[0],this._quality=1)},l.clamp.get=function(){return this._clamp},l.pixelSize.set=function(e){"number"==typeof e?(this._pixelSize.x=e,this._pixelSize.y=e):Array.isArray(e)?(this._pixelSize.x=e[0],this._pixelSize.y=e[1]):e instanceof t.Point?(this._pixelSize.x=e.x,this._pixelSize.y=e.y):(this._pixelSize.x=1,this._pixelSize.y=1)},l.pixelSize.get=function(){return this._pixelSize},l.quality.get=function(){return this._quality},l.quality.set=function(e){this._quality=Math.max(1,Math.round(e)),this._generateKernels()},l.blur.get=function(){return this._blur},l.blur.set=function(e){this._blur=e,this._generateKernels()},Object.defineProperties(n.prototype,l),n}(t.Filter);e.KawaseBlurFilter=n,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-kawase-blur.js.map

Extensions/Effects/pixi-filters/filter-outline.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,o){"object"==typeof exports&&"undefined"!=typeof module?o(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],o):o(e.__filters={},e.PIXI)}(this,function(e,o){"use strict";var t="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec2 thickness;\nuniform vec4 outlineColor;\nuniform vec4 filterClamp;\n\nconst float DOUBLE_PI = 3.14159265358979323846264 * 2.;\n\nvoid main(void) {\n    vec4 ownColor = texture2D(uSampler, vTextureCoord);\n    vec4 curColor;\n    float maxAlpha = 0.;\n    vec2 displaced;\n    for (float angle = 0.; angle <= DOUBLE_PI; angle += ${angleStep}) {\n        displaced.x = vTextureCoord.x + thickness.x * cos(angle);\n        displaced.y = vTextureCoord.y + thickness.y * sin(angle);\n        curColor = texture2D(uSampler, clamp(displaced, filterClamp.xy, filterClamp.zw));\n        maxAlpha = max(maxAlpha, curColor.a);\n    }\n    float resultAlpha = max(maxAlpha, ownColor.a);\n    gl_FragColor = vec4((ownColor.rgb + outlineColor.rgb * (1. - ownColor.a)) * resultAlpha, resultAlpha);\n}\n",n=function(e){function n(o,i,l){void 0===o&&(o=1),void 0===i&&(i=0),void 0===l&&(l=.1);var s=Math.max(l*n.MAX_SAMPLES,n.MIN_SAMPLES),a=(2*Math.PI/s).toFixed(7);e.call(this,t,r.replace(/\$\{angleStep\}/,a)),this.uniforms.thickness=new Float32Array([0,0]),this.thickness=o,this.uniforms.outlineColor=new Float32Array([0,0,0,1]),this.color=i,this.quality=l}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var i={color:{configurable:!0}};return n.prototype.apply=function(e,o,t,r){this.uniforms.thickness[0]=this.thickness/o.size.width,this.uniforms.thickness[1]=this.thickness/o.size.height,e.applyFilter(this,o,t,r)},i.color.get=function(){return o.utils.rgb2hex(this.uniforms.outlineColor)},i.color.set=function(e){o.utils.hex2rgb(e,this.uniforms.outlineColor)},Object.defineProperties(n.prototype,i),n}(o.Filter);n.MIN_SAMPLES=1,n.MAX_SAMPLES=100,e.OutlineFilter=n,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-outline.js.map

Extensions/Effects/pixi-filters/filter-pixelate.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 var __filters=function(e,o){"use strict";var r="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",n="precision mediump float;\n\nvarying vec2 vTextureCoord;\n\nuniform vec2 size;\nuniform sampler2D uSampler;\n\nuniform vec4 filterArea;\n\nvec2 mapCoord( vec2 coord )\n{\n    coord *= filterArea.xy;\n    coord += filterArea.zw;\n\n    return coord;\n}\n\nvec2 unmapCoord( vec2 coord )\n{\n    coord -= filterArea.zw;\n    coord /= filterArea.xy;\n\n    return coord;\n}\n\nvec2 pixelate(vec2 coord, vec2 size)\n{\n\treturn floor( coord / size ) * size;\n}\n\nvoid main(void)\n{\n    vec2 coord = mapCoord(vTextureCoord);\n\n    coord = pixelate(coord, size);\n\n    coord = unmapCoord(coord);\n\n    gl_FragColor = texture2D(uSampler, coord);\n}\n",t=function(e){function o(o){void 0===o&&(o=10),e.call(this,r,n),this.size=o}e&&(o.__proto__=e),o.prototype=Object.create(e&&e.prototype),o.prototype.constructor=o;var t={size:{configurable:!0}};return t.size.get=function(){return this.uniforms.size},t.size.set=function(e){"number"==typeof e&&(e=[e,e]),this.uniforms.size=e},Object.defineProperties(o.prototype,t),o}(o.Filter);return e.PixelateFilter=t,e}({},PIXI);Object.assign(PIXI.filters,__filters);
-//# sourceMappingURL=filter-pixelate.js.map

Extensions/Effects/pixi-filters/filter-radial-blur.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],n):n((e=e||self).__filters={},e.PIXI)}(this,function(e,n){"use strict";var t="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec4 filterArea;\n\nuniform float uRadian;\nuniform vec2 uCenter;\nuniform float uRadius;\nuniform int uKernelSize;\n\nconst int MAX_KERNEL_SIZE = 2048;\n\nvoid main(void)\n{\n    vec4 color = texture2D(uSampler, vTextureCoord);\n\n    if (uKernelSize == 0)\n    {\n        gl_FragColor = color;\n        return;\n    }\n\n    float aspect = filterArea.y / filterArea.x;\n    vec2 center = uCenter.xy / filterArea.xy;\n    float gradient = uRadius / filterArea.x * 0.3;\n    float radius = uRadius / filterArea.x - gradient * 0.5;\n    int k = uKernelSize - 1;\n\n    vec2 coord = vTextureCoord;\n    vec2 dir = vec2(center - coord);\n    float dist = length(vec2(dir.x, dir.y * aspect));\n\n    float radianStep = uRadian;\n    if (radius >= 0.0 && dist > radius) {\n        float delta = dist - radius;\n        float gap = gradient;\n        float scale = 1.0 - abs(delta / gap);\n        if (scale <= 0.0) {\n            gl_FragColor = color;\n            return;\n        }\n        radianStep *= scale;\n    }\n    radianStep /= float(k);\n\n    float s = sin(radianStep);\n    float c = cos(radianStep);\n    mat2 rotationMatrix = mat2(vec2(c, -s), vec2(s, c));\n\n    for(int i = 0; i < MAX_KERNEL_SIZE - 1; i++) {\n        if (i == k) {\n            break;\n        }\n\n        coord -= center;\n        coord.y *= aspect;\n        coord = rotationMatrix * coord;\n        coord.y /= aspect;\n        coord += center;\n\n        vec4 sample = texture2D(uSampler, coord);\n\n        // switch to pre-multiplied alpha to correctly blur transparent images\n        // sample.rgb *= sample.a;\n\n        color += sample;\n    }\n\n    gl_FragColor = color / float(uKernelSize);\n}\n",i=function(e){function n(n,i,o,a){void 0===n&&(n=0),void 0===i&&(i=[0,0]),void 0===o&&(o=5),void 0===a&&(a=-1),e.call(this,t,r),this._angle=0,this.angle=n,this.center=i,this.kernelSize=o,this.radius=a}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var i={angle:{configurable:!0},center:{configurable:!0},radius:{configurable:!0}};return n.prototype.apply=function(e,n,t,r){this.uniforms.uKernelSize=0!==this._angle?this.kernelSize:0,e.applyFilter(this,n,t,r)},i.angle.set=function(e){this._angle=e,this.uniforms.uRadian=e*Math.PI/180},i.angle.get=function(){return this._angle},i.center.get=function(){return this.uniforms.uCenter},i.center.set=function(e){this.uniforms.uCenter=e},i.radius.get=function(){return this.uniforms.uRadius},i.radius.set=function(e){(e<0||e===1/0)&&(e=-1),this.uniforms.uRadius=e},Object.defineProperties(n.prototype,i),n}(n.Filter);e.RadialBlurFilter=i,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-radial-blur.js.map

Extensions/Effects/pixi-filters/filter-reflection.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],n):n(e.__filters={},e.PIXI)}(this,function(e,n){"use strict";var r="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",t="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\n\nuniform vec4 filterArea;\nuniform vec4 filterClamp;\nuniform vec2 dimensions;\n\nuniform bool mirror;\nuniform float boundary;\nuniform vec2 amplitude;\nuniform vec2 waveLength;\nuniform vec2 alpha;\nuniform float time;\n\nfloat rand(vec2 co) {\n    return fract(sin(dot(co.xy, vec2(12.9898, 78.233))) * 43758.5453);\n}\n\nvoid main(void)\n{\n    vec2 pixelCoord = vTextureCoord.xy * filterArea.xy;\n    vec2 coord = pixelCoord / dimensions;\n\n    if (coord.y < boundary) {\n        gl_FragColor = texture2D(uSampler, vTextureCoord);\n        return;\n    }\n\n    float k = (coord.y - boundary) / (1. - boundary + 0.0001);\n    float areaY = boundary * dimensions.y / filterArea.y;\n    float v = areaY + areaY - vTextureCoord.y;\n    float y = mirror ? v : vTextureCoord.y;\n\n    float _amplitude = ((amplitude.y - amplitude.x) * k + amplitude.x ) / filterArea.x;\n    float _waveLength = ((waveLength.y - waveLength.x) * k + waveLength.x) / filterArea.y;\n    float _alpha = (alpha.y - alpha.x) * k + alpha.x;\n\n    float x = vTextureCoord.x + cos(v * 6.28 / _waveLength - time) * _amplitude;\n    x = clamp(x, filterClamp.x, filterClamp.z);\n\n    vec4 color = texture2D(uSampler, vec2(x, y));\n\n    gl_FragColor = color * _alpha;\n}\n",o=function(e){function n(n){e.call(this,r,t),Object.assign(this,{mirror:!0,boundary:.5,amplitude:[0,20],waveLength:[30,100],alpha:[1,1],time:0},n)}e&&(n.__proto__=e),n.prototype=Object.create(e&&e.prototype),n.prototype.constructor=n;var o={mirror:{configurable:!0},boundary:{configurable:!0},amplitude:{configurable:!0},waveLength:{configurable:!0},alpha:{configurable:!0}};return n.prototype.apply=function(e,n,r,t){this.uniforms.dimensions[0]=n.sourceFrame.width,this.uniforms.dimensions[1]=n.sourceFrame.height,this.uniforms.time=this.time,e.applyFilter(this,n,r,t)},o.mirror.set=function(e){this.uniforms.mirror=e},o.mirror.get=function(){return this.uniforms.mirror},o.boundary.set=function(e){this.uniforms.boundary=e},o.boundary.get=function(){return this.uniforms.boundary},o.amplitude.set=function(e){this.uniforms.amplitude[0]=e[0],this.uniforms.amplitude[1]=e[1]},o.amplitude.get=function(){return this.uniforms.amplitude},o.waveLength.set=function(e){this.uniforms.waveLength[0]=e[0],this.uniforms.waveLength[1]=e[1]},o.waveLength.get=function(){return this.uniforms.waveLength},o.alpha.set=function(e){this.uniforms.alpha[0]=e[0],this.uniforms.alpha[1]=e[1]},o.alpha.get=function(){return this.uniforms.alpha},Object.defineProperties(n.prototype,o),n}(n.Filter);e.ReflectionFilter=o,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this.__filters);
-//# sourceMappingURL=filter-reflection.js.map

Extensions/Effects/pixi-filters/filter-rgb-split.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(e,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],r):r(e.__filters={},e.PIXI)}(this,function(e,r){"use strict";var t="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",n="precision mediump float;\n\nvarying vec2 vTextureCoord;\n\nuniform sampler2D uSampler;\nuniform vec4 filterArea;\nuniform vec2 red;\nuniform vec2 green;\nuniform vec2 blue;\n\nvoid main(void)\n{\n   gl_FragColor.r = texture2D(uSampler, vTextureCoord + red/filterArea.xy).r;\n   gl_FragColor.g = texture2D(uSampler, vTextureCoord + green/filterArea.xy).g;\n   gl_FragColor.b = texture2D(uSampler, vTextureCoord + blue/filterArea.xy).b;\n   gl_FragColor.a = texture2D(uSampler, vTextureCoord).a;\n}\n",o=function(e){function r(r,o,i){void 0===r&&(r=[-10,0]),void 0===o&&(o=[0,10]),void 0===i&&(i=[0,0]),e.call(this,t,n),this.red=r,this.green=o,this.blue=i}e&&(r.__proto__=e),r.prototype=Object.create(e&&e.prototype),r.prototype.constructor=r;var o={red:{configurable:!0},green:{configurable:!0},blue:{configurable:!0}};return o.red.get=function(){return this.uniforms.red},o.red.set=function(e){this.uniforms.red=e},o.green.get=function(){return this.uniforms.green},o.green.set=function(e){this.uniforms.green=e},o.blue.get=function(){return this.uniforms.blue},o.blue.set=function(e){this.uniforms.blue=e},Object.defineProperties(r.prototype,o),r}(r.Filter);e.RGBSplitFilter=o,Object.defineProperty(e,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-rgb-split.js.map

Extensions/Effects/pixi-filters/filter-tilt-shift.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],e):e(t.__filters={},t.PIXI)}(this,function(t,e){"use strict";var i="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="varying vec2 vTextureCoord;\n\nuniform sampler2D uSampler;\nuniform float blur;\nuniform float gradientBlur;\nuniform vec2 start;\nuniform vec2 end;\nuniform vec2 delta;\nuniform vec2 texSize;\n\nfloat random(vec3 scale, float seed)\n{\n    return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);\n}\n\nvoid main(void)\n{\n    vec4 color = vec4(0.0);\n    float total = 0.0;\n\n    float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);\n    vec2 normal = normalize(vec2(start.y - end.y, end.x - start.x));\n    float radius = smoothstep(0.0, 1.0, abs(dot(vTextureCoord * texSize - start, normal)) / gradientBlur) * blur;\n\n    for (float t = -30.0; t <= 30.0; t++)\n    {\n        float percent = (t + offset - 0.5) / 30.0;\n        float weight = 1.0 - abs(percent);\n        vec4 sample = texture2D(uSampler, vTextureCoord + delta / texSize * percent * radius);\n        sample.rgb *= sample.a;\n        color += sample * weight;\n        total += weight;\n    }\n\n    color /= total;\n    color.rgb /= color.a + 0.00001;\n\n    gl_FragColor = color;\n}\n",n=function(t){function n(n,o,s,l){void 0===n&&(n=100),void 0===o&&(o=600),void 0===s&&(s=null),void 0===l&&(l=null),t.call(this,i,r),this.uniforms.blur=n,this.uniforms.gradientBlur=o,this.uniforms.start=s||new e.Point(0,window.innerHeight/2),this.uniforms.end=l||new e.Point(600,window.innerHeight/2),this.uniforms.delta=new e.Point(30,30),this.uniforms.texSize=new e.Point(window.innerWidth,window.innerHeight),this.updateDelta()}t&&(n.__proto__=t),n.prototype=Object.create(t&&t.prototype),n.prototype.constructor=n;var o={blur:{configurable:!0},gradientBlur:{configurable:!0},start:{configurable:!0},end:{configurable:!0}};return n.prototype.updateDelta=function(){this.uniforms.delta.x=0,this.uniforms.delta.y=0},o.blur.get=function(){return this.uniforms.blur},o.blur.set=function(t){this.uniforms.blur=t},o.gradientBlur.get=function(){return this.uniforms.gradientBlur},o.gradientBlur.set=function(t){this.uniforms.gradientBlur=t},o.start.get=function(){return this.uniforms.start},o.start.set=function(t){this.uniforms.start=t,this.updateDelta()},o.end.get=function(){return this.uniforms.end},o.end.set=function(t){this.uniforms.end=t,this.updateDelta()},Object.defineProperties(n.prototype,o),n}(e.Filter),o=function(t){function e(){t.apply(this,arguments)}return t&&(e.__proto__=t),e.prototype=Object.create(t&&t.prototype),e.prototype.constructor=e,e.prototype.updateDelta=function(){var t=this.uniforms.end.x-this.uniforms.start.x,e=this.uniforms.end.y-this.uniforms.start.y,i=Math.sqrt(t*t+e*e);this.uniforms.delta.x=t/i,this.uniforms.delta.y=e/i},e}(n),s=function(t){function e(){t.apply(this,arguments)}return t&&(e.__proto__=t),e.prototype=Object.create(t&&t.prototype),e.prototype.constructor=e,e.prototype.updateDelta=function(){var t=this.uniforms.end.x-this.uniforms.start.x,e=this.uniforms.end.y-this.uniforms.start.y,i=Math.sqrt(t*t+e*e);this.uniforms.delta.x=-e/i,this.uniforms.delta.y=t/i},e}(n),l=function(t){function e(e,i,r,n){void 0===e&&(e=100),void 0===i&&(i=600),void 0===r&&(r=null),void 0===n&&(n=null),t.call(this),this.tiltShiftXFilter=new o(e,i,r,n),this.tiltShiftYFilter=new s(e,i,r,n)}t&&(e.__proto__=t),e.prototype=Object.create(t&&t.prototype),e.prototype.constructor=e;var i={blur:{configurable:!0},gradientBlur:{configurable:!0},start:{configurable:!0},end:{configurable:!0}};return e.prototype.apply=function(t,e,i){var r=t.getRenderTarget(!0);this.tiltShiftXFilter.apply(t,e,r),this.tiltShiftYFilter.apply(t,r,i),t.returnRenderTarget(r)},i.blur.get=function(){return this.tiltShiftXFilter.blur},i.blur.set=function(t){this.tiltShiftXFilter.blur=this.tiltShiftYFilter.blur=t},i.gradientBlur.get=function(){return this.tiltShiftXFilter.gradientBlur},i.gradientBlur.set=function(t){this.tiltShiftXFilter.gradientBlur=this.tiltShiftYFilter.gradientBlur=t},i.start.get=function(){return this.tiltShiftXFilter.start},i.start.set=function(t){this.tiltShiftXFilter.start=this.tiltShiftYFilter.start=t},i.end.get=function(){return this.tiltShiftXFilter.end},i.end.set=function(t){this.tiltShiftXFilter.end=this.tiltShiftYFilter.end=t},Object.defineProperties(e.prototype,i),e}(e.Filter);t.TiltShiftFilter=l,t.TiltShiftXFilter=o,t.TiltShiftYFilter=s,t.TiltShiftAxisFilter=n,Object.defineProperty(t,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-tilt-shift.js.map

Extensions/Effects/pixi-filters/filter-twist.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(o,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],n):n((o=o||self).__filters={},o.PIXI)}(this,function(o,n){"use strict";var r="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",e="varying vec2 vTextureCoord;\n\nuniform sampler2D uSampler;\nuniform float radius;\nuniform float angle;\nuniform vec2 offset;\nuniform vec4 filterArea;\n\nvec2 mapCoord( vec2 coord )\n{\n    coord *= filterArea.xy;\n    coord += filterArea.zw;\n\n    return coord;\n}\n\nvec2 unmapCoord( vec2 coord )\n{\n    coord -= filterArea.zw;\n    coord /= filterArea.xy;\n\n    return coord;\n}\n\nvec2 twist(vec2 coord)\n{\n    coord -= offset;\n\n    float dist = length(coord);\n\n    if (dist < radius)\n    {\n        float ratioDist = (radius - dist) / radius;\n        float angleMod = ratioDist * ratioDist * angle;\n        float s = sin(angleMod);\n        float c = cos(angleMod);\n        coord = vec2(coord.x * c - coord.y * s, coord.x * s + coord.y * c);\n    }\n\n    coord += offset;\n\n    return coord;\n}\n\nvoid main(void)\n{\n\n    vec2 coord = mapCoord(vTextureCoord);\n\n    coord = twist(coord);\n\n    coord = unmapCoord(coord);\n\n    gl_FragColor = texture2D(uSampler, coord );\n\n}\n",t=function(o){function n(n,t,i){void 0===n&&(n=200),void 0===t&&(t=4),void 0===i&&(i=20),o.call(this,r,e),this.radius=n,this.angle=t,this.padding=i}o&&(n.__proto__=o),n.prototype=Object.create(o&&o.prototype),n.prototype.constructor=n;var t={offset:{configurable:!0},radius:{configurable:!0},angle:{configurable:!0}};return t.offset.get=function(){return this.uniforms.offset},t.offset.set=function(o){this.uniforms.offset=o},t.radius.get=function(){return this.uniforms.radius},t.radius.set=function(o){this.uniforms.radius=o},t.angle.get=function(){return this.uniforms.angle},t.angle.set=function(o){this.uniforms.angle=o},Object.defineProperties(n.prototype,t),n}(n.Filter);o.TwistFilter=t,Object.defineProperty(o,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-twist.js.map

Extensions/Effects/pixi-filters/filter-zoom-blur.js

@@ -6,4 +6,3 @@
  * http://www.opensource.org/licenses/mit-license
  */
 !function(n,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("pixi.js")):"function"==typeof define&&define.amd?define(["exports","pixi.js"],e):e(n.__filters={},n.PIXI)}(this,function(n,e){"use strict";var t="attribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\n\nuniform mat3 projectionMatrix;\n\nvarying vec2 vTextureCoord;\n\nvoid main(void)\n{\n    gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0);\n    vTextureCoord = aTextureCoord;\n}",r="varying vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec4 filterArea;\n\nuniform vec2 uCenter;\nuniform float uStrength;\nuniform float uInnerRadius;\nuniform float uRadius;\n\nconst float MAX_KERNEL_SIZE = 32.0;\n\nfloat random(vec3 scale, float seed) {\n    // use the fragment position for a different seed per-pixel\n    return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);\n}\n\nvoid main() {\n\n    float minGradient = uInnerRadius * 0.3;\n    float innerRadius = (uInnerRadius + minGradient * 0.5) / filterArea.x;\n\n    float gradient = uRadius * 0.3;\n    float radius = (uRadius - gradient * 0.5) / filterArea.x;\n\n    float countLimit = MAX_KERNEL_SIZE;\n\n    vec2 dir = vec2(uCenter.xy / filterArea.xy - vTextureCoord);\n    float dist = length(vec2(dir.x, dir.y * filterArea.y / filterArea.x));\n\n    float strength = uStrength;\n\n    float delta = 0.0;\n    float gap;\n    if (dist < innerRadius) {\n        delta = innerRadius - dist;\n        gap = minGradient;\n    } else if (radius >= 0.0 && dist > radius) { // radius < 0 means it's infinity\n        delta = dist - radius;\n        gap = gradient;\n    }\n\n    if (delta > 0.0) {\n        float normalCount = gap / filterArea.x;\n        delta = (normalCount - delta) / normalCount;\n        countLimit *= delta;\n        strength *= delta;\n        if (countLimit < 1.0)\n        {\n            gl_FragColor = texture2D(uSampler, vTextureCoord);\n            return;\n        }\n    }\n\n    // randomize the lookup values to hide the fixed number of samples\n    float offset = random(vec3(12.9898, 78.233, 151.7182), 0.0);\n\n    float total = 0.0;\n    vec4 color = vec4(0.0);\n\n    dir *= strength;\n\n    for (float t = 0.0; t < MAX_KERNEL_SIZE; t++) {\n        float percent = (t + offset) / MAX_KERNEL_SIZE;\n        float weight = 4.0 * (percent - percent * percent);\n        vec2 p = vTextureCoord + dir * percent;\n        vec4 sample = texture2D(uSampler, p);\n\n        // switch to pre-multiplied alpha to correctly blur transparent images\n        // sample.rgb *= sample.a;\n\n        color += sample * weight;\n        total += weight;\n\n        if (t > countLimit){\n            break;\n        }\n    }\n\n    color /= total;\n    // switch back from pre-multiplied alpha\n    color.rgb /= color.a + 0.00001;\n\n    gl_FragColor = color;\n}\n",i=function(n){function e(e,i,o,a){void 0===e&&(e=.1),void 0===i&&(i=[0,0]),void 0===o&&(o=0),void 0===a&&(a=-1),n.call(this,t,r),this.center=i,this.strength=e,this.innerRadius=o,this.radius=a}n&&(e.__proto__=n),e.prototype=Object.create(n&&n.prototype),e.prototype.constructor=e;var i={center:{configurable:!0},strength:{configurable:!0},innerRadius:{configurable:!0},radius:{configurable:!0}};return i.center.get=function(){return this.uniforms.uCenter},i.center.set=function(n){this.uniforms.uCenter=n},i.strength.get=function(){return this.uniforms.uStrength},i.strength.set=function(n){this.uniforms.uStrength=n},i.innerRadius.get=function(){return this.uniforms.uInnerRadius},i.innerRadius.set=function(n){this.uniforms.uInnerRadius=n},i.radius.get=function(){return this.uniforms.uRadius},i.radius.set=function(n){(n<0||n===1/0)&&(n=-1),this.uniforms.uRadius=n},Object.defineProperties(e.prototype,i),e}(e.Filter);n.ZoomBlurFilter=i,Object.defineProperty(n,"__esModule",{value:!0})}),Object.assign(PIXI.filters,this?this.__filters:__filters);
-//# sourceMappingURL=filter-zoom-blur.js.map

Extensions/FileSystem/JsExtension.js

@@ -385,6 +385,19 @@ module.exports = {
       .setIncludeFile('Extensions/FileSystem/filesystemtools.js')
       .setFunctionName('gdjs.fileSystem.getUserdataPath');
 
+    extension
+      .addStrExpression(
+        'UserHomePath',
+        _('User\'s Home folder'),
+        _('Get the path to the user home folder.'),
+        _('Filesystem/Windows, Linux, MacOS'),
+        'JsPlatform/Extensions/filesystem_folder24.png',
+        'JsPlatform/Extensions/filesystem_folder32.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/FileSystem/filesystemtools.js')
+      .setFunctionName('gdjs.fileSystem.getUserHomePath');
+
     extension
       .addStrExpression(
         'TempPath',

Extensions/FileSystem/filesystemtools.js

@@ -97,6 +97,23 @@ gdjs.fileSystem.getUserdataPath = function(runtimeScene) {
   }
 };
 
+/**
+ * Get the path to the user's home folder (on Windows `C:\Users\<USERNAME>\` for example).
+ * @return {string} The path to user's "home" folder
+ */
+gdjs.fileSystem.getUserHomePath = function() {
+  const electron = runtimeScene
+    .getGame()
+    .getRenderer()
+    .getElectron();
+
+  if (electron) {
+    return electron.remote.app.getPath('home') || '';
+  } else {
+    return '';
+  }
+};
+
 /**
  * Get the path to 'Temp' folder.
  * @param {gdjs.RuntimeScene} runtimeScene The current scene

Extensions/Inventory/tests/inventorytools.spec.js

@@ -1,5 +1,5 @@
 describe('Inventory', function() {
-	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}});
+	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}, resources: {resources: []}});
 	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
 
 	gdjs.evtTools.inventory.add(runtimeScene, "MyInventory", "sword");

Extensions/LinkedObjects/tests/linkedobjects.spec.js

@@ -1,6 +1,6 @@
 
 describe('gdjs.LinksManager', function() {
-	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}});
+	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}, resources: {resources: []}});
 	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
 	runtimeScene.loadFromScene({
 		layers:[{name:"", visibility: true}],

Extensions/PanelSpriteObject/panelspriteruntimeobject-pixi-renderer.js

@@ -245,7 +245,7 @@ gdjs.PanelSpriteRuntimeObjectPixiRenderer.prototype.setTexture = function(
     texture,
     makeInsideTexture(
       new PIXI.Rectangle(
-        this._borderSprites[1].width - obj._rBorder,
+        texture.width - obj._rBorder,
         0,
         obj._rBorder,
         obj._tBorder
@@ -261,7 +261,7 @@ gdjs.PanelSpriteRuntimeObjectPixiRenderer.prototype.setTexture = function(
     makeInsideTexture(
       new PIXI.Rectangle(
         0,
-        this._borderSprites[5].height - obj._bBorder,
+        texture.height - obj._bBorder,
         obj._lBorder,
         obj._bBorder
       )
@@ -271,8 +271,8 @@ gdjs.PanelSpriteRuntimeObjectPixiRenderer.prototype.setTexture = function(
     texture,
     makeInsideTexture(
       new PIXI.Rectangle(
-        this._borderSprites[7].width - obj._rBorder,
-        this._borderSprites[7].height - obj._bBorder,
+        texture.width - obj._rBorder,
+        texture.height - obj._bBorder,
         obj._rBorder,
         obj._bBorder
       )

Extensions/PathfindingBehavior/JsExtension.cpp

@@ -133,15 +133,14 @@ class PathfindingBehaviorJsExtension : public gd::PlatformExtension {
           GetAllExpressionsForBehavior(
               "PathfindingBehavior::PathfindingObstacleBehavior");
 
-      autActions["PathfindingObstacleBehavior::Cost"]
+      autActions["PathfindingBehavior::Cost"]
           .SetFunctionName("setCost")
           .SetGetter("getCost");
-      autConditions["PathfindingObstacleBehavior::Cost"].SetFunctionName(
-          "getCost");
-      autActions["PathfindingObstacleBehavior::SetImpassable"].SetFunctionName(
+      autConditions["PathfindingBehavior::Cost"].SetFunctionName("getCost");
+      autActions["PathfindingBehavior::SetImpassable"].SetFunctionName(
           "setImpassable");
-      autConditions["PathfindingObstacleBehavior::IsImpassable"]
-          .SetFunctionName("isImpassable");
+      autConditions["PathfindingBehavior::IsImpassable"].SetFunctionName(
+          "isImpassable");
 
       autExpressions["Cost"].SetFunctionName("getCost");
     }

Extensions/PlatformBehavior/Extension.cpp

@@ -181,6 +181,39 @@ void DeclarePlatformBehaviorExtension(gd::PlatformExtension& extension) {
         .SetGetter("GetMaxFallingSpeed")
         .SetIncludeFile("PlatformBehavior/PlatformerObjectRuntimeBehavior.h");
 
+     aut.AddCondition(
+           "LadderClimbingSpeed",
+           _("Ladder climbing speed"),
+           _("Compare the ladder climbing speed (in pixels per "
+             "second)."),
+           _("the ladder climbing speed"),
+           _("Options"),
+           "CppPlatform/Extensions/platformerobjecticon24.png",
+           "CppPlatform/Extensions/platformerobjecticon16.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior")
+        .UseStandardRelationalOperatorParameters("number")
+        .MarkAsAdvanced()
+        .SetFunctionName("GetLadderClimbingSpeed")
+        .SetIncludeFile("PlatformBehavior/PlatformerObjectRuntimeBehavior.h");
+
+    aut.AddAction(
+           "LadderClimbingSpeed",
+           _("Ladder climbing speed"),
+           _("Change the ladder climbing speed (in pixels per "
+             "second)."),
+           _("the ladder climbing speed"),
+           _("Options"),
+           "CppPlatform/Extensions/platformerobjecticon24.png",
+           "CppPlatform/Extensions/platformerobjecticon16.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior")
+        .UseStandardOperatorParameters("number")
+        .MarkAsAdvanced()
+        .SetFunctionName("SetLadderClimbingSpeed")
+        .SetGetter("GetLadderClimbingSpeed")
+        .SetIncludeFile("PlatformBehavior/PlatformerObjectRuntimeBehavior.h");
+
     aut.AddCondition("Acceleration",
                      _("Acceleration"),
                      _("Compare the acceleration of the object (in pixels per "
@@ -303,9 +336,34 @@ void DeclarePlatformBehaviorExtension(gd::PlatformExtension& extension) {
         .SetGetter("GetJumpSpeed")
         .SetIncludeFile("PlatformBehavior/PlatformerObjectRuntimeBehavior.h");
 
+    aut.AddCondition(
+           "JumpSustainTime",
+           _("Jump sustain time"),
+           _("Compare the jump sustain time of the object (in seconds)."),
+           _("the jump sustain time"),
+           _("Options"),
+           "CppPlatform/Extensions/platformerobjecticon24.png",
+           "CppPlatform/Extensions/platformerobjecticon16.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior")
+        .UseStandardRelationalOperatorParameters("number")
+        .MarkAsAdvanced();
+
+    aut.AddAction(
+           "JumpSustainTime",
+           _("Jump sustain time"),
+           _("Change the jump sustain time of an object (in seconds)."),
+           _("the jump sustain time"),
+           _("Options"),
+           "CppPlatform/Extensions/platformerobjecticon24.png",
+           "CppPlatform/Extensions/platformerobjecticon16.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior")
+        .UseStandardOperatorParameters("number");
+
     aut.AddAction(
            "SetCanJump",
-           _("Allow again jumping"),
+           _("Allow jumping again"),
            _("When this action is executed, the object is able to jump again, "
              "even if it is in the air: this can be useful to allow a double "
              "jump for example. This is not a permanent effect: you must call "
@@ -463,6 +521,16 @@ void DeclarePlatformBehaviorExtension(gd::PlatformExtension& extension) {
         .SetFunctionName("GetMaxFallingSpeed")
         .SetIncludeFile("PlatformBehavior/PlatformerObjectRuntimeBehavior.h");
 
+    aut.AddExpression("LadderClimbingSpeed",
+                      _("Ladder climbing speed"),
+                      _("Get the ladder climbing speed"),
+                      _("Options"),
+                      "CppPlatform/Extensions/platformerobjecticon16.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior")
+        .SetFunctionName("GetLadderClimbingSpeed")
+        .SetIncludeFile("PlatformBehavior/PlatformerObjectRuntimeBehavior.h");
+
     aut.AddExpression("Acceleration",
                       _("Acceleration"),
                       _("Acceleration"),
@@ -502,6 +570,14 @@ void DeclarePlatformBehaviorExtension(gd::PlatformExtension& extension) {
         .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior")
         .SetFunctionName("GetJumpSpeed")
         .SetIncludeFile("PlatformBehavior/PlatformerObjectRuntimeBehavior.h");
+
+    aut.AddExpression("JumpSustainTime",
+                      _("Jump sustain time"),
+                      _("The time during which keeping the jump button held allow the initial jump speed to be maintained."),
+                      _("Options"),
+                      "CppPlatform/Extensions/platformerobjecticon16.png")
+        .AddParameter("object", _("Object"))
+        .AddParameter("behavior", _("Behavior"), "PlatformerObjectBehavior");
 #endif
   }
   {

Extensions/PlatformBehavior/JsExtension.cpp

@@ -70,6 +70,12 @@ class PlatformBehaviorJsExtension : public gd::PlatformExtension {
       autExpressions["MaxFallingSpeed"].SetFunctionName("getMaxFallingSpeed");
       autConditions["PlatformBehavior::Acceleration"].SetFunctionName(
           "getAcceleration");
+      autActions["PlatformBehavior::LadderClimbingSpeed"]
+          .SetFunctionName("setLadderClimbingSpeed")
+          .SetGetter("getLadderClimbingSpeed");
+      autExpressions["LadderClimbingSpeed"].SetFunctionName("getLadderClimbingSpeed");
+      autConditions["PlatformBehavior::LadderClimbingSpeed"].SetFunctionName(
+          "getLadderClimbingSpeed");
       autActions["PlatformBehavior::Acceleration"]
           .SetFunctionName("setAcceleration")
           .SetGetter("getAcceleration");
@@ -92,6 +98,12 @@ class PlatformBehaviorJsExtension : public gd::PlatformExtension {
           .SetFunctionName("setJumpSpeed")
           .SetGetter("getJumpSpeed");
       autExpressions["JumpSpeed"].SetFunctionName("getJumpSpeed");
+      autConditions["PlatformBehavior::JumpSustainTime"].SetFunctionName(
+          "getJumpSustainTime");
+      autActions["PlatformBehavior::JumpSustainTime"]
+          .SetFunctionName("setJumpSustainTime")
+          .SetGetter("getJumpSustainTime");
+      autExpressions["JumpSustainTime"].SetFunctionName("getJumpSustainTime");
 
       autActions["PlatformBehavior::SetCanJump"].SetFunctionName("setCanJump");
       autActions["PlatformBehavior::SimulateLeftKey"].SetFunctionName(

Extensions/PlatformBehavior/PlatformerObjectBehavior.cpp

@@ -6,11 +6,13 @@ This project is released under the MIT License.
 */
 
 #include "PlatformerObjectBehavior.h"
+
 #include <SFML/Window.hpp>
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <memory>
+
 #include "GDCore/Tools/Localization.h"
 #include "GDCpp/Runtime/CommonTools.h"
 #include "GDCpp/Runtime/Project/Layout.h"
@@ -22,6 +24,7 @@ This project is released under the MIT License.
 #if defined(GD_IDE_ONLY)
 #include <iostream>
 #include <map>
+
 #include "GDCore/Project/PropertyDescriptor.h"
 #endif
 
@@ -30,10 +33,12 @@ void PlatformerObjectBehavior::InitializeContent(
   behaviorContent.SetAttribute("roundCoordinates", true);
   behaviorContent.SetAttribute("gravity", 1000);
   behaviorContent.SetAttribute("maxFallingSpeed", 700);
+  behaviorContent.SetAttribute("ladderClimbingSpeed", 150);
   behaviorContent.SetAttribute("acceleration", 1500);
   behaviorContent.SetAttribute("deceleration", 1500);
   behaviorContent.SetAttribute("maxSpeed", 250);
   behaviorContent.SetAttribute("jumpSpeed", 600);
+  behaviorContent.SetAttribute("jumpSustainTime", 0.2);
   behaviorContent.SetAttribute("ignoreDefaultControls", false);
   behaviorContent.SetAttribute("slopeMaxAngle", 60);
   behaviorContent.SetAttribute("canGrabPlatforms", false);
@@ -51,8 +56,18 @@ PlatformerObjectBehavior::GetProperties(
       gd::String::From(behaviorContent.GetDoubleAttribute("gravity")));
   properties[_("Jump speed")].SetValue(
       gd::String::From(behaviorContent.GetDoubleAttribute("jumpSpeed")));
+  properties["jumpSustainTime"]
+      .SetValue(gd::String::From(
+          behaviorContent.GetDoubleAttribute("jumpSustainTime", 0)))
+      .SetLabel(_("Jump sustain time"))
+      .SetDescription(
+          _("Maximum time (in seconds) during which the jump strength is "
+            "sustained if the jump key is held - allowing variable height "
+            "jumps."));
   properties[_("Max. falling speed")].SetValue(
       gd::String::From(behaviorContent.GetDoubleAttribute("maxFallingSpeed")));
+  properties[_("Ladder climbing speed")].SetValue(gd::String::From(
+      behaviorContent.GetDoubleAttribute("ladderClimbingSpeed", 150)));
   properties[_("Acceleration")].SetValue(
       gd::String::From(behaviorContent.GetDoubleAttribute("acceleration")));
   properties[_("Deceleration")].SetValue(
@@ -91,7 +106,7 @@ bool PlatformerObjectBehavior::UpdateProperty(
     gd::Project& project) {
   if (name == _("Default controls"))
     behaviorContent.SetAttribute("ignoreDefaultControls", (value == "0"));
-  if (name == _("Round coordinates"))
+  else if (name == _("Round coordinates"))
     behaviorContent.SetAttribute("roundCoordinates", (value == "1"));
   else if (name == _("Can grab platform ledges"))
     behaviorContent.SetAttribute("canGrabPlatforms", (value == "1"));
@@ -104,6 +119,8 @@ bool PlatformerObjectBehavior::UpdateProperty(
       behaviorContent.SetAttribute("gravity", value.To<double>());
     else if (name == _("Max. falling speed"))
       behaviorContent.SetAttribute("maxFallingSpeed", value.To<double>());
+    else if (name == _("Ladder climbing speed"))
+      behaviorContent.SetAttribute("ladderClimbingSpeed", value.To<double>());
     else if (name == _("Acceleration"))
       behaviorContent.SetAttribute("acceleration", value.To<double>());
     else if (name == _("Deceleration"))
@@ -112,6 +129,8 @@ bool PlatformerObjectBehavior::UpdateProperty(
       behaviorContent.SetAttribute("maxSpeed", value.To<double>());
     else if (name == _("Jump speed"))
       behaviorContent.SetAttribute("jumpSpeed", value.To<double>());
+    else if (name == "jumpSustainTime")
+      behaviorContent.SetAttribute("jumpSustainTime", value.To<double>());
     else if (name == _("Slope max. angle")) {
       double newMaxAngle = value.To<double>();
       if (newMaxAngle < 0 || newMaxAngle >= 90) return false;

Extensions/PlatformBehavior/PlatformerObjectRuntimeBehavior.cpp

@@ -27,6 +27,7 @@ PlatformerObjectRuntimeBehavior::PlatformerObjectRuntimeBehavior(
       roundCoordinates(true),
       gravity(1000),
       maxFallingSpeed(700),
+      ladderClimbingSpeed(150),
       acceleration(1500),
       deceleration(1500),
       maxSpeed(250),
@@ -64,6 +65,7 @@ PlatformerObjectRuntimeBehavior::PlatformerObjectRuntimeBehavior(
       behaviorContent.GetBoolAttribute("roundCoordinates", false);
   gravity = behaviorContent.GetDoubleAttribute("gravity");
   maxFallingSpeed = behaviorContent.GetDoubleAttribute("maxFallingSpeed");
+  ladderClimbingSpeed = behaviorContent.GetDoubleAttribute("ladderClimbingSpeed");
   acceleration = behaviorContent.GetDoubleAttribute("acceleration");
   deceleration = behaviorContent.GetDoubleAttribute("deceleration");
   maxSpeed = behaviorContent.GetDoubleAttribute("maxSpeed");
@@ -245,8 +247,8 @@ void PlatformerObjectRuntimeBehavior::DoStepPreEvents(RuntimeScene& scene) {
         !ignoreDefaultControls && scene.GetInputManager().IsKeyPressed("Up");
     downKey |=
         !ignoreDefaultControls && scene.GetInputManager().IsKeyPressed("Down");
-    if (upKey) requestedDeltaY -= 150 * timeDelta;
-    if (downKey) requestedDeltaY += 150 * timeDelta;
+    if (upKey) requestedDeltaY -= ladderClimbingSpeed * timeDelta;
+    if (downKey) requestedDeltaY += ladderClimbingSpeed * timeDelta;
 
     // Coming to an extremity of a ladder
     if (!IsOverlappingLadder(potentialObjects)) {
@@ -323,6 +325,7 @@ void PlatformerObjectRuntimeBehavior::DoStepPreEvents(RuntimeScene& scene) {
   }
 
   if (jumping) {
+    // TODO: Port the jump sustain feature
     requestedDeltaY -= currentJumpSpeed * timeDelta;
     currentJumpSpeed -= gravity * timeDelta;
     if (currentJumpSpeed < 0) {
@@ -448,7 +451,7 @@ void PlatformerObjectRuntimeBehavior::DoStepPreEvents(RuntimeScene& scene) {
       // this extra check).
       bool canLand = requestedDeltaY >= 0;
 
-      // Check if landing on a new floor: (Exclude already overlapped jump truh)
+      // Check if landing on a new floor: (Exclude already overlapped jump thru)
       std::set<PlatformRuntimeBehavior*> collidingObjects =
           GetPlatformsCollidingWith(potentialObjects, overlappedJumpThru);
       if (canLand && !collidingObjects.empty()) {  // Just landed on floor

Extensions/PlatformBehavior/PlatformerObjectRuntimeBehavior.h

@@ -33,6 +33,7 @@ class GD_EXTENSION_API PlatformerObjectRuntimeBehavior
 
   double GetGravity() const { return gravity; };
   double GetMaxFallingSpeed() const { return maxFallingSpeed; };
+  double GetLadderClimbingSpeed() const { return ladderClimbingSpeed; };
   double GetAcceleration() const { return acceleration; };
   double GetDeceleration() const { return deceleration; };
   double GetMaxSpeed() const { return maxSpeed; };
@@ -43,6 +44,7 @@ class GD_EXTENSION_API PlatformerObjectRuntimeBehavior
   void SetMaxFallingSpeed(double maxFallingSpeed_) {
     maxFallingSpeed = maxFallingSpeed_;
   };
+  void SetLadderClimbingSpeed(double ladderClimbingSpeed_) { ladderClimbingSpeed = ladderClimbingSpeed_; };
   void SetAcceleration(double acceleration_) { acceleration = acceleration_; };
   void SetDeceleration(double deceleration_) { deceleration = deceleration_; };
   void SetMaxSpeed(double maxSpeed_) { maxSpeed = maxSpeed_; };
@@ -180,6 +182,7 @@ class GD_EXTENSION_API PlatformerObjectRuntimeBehavior
                            ///< X and Y axis.
   double gravity;          ///< In pixels.seconds^-2
   double maxFallingSpeed;  ///< In pixels.seconds^-1
+  double ladderClimbingSpeed; ///<In pixels.seconds^-1
   double acceleration;     ///< In pixels.seconds^-2
   double deceleration;     ///< In pixels.seconds^-2
   double maxSpeed;         ///< In pixels.seconds^-1

Extensions/PlatformBehavior/platformerobjectruntimebehavior.js

@@ -31,6 +31,7 @@ gdjs.PlatformerObjectRuntimeBehavior = function(
   this._roundCoordinates = behaviorData.roundCoordinates;
   this._gravity = behaviorData.gravity;
   this._maxFallingSpeed = behaviorData.maxFallingSpeed;
+  this._ladderClimbingSpeed = behaviorData.ladderClimbingSpeed || 150;
   this._acceleration = behaviorData.acceleration;
   this._deceleration = behaviorData.deceleration;
   this._maxSpeed = behaviorData.maxSpeed;
@@ -38,6 +39,7 @@ gdjs.PlatformerObjectRuntimeBehavior = function(
   this._canGrabPlatforms = behaviorData.canGrabPlatforms || false;
   this._yGrabOffset = behaviorData.yGrabOffset || 0;
   this._xGrabTolerance = behaviorData.xGrabTolerance || 10;
+  this._jumpSustainTime = behaviorData.jumpSustainTime || 0;
   this._isOnFloor = false;
   this._isOnLadder = false;
   this._floorPlatform = null;
@@ -45,6 +47,8 @@ gdjs.PlatformerObjectRuntimeBehavior = function(
   this._currentSpeed = 0;
   this._jumping = false;
   this._currentJumpSpeed = 0;
+  this._timeSinceCurrentJumpStart = 0;
+  this._jumpKeyHeldSinceJumpStart = false;
   this._canJump = false;
   this._isGrabbingPlatform = false;
   this._grabbedPlatform = null;
@@ -263,8 +267,8 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.doStepPreEvents = function(
         .getGame()
         .getInputManager()
         .isKeyPressed(DOWNKEY);
-    if (this._upKey) requestedDeltaY -= 150 * timeDelta;
-    if (this._downKey) requestedDeltaY += 150 * timeDelta;
+    if (this._upKey) requestedDeltaY -= this._ladderClimbingSpeed * timeDelta;
+    if (this._downKey) requestedDeltaY += this._ladderClimbingSpeed * timeDelta;
 
     //Coming to an extremity of a ladder
     if (!this._isOverlappingLadder()) {
@@ -367,6 +371,8 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.doStepPreEvents = function(
   if (this._canJump && this._jumpKey) {
     this._jumping = true;
     this._canJump = false;
+    this._timeSinceCurrentJumpStart = 0;
+    this._jumpKeyHeldSinceJumpStart = true;
     //this._isOnFloor = false; If floor is a very steep slope, the object could go into it.
     this._isOnLadder = false;
     this._currentJumpSpeed = this._jumpSpeed;
@@ -375,9 +381,22 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.doStepPreEvents = function(
     //object.setY(object.getY()-1); //Useless and dangerous
   }
 
+  // Check if the jump key is continuously held since
+  // the beginning of the jump.
+  if (!this._jumpKey) this._jumpKeyHeldSinceJumpStart = false;
+
   if (this._jumping) {
+    this._timeSinceCurrentJumpStart += timeDelta;
     requestedDeltaY -= this._currentJumpSpeed * timeDelta;
-    this._currentJumpSpeed -= this._gravity * timeDelta;
+
+    // Decrease jump speed after the (optional) jump sustain time is over.
+    var sustainJumpSpeed =
+      this._jumpKeyHeldSinceJumpStart &&
+      this._timeSinceCurrentJumpStart < this._jumpSustainTime;
+    if (!sustainJumpSpeed) {
+      this._currentJumpSpeed -= this._gravity * timeDelta;
+    }
+
     if (this._currentJumpSpeed < 0) {
       this._currentJumpSpeed = 0;
       this._jumping = false;
@@ -866,6 +885,14 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.getMaxFallingSpeed = function() {
   return this._maxFallingSpeed;
 };
 
+/**
+ * Get the speed used to move on Y axis when climbing a ladder.
+ * @returns {number} The speed of ladder climbing.
+ */
+gdjs.PlatformerObjectRuntimeBehavior.prototype.getLadderClimbingSpeed = function() {
+  return this._ladderClimbingSpeed;
+};
+
 /**
  * Get the acceleration value of the Platformer Object.
  * @returns {number} The current acceleration.
@@ -898,6 +925,14 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.getJumpSpeed = function() {
   return this._jumpSpeed;
 };
 
+/**
+ * Get the jump sustain time of the Platformer Object.
+ * @returns {number} The jump sustain time.
+ */
+gdjs.PlatformerObjectRuntimeBehavior.prototype.getJumpSustainTime = function() {
+  return this._jumpSustainTime;
+};
+
 /**
  * Set the gravity of the Platformer Object.
  * @param {number} gravity The new gravity.
@@ -916,6 +951,16 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.setMaxFallingSpeed = function(
   this._maxFallingSpeed = maxFallingSpeed;
 };
 
+/**
+* Set the speed used to move on Y axis when climbing a ladder.
+* @param {number} ladderClimbingSpeed The speed of ladder climbing.
+*/
+gdjs.PlatformerObjectRuntimeBehavior.prototype.setLadderClimbingSpeed = function (
+  ladderClimbingSpeed
+) {
+  this._ladderClimbingSpeed = ladderClimbingSpeed;
+};
+
 /**
  * Set the acceleration of the Platformer Object.
  * @param {number} acceleration The new acceleration.
@@ -956,6 +1001,16 @@ gdjs.PlatformerObjectRuntimeBehavior.prototype.setJumpSpeed = function(
   this._jumpSpeed = jumpSpeed;
 };
 
+/**
+ * Set the jump sustain time of the Platformer Object.
+ * @param {number} jumpSpeed The new jump sustain time.
+ */
+gdjs.PlatformerObjectRuntimeBehavior.prototype.setJumpSustainTime = function(
+  jumpSustainTime
+) {
+  this._jumpSustainTime = jumpSustainTime;
+};
+
 /**
  * Set the maximum slope angle of the Platformer Object.
  * @param {number} slopeMaxAngle The new maximum slope angle.

Extensions/PlatformBehavior/tests/platformerobjectruntimebehavior.spec.js

@@ -1,282 +1,483 @@
+const makeTestRuntimeScene = () => {
+  const runtimeGame = new gdjs.RuntimeGame({
+    variables: [],
+    resources: {
+      resources: [],
+    },
+    properties: { windowWidth: 800, windowHeight: 600 },
+  });
+  const runtimeScene = new gdjs.RuntimeScene(runtimeGame);
+  runtimeScene.loadFromScene({
+    layers: [{ name: '', visibility: true }],
+    variables: [],
+    behaviorsSharedData: [],
+    objects: [],
+    instances: [],
+  });
+  runtimeScene._timeManager.getElapsedTime = function() {
+    return (1 / 60) * 1000;
+  };
+  return runtimeScene;
+};
+
+const addPlatformObject = runtimeScene => {
+  var platform = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj2',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformBehavior',
+        canBeGrabbed: true,
+      },
+    ],
+  });
+  platform.getWidth = function() {
+    return 60;
+  };
+  platform.getHeight = function() {
+    return 32;
+  };
+  runtimeScene.addObject(platform);
+
+  return platform;
+};
+
 describe('gdjs.PlatformerObjectRuntimeBehavior', function() {
-	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}});
-	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
-	runtimeScene.loadFromScene({
-		layers: [{name: "", visibility: true}],
-		variables: [],
-		behaviorsSharedData: [],
-		objects: [],
-		instances: []
-	});
-	runtimeScene._timeManager.getElapsedTime = function() { return 1 / 60 * 1000; };
+  const runtimeScene = makeTestRuntimeScene();
 
-	//Put a platformer object in the air.
-	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformerObjectBehavior",
-		name: "auto1",
-		gravity: 900,
-		maxFallingSpeed: 1500,
-		acceleration: 500,
-		deceleration: 1500,
-		maxSpeed: 500,
-		jumpSpeed: 1500,
-		canGrabPlatforms: true,
-		ignoreDefaultControls: true,
-		slopeMaxAngle: 60
-	}]});
-	object.getWidth = function() { return 10; };
-	object.getHeight = function() { return 20; };
-	runtimeScene.addObject(object);
-	object.setPosition(0, -100);
+  //Put a platformer object in the air.
+  var object = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj1',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformerObjectBehavior',
+        name: 'auto1',
+        gravity: 900,
+        maxFallingSpeed: 1500,
+        acceleration: 500,
+        deceleration: 1500,
+        maxSpeed: 500,
+        jumpSpeed: 1500,
+        canGrabPlatforms: true,
+        ignoreDefaultControls: true,
+        slopeMaxAngle: 60,
+      },
+    ],
+  });
+  object.getWidth = function() {
+    return 10;
+  };
+  object.getHeight = function() {
+    return 20;
+  };
+  runtimeScene.addObject(object);
+  object.setPosition(0, -100);
 
-	//Put a platform
-	var platform = new gdjs.RuntimeObject(runtimeScene, {name: "obj2", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformBehavior",
-		canBeGrabbed: true,
-	}]});
-	platform.getWidth = function() { return 60; };
-	platform.getHeight = function() { return 32; };
-	runtimeScene.addObject(platform);
-	platform.setPosition(0, -10);
+  //Put a platform
+  const platform = addPlatformObject(runtimeScene);
+  platform.setPosition(0, -10);
 
-	it('can fall when in the air', function() {
-		for(var i = 0; i<30; ++i) {
-			runtimeScene.renderAndStep();
-			if (i < 10) expect(object.getBehavior("auto1").isFalling()).to.be(true);
-		}
+  it('can fall when in the air', function() {
+    for (var i = 0; i < 30; ++i) {
+      runtimeScene.renderAndStep();
+      if (i < 10) expect(object.getBehavior('auto1').isFalling()).to.be(true);
+    }
 
-		//Check the platform stopped the platformer object.
-		expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		expect(object.getBehavior("auto1").isMoving()).to.be(false);
+    //Check the platform stopped the platformer object.
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
 
-		for(var i = 0; i<35; ++i) { //Check that the platformer object can fall.
-			object.getBehavior("auto1").simulateRightKey();
-			runtimeScene.renderAndStep();
-		}
-		expect(object.getX()).to.be.within(87.50, 87.51);
-		expect(object.getY()).to.be(-24.75);
-		expect(object.getBehavior("auto1").isFalling()).to.be(true);
+    for (var i = 0; i < 35; ++i) {
+      //Check that the platformer object can fall.
+      object.getBehavior('auto1').simulateRightKey();
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getX()).to.be.within(87.5, 87.51);
+    expect(object.getY()).to.be(-24.75);
+    expect(object.getBehavior('auto1').isFalling()).to.be(true);
 
-		for(var i = 0; i<100; ++i) { //Let the speed on X axis go back to 0.
-			runtimeScene.renderAndStep();
-		}
-	});
+    for (var i = 0; i < 100; ++i) {
+      //Let the speed on X axis go back to 0.
+      runtimeScene.renderAndStep();
+    }
+  });
 
-	it('can grab, and release, a platform', function() {
-		//Put the object near the right ledge of the platform.
-		object.setPosition(platform.getX() + platform.getWidth() + 2, platform.getY() - 10);
+  it('can grab, and release, a platform', function() {
+    //Put the object near the right ledge of the platform.
+    object.setPosition(
+      platform.getX() + platform.getWidth() + 2,
+      platform.getY() - 10
+    );
 
-		for(var i = 0; i<35; ++i) {
-			object.getBehavior("auto1").simulateLeftKey();
-			runtimeScene.renderAndStep();
-		}
+    for (var i = 0; i < 35; ++i) {
+      object.getBehavior('auto1').simulateLeftKey();
+      runtimeScene.renderAndStep();
+    }
 
-		//Check that the object grabbed the platform
-		expect(object.getX()).to.be.within(
-			platform.getX() + platform.getWidth() + 1,
-			platform.getX() + platform.getWidth() + 2
-		);
-		expect(object.getY()).to.be(platform.getY());
+    //Check that the object grabbed the platform
+    expect(object.getX()).to.be.within(
+      platform.getX() + platform.getWidth() + 1,
+      platform.getX() + platform.getWidth() + 2
+    );
+    expect(object.getY()).to.be(platform.getY());
 
-		object.getBehavior("auto1").simulateReleaseKey();
-		for(var i = 0; i<10; ++i) {
-			runtimeScene.renderAndStep();
-		}
+    object.getBehavior('auto1').simulateReleaseKey();
+    for (var i = 0; i < 10; ++i) {
+      runtimeScene.renderAndStep();
+    }
 
-		//Check that the object is falling
-		expect(object.getY()).to.be(1.25);
-	});
+    //Check that the object is falling
+    expect(object.getY()).to.be(1.25);
+  });
 
-	it('can track object height changes', function() {
-		//Put the object near the right ledge of the platform.
-		object.setPosition(platform.getX() + 10, platform.getY() - object.getHeight() - 1);
+  it('can track object height changes', function() {
+    //Put the object near the right ledge of the platform.
+    object.setPosition(
+      platform.getX() + 10,
+      platform.getY() - object.getHeight() - 1
+    );
 
-		for(var i = 0; i<15; ++i) {
-			runtimeScene.renderAndStep();
-		}
+    for (var i = 0; i < 15; ++i) {
+      runtimeScene.renderAndStep();
+    }
 
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		expect(object.getX()).to.be(10);
-		expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getX()).to.be(10);
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
 
-		object.getHeight = function() { return 9; }
-		runtimeScene.renderAndStep();
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		expect(object.getY()).to.be(-19); // -19 = -10 (platform y) + -9 (object height)
+    object.getHeight = function() {
+      return 9;
+    };
+    runtimeScene.renderAndStep();
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getY()).to.be(-19); // -19 = -10 (platform y) + -9 (object height)
 
-		for(var i = 0; i<10; ++i) {
-			object.getBehavior("auto1").simulateRightKey();
-			runtimeScene.renderAndStep();
-			expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		}
-		expect(object.getY()).to.be(-19);
-		expect(object.getX()).to.be.within(17.638, 17.639);
+    for (var i = 0; i < 10; ++i) {
+      object.getBehavior('auto1').simulateRightKey();
+      runtimeScene.renderAndStep();
+      expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    }
+    expect(object.getY()).to.be(-19);
+    expect(object.getX()).to.be.within(17.638, 17.639);
 
-		object.getHeight = function() { return 20; }
-		runtimeScene.renderAndStep();
-		expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
-	});
+    object.getHeight = function() {
+      return 20;
+    };
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+  });
+});
+
+describe('gdjs.PlatformerObjectRuntimeBehavior, jump and jump sustain (round coordinates on)', function() {
+  const runtimeScene = makeTestRuntimeScene();
+
+  //Put a platformer object on a platform
+  var object = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj1',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformerObjectBehavior',
+        name: 'auto1',
+        gravity: 1500,
+        maxFallingSpeed: 1500,
+        acceleration: 500,
+        deceleration: 1500,
+        maxSpeed: 500,
+        jumpSpeed: 900,
+        canGrabPlatforms: true,
+        ignoreDefaultControls: true,
+        slopeMaxAngle: 60,
+        jumpSustainTime: 0.2,
+        roundCoordinates: true,
+      },
+    ],
+  });
+  object.getWidth = function() {
+    return 10;
+  };
+  object.getHeight = function() {
+    return 20;
+  };
+  runtimeScene.addObject(object);
+  object.setPosition(0, -32);
+
+  //Put a platform
+  const platform = addPlatformObject(runtimeScene);
+  platform.setPosition(0, -10);
+
+  it('can jump', function() {
+    // Ensure the object falls on the platform
+    for (var i = 0; i < 10; ++i) {
+      runtimeScene.renderAndStep();
+    }
+
+    //Check the object is on the platform
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
+
+    // Jump without sustaining
+    object.getBehavior('auto1').simulateJumpKey();
+    for (var i = 0; i < 18; ++i) {
+      runtimeScene.renderAndStep();
+	}
+
+    // Check that we reached the maximum height
+    expect(object.getY()).to.be.within(-180, -179);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be(-180);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-180, -179);
+
+    // Then let the object fall
+    for (var i = 0; i < 60; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be(-30);
+  });
+
+  it('can jump, sustaining the jump', function() {
+    //Check the object is on the platform
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
+
+	// Jump with sustaining as much as possible, and
+	// even more (18 frames at 60fps is greater than 0.2s)
+    for (var i = 0; i < 18; ++i) {
+      object.getBehavior('auto1').simulateJumpKey();
+      runtimeScene.renderAndStep();
+    }
+
+    // Check the height reached
+    expect(object.getY()).to.be(-230);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be(-235);
+    for (var i = 0; i < 5; ++i) {
+      // Verify that pressing the jump key does not change anything
+      object.getBehavior('auto1').simulateJumpKey();
+      runtimeScene.renderAndStep();
+    }
+
+    // Check that we reached the maximum height
+    expect(object.getY()).to.be(-247.5);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be(-247.5);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-247, -246);
+
+    // Then let the object fall
+    for (var i = 0; i < 60; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be(-30);
+  });
+
+  it('can jump, and only sustain the jump while key held', function() {
+    //Check the object is on the platform
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
+
+	// Jump with sustaining a bit (5 frames at 60fps = 0.08s), then stop
+    for (var i = 0; i < 5; ++i) {
+      object.getBehavior('auto1').simulateJumpKey();
+      runtimeScene.renderAndStep();
+    }
+	expect(object.getY()).to.be.within(-101, -100);
+
+	// Stop holding the jump key
+	runtimeScene.renderAndStep();
+
+    for (var i = 0; i < 13; ++i) {
+	  // then hold it again (but it's too late, jump sustain is gone for this jump)
+      object.getBehavior('auto1').simulateJumpKey();
+      runtimeScene.renderAndStep();
+    }
+
+    // Check that we reached the maximum height
+    expect(object.getY()).to.be.within(-206, -205);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-208, -207);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-208, -207);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-208, -207);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-206, -205);
+    runtimeScene.renderAndStep();
+
+    // Then let the object fall
+    for (var i = 0; i < 60; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be(-30);
+  });
 });
 
 describe('gdjs.PlatformerObjectRuntimeBehavior, jumpthru', function() {
-	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}});
-	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
-	runtimeScene.loadFromScene({
-		layers: [{name: "", visibility: true}],
-		variables: [],
-		behaviorsSharedData: [],
-		objects: [],
-		instances: []
-	});
-	runtimeScene._timeManager.getElapsedTime = function() { return 1 / 60 * 1000; };
+  const runtimeScene = makeTestRuntimeScene();
 
-	//Put a platformer object in a platform.
-	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformerObjectBehavior",
-		name: "auto1",
-		roundCoordinates: true,
-		gravity: 900,
-		maxFallingSpeed: 1500,
-		acceleration: 500,
-		deceleration: 1500,
-		maxSpeed: 500,
-		jumpSpeed: 500,
-		canGrabPlatforms: true,
-		ignoreDefaultControls: true,
-		slopeMaxAngle: 60
-	}]});
-	object.getWidth = function() { return 10; };
-	object.getHeight = function() { return 20; };
-	runtimeScene.addObject(object);
-	object.setPosition(0, -30);
+  //Put a platformer object in a platform.
+  var object = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj1',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformerObjectBehavior',
+        name: 'auto1',
+        roundCoordinates: true,
+        gravity: 900,
+        maxFallingSpeed: 1500,
+        acceleration: 500,
+        deceleration: 1500,
+        maxSpeed: 500,
+        jumpSpeed: 500,
+        canGrabPlatforms: true,
+        ignoreDefaultControls: true,
+        slopeMaxAngle: 60,
+      },
+    ],
+  });
+  object.getWidth = function() {
+    return 10;
+  };
+  object.getHeight = function() {
+    return 20;
+  };
+  runtimeScene.addObject(object);
+  object.setPosition(0, -30);
 
-	//Put a platform
-	var platform = new gdjs.RuntimeObject(runtimeScene, {name: "obj2", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformBehavior",
-		canBeGrabbed: true,
-		platformType: "Platform",
-	}]});
-	platform.getWidth = function() { return 60; };
-	platform.getHeight = function() { return 32; };
-	runtimeScene.addObject(platform);
-	platform.setPosition(0, -10);
+  //Put a platform
+  const platform = addPlatformObject(runtimeScene);
+  platform.setPosition(0, -10);
 
-	// Put a jump thru, higher than the platform so that the object jump from under it
-	// and will land on it at the end of the jump.
-	var jumpthru = new gdjs.RuntimeObject(runtimeScene, {name: "obj2", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformBehavior",
-		canBeGrabbed: true,
-		platformType: "Jumpthru",
-	}]});
-	jumpthru.getWidth = function() { return 60; };
-	jumpthru.getHeight = function() { return 5; };
-	runtimeScene.addObject(jumpthru);
-	jumpthru.setPosition(0, -33);
+  // Put a jump thru, higher than the platform so that the object jump from under it
+  // and will land on it at the end of the jump.
+  var jumpthru = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj2',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformBehavior',
+        canBeGrabbed: true,
+        platformType: 'Jumpthru',
+      },
+    ],
+  });
+  jumpthru.getWidth = function() {
+    return 60;
+  };
+  jumpthru.getHeight = function() {
+    return 5;
+  };
+  runtimeScene.addObject(jumpthru);
+  jumpthru.setPosition(0, -33);
 
-	it('can jump through the jumpthru', function() {
-		//Check the platform stopped the platformer object.
-		for(var i = 0; i<5; ++i) {
-			runtimeScene.renderAndStep();
-		}
-		expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		expect(object.getBehavior("auto1").isMoving()).to.be(false);
+  it('can jump through the jumpthru', function() {
+    //Check the platform stopped the platformer object.
+    for (var i = 0; i < 5; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be(-30); // -30 = -10 (platform y) + -20 (object height)
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
 
-		// Check that the jump starts properly, and is not stopped on the jumpthru
-		object.getBehavior("auto1").simulateJumpKey();
-		runtimeScene.renderAndStep();
-		expect(object.getY()).to.be.within(-39, -38);
-		runtimeScene.renderAndStep();
-		expect(object.getY()).to.be.within(-47, -46);
-		runtimeScene.renderAndStep();
-		// At this step, the object is almost on the jumpthru (-53 + 20 (object height) = -33 (jump thru Y position)),
-		// but the object should not stop.
-		expect(object.getY()).to.be.within(-54, -53);
-		runtimeScene.renderAndStep();
-		expect(object.getY()).to.be.within(-61, -60);
-		runtimeScene.renderAndStep();
-		expect(object.getY()).to.be.within(-67, -66);
-		expect(object.getBehavior("auto1").isJumping()).to.be(true);
+    // Check that the jump starts properly, and is not stopped on the jumpthru
+    object.getBehavior('auto1').simulateJumpKey();
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-39, -38);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-47, -46);
+    runtimeScene.renderAndStep();
+    // At this step, the object is almost on the jumpthru (-53 + 20 (object height) = -33 (jump thru Y position)),
+    // but the object should not stop.
+    expect(object.getY()).to.be.within(-54, -53);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-61, -60);
+    runtimeScene.renderAndStep();
+    expect(object.getY()).to.be.within(-67, -66);
+    expect(object.getBehavior('auto1').isJumping()).to.be(true);
 
-		// Continue the simulation and check that position is correct in the middle of the jump
-		for(var i = 0; i<20; ++i) {
-			runtimeScene.renderAndStep();
-		}
-		expect(object.getY()).to.be.within(-89, -88);
+    // Continue the simulation and check that position is correct in the middle of the jump
+    for (var i = 0; i < 20; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be.within(-89, -88);
 
-		// Continue simulation and check that we arrive on the jumpthru
-		for(var i = 0; i<10; ++i) {
-			runtimeScene.renderAndStep();
-		}
-		expect(object.getY()).to.be.within(jumpthru.getY() - object.getHeight(), jumpthru.getY() - object.getHeight() + 1);
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-	});
+    // Continue simulation and check that we arrive on the jumpthru
+    for (var i = 0; i < 10; ++i) {
+      runtimeScene.renderAndStep();
+    }
+    expect(object.getY()).to.be.within(
+      jumpthru.getY() - object.getHeight(),
+      jumpthru.getY() - object.getHeight() + 1
+    );
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+  });
 });
 
 describe('gdjs.PlatformerObjectRuntimeBehavior, rounded coordinates (moving platforms)', function() {
-	var runtimeGame = new gdjs.RuntimeGame({variables: [], properties: {windowWidth: 800, windowHeight: 600}});
-	var runtimeScene = new gdjs.RuntimeScene(runtimeGame);
-	runtimeScene.loadFromScene({
-		layers: [{name: "", visibility: true}],
-		variables: [],
-		behaviorsSharedData: [],
-		objects: [],
-		instances: []
-	});
-	runtimeScene._timeManager.getElapsedTime = function() { return 1 / 60 * 1000; };
+  const runtimeScene = makeTestRuntimeScene();
 
-	//Put a platformer object on a platform.
-	var object = new gdjs.RuntimeObject(runtimeScene, {name: "obj1", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformerObjectBehavior",
-		name: "auto1",
-		roundCoordinates: true,
-		gravity: 900,
-		maxFallingSpeed: 1500,
-		acceleration: 500,
-		deceleration: 1500,
-		maxSpeed: 500,
-		jumpSpeed: 1500,
-		canGrabPlatforms: true,
-		ignoreDefaultControls: true,
-		slopeMaxAngle: 60
-	}]});
-	object.getWidth = function() { return 10; };
-	object.getHeight = function() { return 20; };
-	runtimeScene.addObject(object);
-	object.setPosition(0, -30);
+  //Put a platformer object on a platform.
+  var object = new gdjs.RuntimeObject(runtimeScene, {
+    name: 'obj1',
+    type: '',
+    behaviors: [
+      {
+        type: 'PlatformBehavior::PlatformerObjectBehavior',
+        name: 'auto1',
+        roundCoordinates: true,
+        gravity: 900,
+        maxFallingSpeed: 1500,
+        acceleration: 500,
+        deceleration: 1500,
+        maxSpeed: 500,
+        jumpSpeed: 1500,
+        canGrabPlatforms: true,
+        ignoreDefaultControls: true,
+        slopeMaxAngle: 60,
+      },
+    ],
+  });
+  object.getWidth = function() {
+    return 10;
+  };
+  object.getHeight = function() {
+    return 20;
+  };
+  runtimeScene.addObject(object);
+  object.setPosition(0, -30);
 
-	//Put a platform
-	var platform = new gdjs.RuntimeObject(runtimeScene, {name: "obj2", type: "", behaviors: [{
-		type: "PlatformBehavior::PlatformBehavior",
-		canBeGrabbed: true,
-	}]});
-	platform.getWidth = function() { return 60; };
-	platform.getHeight = function() { return 32; };
-	runtimeScene.addObject(platform);
-	platform.setPosition(0, -10);
+  //Put a platform
+  const platform = addPlatformObject(runtimeScene);
+  platform.setPosition(0, -10);
 
-	it('follows the platform', function() {
-		for(var i = 0; i<30; ++i) {
-			runtimeScene.renderAndStep();
-		}
+  it('follows the platform', function() {
+    for (var i = 0; i < 30; ++i) {
+      runtimeScene.renderAndStep();
+    }
 
-		// Check the object has not moved.
-		expect(object.getY()).to.be(-30);
-		expect(object.getX()).to.be(0);
-		expect(object.getBehavior("auto1").isOnFloor()).to.be(true);
-		expect(object.getBehavior("auto1").isFalling()).to.be(false);
-		expect(object.getBehavior("auto1").isMoving()).to.be(false);
+    // Check the object has not moved.
+    expect(object.getY()).to.be(-30);
+    expect(object.getX()).to.be(0);
+    expect(object.getBehavior('auto1').isOnFloor()).to.be(true);
+    expect(object.getBehavior('auto1').isFalling()).to.be(false);
+    expect(object.getBehavior('auto1').isMoving()).to.be(false);
 
-		// Check that the object follow the platform, even if the
-		// movement is less than one pixel.
-		platform.setX(platform.getX()+0.12);
-		runtimeScene.renderAndStep();
-		platform.setX(platform.getX()+0.12);
-		runtimeScene.renderAndStep();
-		platform.setX(platform.getX()+0.12);
-		runtimeScene.renderAndStep();
+    // Check that the object follow the platform, even if the
+    // movement is less than one pixel.
+    platform.setX(platform.getX() + 0.12);
+    runtimeScene.renderAndStep();
+    platform.setX(platform.getX() + 0.12);
+    runtimeScene.renderAndStep();
+    platform.setX(platform.getX() + 0.12);
+    runtimeScene.renderAndStep();
 
-		expect(object.getX()).to.be(0.36);
-	});
+    expect(object.getX()).to.be(0.36);
+  });
 });

Extensions/SystemInfo/Extension.cpp

@@ -42,6 +42,21 @@ void DeclareSystemInfoExtension(gd::PlatformExtension& extension) {
       .AddCodeOnlyParameter("currentScene", "")
       .SetFunctionName("SystemInfo::IsWebGLSupported")
       .SetIncludeFile("SystemInfo/SystemInfoTools.h");
+
+  extension
+      .AddCondition(
+          "IsPreview",
+          _("Is the game running as a preview"),
+          _(
+            "Check if the game is currently being previewed in the editor. "
+            "This can be used to enable a \"Debug mode\" or do some work only in previews."
+          ),
+          _("The game is being previewed in the editor"),
+          _("System information"),
+          "CppPlatform/Extensions/systeminfoicon24.png",
+          "CppPlatform/Extensions/systeminfoicon16.png")
+
+      .AddCodeOnlyParameter("currentScene", "");
 #endif
 }
 

Extensions/SystemInfo/JsExtension.cpp

@@ -31,6 +31,10 @@ class SystemInfoJsExtension : public gd::PlatformExtension {
         .codeExtraInformation
         .SetIncludeFile("Extensions/SystemInfo/systeminfotools.js")
         .SetFunctionName("gdjs.evtTools.systemInfo.isWebGLSupported");
+    GetAllConditions()["SystemInfo::IsPreview"]
+        .codeExtraInformation
+        .SetIncludeFile("Extensions/SystemInfo/systeminfotools.js")
+        .SetFunctionName("gdjs.evtTools.systemInfo.isPreview");
 
     StripUnimplementedInstructionsAndExpressions();
     GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION();

Extensions/SystemInfo/systeminfotools.js

@@ -36,4 +36,13 @@ gdjs.evtTools.systemInfo.isMobile = function() {
  */
 gdjs.evtTools.systemInfo.isWebGLSupported = function(runtimeScene) {
 	return runtimeScene.getGame().getRenderer().isWebGLSupported();
-};
+};
+
+/**
+ * Check if the game is running as a preview, launched from an editor.
+ * @param {gdjs.RuntimeScene} runtimeScene The current scene.
+ * @returns {boolean} true if the game is running as a preview.
+ */
+gdjs.evtTools.systemInfo.isPreview = function(runtimeScene) {
+	return runtimeScene.getGame().isPreview();
+};

GDJS/GDJS/Events/Builtin/JsCodeEvent.cpp

@@ -18,9 +18,32 @@ using namespace std;
 
 namespace gdjs {
 
+vector<pair<gd::Expression*, gd::ParameterMetadata> >
+    JsCodeEvent::GetAllExpressionsWithMetadata() {
+  vector<pair<gd::Expression*, gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&parameterObjects, metadata));
+
+  return allExpressionsWithMetadata;
+}
+
+vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+    JsCodeEvent::GetAllExpressionsWithMetadata() const {
+  vector<pair<const gd::Expression*, const gd::ParameterMetadata> >
+      allExpressionsWithMetadata;
+  auto metadata = gd::ParameterMetadata().SetType("object");
+  allExpressionsWithMetadata.push_back(
+      std::make_pair(&parameterObjects, metadata));
+
+  return allExpressionsWithMetadata;
+}
+
 void JsCodeEvent::SerializeTo(gd::SerializerElement& element) const {
   element.AddChild("inlineCode").SetValue(inlineCode);
-  element.AddChild("parameterObjects").SetValue(parameterObjects);
+  element.AddChild("parameterObjects")
+      .SetValue(parameterObjects.GetPlainString());
   element.AddChild("useStrict").SetValue(useStrict);
 }
 
@@ -28,7 +51,9 @@ void JsCodeEvent::UnserializeFrom(gd::Project& project,
                                   const gd::SerializerElement& element) {
   inlineCode = element.GetChild("inlineCode").GetValue().GetString();
   parameterObjects =
-      element.GetChild("parameterObjects").GetValue().GetString();
+      gd::Expression(element.GetChild("parameterObjects")
+                         .GetValue()
+                         .GetString());
 
   if (!element.HasChild("useStrict")) {
     // Compatibility with GD <= 5.0.0-beta68

GDJS/GDJS/Events/Builtin/JsCodeEvent.h

@@ -6,6 +6,7 @@
 #ifndef JSCODEEVENT_H
 #define JSCODEEVENT_H
 #include "GDCore/Events/Event.h"
+#include "GDCore/Events/Expression.h"
 namespace gd {
 class Instruction;
 class Project;
@@ -31,11 +32,16 @@ class JsCodeEvent : public gd::BaseEvent {
   const gd::String& GetInlineCode() const { return inlineCode; };
   void SetInlineCode(const gd::String& code) { inlineCode = code; };
 
-  const gd::String& GetParameterObjects() const { return parameterObjects; };
+  const gd::String& GetParameterObjects() const { return parameterObjects.GetPlainString(); };
   void SetParameterObjects(const gd::String& objectName) {
-    parameterObjects = objectName;
+    parameterObjects = gd::Expression(objectName);
   };
 
+  virtual std::vector<std::pair<gd::Expression*, gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata();
+  virtual std::vector<std::pair<const gd::Expression*, const gd::ParameterMetadata> >
+      GetAllExpressionsWithMetadata() const;
+
   virtual void SerializeTo(gd::SerializerElement& element) const;
   virtual void UnserializeFrom(gd::Project& project,
                                const gd::SerializerElement& element);
@@ -44,9 +50,9 @@ class JsCodeEvent : public gd::BaseEvent {
  private:
   void Init(const JsCodeEvent& event);
 
-  gd::String inlineCode;        ///< Contains the Javacript code of the event.
-  gd::String parameterObjects;  ///< Name of the (group of) objects to pass as
-                                ///< parameter.
+  gd::String inlineCode;            ///< Contains the Javacript code of the event.
+  gd::Expression parameterObjects;  ///< Name of the (group of) objects to pass as
+                                    ///< parameter.
   bool useStrict;  ///< Should the generated JS function have "use strict". true
                    ///< by default. Should be removed once all the game engine
                    ///< is using "use strict".

GDJS/GDJS/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -4,7 +4,9 @@
  * reserved. This project is released under the MIT License.
  */
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
+
 #include <algorithm>
+
 #include "GDCore/CommonTools.h"
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerationContext.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
@@ -164,7 +166,7 @@ gd::String EventsCodeGenerator::GenerateBehaviorEventsFunctionCode(
       // as a parameter called "Behavior".
       "var Behavior = this.name;\n" +
       codeGenerator.GenerateEventsFunctionContext(
-          eventsFunction.GetParameters(), "Object");
+          eventsFunction.GetParameters(), "Object", "Behavior");
 
   gd::String output = GenerateEventsListCompleteFunctionCode(
       project,
@@ -205,7 +207,8 @@ gd::String EventsCodeGenerator::GenerateEventsFunctionParameterDeclarationsList(
 
 gd::String EventsCodeGenerator::GenerateEventsFunctionContext(
     const vector<gd::ParameterMetadata>& parameters,
-    const gd::String& thisObjectName) {
+    const gd::String& thisObjectName,
+    const gd::String& thisBehaviorName) {
   // When running in the context of a function generated from events, we
   // need some indirection to deal with objects, behaviors and parameters in
   // general:
@@ -214,32 +217,61 @@ gd::String EventsCodeGenerator::GenerateEventsFunctionContext(
   // of objects.
   // * Behaviors are passed as string, representing the name of the behavior.
   // This can differ from the name used to refer to the behavior in the events
-  // of the function (for example, a behavior can simply called "Behavior" in
+  // of the function (for example, a behavior can simply be called "Behavior" in
   // the parameter name).
   // * For other parameters, allow to access to them without transformation.
   // Conditions/expressions are available to deal with them in events.
 
   gd::String objectsGettersMap;
-  gd::String behaviorsGetterMap;
-  gd::String objectsCreators;
+  gd::String objectArraysMap;
+  gd::String behaviorNamesMap;
   gd::String argumentsGetters;
+
+  // If we have an object considered as the current object ("this") (usually
+  // called Object in behavior events function), generate a slightly more
+  // optimized getter for it (bypassing "Object" hashmap, and directly return
+  // the array containing it).
+  if (!thisObjectName.empty()) {
+    objectsGettersMap +=
+        ConvertToStringExplicit(thisObjectName) + ": " + thisObjectName + "\n";
+    objectArraysMap +=
+        ConvertToStringExplicit(thisObjectName) + ": thisObjectList\n";
+  }
+  // If we have a behavior considered as the current behavior ("this") (usually
+  // called Behavior in behavior events function), generate a slightly more
+  // optimized getter for it.
+  if (!thisBehaviorName.empty()) {
+    behaviorNamesMap += ConvertToStringExplicit(thisBehaviorName) + ": " +
+                        thisBehaviorName + "\n";
+  }
+
   for (const auto& parameter : parameters) {
     if (parameter.GetName().empty()) continue;
 
     if (gd::ParameterMetadata::IsObject(parameter.GetType())) {
+      if (parameter.GetName() == thisObjectName) {
+        continue;
+      }
+
       // Generate map that will be used to get the lists of objects passed
-      // as parameters
+      // as parameters (either as objects lists or array).
       gd::String comma = objectsGettersMap.empty() ? "" : ", ";
       objectsGettersMap += comma +
                            ConvertToStringExplicit(parameter.GetName()) + ": " +
                            parameter.GetName() + "\n";
+      objectArraysMap += comma + ConvertToStringExplicit(parameter.GetName()) +
+                         ": gdjs.objectsListsToArray(" + parameter.GetName() +
+                         ")\n";
     } else if (gd::ParameterMetadata::IsBehavior(parameter.GetType())) {
+      if (parameter.GetName() == thisBehaviorName) {
+        continue;
+      }
+
       // Generate map that will be used to transform from behavior name used in
       // function to the "real" behavior name from the caller.
-      gd::String comma = behaviorsGetterMap.empty() ? "" : ", ";
-      behaviorsGetterMap += comma +
-                            ConvertToStringExplicit(parameter.GetName()) +
-                            ": " + parameter.GetName() + "\n";
+      gd::String comma = behaviorNamesMap.empty() ? "" : ", ";
+      behaviorNamesMap += comma + ConvertToStringExplicit(parameter.GetName()) +
+                          ": " + parameter.GetName() + "\n";
     } else {
       argumentsGetters +=
           "if (argName === " + ConvertToStringExplicit(parameter.GetName()) +
@@ -247,35 +279,27 @@ gd::String EventsCodeGenerator::GenerateEventsFunctionContext(
     }
   }
 
-  // If we have an object considered as the current object ("this") (usually
-  // called Object in behavior events function), generate a slightly more
-  // optimized getter for it (bypassing "Object" hashmap, and directly return
-  // the array containing it).
-  gd::String thisObjectGetterCode =
-      thisObjectName.empty()
-          ? ""
-          : "if (objectName === " + ConvertToStringExplicit(thisObjectName) +
-                ") { return thisObjectList; }";
-
   return gd::String("var eventsFunctionContext = {\n") +
          // The object name to parameter map:
          "  _objectsMap: {\n" + objectsGettersMap +
          "},\n"
+         // The object name to arrays map:
+         "  _objectArraysMap: {\n" +
+         objectArraysMap +
+         "},\n"
          // The behavior name to parameter map:
          "  _behaviorNamesMap: {\n" +
-         behaviorsGetterMap +
+         behaviorNamesMap +
          "},\n"
          // Function that will be used to query objects, when a new object list
-         // is needed by events.
+         // is needed by events. We assume it's used a lot by the events
+         // generated code, so we cache the arrays in a map.
          "  getObjects: function(objectName) {\n" +
-         "    " + thisObjectGetterCode +
-         "    var objectsList = "
-         "eventsFunctionContext._objectsMap[objectName];\n" +
-         "    return objectsList ? gdjs.objectsListsToArray(objectsList) : "
-         "[];\n"
+         "    return eventsFunctionContext._objectArraysMap[objectName] || "
+         "[];\n" +
          "  },\n" +
          // Function that can be used in JS code to get the lists of objects
-         // and filter/alter them.
+         // and filter/alter them (not actually used in events).
          "  getObjectsLists: function(objectName) {\n" +
          "    return eventsFunctionContext._objectsMap[objectName] || null;\n"
          "  },\n" +
@@ -283,7 +307,6 @@ gd::String EventsCodeGenerator::GenerateEventsFunctionContext(
          // can be different between the parameter name vs the actual behavior
          // name passed as argument).
          "  getBehaviorName: function(behaviorName) {\n" +
-         // TODO: Use parentEventsFunctionContext?
          "    return eventsFunctionContext._behaviorNamesMap[behaviorName];\n"
          "  },\n" +
          // Creator function that will be used to create new objects. We
@@ -294,6 +317,9 @@ gd::String EventsCodeGenerator::GenerateEventsFunctionContext(
          "  createObject: function(objectName) {\n"
          "    var objectsList = "
          "eventsFunctionContext._objectsMap[objectName];\n" +
+         // TODO: we could speed this up by storing a map of object names, but the
+         // cost of creating/storing it for each events function might not be
+         // worth it.
          "    if (objectsList) {\n" +
          "      return parentEventsFunctionContext ?\n" +
          "        "
@@ -898,24 +924,25 @@ gd::String EventsCodeGenerator::GenerateObject(
   //(references to) objects lists. We statically declare and construct them to
   // avoid re-creating them at runtime. Arrays are passed as reference in JS and
   // we always use the same static arrays, making this possible.
-  auto declareMapOfObjects = [this](
-      const std::vector<gd::String>& objects,
-      const gd::EventsCodeGenerationContext& context) {
-    gd::String objectsMapName = GetCodeNamespaceAccessor() + "mapOf";
-    gd::String mapDeclaration;
-    for (auto& objectName : objects) {
-      // The map name must be unique for each set of objects lists.
-      objectsMapName += ManObjListName(GetObjectListName(objectName, context));
+  auto declareMapOfObjects =
+      [this](const std::vector<gd::String>& objects,
+             const gd::EventsCodeGenerationContext& context) {
+        gd::String objectsMapName = GetCodeNamespaceAccessor() + "mapOf";
+        gd::String mapDeclaration;
+        for (auto& objectName : objects) {
+          // The map name must be unique for each set of objects lists.
+          objectsMapName +=
+              ManObjListName(GetObjectListName(objectName, context));
 
-      if (!mapDeclaration.empty()) mapDeclaration += ", ";
-      mapDeclaration += "\"" + ConvertToString(objectName) +
-                        "\": " + GetObjectListName(objectName, context);
-    }
+          if (!mapDeclaration.empty()) mapDeclaration += ", ";
+          mapDeclaration += "\"" + ConvertToString(objectName) +
+                            "\": " + GetObjectListName(objectName, context);
+        }
 
-    AddCustomCodeOutsideMain(objectsMapName + " = Hashtable.newFrom({" +
-                             mapDeclaration + "});");
-    return objectsMapName;
-  };
+        AddCustomCodeOutsideMain(objectsMapName + " = Hashtable.newFrom({" +
+                                 mapDeclaration + "});");
+        return objectsMapName;
+      };
 
   gd::String output;
   if (type == "objectList") {
@@ -1026,15 +1053,13 @@ gd::String EventsCodeGenerator::GenerateReferenceToUpperScopeBoolean(
     const gd::String& referenceName,
     const gd::String& referencedBoolean,
     gd::EventsCodeGenerationContext& context) {
-  if (context.GetParentContext() == NULL) return "";
+  if (context.GetCurrentConditionDepth() <= 0)
+    return "/* Code generation error: the referenced boolean can't exist as "
+           "the context has a condition depth of 0. */";
 
-  // FIXME: Using context.GetParentContext() generates the wrong boolean name in
-  // case a condition with a custom code generator is used inside another
-  // condition (i.e: as a subinstructions).
   return GenerateBooleanFullName(referenceName, context) + " = " +
-         GenerateBooleanFullName(referencedBoolean,
-                                 *context.GetParentContext()) +
-         ";\n";
+         GetCodeNamespaceAccessor() + referencedBoolean + "_" +
+         gd::String::From(context.GetCurrentConditionDepth() - 1) + ";\n";
 }
 
 gd::String EventsCodeGenerator::GenerateBooleanInitializationToFalse(

GDJS/GDJS/Events/CodeGeneration/EventsCodeGenerator.h

@@ -328,7 +328,8 @@ class EventsCodeGenerator : public gd::EventsCodeGenerator {
    */
   gd::String GenerateEventsFunctionContext(
       const std::vector<gd::ParameterMetadata>& parameters,
-      const gd::String& thisObjectName = "");
+      const gd::String& thisObjectName = "",
+      const gd::String& thisBehaviorName = "");
 
   gd::String GenerateEventsFunctionReturn(
       const gd::EventsFunction& eventFunction);

GDJS/GDJS/IDE/Exporter.cpp

@@ -39,7 +39,10 @@ bool Exporter::ExportLayoutForPixiPreview(gd::Project& project,
                                           gd::Layout& layout,
                                           gd::String exportDir) {
   ExporterHelper helper(fs, gdjsRoot, codeOutputDir);
-  return helper.ExportLayoutForPixiPreview(project, layout, exportDir, "");
+  gd::SerializerElement options;
+  options.AddChild("isPreview").SetBoolValue(true);
+
+  return helper.ExportLayoutForPixiPreview(project, layout, exportDir, gd::Serializer::ToJSON(options));
 }
 
 bool Exporter::ExportExternalLayoutForPixiPreview(
@@ -49,6 +52,7 @@ bool Exporter::ExportExternalLayoutForPixiPreview(
     gd::String exportDir) {
   gd::SerializerElement options;
   options.AddChild("injectExternalLayout").SetValue(externalLayout.GetName());
+  options.AddChild("isPreview").SetBoolValue(true);
 
   ExporterHelper helper(fs, gdjsRoot, codeOutputDir);
   return helper.ExportLayoutForPixiPreview(

GDJS/GDJS/IDE/ExporterHelper.cpp

@@ -614,21 +614,23 @@ void ExporterHelper::RemoveIncludes(bool pixiRenderers,
                                     bool cocosRenderers,
                                     std::vector<gd::String> &includesFiles) {
   if (pixiRenderers) {
-    for (auto it = includesFiles.begin(); it != includesFiles.end();) {
-      if (it->find("pixi-renderer") != gd::String::npos ||
-          it->find("pixi-filter") != gd::String::npos)
-        includesFiles.erase(it++);
+    for (size_t i = 0; i < includesFiles.size();) {
+      const gd::String &includeFile = includesFiles[i];
+      if (includeFile.find("pixi-renderer") != gd::String::npos ||
+          includeFile.find("pixi-filter") != gd::String::npos)
+        includesFiles.erase(includesFiles.begin() + i);
       else
-        ++it;
+        ++i;
     }
   }
   if (cocosRenderers) {
-    for (auto it = includesFiles.begin(); it != includesFiles.end();) {
-      if (it->find("cocos-renderer") != gd::String::npos ||
-          it->find("cocos-shader") != gd::String::npos)
-        includesFiles.erase(it++);
+    for (size_t i = 0; i < includesFiles.size();) {
+      const gd::String &includeFile = includesFiles[i];
+      if (includeFile.find("cocos-renderer") != gd::String::npos ||
+          includeFile.find("cocos-shader") != gd::String::npos)
+        includesFiles.erase(includesFiles.begin() + i);
       else
-        ++it;
+        ++i;
     }
   }
 }

GDJS/Runtime/Electron/main.js

@@ -17,6 +17,12 @@ function createWindow() {
     useContentSize: true,
     title: "GDJS_GAME_NAME",
     backgroundColor: '#000000'
+    // To be added once upgraded to Electron 8+
+    // (or custom events to be written for each usage of electron
+    // in the game engine):
+    // ,webPreferences: {
+    //   nodeIntegration: true,
+    // }
   });
 
   // Open external link in the OS default browser

GDJS/Runtime/Electron/package.json

@@ -8,5 +8,10 @@
     "dependencies": {},
     "devDependencies": {
       "electron": "3.0.9"
+    },
+    "build": {
+        "directories": {
+            "buildResources": "buildResources"
+        }
     }
-  }
+}

GDJS/Runtime/cocos-renderers/cocos-image-manager.js

@@ -9,7 +9,7 @@
  *
  * @class CocosImageManager
  * @memberof gdjs
- * @param {Object} resources The resources data of the game.
+ * @param {ResourceData[]} resources The resources data of the game.
  */
 gdjs.CocosImageManager = function(resources)
 {

GDJS/Runtime/cocos-renderers/layer-cocos-renderer.js

@@ -16,7 +16,7 @@ gdjs.LayerCocosRenderer = function(layer, runtimeSceneRenderer)
     this._layer = layer;
     this.convertYPosition = runtimeSceneRenderer.convertYPosition;
 
-    var effects = this._layer.getEffects();
+    var effects = this._layer.getEffectsData();
     if (effects.length === 0) {
         this._cocosLayer = new CocosLayer();
         runtimeSceneRenderer.getCocosScene().addChild(this._cocosLayer);
@@ -60,7 +60,7 @@ gdjs.LayerCocosRenderer.prototype._makeShaders = function() {
         return;
     }
 
-    var effects = this._layer.getEffects();
+    var effects = this._layer.getEffectsData();
     if (effects.length === 0) {
         return;
     } else if (effects.length > 1) {
@@ -165,3 +165,28 @@ gdjs.LayerCocosRenderer.prototype.setEffectStringParameter = function (name, par
 gdjs.LayerCocosRenderer.prototype.setEffectBooleanParameter = function (name, parameterName, value) {
     // Unimplemented
 };
+
+gdjs.LayerCocosRenderer.prototype.hasEffect = function(name) {
+    for (var i = 0;i < this._shaders.length; ++i) {
+        if (this._shaders[i].name === name) {
+            return true;
+        }
+    }
+    return false;
+};
+
+gdjs.LayerCocosRenderer.prototype.enableEffect = function(name, value) {
+    // Unimplemented
+};
+
+gdjs.LayerCocosRenderer.prototype.addEffect = function(effectData) {
+    // Unimplemented
+};
+
+gdjs.LayerCocosRenderer.prototype.removeEffect = function(effect) {
+    // Unimplemented
+};
+
+gdjs.LayerCocosRenderer.prototype.isEffectEnabled = function(name) {
+    return this.hasEffect(name);
+};

GDJS/Runtime/events-tools/commontools.js

@@ -5,15 +5,16 @@
  */
 
 /**
- * @memberof gdjs.evtTools
- * @class common
+ * @namespace common
  * @static
  * @private
  */
 gdjs.evtTools.common = gdjs.evtTools.common || {};
 
 /**
- * Get the value of a variable. Equivalent of variable.getAsNumber().
+ * Get the value of a variable. Equivalent to `variable.getAsNumber()`.
+ * @param {gdjs.Variable} variable Variable.
+ * @returns {number} The content of the variable, as a number.
  * @private
  */
 gdjs.evtTools.common.getVariableNumber = function(variable) {
@@ -21,7 +22,9 @@ gdjs.evtTools.common.getVariableNumber = function(variable) {
 };
 
 /**
- * Get the string of a variable. Equivalent of variable.getAsString().
+ * Get the string of a variable. Equivalent to `variable.getAsString()`.
+ * @param {gdjs.Variable} variable Variable.
+ * @returns {string} The content of the variable, as a string.
  * @private
  */
 gdjs.evtTools.common.getVariableString = function(variable) {
@@ -29,29 +32,32 @@ gdjs.evtTools.common.getVariableString = function(variable) {
 };
 
 /**
+ * Check if a scene variable exists.
+ * @param {gdjs.RuntimeScene} runtimeScene The scene.
+ * @param {string} variableName Name of the scene variable.
+ * @returns {boolean} true if the scene variable exits, false otherwise.
  * @private
  */
-gdjs.evtTools.common.sceneVariableExists = function(
-  runtimeScene,
-  variableName
-) {
+gdjs.evtTools.common.sceneVariableExists = function(runtimeScene, variableName) {
   return runtimeScene.getVariables().has(variableName);
 };
 
 /**
+ * Check if a global variable exists.
+ * @param {gdjs.RuntimeScene} runtimeScene The scene.
+ * @param {string} variableName Name of the global variable.
+ * @returns {boolean} true if the global variable exits, false otherwise.
  * @private
  */
-gdjs.evtTools.common.globalVariableExists = function(
-  runtimeScene,
-  variableName
-) {
-  return runtimeScene
-    .getGame()
-    .getVariables()
-    .has(variableName);
+gdjs.evtTools.common.globalVariableExists = function(runtimeScene, variableName) {
+  return runtimeScene.getGame().getVariables().has(variableName);
 };
 
 /**
+ * Check if a child exists in a variable.
+ * @param {gdjs.Variable} variable Variable.
+ * @param {string} childName Name of the child.
+ * @returns {boolean} true if child exist in the variable, false otherwise.
  * @private
  */
 gdjs.evtTools.common.variableChildExists = function(variable, childName) {
@@ -59,6 +65,10 @@ gdjs.evtTools.common.variableChildExists = function(variable, childName) {
 };
 
 /**
+ * Remove the child with the given name in a variable.
+ * @param {gdjs.Variable} variable Variable.
+ * @param {string} childName Name of the child.
+ * @returns {gdjs.Variable} The new variable, with the child removed.
  * @private
  */
 gdjs.evtTools.common.variableRemoveChild = function(variable, childName) {
@@ -66,6 +76,8 @@ gdjs.evtTools.common.variableRemoveChild = function(variable, childName) {
 };
 
 /**
+ * Clear the children in a variable.
+ * @param {gdjs.Variable} variable Variable.
  * @private
  */
 gdjs.evtTools.common.variableClearChildren = function(variable) {
@@ -73,6 +85,9 @@ gdjs.evtTools.common.variableClearChildren = function(variable) {
 };
 
 /**
+ * Get the number of children in a variable.
+ * @param {gdjs.Variable} variable Variable.
+ * @returns {number} The number of children in the variable.
  * @private
  */
 gdjs.evtTools.common.getVariableChildCount = function(variable) {
@@ -81,7 +96,9 @@ gdjs.evtTools.common.getVariableChildCount = function(variable) {
 };
 
 /**
- * Convert a string to a float.
+ * Convert a string to a number.
+ * @param {boolean} str String to convert.
+ * @returns {number} The parsed number, or NaN if invalid.
  * @private
  */
 gdjs.evtTools.common.toNumber = function(str) {
@@ -90,6 +107,8 @@ gdjs.evtTools.common.toNumber = function(str) {
 
 /**
  * Convert a number to a string.
+ * @param {number} num Value to convert to a string.
+ * @returns {string} The value as a string.
  * @private
  */
 gdjs.evtTools.common.toString = function(num) {
@@ -100,97 +119,196 @@ gdjs.evtTools.common.toString = function(num) {
 
 /**
  * Negate the boolean.
+ * @param {boolean} bool The boolean to negate.
+ * @returns {boolean} The negated value.
  * @private
  */
 gdjs.evtTools.common.logicalNegation = function(bool) {
   return !bool;
 };
 
+/**
+ * Limit a value to a range.
+ * @param {number} x Value.
+ * @param {number} min The minimum value.
+ * @param {number} max The  maximum value.
+ * @returns {number} The new value.
+ */
 gdjs.evtTools.common.clamp = function(x, min, max) {
   return Math.min(Math.max(x, min), max);
 };
 
+/**
+ * Hyperbolic arc-cosine
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic arc-cosine for the value.
+ */
 gdjs.evtTools.common.acosh = function(arg) {
   // http://kevin.vanzonneveld.net
   // +   original by: Onno Marsman
   return Math.log(arg + Math.sqrt(arg * arg - 1));
 };
 
+/**
+ * Hyperbolic arcsine
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic arcsine for the value.
+ */
 gdjs.evtTools.common.asinh = function(arg) {
   // http://kevin.vanzonneveld.net
   // +   original by: Onno Marsman
   return Math.log(arg + Math.sqrt(arg * arg + 1));
 };
 
+/**
+ * Hyperbolic arctangent
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic arctangent for the value.
+ */
 gdjs.evtTools.common.atanh = function(arg) {
   // http://kevin.vanzonneveld.net
   // +   original by: Onno Marsman
   return 0.5 * Math.log((1 + arg) / (1 - arg));
 };
 
+/**
+ * Hyperbolic cosine
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic cosine for the value.
+ */
 gdjs.evtTools.common.cosh = function(arg) {
   return (Math.exp(arg) + Math.exp(-arg)) / 2;
 };
 
+/**
+ * Hyperbolic sine
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic sine for the value.
+ */
 gdjs.evtTools.common.sinh = function(arg) {
   return (Math.exp(arg) - Math.exp(-arg)) / 2;
 };
 
+/**
+ * Hyperbolic tangent
+ * @param {number} arg Value.
+ * @returns {number} The hyperbolic tangent for the value.
+ */
 gdjs.evtTools.common.tanh = function(arg) {
   return (Math.exp(arg) - Math.exp(-arg)) / (Math.exp(arg) + Math.exp(-arg));
 };
 
+/**
+ * Cotangent
+ * @param {number} arg Value.
+ * @returns {number} The cotangent for the value.
+ */
 gdjs.evtTools.common.cot = function(arg) {
   return 1 / Math.tan(arg);
 };
 
+/**
+ * Cosecant
+ * @param {number} arg Value.
+ * @returns {number} The cosecant for the value.
+ */
 gdjs.evtTools.common.csc = function(arg) {
   return 1 / Math.sin(arg);
 };
 
+/**
+ * Secant
+ * @param {number} arg Value.
+ * @returns {number} The secant for the value.
+ */
 gdjs.evtTools.common.sec = function(arg) {
   return 1 / Math.cos(arg);
 };
 
+/**
+ * Base-10 logarithm
+ * @param {number} arg Value.
+ * @returns {number} The base-10 logarithm for the value.
+ */
 gdjs.evtTools.common.log10 = function(arg) {
   return Math.log(arg) / Math.LN10;
 };
 
+/**
+ * Base-2 logarithm
+ * @param {number} arg Value.
+ * @returns {number} The base-2 logarithm for the value.
+ */
 gdjs.evtTools.common.log2 = function(arg) {
   return Math.log(arg) / Math.LN2;
 };
 
+/**
+ * Returns the sign of the number. This checks if the value is positive, negative or zero.
+ * @param {number} arg Value.
+ * @returns {number} Return the sign for the value (1, -1 or 0).
+ */
 gdjs.evtTools.common.sign = function(arg) {
   if (arg === 0) return 0;
 
   return arg > 0 ? +1 : -1;
 };
 
+/**
+ * Cube root
+ * @param {number} x Value.
+ * @returns {number} Return the cube root for the value.
+ */
 gdjs.evtTools.common.cbrt = function(x) {
   return Math.pow(x, 1 / 3);
 };
 
+/**
+ * N-th root
+ * @param {number} x Base value.
+ * @param {number} n Exponent value.
+ * @returns {number} Return the n-th root for the value.
+ */
 gdjs.evtTools.common.nthroot = function(x, n) {
   return Math.pow(x, 1 / n);
 };
 
+/**
+ * Modulo operation (the remainder after dividing one number by another)
+ * @param {number} x Dividend value.
+ * @param {number} y Divisor value.
+ * @returns {number} Return the remainder for the values.
+ */
 gdjs.evtTools.common.mod = function(x, y) {
   return x - y * Math.floor(x / y);
 };
 
+/**
+ * Returns the difference between two angles, in degrees.
+ * @param {number} angle1 First angle, in degrees.
+ * @param {number} angle2 Second angle, in degrees.
+ * @returns {number} Return the difference of the angles, in degrees.
+ */
 gdjs.evtTools.common.angleDifference = function(angle1, angle2) {
-  return (
-    gdjs.evtTools.common.mod(
-      gdjs.evtTools.common.mod(angle1 - angle2, 360.0) + 180.0,
-      360.0
-    ) - 180.0
-  );
+  return gdjs.evtTools.common.mod(gdjs.evtTools.common.mod(angle1 - angle2, 360.0) + 180.0, 360.0) - 180.0;
 };
 
+/**
+ * Runs a linear interpolation between a and b.
+ * @param {number} a Start value.
+ * @param {number} b End value.
+ * @param {number} x The interpolation value between 0 and 1.
+ * @returns {number} The interpolated value, now between a and b.
+ */
 gdjs.evtTools.common.lerp = function(a, b, x) {
   return a + (b - a) * x;
 };
 
+/**
+ * Truncate a number.
+ * @param {number} x Value.
+ * @returns {number} Return the value with all decimal places dropped.
+ */
 gdjs.evtTools.common.trunc = function(x) {
   return x | 0;
 };

GDJS/Runtime/fontfaceobserver-font-manager/fontfaceobserver-font-manager.js

@@ -14,7 +14,7 @@
  *
  * @class FontFaceObserverFontManager
  * @memberof gdjs
- * @param {Object} resources The resources data of the game.
+ * @param {ResourceData[]} resources The resources data of the game.
  */
 gdjs.FontFaceObserverFontManager = function(resources)
 {
@@ -81,11 +81,9 @@ gdjs.FontFaceObserverFontManager._getFontFamilyFromFilename = function(filename)
  * used by using the font family returned by getFontFamily.
  * @param onProgress Callback called each time a new file is loaded.
  * @param onComplete Callback called when loading is done.
- * @param resources The resources to be loaded. If not specified, will load the resources
- * specified in the FontFaceObserverFontManager constructor.
  */
-gdjs.FontFaceObserverFontManager.prototype.loadFonts = function(onProgress, onComplete, resources) {
-	resources = resources || this._resources;
+gdjs.FontFaceObserverFontManager.prototype.loadFonts = function(onProgress, onComplete) {
+	var resources = this._resources;
 
 	//Construct the list of files to be loaded.
 	//For one loaded file, it can have one or more resources

GDJS/Runtime/gd.js

@@ -13,7 +13,7 @@ window.gdjs = {
   behaviorsTypes: new Hashtable(),
   /**
    * Contains functions used by events (this is a convention only, functions can actually
-   * by anywhere).
+   * be anywhere).
    * @namespace
    * @memberOf gdjs
    */

GDJS/Runtime/jsonmanager.js

@@ -14,7 +14,7 @@
  *
  * @class JsonManager
  * @memberof gdjs
- * @param {Object[]} resources The resources data of the game.
+ * @param {ResourceData[]} resources The resources data of the game.
  */
 gdjs.JsonManager = function(resources) {
   this._resources = resources;
@@ -28,14 +28,14 @@ gdjs.JsonManager = function(resources) {
  * @callback JsonManagerOnProgressCallback
  * @param {number} loaded The number of json files loaded so far
  * @param {number} total The total number to be loaded
- * @returns {undefined} Nothing
+ * @returns {void} Nothing
  */
 
 /**
  * The callback called when all jsons are preloaded
  * @callback JsonManagerOnCompleteCallback
  * @param {number} total The total number to be loaded
- * @returns {undefined} Nothing
+ * @returns {void} Nothing
  */
 
 /**

GDJS/Runtime/layer.js

@@ -11,7 +11,7 @@
  * Viewports and multiple cameras are not supported.
  *
  * @class Layer
- * @param {Object} layerData The data used to initialize the layer
+ * @param {LayerData} layerData The data used to initialize the layer
  * @param {gdjs.RuntimeScene} runtimeScene The scene in which the layer is used
  * @memberof gdjs
  */
@@ -21,7 +21,7 @@ gdjs.Layer = function(layerData, runtimeScene) {
   this._zoomFactor = 1;
   this._timeScale = 1;
   this._hidden = !layerData.visibility;
-  this._effects = layerData.effects || [];
+  this._effectsData = layerData.effects || [];
   this._cameraX = runtimeScene.getGame().getGameResolutionWidth() / 2;
   this._cameraY = runtimeScene.getGame().getGameResolutionHeight() / 2;
   this._cachedGameResolutionWidth = runtimeScene
@@ -275,10 +275,26 @@ gdjs.Layer.prototype.getHeight = function() {
   return this._cachedGameResolutionHeight;
 };
 
-gdjs.Layer.prototype.getEffects = function() {
-  return this._effects;
+gdjs.Layer.prototype.getEffectsData = function() {
+  return this._effectsData;
 };
 
+/**
+ * Add a new effect, or replace the one with the same name.
+ * @param {EffectData} effectData The data of the effect to add.
+ */
+gdjs.Layer.prototype.addEffect = function(effectData) {
+  this._renderer.addEffect(effectData);
+}
+
+/**
+ * Remove the effect with the specified name
+ * @param {string} effectName The name of the effect.
+ */
+gdjs.Layer.prototype.removeEffect = function(effectName) {
+  this._renderer.removeEffect(effectName);
+}
+
 /**
  * Change an effect parameter value (for parameters that are numbers).
  * @param {string} name The name of the effect to update.
@@ -339,28 +355,37 @@ gdjs.Layer.prototype.isEffectEnabled = function(name) {
   return this._renderer.isEffectEnabled(name);
 };
 
+/**
+ * Check if an effect exists on this layer
+ * @param {string} name The name of the effect
+ * @return {boolean} true if the effect exists, false otherwise.
+ */
+gdjs.Layer.prototype.hasEffect = function(name) {
+  return this._renderer.hasEffect(name);
+};
+
 gdjs.Layer.prototype._setEffectsDefaultParameters = function() {
-  for (var i = 0; i < this._effects.length; ++i) {
-    var effect = this._effects[i];
-    for (var name in effect.doubleParameters) {
+  for (var i = 0; i < this._effectsData.length; ++i) {
+    var effectData = this._effectsData[i];
+    for (var name in effectData.doubleParameters) {
       this.setEffectDoubleParameter(
-        effect.name,
+        effectData.name,
         name,
-        effect.doubleParameters[name]
+        effectData.doubleParameters[name]
       );
     }
-    for (var name in effect.stringParameters) {
+    for (var name in effectData.stringParameters) {
       this.setEffectStringParameter(
-        effect.name,
+        effectData.name,
         name,
-        effect.stringParameters[name]
+        effectData.stringParameters[name]
       );
     }
-    for (var name in effect.booleanParameters) {
+    for (var name in effectData.booleanParameters) {
       this.setEffectBooleanParameter(
-        effect.name,
+        effectData.name,
         name,
-        effect.booleanParameters[name]
+        effectData.booleanParameters[name]
       );
     }
   }

GDJS/Runtime/pixi-renderers/layer-pixi-renderer.js

@@ -66,47 +66,62 @@ gdjs.LayerPixiRenderer.prototype.updateTime = function() {
 };
 
 gdjs.LayerPixiRenderer.prototype._setupFilters = function() {
-  var effects = this._layer.getEffects();
-  if (effects.length === 0) {
+  var effectsData = this._layer.getEffectsData();
+  if (effectsData.length === 0) {
     return;
   }
 
-  this._filters = {};
+  this._pixiContainer.filters = [];
+  for (var i = 0; i < effectsData.length; ++i) {
+    this.addEffect(effectsData[i])
+  }
+};
 
-  // @ts-ignore
-  /** @type PIXI.Filter[] */
-  var pixiFilters = [];
-  for (var i = 0; i < effects.length; ++i) {
-    var effect = effects[i];
-    var filterCreator = gdjs.PixiFiltersTools.getFilterCreator(
-      effect.effectType
+/**
+ * Add a new effect, or replace the one with the same name.
+ * @param {EffectData} effectData The data of the effect to add.
+ */
+gdjs.LayerPixiRenderer.prototype.addEffect = function(effectData) {
+  var filterCreator = gdjs.PixiFiltersTools.getFilterCreator(
+    effectData.effectType
+  );
+  if (!filterCreator) {
+    console.log(
+      'Filter "' +
+        effectData.name +
+        '" has an unknown effect type: "' +
+        effectData.effectType +
+        '". Was it registered properly? Is the effect type correct?'
     );
-    if (!filterCreator) {
-      console.log(
-        'Filter "' +
-          effect.name +
-          '" has an unknown effect type: "' +
-          effect.effectType +
-          '". Was it registered properly? Is the effect type correct?'
-      );
-      continue;
-    }
-
-    /** @type gdjsPixiFiltersToolsFilter */
-    var filter = {
-      pixiFilter: filterCreator.makePIXIFilter(this._layer, effect),
-      updateDoubleParameter: filterCreator.updateDoubleParameter,
-      updateStringParameter: filterCreator.updateStringParameter,
-      updateBooleanParameter: filterCreator.updateBooleanParameter,
-      update: filterCreator.update,
-    };
-
-    pixiFilters.push(filter.pixiFilter);
-    this._filters[effect.name] = filter;
+    return;
   }
 
-  this._pixiContainer.filters = pixiFilters;
-};
+  /** @type gdjsPixiFiltersToolsFilter */
+  var filter = {
+    pixiFilter: filterCreator.makePIXIFilter(this._layer, effectData),
+    updateDoubleParameter: filterCreator.updateDoubleParameter,
+    updateStringParameter: filterCreator.updateStringParameter,
+    updateBooleanParameter: filterCreator.updateBooleanParameter,
+    update: filterCreator.update,
+  };
+
+  this._pixiContainer.filters = (this._pixiContainer.filters || [])
+    .concat(filter.pixiFilter);
+  this._filters[effectData.name] = filter;
+}
+
+/**
+ * Remove the effect with the specified name
+ * @param {string} effectName The name of the effect.
+ */
+gdjs.LayerPixiRenderer.prototype.removeEffect = function(effectName) {
+  var filter = this._filters[effectName];
+  if (!filter) return;
+
+  this._pixiContainer.filters = (this._pixiContainer.filters || [])
+    .filter(function(pixiFilter) { return pixiFilter !== filter.pixiFilter; });
+  delete this._filters[effectName];
+}
 
 /**
  * Add a child to the pixi container associated to the layer.
@@ -203,6 +218,15 @@ gdjs.LayerPixiRenderer.prototype.setEffectBooleanParameter = function(
   filter.updateBooleanParameter(filter.pixiFilter, parameterName, value);
 };
 
+/**
+ * Check if an effect exists.
+ * @param {string} name The effect name
+ * @returns {boolean} True if the effect exists, false otherwise
+ */
+gdjs.LayerPixiRenderer.prototype.hasEffect = function(name) {
+  return !!this._filters[name];
+};
+
 /**
  * Enable an effect.
  * @param {string} name The effect name

GDJS/Runtime/pixi-renderers/pixi-image-manager.js

@@ -9,7 +9,7 @@
  *
  * @class PixiImageManager
  * @memberof gdjs
- * @param {Object} resources The resources data of the game.
+ * @param {ResourceData[]} resources The resources data of the game.
  */
 gdjs.PixiImageManager = function(resources)
 {
@@ -111,11 +111,9 @@ gdjs.PixiImageManager.prototype.getInvalidPIXITexture = function() {
  * used by calling `getPIXITexture`.
  * @param onProgress Callback called each time a new file is loaded.
  * @param onComplete Callback called when loading is done.
- * @param resources The resources to be loaded. If not specified, will load the resources
- * specified in the PixiImageManager constructor.
  */
-gdjs.PixiImageManager.prototype.loadTextures = function(onProgress, onComplete, resources) {
-	resources = resources || this._resources;
+gdjs.PixiImageManager.prototype.loadTextures = function(onProgress, onComplete) {
+	var resources = this._resources;
 
 	//Construct the list of files to be loaded.
 	//For one loaded file, it can have one or more resources

GDJS/Runtime/runtimegame.js

@@ -1,3 +1,4 @@
+// @ts-check
 /*
  * GDevelop JS Platform
  * Copyright 2013-2016 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
@@ -9,28 +10,28 @@
  *
  * @memberof gdjs
  * @class RuntimeGame
- * @param {Object} data The object (usually stored in data.json) containing the full project data
- * @param {Object=} spec Optional object for specifiying additional options: {forceFullscreen: ...}
+ * @param {ProjectData} data The object (usually stored in data.json) containing the full project data
+ * @param {Object=} options Optional object for specifiying additional options: {forceFullscreen: ...}
  */
-gdjs.RuntimeGame = function(data, spec) {
-  spec = spec || {};
+gdjs.RuntimeGame = function(data, options) {
+  options = options || {};
 
   this._variables = new gdjs.VariablesContainer(data.variables);
   this._data = data;
   this._imageManager = new gdjs.ImageManager(
-    data.resources ? data.resources.resources : undefined
+    data.resources.resources
   );
   this._soundManager = new gdjs.SoundManager(
-    data.resources ? data.resources.resources : undefined
+    data.resources.resources
   );
   this._fontManager = new gdjs.FontManager(
-    data.resources ? data.resources.resources : undefined
+    data.resources.resources
   );
   this._jsonManager = new gdjs.JsonManager(
-    data.resources ? data.resources.resources : undefined
+    data.resources.resources
   );
-  this._maxFPS = data ? parseInt(data.properties.maxFPS, 10) : 60;
-  this._minFPS = data ? parseInt(data.properties.minFPS, 10) : 15;
+  this._maxFPS = data ? data.properties.maxFPS : 60;
+  this._minFPS = data ? data.properties.minFPS : 15;
 
   this._gameResolutionWidth = data.properties.windowWidth;
   this._gameResolutionHeight = data.properties.windowHeight;
@@ -43,7 +44,7 @@ gdjs.RuntimeGame = function(data, spec) {
   this._scaleMode = data.properties.scaleMode || 'linear';
   this._renderer = new gdjs.RuntimeGameRenderer(
     this,
-    spec.forceFullscreen || false
+    options.forceFullscreen || false
   );
 
   //Game loop management (see startGameLoop method)
@@ -55,12 +56,24 @@ gdjs.RuntimeGame = function(data, spec) {
   this._inputManager = new gdjs.InputManager();
 
   //Allow to specify an external layout to insert in the first scene:
-  this._injectExternalLayout = spec.injectExternalLayout || '';
+  this._injectExternalLayout = options.injectExternalLayout || '';
+  this._options = options;
 
   //Optional client to connect to a debugger:
   this._debuggerClient = gdjs.DebuggerClient
     ? new gdjs.DebuggerClient(this)
     : null;
+
+  /** @type {boolean} */
+  this._isPreview = options.isPreview || false;
+};
+
+/**
+ * Return the additional options passed to the RuntimeGame when created.
+ * @returns {?Object} The additional options, if any.
+ */
+gdjs.RuntimeGame.prototype.getAdditionalOptions = function() {
+  return this._options;
 };
 
 gdjs.RuntimeGame.prototype.getRenderer = function() {
@@ -77,25 +90,28 @@ gdjs.RuntimeGame.prototype.getVariables = function() {
 
 /**
  * Get the gdjs.SoundManager of the RuntimeGame.
- * @return {gdjs.SoundManager} The sound manager.
+ * @return {gdjs.HowlerSoundManager | gdjs.CocosSoundManager} The sound manager.
  */
 gdjs.RuntimeGame.prototype.getSoundManager = function() {
+  // @ts-ignore
   return this._soundManager;
 };
 
 /**
  * Get the gdjs.ImageManager of the RuntimeGame.
- * @return {gdjs.ImageManager} The image manager.
+ * @return {gdjs.PixiImageManager | gdjs.CocosImageManager} The image manager.
  */
 gdjs.RuntimeGame.prototype.getImageManager = function() {
+  // @ts-ignore
   return this._imageManager;
 };
 
 /**
  * Get the gdjs.FontManager of the RuntimeGame.
- * @return {gdjs.FontManager} The font manager.
+ * @return {gdjs.FontFaceObserverFontManager} The font manager.
  */
 gdjs.RuntimeGame.prototype.getFontManager = function() {
+  // @ts-ignore
   return this._fontManager;
 };
 
@@ -119,7 +135,7 @@ gdjs.RuntimeGame.prototype.getJsonManager = function() {
 
 /**
  * Get the object containing the game data
- * @return {Object} The object associated to the game.
+ * @return {ProjectData} The object associated to the game.
  */
 gdjs.RuntimeGame.prototype.getGameData = function() {
   return this._data;
@@ -128,11 +144,11 @@ gdjs.RuntimeGame.prototype.getGameData = function() {
 /**
  * Get the data associated to a scene.
  *
- * @param {string} sceneName The name of the scene. If not defined, the first scene will be returned.
- * @return {?Object} The data associated to the scene.
+ * @param {string=} sceneName The name of the scene. If not defined, the first scene will be returned.
+ * @return {?LayoutData} The data associated to the scene.
  */
 gdjs.RuntimeGame.prototype.getSceneData = function(sceneName) {
-  var scene = undefined;
+  var scene = null;
   for (var i = 0, len = this._data.layouts.length; i < len; ++i) {
     var sceneData = this._data.layouts[i];
 
@@ -142,7 +158,7 @@ gdjs.RuntimeGame.prototype.getSceneData = function(sceneName) {
     }
   }
 
-  if (scene === undefined)
+  if (scene === null)
     console.warn('The game has no scene called "' + sceneName + '"');
 
   return scene;
@@ -172,7 +188,7 @@ gdjs.RuntimeGame.prototype.hasScene = function(sceneName) {
  * Get the data associated to an external layout.
  *
  * @param {string} name The name of the external layout.
- * @return {?Object} The data associated to the external layout or null if not found.
+ * @return {?ExternalLayoutData} The data associated to the external layout or null if not found.
  */
 gdjs.RuntimeGame.prototype.getExternalLayoutData = function(name) {
   var externalLayout = null;
@@ -190,7 +206,7 @@ gdjs.RuntimeGame.prototype.getExternalLayoutData = function(name) {
 
 /**
  * Get the data representing all the global objects of the game.
- * @return {Object} The data associated to the global objects.
+ * @return {ObjectData[]} The data associated to the global objects.
  */
 gdjs.RuntimeGame.prototype.getInitialObjectsData = function() {
   return this._data.objects || [];
@@ -424,6 +440,7 @@ gdjs.RuntimeGame.prototype.startGameLoop = function() {
   //Load the first scene
   var firstSceneName = this._data.firstLayout;
   this._sceneStack.push(
+    // @ts-ignore - no risk of null object.
     this.hasScene(firstSceneName) ? firstSceneName : this.getSceneData().name,
     this._injectExternalLayout
   );
@@ -515,7 +532,7 @@ gdjs.RuntimeGame.prototype.startCurrentSceneProfiler = function(
  */
 gdjs.RuntimeGame.prototype.stopCurrentSceneProfiler = function() {
   var currentScene = this._sceneStack.getCurrentScene();
-  if (!currentScene) return null;
+  if (!currentScene) return;
 
   currentScene.stopProfiler();
 };
@@ -526,3 +543,19 @@ gdjs.RuntimeGame.prototype.stopCurrentSceneProfiler = function() {
 gdjs.RuntimeGame.prototype.wasFirstSceneLoaded = function() {
   return this._sceneStack.wasFirstSceneLoaded();
 }
+
+/**
+ * Return the stack of {@link gdjs.RuntimeScene} being played.
+ * @returns {gdjs.SceneStack}
+ */
+gdjs.RuntimeGame.prototype.getSceneStack = function() {
+  return this._sceneStack;
+}
+
+/**
+ * Check if the game is running as a preview, launched from an editor.
+ * @returns {boolean} true if the current game is a preview.
+ */
+gdjs.RuntimeGame.prototype.isPreview = function() {
+  return this._isPreview;
+}

GDJS/Runtime/runtimescene.js

@@ -144,6 +144,19 @@ gdjs.RuntimeScene.prototype.loadFromScene = function(sceneData) {
     this._timeManager.reset();
 };
 
+/**
+ * Check if an object is registered, meaning that instances of it can be created and lives in the scene.
+ * @see gdjs.RuntimeScene#registerObject
+ */
+gdjs.RuntimeScene.prototype.isObjectRegistered = function(objectName) {
+    return (
+        this._objects.containsKey(objectName) &&
+        this._instances.containsKey(objectName) &&
+        this._instancesCache.containsKey(objectName) &&
+        this._objectsCtor.containsKey(objectName)
+    );
+}
+
 /**
  * Register a {@link gdjs.RuntimeObject} so that instances of it can be used in the scene.
  * @param {ObjectData} objectData The data for the object to register.
@@ -155,6 +168,23 @@ gdjs.RuntimeScene.prototype.registerObject = function(objectData) {
     this._objectsCtor.put(objectData.name, gdjs.getObjectConstructor(objectData.type)); //And cache the constructor for the performance sake
 }
 
+/**
+ * Update the data of a {@link gdjs.RuntimeObject} so that instances use this when constructed.
+ * @param {ObjectData} objectData The data for the object to register.
+ */
+gdjs.RuntimeScene.prototype.updateObject = function(objectData) {
+    if (!this.isObjectRegistered(objectData.name)) {
+        console.warn(
+            "Tried to call updateObject for an object that was not registered (" +
+            objectData.name +
+            "). Call registerObject first."
+        );
+    }
+
+    this._objects.put(objectData.name, objectData);
+    // Don't erase instances, nor instances cache, or objectsCtor cache.
+}
+
 /**
  * Called when a scene is "paused", i.e it will be not be rendered again
  * for some time, until it's resumed or unloaded.
@@ -236,7 +266,7 @@ gdjs.RuntimeScene.prototype.unloadScene = function() {
  * Create objects from initial instances data ( for example, the initial instances
  * of the scene or from an external layout ).
  *
- * @param {Object} data The instances data
+ * @param {InstanceData[]} data The instances data
  * @param {number} xPos The offset on X axis
  * @param {number} yPos The offset on Y axis
  */
@@ -508,12 +538,22 @@ gdjs.RuntimeScene.prototype._updateObjectsPostEvents = function() {
 };
 
 /**
- * Change the background color
+ * Change the background color, by setting the RGB components.
+ * Internally, the color is stored as an hexadecimal number.
+ *
+ * @param {number} r The color red component (0-255).
+ * @param {number} g The color green component (0-255).
+ * @param {number} b The color blue component (0-255).
  */
 gdjs.RuntimeScene.prototype.setBackgroundColor = function(r,g,b) {
     this._backgroundColor = parseInt(gdjs.rgbToHex(r,g,b),16);
 };
 
+
+/**
+ * Get the background color, as an hexadecimal number.
+ * @returns {number} The current background color.
+ */
 gdjs.RuntimeScene.prototype.getBackgroundColor = function() {
     return this._backgroundColor;
 }

GDJS/Runtime/spriteruntimeobject.js

@@ -19,6 +19,7 @@
 
 /**
  * @typedef {Object} SpriteCenterPointData Represents the center point in a frame.
+ * @property {string} name Name of the point.
  * @property {boolean} automatic Is the center automatically computed?
  * @property {number} x X position of the point.
  * @property {number} y Y position of the point.
@@ -28,7 +29,7 @@
  * @typedef {Object} SpriteFrameData Represents a {@link gdjs.SpriteAnimationFrame}.
  * @property {string} [image] The resource name of the image used in this frame.
  * @property {Array<SpriteCustomPointData>} [points] The points of the frame.
- * @property {SpritePoint} originPoint The origin point.
+ * @property {SpriteCustomPointData} originPoint The origin point.
  * @property {SpriteCenterPointData} centerPoint The center of the frame.
  * @property {boolean} hasCustomCollisionMask Is The collision mask custom?
  * @property {Array<Array<SpritePoint>>} [customCollisionMask] The collision mask if it is custom.
@@ -52,7 +53,7 @@
  * @typedef {Object} SpriteObjectDataType Represents the data of a {@link gdjs.SpriteRuntimeObject}.
  * @property {boolean} updateIfNotVisible Update the object even if he is not visible?.
  * @property {Array<SpriteAnimationData>} animations The list of {@link SpriteAnimationData} representing {@link gdjs.SpriteAnimation} instances.
- * 
+ *
  * @typedef {ObjectData & SpriteObjectDataType} SpriteObjectData
  */
 
@@ -264,7 +265,7 @@ gdjs.SpriteRuntimeObject = function(runtimeScene, spriteObjectData) {
     this._updateIfNotVisible = !!spriteObjectData.updateIfNotVisible;
 
     //Animations:
-    
+
     if ( this._animations === undefined ) {
         /** @type {Array<gdjs.SpriteAnimation>} */
         this._animations = [];

GDJS/Runtime/types/global-types.js

@@ -0,0 +1,22 @@
+/*
+ * GDevelop JS Platform
+ * Copyright 2013-present Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * This project is released under the MIT License.
+ */
+
+// Import all the types as global typedefs so that they can be used
+// in any JS file of the game engine/extensions/tests. This file is not read by JSDoc
+// because it's not compatible with these TypeScript definitions and import.
+/**
+ * @typedef { import("./project-data").ProjectData } ProjectData
+ * @typedef { import("./project-data").ProjectPropertiesData } ProjectPropertiesData
+ * @typedef { import("./project-data").LoadingScreenData } LoadingScreenData
+ * @typedef { import("./project-data").LayoutData } LayoutData
+ * @typedef { import("./project-data").ExternalLayoutData } ExternalLayoutData
+ * @typedef { import("./project-data").InstanceData } InstanceData
+ * @typedef { import("./project-data").LayerData } LayerData
+ * @typedef { import("./project-data").CameraData } CameraData
+ * @typedef { import("./project-data").EffectData } EffectData
+ * @typedef { import("./project-data").ResourceData } ResourceData
+ * @typedef { import("./project-data").ResourcesData } ResourcesData
+ */

GDJS/Runtime/types/project-data.d.ts

@@ -0,0 +1,168 @@
+/*
+ * GDevelop JS Platform
+ * Copyright 2013-present Florian Rival (Florian.Rival@gmail.com). All rights reserved.
+ * This project is released under the MIT License.
+ */
+
+// ⚠️ While this file is a TypeScript type definitions file, it's used only
+// for describing a serialized exported project. The game engine itself is still typed
+// using JSDoc style annotations (see https://www.typescriptlang.org/docs/handbook/type-checking-javascript-files.html#supported-jsdoc).
+
+// ℹ️ See this doc about supported JavaScript features and type checking in the
+// game engine: https://github.com/4ian/GDevelop/blob/master/newIDE/docs/Supported-JavaScript-features-and-coding-style.md
+
+/**
+ * Contains the data of a serialized exported project.
+ */
+export interface ProjectData {
+  firstLayout: string;
+  gdVersion: GdVersionData;
+  properties: ProjectPropertiesData;
+  resources: ResourcesData;
+  objects: ObjectData[];
+  variables: any[];
+  layouts: LayoutData[];
+  externalLayouts: ExternalLayoutData[];
+}
+
+export interface GdVersionData {
+  build: number;
+  major: number;
+  minor: number;
+  revision: number;
+}
+
+export interface LayoutData {
+  r: number;
+  v: number;
+  b: number;
+  mangledName: string;
+  name: string;
+  stopSoundsOnStartup: boolean;
+  title: string;
+  variables: VariableData[];
+  instances: InstanceData[];
+  objects: ObjectData[];
+  layers: LayerData[];
+  behaviorsSharedData: BehaviorsSharedDatum[];
+}
+
+export interface BehaviorsSharedDatum {
+  name: string;
+  type: string;
+}
+
+export interface ExternalLayoutData {
+  name: string;
+  instances: InstanceData[];
+}
+
+export interface InstanceData {
+  persistentUuid: string;
+  angle: number;
+  customSize: boolean;
+  height: number;
+  layer: string;
+  locked: boolean;
+  name: string;
+  width: number;
+  x: number;
+  y: number;
+  zOrder: number;
+  numberProperties: InstanceNumberProperty[];
+  stringProperties: InstanceStringProperty[];
+  initialVariables: VariableData[];
+}
+
+export interface InstanceNumberProperty {
+  name: string;
+  value: number;
+}
+export interface InstanceStringProperty {
+  name: string;
+  value: number;
+}
+
+export interface LayerData {
+  name: string;
+  visibility: boolean;
+  cameras: CameraData[];
+  effects: EffectData[];
+}
+
+export interface CameraData {
+  defaultSize: boolean;
+  defaultViewport: boolean;
+  height: number;
+  viewportBottom: number;
+  viewportLeft: number;
+  viewportRight: number;
+  viewportTop: number;
+  width: number;
+}
+
+export interface EffectData {
+  effectType: string;
+  name: string;
+  doubleParameters: {
+    [name: string]: number;
+  };
+  stringParameters: {
+    [name: string]: string;
+  };
+  booleanParameters: {
+    [name: string]: boolean;
+  };
+}
+
+export interface ProjectPropertiesData {
+  adMobAppId: string;
+  adaptGameResolutionAtRuntime: boolean;
+  folderProject: boolean;
+  linuxExecutableFilename: string;
+  macExecutableFilename: string;
+  orientation: string;
+  packageName: string;
+  projectFile: string;
+  scaleMode: string;
+  sizeOnStartupMode: string;
+  useExternalSourceFiles: boolean;
+  version: string;
+  winExecutableFilename: string;
+  winExecutableIconFile: string;
+  name: string;
+  author: string;
+  windowWidth: number;
+  windowHeight: number;
+  latestCompilationDirectory: string;
+  maxFPS: number;
+  minFPS: number;
+  verticalSync: boolean;
+  loadingScreen: LoadingScreenData;
+  currentPlatform: string;
+}
+
+export interface LoadingScreenData {
+  showGDevelopSplash: boolean;
+}
+
+export interface ResourcesData {
+  resources: ResourceData[];
+}
+
+export interface ResourceData {
+  alwaysLoaded?: boolean;
+  file: string;
+  kind: ResourceKind;
+  metadata: string;
+  name: string;
+  smoothed?: boolean;
+  userAdded: boolean;
+}
+
+export enum ResourceKind {
+  Audio = 'audio',
+  Image = 'image',
+  Font = 'font',
+  Video = 'video',
+}

GDJS/Runtime/websocket-debugger-client/websocket-debugger-client.js

@@ -1,59 +1,54 @@
+/// @ts-check
 /**
  * An client side implementation of the Debugger
  * @interface
  */
-gdjs.DebuggerClient = function() {} // Necessary for Interface definition 
+gdjs.IDebuggerClient = function() {}
 
 /**
  * Update a value, specified by a path starting from the {@link RuntimeGame} instance.
- * @function
- * @name gdjs.DebuggerClient#set
  * @param {Array<string>} path - The path of the property to modify, starting from the RuntimeGame.
  * @param {any} newValue - The new value.
  */
+gdjs.IDebuggerClient.prototype.set = function(path, newValue) {}
 
 /**
  * Call a method, specified by a path starting from the {@link RuntimeGame} instance.
- * @function
- * @name gdjs.DebuggerClient#call
  * @param {Array<string>} path - The path to the method, starting from the RuntimeGame.
  * @param {Array<any>} args - The arguments to pass the method.
  */
+gdjs.IDebuggerClient.prototype.call = function(path, args) {}
 
 /**
  * Dump all the relevant data from the {@link RuntimeGame} instance and send it to the server.
- * @function
- * @name gdjs.DebuggerClient#sendRuntimeGameDump
  */
+gdjs.IDebuggerClient.prototype.sendRuntimeGameDump = function() {}
 
 /**
  * Start profiling.
- * @function
- * @name gdjs.DebuggerClient#sendProfilerStarted
  */
+gdjs.IDebuggerClient.prototype.sendProfilerStrated = function() {}
 
 /**
  * Stop profiling.
- * @function
- * @name gdjs.DebuggerClient#sendProfilerStopped
  */
+gdjs.IDebuggerClient.prototype.sendProfilerStopped = function() {}
 
 /**
  * Send profiling results.
- * @function
  * @param {any} framesAverageMeasures The measures made for each frames.
  * @param {any} stats Other measures done during the profiler run.
- * @name gdjs.DebuggerClient#sendProfilerOutput
  */
+gdjs.IDebuggerClient.prototype.sendProfilerOutput = function(framesAverageMeasures, stats) {}
 
 
 /**
- * This {@link DebuggerClient} connects to a websocket server, can dump
+ * This {@link IDebuggerClient} connects to a websocket server, can dump
  * the data of the current game, and receive message to change a field or
  * call a function, specified by a path from the {@link RuntimeGame}.
  *
  * @memberof gdjs
- * @implements {gdjs.DebuggerClient}
+ * @implements {gdjs.IDebuggerClient}
  * @class WebsocketDebuggerClient
  * @param {gdjs.RuntimeGame} runtimeGame -  The `gdjs.RuntimeGame` to be debugged
  */
@@ -98,9 +93,9 @@ gdjs.WebsocketDebuggerClient = function(runtimeGame) {
 
     if (data && data.command) {
       if (data.command === 'play') {
-        runtimegame.pause(false);
+        runtimeGame.pause(false);
       } else if (data.command === 'pause') {
-        runtimegame.pause(true);
+        runtimeGame.pause(true);
         that.sendRuntimeGameDump();
       } else if (data.command === 'refresh') {
         that.sendRuntimeGameDump();
@@ -109,7 +104,7 @@ gdjs.WebsocketDebuggerClient = function(runtimeGame) {
       } else if (data.command === 'call') {
         that.call(data.path, data.args);
       } else if (data.command === 'profiler.start') {
-        runtimegame.startCurrentSceneProfiler(function(stoppedProfiler) {
+        runtimeGame.startCurrentSceneProfiler(function(stoppedProfiler) {
           that.sendProfilerOutput(
             stoppedProfiler.getFramesAverageMeasures(),
             stoppedProfiler.getStats()
@@ -118,7 +113,7 @@ gdjs.WebsocketDebuggerClient = function(runtimeGame) {
         });
         that.sendProfilerStarted();
       } else if (data.command === 'profiler.stop') {
-        runtimegame.stopCurrentSceneProfiler();
+        runtimeGame.stopCurrentSceneProfiler();
       } else {
         console.info(
           'Unknown command "' + data.command + '" received by the debugger.'
@@ -128,6 +123,7 @@ gdjs.WebsocketDebuggerClient = function(runtimeGame) {
       console.info('Debugger received a message with badly formatted data.');
     }
   };
+  return;
 };
 
 gdjs.DebuggerClient = gdjs.WebsocketDebuggerClient; //Register the class to let the engine use it.
@@ -347,6 +343,7 @@ gdjs.WebsocketDebuggerClient.prototype._circularSafeStringify = function(
 ) {
   return JSON.stringify(
     obj,
+      // @ts-ignore
     this._depthLimitedSerializer(replacer, cycleReplacer, maxDepth),
     spaces
   );
@@ -367,7 +364,7 @@ gdjs.WebsocketDebuggerClient.prototype._depthLimitedSerializer = function(
   var stack = [],
     keys = [];
 
-  if (cycleReplacer == null)
+  if (cycleReplacer === undefined || cycleReplacer === null)
     cycleReplacer = function(key, value) {
       if (stack[0] === value) return '[Circular ~]';
       return (
@@ -384,6 +381,7 @@ gdjs.WebsocketDebuggerClient.prototype._depthLimitedSerializer = function(
       if (maxDepth != null && thisPos > maxDepth) {
         return '[Max depth reached]';
       } else if (~stack.indexOf(value))
+      // @ts-ignore
         value = cycleReplacer.call(this, key, value);
     } else stack.push(value);
 

GDJS/docs/Readme.md

@@ -4,22 +4,20 @@
 
 ## How to generate the documentation
 
-- Install [Doxygen](www.doxygen.org) and [JSDoc](http://usejsdoc.org/).
-
 - To generate the GDJS Runtime (game engine) documentation:
 
   ```bash
-  cd GDJS
-  jsdoc -c docs/jsdoc.conf.json -t docs/jaguarjs-jsdoc docs/DocMainPage.md
+  cd <GDevelop repository>/GDJS
+  npm run generate-doc
   ```
 
-  Output will be in `docs/GDJS Documentation` in the GDevelop repository root.
+  Output will be in `<GDevelop repository>/docs/GDJS Documentation`.
 
-- To generate the GDJS Platform documentation for the IDE:
+- To generate the GDJS Platform documentation for the IDE, install [Doxygen](www.doxygen.org). Then:
 
   ```bash
-  cd GDJS/docs
+  cd <GDevelop repository>/GDJS/docs
   doxygen
   ```
 
-  Output will be in `docs/GDJS Runtime Documentation` in the GDevelop repository root.
+  Output will be in `<GDevelop repository>/docs/GDJS Runtime Documentation`.

GDJS/docs/jsdoc.conf.json

@@ -8,7 +8,8 @@
       "./Runtime/Cocos2d/",
       "./Runtime/Cordova/",
       "./Runtime/Electron/",
-      "./Runtime/FacebookInstantGames/"
+      "./Runtime/FacebookInstantGames/",
+      "./Runtime/types/"
     ],
     "includePattern": ".+\\.js(doc)?$",
     "excludePattern": "(^|\\/|\\\\)_"
@@ -50,6 +51,7 @@
     "recurse": true,
     "private": false,
     "lenient": true,
+    "template": "docs/jaguarjs-jsdoc",
     "destination": "../docs/GDJS Runtime Documentation"
   }
 }

GDJS/package-lock.json

@@ -4,6 +4,12 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@babel/parser": {
+      "version": "7.9.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+      "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+      "dev": true
+    },
     "@types/expect.js": {
       "version": "0.3.29",
       "resolved": "https://registry.npmjs.org/@types/expect.js/-/expect.js-0.3.29.tgz",
@@ -16,6 +22,79 @@
       "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
       "dev": true
     },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "catharsis": {
+      "version": "0.8.11",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz",
+      "integrity": "sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "entities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true
+    },
+    "graceful-fs": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+      "dev": true
+    },
+    "js2xmlparser": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.1.tgz",
+      "integrity": "sha512-KrPTolcw6RocpYjdC7pL7v62e55q7qOMHvLX1UCLc5AAS8qeJ6nukarEJAF2KL2PZxlbGueEbINqZR2bDe/gUw==",
+      "dev": true,
+      "requires": {
+        "xmlcreate": "^2.0.3"
+      }
+    },
+    "jsdoc": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.4.tgz",
+      "integrity": "sha512-3G9d37VHv7MFdheviDCjUfQoIjdv4TC5zTTf5G9VODLtOnVS6La1eoYBDlbWfsRT3/Xo+j2MIqki2EV12BZfwA==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.9.4",
+        "bluebird": "^3.7.2",
+        "catharsis": "^0.8.11",
+        "escape-string-regexp": "^2.0.0",
+        "js2xmlparser": "^4.0.1",
+        "klaw": "^3.0.0",
+        "markdown-it": "^10.0.0",
+        "markdown-it-anchor": "^5.2.7",
+        "marked": "^0.8.2",
+        "mkdirp": "^1.0.4",
+        "requizzle": "^0.2.3",
+        "strip-json-comments": "^3.1.0",
+        "taffydb": "2.6.2",
+        "underscore": "~1.10.2"
+      }
+    },
     "jsdoc-autoprivate": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/jsdoc-autoprivate/-/jsdoc-autoprivate-0.0.1.tgz",
@@ -27,11 +106,117 @@
       "integrity": "sha512-lqCE44zM2wPv6PjAgzPM/dlrPFUiCVE5DrvntHVvHw5MFObkV+oDYwmO/3TXX7YsD+IdOPbsR4fIx/i+LETgNw==",
       "dev": true
     },
+    "klaw": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
+      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "linkify-it": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
+      "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+      "dev": true,
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "dev": true
+    },
+    "markdown-it": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
+      "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "entities": "~2.0.0",
+        "linkify-it": "^2.0.0",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      }
+    },
+    "markdown-it-anchor": {
+      "version": "5.2.7",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.7.tgz",
+      "integrity": "sha512-REFmIaSS6szaD1bye80DMbp7ePwsPNvLTR5HunsUcZ0SG0rWJQ+Pz24R4UlTKtjKBPhxo0v0tOBDYjZQQknW8Q==",
+      "dev": true
+    },
+    "marked": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz",
+      "integrity": "sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==",
+      "dev": true
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true
+    },
+    "requizzle": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
+      "integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
+      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
+      "dev": true
+    },
+    "taffydb": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
+      "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=",
+      "dev": true
+    },
     "typescript": {
       "version": "3.6.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.4.tgz",
       "integrity": "sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==",
       "dev": true
+    },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true
+    },
+    "underscore": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
+      "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==",
+      "dev": true
+    },
+    "xmlcreate": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.3.tgz",
+      "integrity": "sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ==",
+      "dev": true
     }
   }
 }

GDJS/package.json

@@ -7,6 +7,7 @@
   "devDependencies": {
     "@types/expect.js": "^0.3.29",
     "@types/mocha": "^5.2.7",
+    "jsdoc": "^3.6.4",
     "jsdoc-plugin-intersection": "^1.0.2",
     "typescript": "3.6.4"
   },
@@ -14,6 +15,7 @@
     "jsdoc-autoprivate": "0.0.1"
   },
   "scripts": {
-    "check-types": "tsc"
+    "check-types": "tsc",
+    "generate-doc": "jsdoc -c docs/jsdoc.conf.json docs/DocMainPage.md"
   }
 }