diff --git a/Core/GDCore/DocMainPage.h b/Core/GDCore/DocMainPage.h index efeee126b6..31199b256c 100644 --- a/Core/GDCore/DocMainPage.h +++ b/Core/GDCore/DocMainPage.h @@ -448,7 +448,7 @@ Actions are declared like this : "path-to-an-16-by-16-icon-file.png") .AddParameter("theTypeOfTheParameter", _("Parameter1")) .AddParameter("theTypeOfTheParameter", _("Parameter2")) - .codeExtraInformation.SetFunctionName("MyFunctionName").SetIncludeFile("MyExtension/MyIncludeFile.h"); + .SetFunctionName("MyFunctionName").SetIncludeFile("MyExtension/MyIncludeFile.h"); * \endcode * Declare conditions and expressions in a similar way.
@@ -458,7 +458,7 @@ Actions are declared like this : * You can either do it after declaring the function, or later using this syntax: * * \code - GetAllActions()["ExtensionName::ActionName"].codeExtraInformation.SetFunctionName("MyFunctionName"); + GetAllActions()["ExtensionName::ActionName"].SetFunctionName("MyFunctionName"); * \endcode * * Both methods are ok, but the latest allows to use the same code to declare an extension for the C++ and JS platform, diff --git a/Core/GDCore/Events/EventsCodeGenerator.h b/Core/GDCore/Events/EventsCodeGenerator.h index 53fef093ad..a567c3b490 100644 --- a/Core/GDCore/Events/EventsCodeGenerator.h +++ b/Core/GDCore/Events/EventsCodeGenerator.h @@ -316,7 +316,7 @@ protected: * \code AddExpression("Count", _("Object count"), _("Count the number of picked objects"), _("Objects"), "res/conditions/nbObjet.png") .AddParameter("objectList", _("Object")) - .codeExtraInformation.SetFunctionName("PickedObjectsCount").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + .SetFunctionName("PickedObjectsCount").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); * \endcode * - objectListWithoutPicking : Same as objectList but do not pick object if they are not already picked. diff --git a/Core/GDCore/Events/ExpressionMetadata.h b/Core/GDCore/Events/ExpressionMetadata.h index 1e1d1a4bd3..ccddaf8eb7 100644 --- a/Core/GDCore/Events/ExpressionMetadata.h +++ b/Core/GDCore/Events/ExpressionMetadata.h @@ -20,7 +20,7 @@ namespace gd { /** - * \brief Defines information about how generate code for an expression + * \brief Information about how generate code for an expression */ class ExpressionCodeGenerationInformation { @@ -30,10 +30,11 @@ public: /** * \brief Set the function name which will be used when generating the code. + * \param functionName the name of the function to call */ - ExpressionCodeGenerationInformation & SetFunctionName(const std::string & cppCallingName_) + ExpressionCodeGenerationInformation & SetFunctionName(const std::string & functionName) { - functionCallName = cppCallingName_; + functionCallName = functionName; return *this; } @@ -132,6 +133,17 @@ public: return *this; }; + /** + * \brief Set the function that should be called when generating the source + * code from events. + * \param functionName the name of the function to call + * \note Shortcut for `codeExtraInformation.SetFunctionName`. + */ + ExpressionCodeGenerationInformation & SetFunctionName(const std::string & functionName) + { + return codeExtraInformation.SetFunctionName(functionName); + } + ExpressionCodeGenerationInformation codeExtraInformation; /** Don't use this constructor. Only here to fullfil std::map requirements diff --git a/Core/GDCore/Events/InstructionMetadata.h b/Core/GDCore/Events/InstructionMetadata.h index 00d03443ce..017018aca5 100644 --- a/Core/GDCore/Events/InstructionMetadata.h +++ b/Core/GDCore/Events/InstructionMetadata.h @@ -222,10 +222,11 @@ public: /** * Set the function name which will be used when generating the code. + * \param functionName the name of the function to call */ - ExtraInformation & SetFunctionName(const std::string & cppCallingName_) + ExtraInformation & SetFunctionName(const std::string & functionName_) { - functionCallName = cppCallingName_; + functionCallName = functionName_; return *this; } @@ -255,13 +256,12 @@ public: * .AddParameter("object", _("Object"), "Text", false) * .AddParameter("operator", _("Modification operator")) * .AddParameter("string", _("String")) - * - * .codeExtraInformation.SetFunctionName("SetString").SetManipulatedType("string").SetAssociatedGetter("GetString").SetIncludeFile("MyExtension/TextObject.h"); + * .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString").SetIncludeFile("MyExtension/TextObject.h"); * * DECLARE_END_OBJECT_ACTION() * \endcode */ - ExtraInformation & SetAssociatedGetter(const std::string & getter) + ExtraInformation & SetGetter(const std::string & getter) { optionalAssociatedInstruction = getter; accessType = MutatorAndOrAccessor; @@ -302,17 +302,27 @@ public: /** * \brief Declare if the instruction being declared is somewhat manipulating in a standard way. - * - * Shortcut for "codeExtraInformation.SetManipulatedType(type)". + * \param type "number" or "string" + * \note Shortcut for `codeExtraInformation.SetManipulatedType(type)`. */ ExtraInformation & SetManipulatedType(const std::string & type_) { return codeExtraInformation.SetManipulatedType(type_); } + /** + * \brief Set the function that should be called when generating the source + * code from events. + * \param functionName the name of the function to call + * \note Shortcut for `codeExtraInformation.SetFunctionName`. + */ + ExtraInformation & SetFunctionName(const std::string & functionName) + { + return codeExtraInformation.SetFunctionName(functionName); + } + /** \brief DefaultConstructor. - * - * Please do not use this constructor. Only here to fulfill std::map requirements + * \warning Please do not use this constructor. Only here to fulfill std::map requirements. */ InstructionMetadata(); diff --git a/Core/GDCore/PlatformDefinition/PlatformExtension.cpp b/Core/GDCore/PlatformDefinition/PlatformExtension.cpp index d91522bd51..2dd6a7acfb 100644 --- a/Core/GDCore/PlatformDefinition/PlatformExtension.cpp +++ b/Core/GDCore/PlatformDefinition/PlatformExtension.cpp @@ -395,19 +395,19 @@ void PlatformExtension::CloneExtension(const std::string & platformName, const s if ( stripFunctionsNameAndCodeGeneration ) { for (std::map::iterator it = GetAllActions().begin();it != GetAllActions().end();++it) - it->second.codeExtraInformation.SetFunctionName("").SetAssociatedGetter("") + it->second.SetFunctionName("").SetGetter("") .SetCustomCodeGenerator(std::shared_ptr()); for (std::map::iterator it = GetAllConditions().begin();it != GetAllConditions().end();++it) - it->second.codeExtraInformation.SetFunctionName("").SetAssociatedGetter("") + it->second.SetFunctionName("").SetGetter("") .SetCustomCodeGenerator(std::shared_ptr()); for (std::map::iterator it = GetAllExpressions().begin();it != GetAllExpressions().end();++it) - it->second.codeExtraInformation.SetFunctionName("") + it->second.SetFunctionName("") .SetCustomCodeGenerator(std::shared_ptr()); for (std::map::iterator it = GetAllStrExpressions().begin();it != GetAllStrExpressions().end();++it) - it->second.codeExtraInformation.SetFunctionName("") + it->second.SetFunctionName("") .SetCustomCodeGenerator(std::shared_ptr()); for(std::map::iterator objIt = objectsInfos.begin();objIt!=objectsInfos.end();++objIt) @@ -415,19 +415,19 @@ void PlatformExtension::CloneExtension(const std::string & platformName, const s gd::ObjectMetadata & obj = objIt->second; for (std::map::iterator it = obj.actionsInfos.begin();it != obj.actionsInfos.end();++it) - it->second.codeExtraInformation.SetFunctionName("").SetAssociatedGetter("") + it->second.SetFunctionName("").SetGetter("") .SetCustomCodeGenerator(std::shared_ptr()); for (std::map::iterator it = obj.conditionsInfos.begin();it != obj.conditionsInfos.end();++it) - it->second.codeExtraInformation.SetFunctionName("").SetAssociatedGetter("") + it->second.SetFunctionName("").SetGetter("") .SetCustomCodeGenerator(std::shared_ptr()); for (std::map::iterator it = obj.expressionsInfos.begin();it != obj.expressionsInfos.end();++it) - it->second.codeExtraInformation.SetFunctionName("") + it->second.SetFunctionName("") .SetCustomCodeGenerator(std::shared_ptr()); for (std::map::iterator it = obj.strExpressionsInfos.begin();it != obj.strExpressionsInfos.end();++it) - it->second.codeExtraInformation.SetFunctionName("") + it->second.SetFunctionName("") .SetCustomCodeGenerator(std::shared_ptr()); } @@ -436,19 +436,19 @@ void PlatformExtension::CloneExtension(const std::string & platformName, const s gd::AutomatismMetadata & obj = objIt->second; for (std::map::iterator it = obj.actionsInfos.begin();it != obj.actionsInfos.end();++it) - it->second.codeExtraInformation.SetFunctionName("").SetAssociatedGetter("") + it->second.SetFunctionName("").SetGetter("") .SetCustomCodeGenerator(std::shared_ptr()); for (std::map::iterator it = obj.conditionsInfos.begin();it != obj.conditionsInfos.end();++it) - it->second.codeExtraInformation.SetFunctionName("").SetAssociatedGetter("") + it->second.SetFunctionName("").SetGetter("") .SetCustomCodeGenerator(std::shared_ptr()); for (std::map::iterator it = obj.expressionsInfos.begin();it != obj.expressionsInfos.end();++it) - it->second.codeExtraInformation.SetFunctionName("") + it->second.SetFunctionName("") .SetCustomCodeGenerator(std::shared_ptr()); for (std::map::iterator it = obj.strExpressionsInfos.begin();it != obj.strExpressionsInfos.end();++it) - it->second.codeExtraInformation.SetFunctionName("") + it->second.SetFunctionName("") .SetCustomCodeGenerator(std::shared_ptr()); } diff --git a/Extensions/AES/Extension.cpp b/Extensions/AES/Extension.cpp index 165685fe57..6a9962e099 100644 --- a/Extensions/AES/Extension.cpp +++ b/Extensions/AES/Extension.cpp @@ -41,7 +41,7 @@ public: .AddParameter("file", _("Destination file")) .AddParameter("string", _("Password ( 24 characters )")) - .codeExtraInformation.SetFunctionName("GDpriv::AES::EncryptFile").SetIncludeFile("AES/AESTools.h"); + .SetFunctionName("GDpriv::AES::EncryptFile").SetIncludeFile("AES/AESTools.h"); AddAction("DecryptFile", @@ -56,7 +56,7 @@ public: .AddParameter("file", _("Destination file")) .AddParameter("string", _("Password ( 24 characters )")) - .codeExtraInformation.SetFunctionName("GDpriv::AES::DecryptFile").SetIncludeFile("AES/AESTools.h"); + .SetFunctionName("GDpriv::AES::DecryptFile").SetIncludeFile("AES/AESTools.h"); #endif diff --git a/Extensions/AdvancedXML/src/Extension.cpp b/Extensions/AdvancedXML/src/Extension.cpp index e01ab59ece..9760884b9b 100644 --- a/Extensions/AdvancedXML/src/Extension.cpp +++ b/Extensions/AdvancedXML/src/Extension.cpp @@ -44,8 +44,7 @@ public: .AddParameter("string", _("Reference (allow to access later to the element)")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::CreateNewDocument").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::CreateNewDocument").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("LoadFile", _("Load an XML file"), @@ -58,8 +57,7 @@ public: .AddParameter("file", _("Source file")) .AddParameter("string", _("Reference (allow to access later to the element)")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::LoadXmlFile").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::LoadXmlFile").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("SaveFile", _("Save an XML file"), @@ -72,8 +70,7 @@ public: .AddParameter("file", _("File where to save the document")) .AddParameter("string", _("Reference to the XML document")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::SaveXmlFile").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::SaveXmlFile").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("BrowseTo", _("Load an element into a reference"), @@ -87,8 +84,7 @@ public: .AddParameter("string", _("Name of the reference to the newly created element")) .AddParameter("string", _("Path ( tags can be browsed by separating them using /. Use * to go to the first child element without knowing the tag name )")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::BrowseTo").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::BrowseTo").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("NextSibling", _("Go to next element"), @@ -102,8 +98,7 @@ public: .AddParameter("string", _("Reference to the element preceeding the element to be accessed")) .AddParameter("string", _("Tag name filter "), "", true) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::NextSibling").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::NextSibling").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddCondition("IsRefValid", _("The reference is valid"), @@ -115,8 +110,7 @@ public: .AddParameter("string", _("Reference to the element to be tested")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::IsRefValid").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::IsRefValid").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -132,8 +126,7 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Type")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::GetRefType").SetManipulatedType("number").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::GetRefType").SetManipulatedType("number").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -145,8 +138,7 @@ public: .AddParameter("string", _("Element reference")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::GetRefType").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::GetRefType").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -162,8 +154,7 @@ public: .AddParameter("expression", _("Tye of the element to be created\n(0-> Tag, 1-> Text, 2-> Comment )")) .AddParameter("string", _("Text of the element\nIf the element is a tag, it will be the tag name,if the element is a text or a comment, it will be the content.")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::CreateNewElement").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::CreateNewElement").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("DeleteAnElement", _("Delete an element"), @@ -175,8 +166,7 @@ public: .AddParameter("string", _("Reference to the element to be deleted")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::DeleteAnElement").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::DeleteAnElement").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("InsertElementIntoAnother", _("Add an element inside another"), @@ -190,8 +180,7 @@ public: .AddParameter("string", _("Reference to the parent element (must be a Tag element)")) .AddParameter("string", _("The element will be added before this element (if not defined, the element will be added at the end)"), "", true) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::InsertElementIntoAnother").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::InsertElementIntoAnother").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); AddAction("SetTagName", _("Change the tag name"), @@ -205,8 +194,7 @@ public: .AddParameter("operator", _("Modification sign")) .AddParameter("string", _("Tag name")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::SetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetAssociatedGetter("AdvancedXML::GetText").SetManipulatedType("string"); + .SetFunctionName("AdvancedXML::SetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetGetter("AdvancedXML::GetText").SetManipulatedType("string"); AddStrExpression("GetTagName", _("Tag name"), @@ -216,8 +204,7 @@ public: .AddParameter("string", _("Element reference")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::GetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::GetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -233,8 +220,7 @@ public: .AddParameter("operator", _("Modification sign")) .AddParameter("string", _("Contents")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::SetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetAssociatedGetter("AdvancedXML::GetText").SetManipulatedType("string"); + .SetFunctionName("AdvancedXML::SetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetGetter("AdvancedXML::GetText").SetManipulatedType("string"); AddStrExpression("GetContent", _("Contents"), @@ -244,8 +230,7 @@ public: .AddParameter("string", _("Element reference")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::GetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::GetText").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -258,8 +243,7 @@ public: .AddParameter("string", _("Element reference")) .AddParameter("string", _("Name of the attribute")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::GetAttributeNumber").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::GetAttributeNumber").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -276,8 +260,7 @@ public: .AddParameter("operator", _("Modification sign")) .AddParameter("expression", _("Value")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::SetAttributeNumber").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetAssociatedGetter("AdvancedXML::GetAttributeNumber").SetManipulatedType("number"); + .SetFunctionName("AdvancedXML::SetAttributeNumber").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetGetter("AdvancedXML::GetAttributeNumber").SetManipulatedType("number"); AddStrExpression("GetAttributeString", _("Text of an attribute of an element"), @@ -288,8 +271,7 @@ public: .AddParameter("string", _("Element reference")) .AddParameter("string", _("Name of the attribute")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::GetAttributeString").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::GetAttributeString").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); @@ -306,8 +288,7 @@ public: .AddParameter("operator", _("Modification sign")) .AddParameter("string", _("Value")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::SetAttributeString").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetAssociatedGetter("AdvancedXML::GetAttributeString").SetManipulatedType("string"); + .SetFunctionName("AdvancedXML::SetAttributeString").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h").SetGetter("AdvancedXML::GetAttributeString").SetManipulatedType("string"); AddAction("RemoveAttribute", _("Delete an attribute"), @@ -320,8 +301,7 @@ public: .AddParameter("string", _("Reference to the element")) .AddParameter("string", _("Name of the attribute")) .AddCodeOnlyParameter("currentScene", "") - - .codeExtraInformation.SetFunctionName("AdvancedXML::RemoveAttribute").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); + .SetFunctionName("AdvancedXML::RemoveAttribute").SetIncludeFile("AdvancedXML/src/AdvancedXMLTools.h"); #endif diff --git a/Extensions/Box3DObject/Extension.cpp b/Extensions/Box3DObject/Extension.cpp index 5fd5b046c3..f4ba4c6864 100644 --- a/Extensions/Box3DObject/Extension.cpp +++ b/Extensions/Box3DObject/Extension.cpp @@ -52,7 +52,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetWidth").SetManipulatedType("number").SetAssociatedGetter("GetWidth").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("SetWidth").SetManipulatedType("number").SetGetter("GetWidth").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddCondition("Width", _("Width"), @@ -64,7 +64,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddAction("Height", @@ -77,7 +77,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetHeight").SetManipulatedType("number").SetAssociatedGetter("GetHeight").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("SetHeight").SetManipulatedType("number").SetGetter("GetHeight").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddCondition("Height", @@ -90,7 +90,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("SetHeight").SetManipulatedType("number").SetAssociatedGetter("GetHeight").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("SetHeight").SetManipulatedType("number").SetGetter("GetHeight").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddAction("Depth", @@ -103,7 +103,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetDepth").SetManipulatedType("number").SetAssociatedGetter("GetDepth").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("SetDepth").SetManipulatedType("number").SetGetter("GetDepth").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddCondition("Depth", @@ -116,7 +116,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetDepth").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetDepth").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddAction("ZPosition", @@ -129,7 +129,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetZPosition").SetManipulatedType("number").SetAssociatedGetter("GetZPosition").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("SetZPosition").SetManipulatedType("number").SetGetter("GetZPosition").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddCondition("ZPosition", @@ -142,7 +142,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetZPosition").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetZPosition").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddAction("Yaw", @@ -155,7 +155,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetAngle").SetManipulatedType("number").SetAssociatedGetter("GetAngle").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("SetAngle").SetManipulatedType("number").SetGetter("GetAngle").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddCondition("Yaw", @@ -168,7 +168,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddAction("Pitch", @@ -181,7 +181,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetPitch").SetManipulatedType("number").SetAssociatedGetter("GetPitch").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("SetPitch").SetManipulatedType("number").SetGetter("GetPitch").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddCondition("Pitch", @@ -194,7 +194,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetPitch").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetPitch").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddAction("Roll", @@ -207,7 +207,7 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetRoll").SetManipulatedType("number").SetAssociatedGetter("GetRoll").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("SetRoll").SetManipulatedType("number").SetGetter("GetRoll").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddCondition("Roll", @@ -220,27 +220,27 @@ public: .AddParameter("object", _("Object"), "Box3D", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetRoll").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetRoll").SetManipulatedType("number").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddExpression("Depth", _("Depth of the 3D Box"), _("Depth of the 3D Box"), _("Size"), "res/actions/scaleHeight.png") .AddParameter("object", _("Object"), "Box3D", false) - .codeExtraInformation.SetFunctionName("GetDepth").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetDepth").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddExpression("Z", _("Z Position"), _("Z Position"), _("Position"), "res/actions/scaleHeight.png") .AddParameter("object", _("Object"), "Box3D", false) - .codeExtraInformation.SetFunctionName("GetZPosition").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetZPosition").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddExpression("Yaw", _("Yaw"), _("Yaw"), _("Angle"), "res/actions/scaleHeight.png") .AddParameter("object", _("Object"), "Box3D", false) - .codeExtraInformation.SetFunctionName("GetAngle").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetAngle").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddExpression("Pitch", _("Pitch"), _("Pitch"), _("Angle"), "res/actions/scaleHeight.png") .AddParameter("object", _("Object"), "Box3D", false) - .codeExtraInformation.SetFunctionName("GetPitch").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetPitch").SetIncludeFile("Box3DObject/Box3DObject.h"); obj.AddExpression("Roll", _("Roll"), _("Roll"), _("Angle"), "res/actions/scaleHeight.png") .AddParameter("object", _("Object"), "Box3D", false) - .codeExtraInformation.SetFunctionName("GetRoll").SetIncludeFile("Box3DObject/Box3DObject.h"); + .SetFunctionName("GetRoll").SetIncludeFile("Box3DObject/Box3DObject.h"); #endif diff --git a/Extensions/CommonDialogs/Extension.cpp b/Extensions/CommonDialogs/Extension.cpp index 8edfb96546..67b3f47fcb 100644 --- a/Extensions/CommonDialogs/Extension.cpp +++ b/Extensions/CommonDialogs/Extension.cpp @@ -40,7 +40,7 @@ public: .AddParameter("string", _("Message")) .AddParameter("string", _("Title")) - .codeExtraInformation.SetFunctionName("GDpriv::CommonDialogs::ShowMessageBox").SetIncludeFile("CommonDialogs/CommonDialogs.h"); + .SetFunctionName("GDpriv::CommonDialogs::ShowMessageBox").SetIncludeFile("CommonDialogs/CommonDialogs.h"); AddAction("ShowOpenFile", _("Show a window to choose a file"), @@ -55,7 +55,7 @@ public: .AddParameter("string", _("Title")) .AddParameter("string", _("Wildcard filter ( \"FileType|*.ext;*.ext2|2ndFileType|*.ext3\" ) ( Windows only ) ")) - .codeExtraInformation.SetFunctionName("GDpriv::CommonDialogs::ShowOpenFile").SetIncludeFile("CommonDialogs/CommonDialogs.h"); + .SetFunctionName("GDpriv::CommonDialogs::ShowOpenFile").SetIncludeFile("CommonDialogs/CommonDialogs.h"); AddAction("ShowTextInput", _("Show a window to enter a text"), @@ -70,7 +70,7 @@ public: .AddParameter("string", _("Message")) .AddParameter("string", _("Title")) - .codeExtraInformation.SetFunctionName("GDpriv::CommonDialogs::ShowTextInput").SetIncludeFile("CommonDialogs/CommonDialogs.h"); + .SetFunctionName("GDpriv::CommonDialogs::ShowTextInput").SetIncludeFile("CommonDialogs/CommonDialogs.h"); AddAction("ShowYesNoMsgBox", _("Display a Yes/No message box"), @@ -85,7 +85,7 @@ public: .AddParameter("string", _("Message")) .AddParameter("string", _("Title")) - .codeExtraInformation.SetFunctionName("GDpriv::CommonDialogs::ShowYesNoMsgBox").SetIncludeFile("CommonDialogs/CommonDialogs.h"); + .SetFunctionName("GDpriv::CommonDialogs::ShowYesNoMsgBox").SetIncludeFile("CommonDialogs/CommonDialogs.h"); #endif diff --git a/Extensions/DestroyOutsideAutomatism/Extension.cpp b/Extensions/DestroyOutsideAutomatism/Extension.cpp index dc6abbec0a..2db6c60407 100644 --- a/Extensions/DestroyOutsideAutomatism/Extension.cpp +++ b/Extensions/DestroyOutsideAutomatism/Extension.cpp @@ -43,7 +43,7 @@ void DeclareDestroyOutsideAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetExtraBorder").SetIncludeFile("DestroyOutsideAutomatism/DestroyOutsideAutomatism.h"); + .SetFunctionName("GetExtraBorder").SetIncludeFile("DestroyOutsideAutomatism/DestroyOutsideAutomatism.h"); aut.AddAction("ExtraBorder", _("Additional border"), @@ -57,8 +57,8 @@ void DeclareDestroyOutsideAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetExtraBorder").SetManipulatedType("number") - .SetAssociatedGetter("GetExtraBorder").SetIncludeFile("DestroyOutsideAutomatism/DestroyOutsideAutomatism.h"); + .SetFunctionName("SetExtraBorder").SetManipulatedType("number") + .SetGetter("GetExtraBorder").SetIncludeFile("DestroyOutsideAutomatism/DestroyOutsideAutomatism.h"); #endif } diff --git a/Extensions/DestroyOutsideAutomatism/JsExtension.cpp b/Extensions/DestroyOutsideAutomatism/JsExtension.cpp index ba601a6618..a9cd946924 100644 --- a/Extensions/DestroyOutsideAutomatism/JsExtension.cpp +++ b/Extensions/DestroyOutsideAutomatism/JsExtension.cpp @@ -34,10 +34,8 @@ public: GetAutomatismMetadata("DestroyOutsideAutomatism::DestroyOutside").SetIncludeFile("DestroyOutsideAutomatism/destroyoutsideruntimeautomatism.js"); - GetAllConditionsForAutomatism("DestroyOutsideAutomatism::DestroyOutside")["DestroyOutsideAutomatism::ExtraBorder"].codeExtraInformation - .SetFunctionName("getExtraBorder").SetIncludeFile("DestroyOutsideAutomatism/destroyoutsideruntimeautomatism.js"); - GetAllActionsForAutomatism("DestroyOutsideAutomatism::DestroyOutside")["DestroyOutsideAutomatism::ExtraBorder"].codeExtraInformation - .SetFunctionName("setExtraBorder").SetAssociatedGetter("getExtraBorder").SetIncludeFile("DestroyOutsideAutomatism/destroyoutsideruntimeautomatism.js"); + GetAllConditionsForAutomatism("DestroyOutsideAutomatism::DestroyOutside")["DestroyOutsideAutomatism::ExtraBorder"].SetFunctionName("getExtraBorder").SetIncludeFile("DestroyOutsideAutomatism/destroyoutsideruntimeautomatism.js"); + GetAllActionsForAutomatism("DestroyOutsideAutomatism::DestroyOutside")["DestroyOutsideAutomatism::ExtraBorder"].SetFunctionName("setExtraBorder").SetGetter("getExtraBorder").SetIncludeFile("DestroyOutsideAutomatism/destroyoutsideruntimeautomatism.js"); GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION(); }; diff --git a/Extensions/DraggableAutomatism/Extension.cpp b/Extensions/DraggableAutomatism/Extension.cpp index fee0f9ecee..5ba752d162 100644 --- a/Extensions/DraggableAutomatism/Extension.cpp +++ b/Extensions/DraggableAutomatism/Extension.cpp @@ -40,7 +40,7 @@ void DeclareDraggableAutomatismExtension(gd::PlatformExtension & extension) "CppPlatform/Extensions/draggableicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "Draggable", false) - .codeExtraInformation.SetFunctionName("IsDragged").SetIncludeFile("DraggableAutomatism/DraggableAutomatism.h"); + .SetFunctionName("IsDragged").SetIncludeFile("DraggableAutomatism/DraggableAutomatism.h"); #endif } diff --git a/Extensions/DraggableAutomatism/JsExtension.cpp b/Extensions/DraggableAutomatism/JsExtension.cpp index c84f4b7c09..8a87901a30 100644 --- a/Extensions/DraggableAutomatism/JsExtension.cpp +++ b/Extensions/DraggableAutomatism/JsExtension.cpp @@ -34,8 +34,7 @@ public: DeclareDraggableAutomatismExtension(*this); GetAutomatismMetadata("DraggableAutomatism::Draggable").SetIncludeFile("DraggableAutomatism/draggableruntimeautomatism.js"); - GetAllConditionsForAutomatism("DraggableAutomatism::Draggable")["DraggableAutomatism::Dragged"].codeExtraInformation - .SetFunctionName("isDragged").SetIncludeFile("DraggableAutomatism/draggableruntimeautomatism.js"); + GetAllConditionsForAutomatism("DraggableAutomatism::Draggable")["DraggableAutomatism::Dragged"].SetFunctionName("isDragged").SetIncludeFile("DraggableAutomatism/draggableruntimeautomatism.js"); GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION(); }; }; diff --git a/Extensions/Light/Extension.cpp b/Extensions/Light/Extension.cpp index 261f734a50..d594dfa03a 100644 --- a/Extensions/Light/Extension.cpp +++ b/Extensions/Light/Extension.cpp @@ -51,7 +51,7 @@ public: "CppPlatform/Extensions/lightIcon16.png") .AddParameter("object", _("Object"), "Light", false) .AddParameter("color", _("Color")) - .codeExtraInformation.SetFunctionName("SetColor").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("SetColor").SetIncludeFile("Light/LightObject.h"); obj.AddAction("Intensity", @@ -64,7 +64,7 @@ public: .AddParameter("object", _("Object"), "Light", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetIntensity").SetManipulatedType("number").SetAssociatedGetter("GetIntensity").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("SetIntensity").SetManipulatedType("number").SetGetter("GetIntensity").SetIncludeFile("Light/LightObject.h"); obj.AddCondition("Intensity", @@ -77,7 +77,7 @@ public: .AddParameter("object", _("Object"), "Light", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetIntensity").SetManipulatedType("number").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("GetIntensity").SetManipulatedType("number").SetIncludeFile("Light/LightObject.h"); obj.AddAction("Radius", @@ -90,7 +90,7 @@ public: .AddParameter("object", _("Object"), "Light", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetRadius").SetManipulatedType("number").SetAssociatedGetter("GetRadius").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("SetRadius").SetManipulatedType("number").SetGetter("GetRadius").SetIncludeFile("Light/LightObject.h"); obj.AddCondition("Radius", @@ -103,7 +103,7 @@ public: .AddParameter("object", _("Object"), "Light", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetRadius").SetManipulatedType("number").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("GetRadius").SetManipulatedType("number").SetIncludeFile("Light/LightObject.h"); obj.AddAction("Quality", @@ -116,7 +116,7 @@ public: .AddParameter("object", _("Object"), "Light", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetQuality").SetManipulatedType("number").SetAssociatedGetter("GetQuality").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("SetQuality").SetManipulatedType("number").SetGetter("GetQuality").SetIncludeFile("Light/LightObject.h"); obj.AddCondition("Quality", @@ -129,7 +129,7 @@ public: .AddParameter("object", _("Object"), "Light", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetQuality").SetManipulatedType("number").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("GetQuality").SetManipulatedType("number").SetIncludeFile("Light/LightObject.h"); obj.AddAction("ChangeGlobalColor", @@ -141,7 +141,7 @@ public: "CppPlatform/Extensions/lightIcon16.png") .AddParameter("object", _("Object"), "Light", false) .AddParameter("color", _("Color")) - .codeExtraInformation.SetFunctionName("SetGlobalColor").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("SetGlobalColor").SetIncludeFile("Light/LightObject.h"); obj.AddAction("SetGlobalLight", @@ -153,7 +153,7 @@ public: "CppPlatform/Extensions/lightIcon16.png") .AddParameter("object", _("Object"), "Light", false) .AddParameter("yesorno", _("Make light global")) - .codeExtraInformation.SetFunctionName("SetGlobalLight").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("SetGlobalLight").SetIncludeFile("Light/LightObject.h"); obj.AddCondition("GlobalLight", @@ -164,19 +164,19 @@ public: "CppPlatform/Extensions/lightIcon24.png", "CppPlatform/Extensions/lightIcon16.png") .AddParameter("object", _("Object"), "Light", false) - .codeExtraInformation.SetFunctionName("IsGlobalLight").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("IsGlobalLight").SetIncludeFile("Light/LightObject.h"); obj.AddExpression("Intensity", _("Intensity"), _("Intensity"), _("Setup"), "CppPlatform/Extensions/lightIcon16.png") .AddParameter("object", _("Object"), "Light", false) - .codeExtraInformation.SetFunctionName("GetIntensity").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("GetIntensity").SetIncludeFile("Light/LightObject.h"); obj.AddExpression("Radius", _("Radius"), _("Radius"), _("Setup"), "CppPlatform/Extensions/lightIcon16.png") .AddParameter("object", _("Object"), "Light", false) - .codeExtraInformation.SetFunctionName("GetRadius").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("GetRadius").SetIncludeFile("Light/LightObject.h"); obj.AddExpression("Quality", _("Quality"), _("Quality"), _("Setup"), "CppPlatform/Extensions/lightIcon16.png") .AddParameter("object", _("Object"), "Light", false) - .codeExtraInformation.SetFunctionName("GetQuality").SetIncludeFile("Light/LightObject.h"); + .SetFunctionName("GetQuality").SetIncludeFile("Light/LightObject.h"); #endif AddAutomatism("LightObstacleAutomatism", diff --git a/Extensions/LinkedObjects/Extension.cpp b/Extensions/LinkedObjects/Extension.cpp index 1b204ee8ae..691fdd6813 100644 --- a/Extensions/LinkedObjects/Extension.cpp +++ b/Extensions/LinkedObjects/Extension.cpp @@ -43,7 +43,7 @@ public: .AddParameter("objectPtr", _("Object 1")) .AddParameter("objectPtr", _("Object 2")) - .codeExtraInformation.SetFunctionName("GDpriv::LinkedObjects::LinkObjects").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); + .SetFunctionName("GDpriv::LinkedObjects::LinkObjects").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); AddAction("RemoveLinkBetween", _("Unlink two objects"), @@ -57,7 +57,7 @@ public: .AddParameter("objectPtr", _("Object 1")) .AddParameter("objectPtr", _("Object 2")) - .codeExtraInformation.SetFunctionName("GDpriv::LinkedObjects::RemoveLinkBetween").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); + .SetFunctionName("GDpriv::LinkedObjects::RemoveLinkBetween").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); AddAction("RemoveAllLinksOf", _("Unlink all objects from an object"), @@ -70,7 +70,7 @@ public: .AddCodeOnlyParameter("currentScene", "") .AddParameter("objectPtr", _("Object")) - .codeExtraInformation.SetFunctionName("GDpriv::LinkedObjects::RemoveAllLinksOf").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); + .SetFunctionName("GDpriv::LinkedObjects::RemoveAllLinksOf").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); AddCondition("PickObjectsLinkedTo", _("Take into account linked objects"), @@ -84,7 +84,7 @@ public: .AddParameter("objectList", _("Pick these objects...")) .AddParameter("objectPtr", _("...if they are linked to this object")) - .codeExtraInformation.SetFunctionName("GDpriv::LinkedObjects::PickObjectsLinkedTo").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); + .SetFunctionName("GDpriv::LinkedObjects::PickObjectsLinkedTo").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); AddAction("PickObjectsLinkedTo", @@ -99,7 +99,7 @@ public: .AddParameter("objectList", _("Pick these objects...")) .AddParameter("objectPtr", _("...if they are linked to this object")) - .codeExtraInformation.SetFunctionName("GDpriv::LinkedObjects::PickObjectsLinkedTo").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); + .SetFunctionName("GDpriv::LinkedObjects::PickObjectsLinkedTo").SetIncludeFile("LinkedObjects/LinkedObjectsTools.h"); #endif diff --git a/Extensions/Network/Extension.cpp b/Extensions/Network/Extension.cpp index 32d39f2bc3..81f98e96f2 100644 --- a/Extensions/Network/Extension.cpp +++ b/Extensions/Network/Extension.cpp @@ -44,7 +44,7 @@ public: .AddParameter("string", _("Recipient IP address.")) .AddParameter("expression", _("Recipient port (Default : 50001)"), "", true) - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::AddRecipient").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::AddRecipient").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("RemoveAllRecipients", _("Delete all recipients"), @@ -54,7 +54,7 @@ public: "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::RemoveAllRecipients").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::RemoveAllRecipients").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("ListenToPort", @@ -66,7 +66,7 @@ public: "CppPlatform/Extensions/networkicon.png") .AddParameter("expression", _("Listening port (Default : 50001)"), "", true).SetDefaultValue("50001") - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::ListenToPort").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::ListenToPort").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("StopListening", _("Stop data reception"), @@ -76,7 +76,7 @@ public: "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::ActStopListening").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::ActStopListening").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("SendValue", _("Send a value"), @@ -89,7 +89,7 @@ public: .AddParameter("string", _("Group")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::SendValue").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::SendValue").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("SendString", _("Send a text"), @@ -102,7 +102,7 @@ public: .AddParameter("string", _("Group")) .AddParameter("string", _("Text")) - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::SendString").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::SendString").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("ReceivePackets", _("Receive waiting data"), @@ -112,7 +112,7 @@ public: "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::ReceivePackets").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::ReceivePackets").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("ResetReceivedData", _("Delete all received data stored in memory"), @@ -122,34 +122,34 @@ public: "CppPlatform/Extensions/networkicon24.png", "CppPlatform/Extensions/networkicon.png") - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::ResetReceivedData").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::ResetReceivedData").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddStrExpression("GetReceivedDataString", _("Get the text of a data"), _("Get the text contained in a data"), _("Network: Reception"), "CppPlatform/Extensions/networkicon.png") .AddParameter("string", _("Name of the data containing the text to get")) - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::GetReceivedDataString").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::GetReceivedDataString").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddExpression("GetReceivedDataValue", _("Get the value of a data"), _("Get the value contained in a data"), _("Network: Reception"), "CppPlatform/Extensions/networkicon.png") .AddParameter("string", _("Name of the data containing the text to get")) - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::GetReceivedDataValue").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::GetReceivedDataValue").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddStrExpression("GetLastError", _("Last error occured"), _("Get the text describing the last error which occured."), _("Network: Errors"), "res/error.png") - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::GetLastError").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::GetLastError").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddStrExpression("GetPublicAddress", _("IP address"), _("Allow to get the public IP Address of the computer."), _("Network"), "CppPlatform/Extensions/networkicon.png") .AddParameter("expression", _("Maximum time to wait before getting the address ( in seconds ) ( 0 = no timeout )"), "", true) - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::GetPublicAddress").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::GetPublicAddress").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddStrExpression("GetLocalAddress", _("Local IP address ( local/LAN )"), _("Allow to get the public IP Address of the computer."), _("Network"), "CppPlatform/Extensions/networkicon.png") - .codeExtraInformation.SetFunctionName("GDpriv::NetworkExtension::GetLocalAddress").SetIncludeFile("Network/NetworkManagerFunctions.h"); + .SetFunctionName("GDpriv::NetworkExtension::GetLocalAddress").SetIncludeFile("Network/NetworkManagerFunctions.h"); AddAction("GenerateObjectNetworkId", @@ -162,7 +162,7 @@ public: .AddParameter("objectList", _("Object")) .AddParameter("automatism", _("Automatism"), "NetworkAutomatism", false) - .codeExtraInformation.SetFunctionName("NetworkAutomatism::GenerateObjectNetworkIdentifier").SetIncludeFile("Network/NetworkAutomatism.h"); + .SetFunctionName("NetworkAutomatism::GenerateObjectNetworkIdentifier").SetIncludeFile("Network/NetworkAutomatism.h"); #endif @@ -189,7 +189,7 @@ public: "CppPlatform/Extensions/networkicon.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "NetworkAutomatism", false) - .codeExtraInformation.SetFunctionName("SetAsSender").SetIncludeFile("Network/NetworkAutomatism.h"); + .SetFunctionName("SetAsSender").SetIncludeFile("Network/NetworkAutomatism.h"); aut.AddAction("SetAsReceiver", _("Set to receive data"), @@ -200,7 +200,7 @@ public: "CppPlatform/Extensions/networkicon.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "NetworkAutomatism", false) - .codeExtraInformation.SetFunctionName("SetAsReceiver").SetIncludeFile("Network/NetworkAutomatism.h"); + .SetFunctionName("SetAsReceiver").SetIncludeFile("Network/NetworkAutomatism.h"); aut.AddAction("SetIdentifier", _("Change object's identifier"), @@ -212,12 +212,12 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "NetworkAutomatism", false) .AddParameter("expression", _("Identifier")) - .codeExtraInformation.SetFunctionName("SetIdentifier").SetIncludeFile("Network/NetworkAutomatism.h"); + .SetFunctionName("SetIdentifier").SetIncludeFile("Network/NetworkAutomatism.h"); aut.AddExpression("GetIdentifier", _("Get the identifier of the object"), _("Get the identifier of the object"), _("Automatism Automatic Network Updater"), "res/texteicon.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "NetworkAutomatism", false) - .codeExtraInformation.SetFunctionName("GetIdentifier").SetIncludeFile("Network/NetworkAutomatism.h"); + .SetFunctionName("GetIdentifier").SetIncludeFile("Network/NetworkAutomatism.h"); #endif } diff --git a/Extensions/PanelSpriteObject/Extension.cpp b/Extensions/PanelSpriteObject/Extension.cpp index d7abe53ec0..fec2f90fca 100644 --- a/Extensions/PanelSpriteObject/Extension.cpp +++ b/Extensions/PanelSpriteObject/Extension.cpp @@ -41,7 +41,7 @@ void DeclarePanelSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "PanelSprite", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetWidth").SetManipulatedType("number").SetAssociatedGetter("GetWidth").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); + .SetFunctionName("SetWidth").SetManipulatedType("number").SetGetter("GetWidth").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); obj.AddCondition("Width", _("Width"), @@ -53,7 +53,7 @@ void DeclarePanelSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "PanelSprite", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); + .SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); obj.AddAction("Height", @@ -66,7 +66,7 @@ void DeclarePanelSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "PanelSprite", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetHeight").SetManipulatedType("number").SetAssociatedGetter("GetHeight").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); + .SetFunctionName("SetHeight").SetManipulatedType("number").SetGetter("GetHeight").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); obj.AddCondition("Height", @@ -79,7 +79,7 @@ void DeclarePanelSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "PanelSprite", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("SetHeight").SetManipulatedType("number").SetAssociatedGetter("GetHeight").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); + .SetFunctionName("SetHeight").SetManipulatedType("number").SetGetter("GetHeight").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); obj.AddAction("Angle", @@ -93,7 +93,7 @@ void DeclarePanelSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "PanelSprite", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetAngle").SetManipulatedType("number").SetAssociatedGetter("GetAngle").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); + .SetFunctionName("SetAngle").SetManipulatedType("number").SetGetter("GetAngle").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); obj.AddCondition("Angle", _("Angle"), @@ -106,7 +106,7 @@ void DeclarePanelSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "PanelSprite", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("SetAngle").SetManipulatedType("number").SetAssociatedGetter("GetAngle").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); + .SetFunctionName("SetAngle").SetManipulatedType("number").SetGetter("GetAngle").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); obj.AddAction("Image", @@ -119,7 +119,7 @@ void DeclarePanelSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "PanelSprite", false) .AddParameter("string", _("Image name")) .AddCodeOnlyParameter("currentScene", "0") - .codeExtraInformation.SetFunctionName("ChangeAndReloadImage").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); + .SetFunctionName("ChangeAndReloadImage").SetIncludeFile("PanelSpriteObject/PanelSpriteObject.h"); #endif } diff --git a/Extensions/PanelSpriteObject/JsExtension.cpp b/Extensions/PanelSpriteObject/JsExtension.cpp index 982dfe9f01..3910aa35d6 100644 --- a/Extensions/PanelSpriteObject/JsExtension.cpp +++ b/Extensions/PanelSpriteObject/JsExtension.cpp @@ -29,16 +29,11 @@ public: GetObjectMetadata("PanelSpriteObject::PanelSprite").SetIncludeFile("PanelSpriteObject/panelspriteruntimeobject.js"); - GetAllActionsForObject("PanelSpriteObject::PanelSprite")["PanelSpriteObject::Width"].codeExtraInformation - .SetFunctionName("setWidth").SetAssociatedGetter("getWidth"); - GetAllConditionsForObject("PanelSpriteObject::PanelSprite")["PanelSpriteObject::Width"].codeExtraInformation - .SetFunctionName("getWidth"); - GetAllActionsForObject("PanelSpriteObject::PanelSprite")["PanelSpriteObject::Height"].codeExtraInformation - .SetFunctionName("setHeight").SetAssociatedGetter("getHeight"); - GetAllConditionsForObject("PanelSpriteObject::PanelSprite")["PanelSpriteObject::Height"].codeExtraInformation - .SetFunctionName("getHeight"); - GetAllActionsForObject("PanelSpriteObject::PanelSprite")["PanelSpriteObject::Image"].codeExtraInformation - .SetFunctionName("setTexture"); + GetAllActionsForObject("PanelSpriteObject::PanelSprite")["PanelSpriteObject::Width"].SetFunctionName("setWidth").SetGetter("getWidth"); + GetAllConditionsForObject("PanelSpriteObject::PanelSprite")["PanelSpriteObject::Width"].SetFunctionName("getWidth"); + GetAllActionsForObject("PanelSpriteObject::PanelSprite")["PanelSpriteObject::Height"].SetFunctionName("setHeight").SetGetter("getHeight"); + GetAllConditionsForObject("PanelSpriteObject::PanelSprite")["PanelSpriteObject::Height"].SetFunctionName("getHeight"); + GetAllActionsForObject("PanelSpriteObject::PanelSprite")["PanelSpriteObject::Image"].SetFunctionName("setTexture"); GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION(); }; diff --git a/Extensions/ParticleSystem/ExtensionSubDeclaration1.cpp b/Extensions/ParticleSystem/ExtensionSubDeclaration1.cpp index 2726f4a5cc..4ce54ba8ea 100644 --- a/Extensions/ParticleSystem/ExtensionSubDeclaration1.cpp +++ b/Extensions/ParticleSystem/ExtensionSubDeclaration1.cpp @@ -28,7 +28,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetEmitterForceMin").SetManipulatedType("number").SetAssociatedGetter("GetEmitterForceMin").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetEmitterForceMin").SetManipulatedType("number").SetGetter("GetEmitterForceMin").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("EmitterForceMax", _("Emission maximal force"), @@ -41,7 +41,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetEmitterForceMax").SetManipulatedType("number").SetAssociatedGetter("GetEmitterForceMax").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetEmitterForceMax").SetManipulatedType("number").SetGetter("GetEmitterForceMax").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("EmitterXDirection", _("Emission X direction"), @@ -54,7 +54,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetEmitterXDirection").SetManipulatedType("number").SetAssociatedGetter("GetEmitterXDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetEmitterXDirection").SetManipulatedType("number").SetGetter("GetEmitterXDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("EmitterXDirection", _("Emission X direction"), @@ -67,7 +67,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetEmitterXDirection").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterXDirection").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("EmitterYDirection", @@ -81,7 +81,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetEmitterYDirection").SetManipulatedType("number").SetAssociatedGetter("GetEmitterYDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetEmitterYDirection").SetManipulatedType("number").SetGetter("GetEmitterYDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("EmitterYDirection", _("Emission Y direction"), @@ -94,7 +94,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetEmitterYDirection").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterYDirection").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("EmitterZDirection", @@ -108,7 +108,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetEmitterZDirection").SetManipulatedType("number").SetAssociatedGetter("GetEmitterZDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetEmitterZDirection").SetManipulatedType("number").SetGetter("GetEmitterZDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("EmitterZDirection", @@ -122,7 +122,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetEmitterZDirection").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterZDirection").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("EmitterAngle", @@ -136,7 +136,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetAngle").SetManipulatedType("number").SetAssociatedGetter("GetAngle").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetAngle").SetManipulatedType("number").SetGetter("GetAngle").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("EmitterAngle", @@ -150,7 +150,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("EmitterAngleA", _("Emission angle 1"), @@ -163,7 +163,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetEmitterAngleA").SetManipulatedType("number").SetAssociatedGetter("GetEmitterAngleA").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetEmitterAngleA").SetManipulatedType("number").SetGetter("GetEmitterAngleA").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("EmitterAngleA", @@ -177,7 +177,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetEmitterAngleA").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterAngleA").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("EmitterAngleB", @@ -191,7 +191,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetEmitterAngleB").SetManipulatedType("number").SetAssociatedGetter("GetEmitterAngleB").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetEmitterAngleB").SetManipulatedType("number").SetGetter("GetEmitterAngleB").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("EmitterAngleB", @@ -205,7 +205,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetEmitterAngleB").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterAngleB").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ConeSprayAngle", @@ -219,7 +219,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetConeSprayAngle").SetManipulatedType("number").SetAssociatedGetter("GetConeSprayAngle").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetConeSprayAngle").SetManipulatedType("number").SetGetter("GetConeSprayAngle").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ConeSprayAngle", _("Angle of the spray cone"), @@ -232,7 +232,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetConeSprayAngle").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetConeSprayAngle").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("Friction", _("Friction"), @@ -245,7 +245,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetFriction").SetManipulatedType("number").SetAssociatedGetter("GetFriction").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetFriction").SetManipulatedType("number").SetGetter("GetFriction").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("Friction", @@ -258,7 +258,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("object", _("Object"), "ParticleEmitter") .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetFriction").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetFriction").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ZoneRadius", @@ -272,7 +272,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetZoneRadius").SetManipulatedType("number").SetAssociatedGetter("GetZoneRadius").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetZoneRadius").SetManipulatedType("number").SetGetter("GetZoneRadius").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ZoneRadius", @@ -286,7 +286,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetZoneRadius").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetZoneRadius").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleLifeTimeMin", @@ -300,7 +300,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleLifeTimeMin").SetManipulatedType("number").SetAssociatedGetter("GetParticleLifeTimeMin").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleLifeTimeMin").SetManipulatedType("number").SetGetter("GetParticleLifeTimeMin").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleLifeTimeMin", _("Minimum lifetime"), @@ -313,7 +313,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleLifeTimeMin").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleLifeTimeMin").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleLifeTimeMax", _("Maximum lifetime"), @@ -326,7 +326,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleLifeTimeMax").SetManipulatedType("number").SetAssociatedGetter("GetParticleLifeTimeMax").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleLifeTimeMax").SetManipulatedType("number").SetGetter("GetParticleLifeTimeMax").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleLifeTimeMax", @@ -340,7 +340,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleLifeTimeMax").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleLifeTimeMax").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleGravityX", @@ -354,7 +354,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleGravityX").SetManipulatedType("number").SetAssociatedGetter("GetParticleGravityX").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleGravityX").SetManipulatedType("number").SetGetter("GetParticleGravityX").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleGravityX", @@ -368,7 +368,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleGravityX").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGravityX").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleGravityY", @@ -382,7 +382,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleGravityY").SetManipulatedType("number").SetAssociatedGetter("GetParticleGravityY").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleGravityY").SetManipulatedType("number").SetGetter("GetParticleGravityY").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleGravityY", @@ -396,7 +396,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleGravityY").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGravityY").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleGravityZ", @@ -410,7 +410,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleGravityZ").SetManipulatedType("number").SetAssociatedGetter("GetParticleGravityZ").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleGravityZ").SetManipulatedType("number").SetGetter("GetParticleGravityZ").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleGravityZ", @@ -424,7 +424,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleGravityZ").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGravityZ").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleGravityAngle", _("Gravity angle"), @@ -437,7 +437,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleGravityAngle").SetManipulatedType("number").SetAssociatedGetter("GetParticleGravityAngle").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleGravityAngle").SetManipulatedType("number").SetGetter("GetParticleGravityAngle").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleGravityAngle", _("Gravity angle"), @@ -450,7 +450,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleGravityAngle").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGravityAngle").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleGravityLength", _("Gravity"), @@ -463,7 +463,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleGravityLength").SetManipulatedType("number").SetAssociatedGetter("GetParticleGravityLength").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleGravityLength").SetManipulatedType("number").SetGetter("GetParticleGravityLength").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleGravityLength", _("Gravity"), @@ -476,7 +476,7 @@ void Extension::ExtensionSubDeclaration1(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleGravityLength").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGravityLength").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); #endif } diff --git a/Extensions/ParticleSystem/ExtensionSubDeclaration2.cpp b/Extensions/ParticleSystem/ExtensionSubDeclaration2.cpp index ce89f25ac7..4ec3c37339 100644 --- a/Extensions/ParticleSystem/ExtensionSubDeclaration2.cpp +++ b/Extensions/ParticleSystem/ExtensionSubDeclaration2.cpp @@ -26,7 +26,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("object", _("Object"), "ParticleEmitter") .AddParameter("color", _("Initial color")) - .codeExtraInformation.SetFunctionName("SetParticleColor1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleColor1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleColor2", _("Final color"), @@ -38,7 +38,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("object", _("Object"), "ParticleEmitter") .AddParameter("color", _("Final color")) - .codeExtraInformation.SetFunctionName("SetParticleColor2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleColor2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleRed1", _("Red color, parameter 1"), @@ -51,7 +51,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleRed1").SetManipulatedType("number").SetAssociatedGetter("GetParticleRed1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleRed1").SetManipulatedType("number").SetGetter("GetParticleRed1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleRed1", _("Red color, parameter 1"), @@ -64,7 +64,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleRed1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleRed1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleRed2", _("Red color, parameter 2"), @@ -77,7 +77,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleRed2").SetManipulatedType("number").SetAssociatedGetter("GetParticleRed2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleRed2").SetManipulatedType("number").SetGetter("GetParticleRed2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleRed2", _("Red color, parameter 2"), @@ -90,7 +90,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleRed2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleRed2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleBlue1", _("Blue color, parameter 1"), @@ -103,7 +103,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleBlue1").SetManipulatedType("number").SetAssociatedGetter("GetParticleBlue1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleBlue1").SetManipulatedType("number").SetGetter("GetParticleBlue1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleBlue1", _("Blue color, parameter 1"), @@ -116,7 +116,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleBlue1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleBlue1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleBlue2", _("Blue color, parameter 2"), @@ -129,7 +129,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleBlue2").SetManipulatedType("number").SetAssociatedGetter("GetParticleBlue2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleBlue2").SetManipulatedType("number").SetGetter("GetParticleBlue2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleBlue2", _("Blue color, parameter 2"), @@ -142,7 +142,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleBlue2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleBlue2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleGreen1", _("Green color, parameter 1"), @@ -155,7 +155,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleGreen1").SetManipulatedType("number").SetAssociatedGetter("GetParticleGreen1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleGreen1").SetManipulatedType("number").SetGetter("GetParticleGreen1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleGreen1", _("Green color, parameter 1"), @@ -168,7 +168,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleGreen1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGreen1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleGreen2", @@ -182,7 +182,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleGreen2").SetManipulatedType("number").SetAssociatedGetter("GetParticleGreen2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleGreen2").SetManipulatedType("number").SetGetter("GetParticleGreen2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleGreen2", _("Green color, parameter 2"), @@ -195,7 +195,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleGreen2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGreen2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleSize1", @@ -209,7 +209,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleSize1").SetManipulatedType("number").SetAssociatedGetter("GetParticleSize1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleSize1").SetManipulatedType("number").SetGetter("GetParticleSize1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleSize1", _("SIze, parameter 1"), @@ -222,7 +222,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleSize1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleSize1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleSize2", _("Size, parameter 2"), @@ -235,7 +235,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleSize2").SetManipulatedType("number").SetAssociatedGetter("GetParticleSize2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleSize2").SetManipulatedType("number").SetGetter("GetParticleSize2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleSize2", _("Size, parameter 2"), @@ -248,7 +248,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleSize2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleSize2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleAngle1", _("Angle, parameter 1"), @@ -261,7 +261,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleAngle1").SetManipulatedType("number").SetAssociatedGetter("GetParticleAngle1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleAngle1").SetManipulatedType("number").SetGetter("GetParticleAngle1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleAngle1", _("Angle, parameter 1"), @@ -274,7 +274,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleAngle1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleAngle1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleAngle2", _("Angle, parameter 2"), @@ -287,7 +287,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleAngle2").SetManipulatedType("number").SetAssociatedGetter("GetParticleAngle2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleAngle2").SetManipulatedType("number").SetGetter("GetParticleAngle2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleAngle2", _("Angle, parameter 2"), @@ -300,7 +300,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleAngle2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleAngle2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleAlpha1", _("Transparency, parameter 1"), @@ -313,7 +313,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleAlpha1").SetManipulatedType("number").SetAssociatedGetter("GetParticleAlpha1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleAlpha1").SetManipulatedType("number").SetGetter("GetParticleAlpha1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleAlpha1", _("Transparency, parameter 1"), @@ -326,7 +326,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleAlpha1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleAlpha1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("ParticleAlpha2", _("Transparency, parameter 2"), @@ -339,7 +339,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetParticleAlpha2").SetManipulatedType("number").SetAssociatedGetter("GetParticleAlpha2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetParticleAlpha2").SetManipulatedType("number").SetGetter("GetParticleAlpha2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("ParticleAlpha2", @@ -353,7 +353,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetParticleAlpha2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleAlpha2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("NoMoreParticles", @@ -365,7 +365,7 @@ void Extension::ExtensionSubDeclaration2(gd::ObjectMetadata & obj) "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter") - .codeExtraInformation.SetFunctionName("NoMoreParticles").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("NoMoreParticles").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); #endif } diff --git a/Extensions/ParticleSystem/ExtensionSubDeclaration3.cpp b/Extensions/ParticleSystem/ExtensionSubDeclaration3.cpp index 921faae0f3..995a297804 100644 --- a/Extensions/ParticleSystem/ExtensionSubDeclaration3.cpp +++ b/Extensions/ParticleSystem/ExtensionSubDeclaration3.cpp @@ -25,7 +25,7 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter") - .codeExtraInformation.SetFunctionName("RecreateParticleSystem").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("RecreateParticleSystem").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("RendererParam1", _("Rendering first parameter"), @@ -38,7 +38,7 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetRendererParam1").SetManipulatedType("number").SetAssociatedGetter("GetRendererParam1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetRendererParam1").SetManipulatedType("number").SetGetter("GetRendererParam1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("RendererParam1", _("Direction of gravity on Z axis"), @@ -50,7 +50,7 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) .AddParameter("object", _("Object"), "ParticleEmitter") .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetRendererParam1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetRendererParam1").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("RendererParam2", @@ -64,7 +64,7 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetRendererParam2").SetManipulatedType("number").SetAssociatedGetter("GetRendererParam2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetRendererParam2").SetManipulatedType("number").SetGetter("GetRendererParam2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("RendererParam2", _("Rendering second parameter"), @@ -77,7 +77,7 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetRendererParam2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetRendererParam2").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("Tank", @@ -91,7 +91,7 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetTank").SetManipulatedType("number").SetAssociatedGetter("GetTank").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetTank").SetManipulatedType("number").SetGetter("GetTank").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("Tank", _("Capacity"), @@ -104,7 +104,7 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetTank").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetTank").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("Flow", @@ -118,7 +118,7 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetFlow").SetManipulatedType("number").SetAssociatedGetter("GetFlow").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetFlow").SetManipulatedType("number").SetGetter("GetFlow").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("Flow", @@ -132,7 +132,7 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetFlow").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetFlow").SetManipulatedType("number").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddAction("Texture", @@ -145,7 +145,7 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) .AddParameter("object", _("Object"), "ParticleEmitter") .AddParameter("string", _("New image")) - .codeExtraInformation.SetFunctionName("SetTexture").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("SetTexture").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddCondition("Texture", _("Image"), @@ -158,122 +158,122 @@ void Extension::ExtensionSubDeclaration3(gd::ObjectMetadata & obj) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("string", _("Text to test")) - .codeExtraInformation.SetFunctionName("GetTexture").SetManipulatedType("string").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetTexture").SetManipulatedType("string").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddStrExpression("Texture", _("Particles image"), _("Name of the image displayed by particles"), _("Particles"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetTexture").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetTexture").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("NbParticles", _("Particles number"), _("Particles number"), _("Particles"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetNbParticles").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetNbParticles").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("RendererParam1", _("Rendering first parameter"), _("Rendering first parameter"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetRendererParam1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetRendererParam1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("RendererParam2", _("Rendering second parameter"), _("Rendering second parameter"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetRendererParam2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetRendererParam2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("Tank", _("Capacity"), _("Capacity"), _("Common"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetTank").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetTank").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("Flow", _("Flow"), _("Flow"), _("Common"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetFlow").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetFlow").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("EmitterForceMin", _("Emission minimal force"), _("Emission minimal force"), _("Common"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetEmitterForceMin").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterForceMin").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("EmitterForceMax", _("Emission maximal force"), _("Emission maximal force"), _("Common"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetEmitterForceMax").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterForceMax").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("EmitterXDirection", _("Emission X direction"), _("Emission X direction"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetEmitterXDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterXDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("EmitterYDirection", _("Emission Y direction"), _("Emission Y direction"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetEmitterYDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterYDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("EmitterZDirection", _("Emission Z direction"), _("Emission Z direction"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetEmitterZDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterZDirection").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("EmitterAngle", _("Emission angle"), _("Emission angle"), _("Common"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetAngle").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetAngle").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("EmitterAngleA", _("Emission angle A"), _("Emission angle A"), _("Advanced"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetEmitterAngleA").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterAngleA").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("EmitterAngleB", _("Emission angle B"), _("Emission angle B"), _("Advanced"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetEmitterAngleB").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetEmitterAngleB").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ZoneRadius", _("Radius of the emission zone"), _("Radius of the emission zone"), _("Common"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetZoneRadius").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetZoneRadius").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleGravityX", _("X Gravity of particles"), _("X Gravity of particles"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleGravityX").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGravityX").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleGravityY", _("Y Gravity of particles"), _("Y Gravity of particles"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleGravityY").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGravityY").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleGravityZ", _("Z Gravity of particles"), _("Z Gravity of particles"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleGravityZ").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGravityZ").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleGravityAngle", _("Gravity angle"), _("Gravity angle"), _("Common"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleGravityAngle").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGravityAngle").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleGravityLength", _("Gravity"), _("Gravity value"), _("Common"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleGravityLength").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGravityLength").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("Friction", _("Particles friction"), _("Particles friction"), _("Common"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetFriction").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetFriction").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleLifeTimeMin", _("Minimum lifetime of particles"), _("Minimum lifetime of particles"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleLifeTimeMin").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleLifeTimeMin").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleLifeTimeMax", _("Maximum lifetime of particles"), _("Maximum lifetime of particles"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleLifeTimeMax").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleLifeTimeMax").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleRed1", _("Parameter 1 of red color"), _("Parameter 1 of red color"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleRed1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleRed1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleRed2", _("Parameter 2 of red color"), _("Parameter 2 of red color"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleRed2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleRed2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleBlue1", _("Parameter 1 of blue color"), _("Parameter 1 of blue color"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleBlue1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleBlue1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleBlue2", _("Parameter 2 of blue color"), _("Parameter 2 of blue color"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleBlue2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleBlue2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleGreen1", _("Parameter 1 of green color"), _("Parameter 1 of green color"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleGreen1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGreen1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleGreen2", _("Parameter 2 of green color"), _("Parameter 2 of green color"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleGreen2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleGreen2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleAlpha1", _("Parameter 1 of transparency"), _("Parameter 1 of transparency"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleAlpha1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleAlpha1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleAlpha2", _("Parameter 2 of transparency"), _("Parameter 2 of transparency"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleAlpha2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleAlpha2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleSize1", _("Parameter 1 of size"), _("Parameter 1 of size"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleSize1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleSize1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleSize2", _("Parameter 2 of size"), _("Parameter 2 of size"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleSize2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleSize2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleAngle1", _("Parameter 1 of angle"), _("Parameter 1 of angle"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleAngle1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleAngle1").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); obj.AddExpression("ParticleAngle2", _("Parameter 2 of angle"), _("Parameter 2 of angle"), _("Setup"), "CppPlatform/Extensions/particleSystemicon16.png") .AddParameter("object", _("Object"), "ParticleEmitter", false) - .codeExtraInformation.SetFunctionName("GetParticleAngle2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); + .SetFunctionName("GetParticleAngle2").SetIncludeFile("ParticleSystem/ParticleEmitterObject.h"); #endif } diff --git a/Extensions/PathAutomatism/Extension.cpp b/Extensions/PathAutomatism/Extension.cpp index 9a5693ecb4..f722058f75 100644 --- a/Extensions/PathAutomatism/Extension.cpp +++ b/Extensions/PathAutomatism/Extension.cpp @@ -58,7 +58,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("yesorno", _("Activate")) - .codeExtraInformation.SetFunctionName("SetReverseAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("SetReverseAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetStopAtEnd", _("De/activate the stop at the end of the path"), @@ -70,7 +70,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("yesorno", _("Activate")) - .codeExtraInformation.SetFunctionName("SetStopAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("SetStopAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("ReverseAtEnd", _("Rounds"), @@ -81,7 +81,7 @@ public: "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("ReverseAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("ReverseAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("StopAtEnd", _("Stop at the end of the path"), @@ -92,7 +92,7 @@ public: "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("StopAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("StopAtEnd").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("Reverse", _("Invert the movement on the path"), @@ -103,7 +103,7 @@ public: "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("Reverse").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("Reverse").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetSegment", _("Number of the segment on the path"), @@ -116,7 +116,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetCurrentSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetCurrentSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("EnterSegment", _("Position on the segment of a path"), @@ -129,12 +129,12 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("operator", _("Modification sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetCurrentSegment").SetAssociatedGetter("GetCurrentSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("SetCurrentSegment").SetGetter("GetCurrentSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddExpression("Segment", _("Current segment"), _("Number of the current segment"), _("Position"), "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("GetCurrentSegment").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetCurrentSegment").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetPosition", _("Position of the object on the segment"), @@ -147,7 +147,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetPositionOnSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetPositionOnSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetPosition", _("Put the object on a precise position of the current segment"), @@ -160,12 +160,12 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("operator", _("Modification sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetPositionOnSegment").SetAssociatedGetter("GetPositionOnSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("SetPositionOnSegment").SetGetter("GetPositionOnSegment").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddExpression("Position", _("Position on the segment"), _("Position on the segment ( value between 0 and 1 )"), _("Position"), "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("GetPositionOnSegment").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetPositionOnSegment").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetPathName", _("Path name"), @@ -178,7 +178,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("string", _("Name")) - .codeExtraInformation.SetFunctionName("GetCurrentPathName").SetManipulatedType("string").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetCurrentPathName").SetManipulatedType("string").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetPathName", _("Change the path"), @@ -190,12 +190,12 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("string", _("Name")) - .codeExtraInformation.SetFunctionName("ChangeCurrentPath").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("ChangeCurrentPath").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddStrExpression("CurrentPathName", _("Current path name"), _("Current path name"), _("Path"), "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("GetCurrentPathName").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetCurrentPathName").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetOffsetX", _("X position of the path"), @@ -208,7 +208,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetOffsetX").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetOffsetX").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetOffsetX", _("Modify the path X position"), @@ -221,12 +221,12 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("operator", _("Modification sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetOffsetX").SetAssociatedGetter("GetOffsetX").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("SetOffsetX").SetGetter("GetOffsetX").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddExpression("PathX", _("X position of the path"), _("X position of the path"), _("Path position"), "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("GetOffsetX").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetOffsetX").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetOffsetY", _("Path Y position"), @@ -239,7 +239,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetOffsetY").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetOffsetY").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetOffsetY", _("Modify the path Y position"), @@ -252,12 +252,12 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("operator", _("Modification sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetOffsetY").SetAssociatedGetter("GetOffsetY").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("SetOffsetY").SetGetter("GetOffsetY").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddExpression("PathY", _("Path Y position"), _("Path Y position"), _("Path position"), "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("GetOffsetY").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetOffsetY").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetFollowAngle", _("Automatic rotation"), @@ -268,7 +268,7 @@ public: "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("FollowAngle").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("FollowAngle").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetFollowAngle", _("De/activate automatic rotation"), @@ -280,7 +280,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("yesorno", _("Activate \?")) - .codeExtraInformation.SetFunctionName("SetFollowAngle").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("SetFollowAngle").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetAngleOffset", _("Angle offset"), @@ -293,7 +293,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetAngleOffset", _("Change the angle offset"), @@ -306,12 +306,12 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("operator", _("Modification sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetAngleOffset").SetAssociatedGetter("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("SetAngleOffset").SetGetter("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddExpression("AngleOffset", _("Angle offset"), _("Add an offset to the angle of the object"), _("Options"), "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("GetAngleOffset").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetAngleOffset").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddCondition("GetSpeed", _("Speed"), @@ -324,7 +324,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddAction("SetSpeed", _("Change the speed"), @@ -337,12 +337,12 @@ public: .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) .AddParameter("operator", _("Modification sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetSpeed").SetAssociatedGetter("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("SetSpeed").SetGetter("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathAutomatism/PathAutomatism.h"); aut.AddExpression("Speed", _("Speed"), _("Moving speed on the path"), _("Movement"), "CppPlatform/Extensions/pathicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathAutomatism", false) - .codeExtraInformation.SetFunctionName("GetSpeed").SetIncludeFile("PathAutomatism/PathAutomatism.h"); + .SetFunctionName("GetSpeed").SetIncludeFile("PathAutomatism/PathAutomatism.h"); #endif diff --git a/Extensions/PathfindingAutomatism/Extension.cpp b/Extensions/PathfindingAutomatism/Extension.cpp index 325c35650a..03a3f4f5c0 100644 --- a/Extensions/PathfindingAutomatism/Extension.cpp +++ b/Extensions/PathfindingAutomatism/Extension.cpp @@ -57,7 +57,7 @@ public: .AddCodeOnlyParameter("currentScene", "") .AddParameter("expression", _("Destination X position")) .AddParameter("expression", _("Destination Y position")) - .codeExtraInformation.SetFunctionName("MoveTo").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("MoveTo").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("PathFound", _("Path found"), @@ -68,7 +68,7 @@ public: "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("PathFound").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("PathFound").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("DestinationReached", _("Destination reached"), @@ -79,7 +79,7 @@ public: "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("DestinationReached").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("DestinationReached").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("CellWidth", _("Width of the cells"), @@ -92,7 +92,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Width (pixels)")) - .codeExtraInformation.SetFunctionName("SetCellWidth").SetAssociatedGetter("GetCellWidth").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("SetCellWidth").SetGetter("GetCellWidth").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("CellWidth", _("Width of the virtual grid"), @@ -105,7 +105,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Width (pixels)")) - .codeExtraInformation.SetFunctionName("GetCellWidth").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetCellWidth").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("CellHeight", _("Height of the cells"), @@ -118,7 +118,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Height (pixels)")) - .codeExtraInformation.SetFunctionName("SetCellHeight").SetAssociatedGetter("GetCellHeight").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("SetCellHeight").SetGetter("GetCellHeight").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("CellHeight", _("Height of the virtual grid"), @@ -131,7 +131,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Height (pixels)")) - .codeExtraInformation.SetFunctionName("GetCellHeight").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetCellHeight").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("Acceleration", _("Acceleration"), @@ -144,7 +144,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetAcceleration").SetAssociatedGetter("GetAcceleration").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("SetAcceleration").SetGetter("GetAcceleration").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("Acceleration", _("Acceleration"), @@ -157,7 +157,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetAcceleration").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetAcceleration").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("MaxSpeed", _("Maximum speed"), @@ -170,7 +170,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetMaxSpeed").SetAssociatedGetter("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("SetMaxSpeed").SetGetter("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("MaxSpeed", _("Maximum speed"), @@ -183,7 +183,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("Speed", _("Speed"), @@ -196,7 +196,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetSpeed").SetAssociatedGetter("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("SetSpeed").SetGetter("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("Speed", _("Speed"), @@ -209,7 +209,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("AngularMaxSpeed", _("Angular maximum speed"), @@ -222,7 +222,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetAngularMaxSpeed").SetAssociatedGetter("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("SetAngularMaxSpeed").SetGetter("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("AngularMaxSpeed", _("Angular maximum speed"), @@ -235,7 +235,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("AngleOffset", _("Rotation offset"), @@ -248,7 +248,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetAngleOffset").SetAssociatedGetter("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("SetAngleOffset").SetGetter("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("AngleOffset", _("Rotation offset"), @@ -261,7 +261,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("ExtraBorder", _("Extra border"), @@ -274,7 +274,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value (in pixels)")) - .codeExtraInformation.SetFunctionName("SetExtraBorder").SetAssociatedGetter("GetExtraBorder").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("SetExtraBorder").SetGetter("GetExtraBorder").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("ExtraBorder", _("Extra border"), @@ -287,7 +287,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value (in pixels)")) - .codeExtraInformation.SetFunctionName("GetExtraBorder").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetExtraBorder").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("AllowDiagonals", _("Diagonals moves"), @@ -299,7 +299,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("yesorno", _("Allow?")) - .codeExtraInformation.SetFunctionName("SetAllowDiagonals").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("SetAllowDiagonals").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("DiagonalsAllowed", _("Diagonals moves"), @@ -310,7 +310,7 @@ public: "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("DiagonalsAllowed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("DiagonalsAllowed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddAction("RotateObject", _("Rotate the object"), @@ -322,7 +322,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("yesorno", _("Rotate object?")) - .codeExtraInformation.SetFunctionName("SetRotateObject").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("SetRotateObject").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddCondition("ObjectRotated", _("Object rotated"), @@ -333,99 +333,99 @@ public: "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("IsObjectRotated").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("IsObjectRotated").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("GetNodeX", _("Get a waypoint X position"), _("Get next waypoint X position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("expression", _("Node index (start at 0!)")) - .codeExtraInformation.SetFunctionName("GetNodeX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetNodeX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("GetNodeY", _("Get a waypoint Y position"), _("Get next waypoint Y position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) .AddParameter("expression", _("Node index (start at 0!)")) - .codeExtraInformation.SetFunctionName("GetNodeY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetNodeY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("NextNodeIndex", _("Index of the next waypoint"), _("Get the index of the next waypoint to reach"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetNextNodeIndex").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetNextNodeIndex").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("NodeCount", _("Waypoint count"), _("Get the number of waypoints on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetNodeCount").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetNodeCount").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("NextNodeX", _("Get next waypoint X position"), _("Get next waypoint X position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetNextNodeX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetNextNodeX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("NextNodeY", _("Get next waypoint Y position"), _("Get next waypoint Y position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetNextNodeY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetNextNodeY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("LastNodeX", _("Last waypoint X position"), _("Last waypoint X position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetLastNodeX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetLastNodeX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("LastNodeY", _("Last waypoint Y position"), _("Last waypoint Y position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetLastNodeY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetLastNodeY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("DestinationX", _("Destination X position"), _("Destination X position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetDestinationX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetDestinationX").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("DestinationY", _("Destination Y position"), _("Destination Y position"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetDestinationY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetDestinationY").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("Acceleration", _("Acceleration"), _("Acceleration of the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetAcceleration").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetAcceleration").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("MaxSpeed", _("Maximum speed"), _("Maximum speed of the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetMaxSpeed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetMaxSpeed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("Speed", _("Speed"), _("Speed of the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetSpeed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetSpeed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("AngularMaxSpeed", _("Angular maximum speed"), _("Angular maximum speed of the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetAngularMaxSpeed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetAngularMaxSpeed").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("AngleOffset", _("Rotation offset"), _("Rotation offset applied the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetAngleOffset").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetAngleOffset").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("ExtraBorder", _("Extra border size"), _("Extra border applied the object on the path"), _("Path"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetExtraBorder").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetExtraBorder").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("CellWidth", _("Width of a cell"), _("Width of the virtual grid"), _("Virtual grid"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetCellWidth").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetCellWidth").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); aut.AddExpression("CellHeight", _("Height of a cell"), _("Height of the virtual grid"), _("Virtual grid"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingAutomatism", false) - .codeExtraInformation.SetFunctionName("GetCellHeight").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); + .SetFunctionName("GetCellHeight").SetIncludeFile("PathfindingAutomatism/PathfindingAutomatism.h"); #endif } @@ -454,7 +454,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingObstacleAutomatism", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Difficulty")) - .codeExtraInformation.SetFunctionName("SetCost").SetAssociatedGetter("GetCost").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); + .SetFunctionName("SetCost").SetGetter("GetCost").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); aut.AddCondition("Cost", _("Cost"), @@ -467,7 +467,7 @@ public: .AddParameter("automatism", _("Automatism"), "PathfindingObstacleAutomatism", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Difficulty")) - .codeExtraInformation.SetFunctionName("GetCost").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); + .SetFunctionName("GetCost").SetManipulatedType("number").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); aut.AddAction("SetImpassable", _("Set impassable"), @@ -479,7 +479,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingObstacleAutomatism", false) .AddParameter("yesorno", _("Impassable?")) - .codeExtraInformation.SetFunctionName("SetImpassable").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); + .SetFunctionName("SetImpassable").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); aut.AddCondition("IsImpassable", _("Is impassable"), @@ -490,12 +490,12 @@ public: "CppPlatform/Extensions/pathfindingobstacleicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingObstacleAutomatism", false) - .codeExtraInformation.SetFunctionName("IsImpassable").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); + .SetFunctionName("IsImpassable").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); aut.AddExpression("Cost", _("Cost"), _("Obstacle cost"), _("Obstacles"), "CppPlatform/Extensions/AStaricon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PathfindingObstacleAutomatism", false) - .codeExtraInformation.SetFunctionName("GetCost").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); + .SetFunctionName("GetCost").SetIncludeFile("PathfindingAutomatism/PathfindingObstacleAutomatism.h"); #endif } diff --git a/Extensions/PathfindingAutomatism/JsExtension.cpp b/Extensions/PathfindingAutomatism/JsExtension.cpp index fe60f9c933..c9b11370ce 100644 --- a/Extensions/PathfindingAutomatism/JsExtension.cpp +++ b/Extensions/PathfindingAutomatism/JsExtension.cpp @@ -41,50 +41,50 @@ public: std::map & autConditions = GetAllConditionsForAutomatism("PathfindingAutomatism::PathfindingAutomatism"); std::map & autExpressions = GetAllExpressionsForAutomatism("PathfindingAutomatism::PathfindingAutomatism"); - autConditions["PathfindingAutomatism::PathFound"].codeExtraInformation.SetFunctionName("pathFound"); - autActions["PathfindingAutomatism::SetDestination"].codeExtraInformation.SetFunctionName("moveTo"); - autConditions["PathfindingAutomatism::DestinationReached"].codeExtraInformation.SetFunctionName("destinationReached"); - autActions["PathfindingAutomatism::CellWidth"].codeExtraInformation.SetFunctionName("setCellWidth").SetAssociatedGetter("getCellWidth"); - autConditions["PathfindingAutomatism::CellWidth"].codeExtraInformation.SetFunctionName("getCellWidth"); - autActions["PathfindingAutomatism::CellHeight"].codeExtraInformation.SetFunctionName("setCellHeight").SetAssociatedGetter("getCellHeight"); - autConditions["PathfindingAutomatism::CellHeight"].codeExtraInformation.SetFunctionName("getCellHeight"); - autActions["PathfindingAutomatism::Acceleration"].codeExtraInformation.SetFunctionName("setAcceleration").SetAssociatedGetter("getAcceleration"); - autConditions["PathfindingAutomatism::Acceleration"].codeExtraInformation.SetFunctionName("getAcceleration"); - autActions["PathfindingAutomatism::MaxSpeed"].codeExtraInformation.SetFunctionName("setMaxSpeed").SetAssociatedGetter("getMaxSpeed"); - autConditions["PathfindingAutomatism::MaxSpeed"].codeExtraInformation.SetFunctionName("getMaxSpeed"); - autActions["PathfindingAutomatism::Speed"].codeExtraInformation.SetFunctionName("setSpeed").SetAssociatedGetter("getSpeed"); - autConditions["PathfindingAutomatism::Speed"].codeExtraInformation.SetFunctionName("getSpeed"); - autActions["PathfindingAutomatism::AngularMaxSpeed"].codeExtraInformation.SetFunctionName("setAngularMaxSpeed").SetAssociatedGetter("getAngularMaxSpeed"); - autConditions["PathfindingAutomatism::AngularMaxSpeed"].codeExtraInformation.SetFunctionName("getAngularMaxSpeed"); - autActions["PathfindingAutomatism::AngleOffset"].codeExtraInformation.SetFunctionName("setAngleOffset").SetAssociatedGetter("getAngleOffset"); - autConditions["PathfindingAutomatism::AngleOffset"].codeExtraInformation.SetFunctionName("getAngleOffset"); - autActions["PathfindingAutomatism::ExtraBorder"].codeExtraInformation.SetFunctionName("setExtraBorder").SetAssociatedGetter("getExtraBorder"); - autConditions["PathfindingAutomatism::ExtraBorder"].codeExtraInformation.SetFunctionName("getExtraBorder"); + autConditions["PathfindingAutomatism::PathFound"].SetFunctionName("pathFound"); + autActions["PathfindingAutomatism::SetDestination"].SetFunctionName("moveTo"); + autConditions["PathfindingAutomatism::DestinationReached"].SetFunctionName("destinationReached"); + autActions["PathfindingAutomatism::CellWidth"].SetFunctionName("setCellWidth").SetGetter("getCellWidth"); + autConditions["PathfindingAutomatism::CellWidth"].SetFunctionName("getCellWidth"); + autActions["PathfindingAutomatism::CellHeight"].SetFunctionName("setCellHeight").SetGetter("getCellHeight"); + autConditions["PathfindingAutomatism::CellHeight"].SetFunctionName("getCellHeight"); + autActions["PathfindingAutomatism::Acceleration"].SetFunctionName("setAcceleration").SetGetter("getAcceleration"); + autConditions["PathfindingAutomatism::Acceleration"].SetFunctionName("getAcceleration"); + autActions["PathfindingAutomatism::MaxSpeed"].SetFunctionName("setMaxSpeed").SetGetter("getMaxSpeed"); + autConditions["PathfindingAutomatism::MaxSpeed"].SetFunctionName("getMaxSpeed"); + autActions["PathfindingAutomatism::Speed"].SetFunctionName("setSpeed").SetGetter("getSpeed"); + autConditions["PathfindingAutomatism::Speed"].SetFunctionName("getSpeed"); + autActions["PathfindingAutomatism::AngularMaxSpeed"].SetFunctionName("setAngularMaxSpeed").SetGetter("getAngularMaxSpeed"); + autConditions["PathfindingAutomatism::AngularMaxSpeed"].SetFunctionName("getAngularMaxSpeed"); + autActions["PathfindingAutomatism::AngleOffset"].SetFunctionName("setAngleOffset").SetGetter("getAngleOffset"); + autConditions["PathfindingAutomatism::AngleOffset"].SetFunctionName("getAngleOffset"); + autActions["PathfindingAutomatism::ExtraBorder"].SetFunctionName("setExtraBorder").SetGetter("getExtraBorder"); + autConditions["PathfindingAutomatism::ExtraBorder"].SetFunctionName("getExtraBorder"); - autActions["PathfindingAutomatism::AllowDiagonals"].codeExtraInformation.SetFunctionName("allowDiagonals"); - autConditions["PathfindingAutomatism::DiagonalsAllowed"].codeExtraInformation.SetFunctionName("diagonalsAllowed"); - autActions["PathfindingAutomatism::RotateObject"].codeExtraInformation.SetFunctionName("setRotateObject"); - autConditions["PathfindingAutomatism::ObjectRotated"].codeExtraInformation.SetFunctionName("isObjectRotated"); + autActions["PathfindingAutomatism::AllowDiagonals"].SetFunctionName("allowDiagonals"); + autConditions["PathfindingAutomatism::DiagonalsAllowed"].SetFunctionName("diagonalsAllowed"); + autActions["PathfindingAutomatism::RotateObject"].SetFunctionName("setRotateObject"); + autConditions["PathfindingAutomatism::ObjectRotated"].SetFunctionName("isObjectRotated"); - autExpressions["GetNodeX"].codeExtraInformation.SetFunctionName("getNodeX"); - autExpressions["GetNodeY"].codeExtraInformation.SetFunctionName("getNodeY"); - autExpressions["NextNodeIndex"].codeExtraInformation.SetFunctionName("getNextNodeIndex"); - autExpressions["NodeCount"].codeExtraInformation.SetFunctionName("getNodeCount"); - autExpressions["NextNodeX"].codeExtraInformation.SetFunctionName("getNextNodeX"); - autExpressions["NextNodeY"].codeExtraInformation.SetFunctionName("getNextNodeY"); - autExpressions["LastNodeX"].codeExtraInformation.SetFunctionName("getLastNodeX"); - autExpressions["LastNodeY"].codeExtraInformation.SetFunctionName("getLastNodeY"); - autExpressions["DestinationX"].codeExtraInformation.SetFunctionName("getDestinationX"); - autExpressions["DestinationY"].codeExtraInformation.SetFunctionName("getDestinationY"); + autExpressions["GetNodeX"].SetFunctionName("getNodeX"); + autExpressions["GetNodeY"].SetFunctionName("getNodeY"); + autExpressions["NextNodeIndex"].SetFunctionName("getNextNodeIndex"); + autExpressions["NodeCount"].SetFunctionName("getNodeCount"); + autExpressions["NextNodeX"].SetFunctionName("getNextNodeX"); + autExpressions["NextNodeY"].SetFunctionName("getNextNodeY"); + autExpressions["LastNodeX"].SetFunctionName("getLastNodeX"); + autExpressions["LastNodeY"].SetFunctionName("getLastNodeY"); + autExpressions["DestinationX"].SetFunctionName("getDestinationX"); + autExpressions["DestinationY"].SetFunctionName("getDestinationY"); - autExpressions["Acceleration"].codeExtraInformation.SetFunctionName("getAcceleration"); - autExpressions["MaxSpeed"].codeExtraInformation.SetFunctionName("getMaxSpeed"); - autExpressions["Speed"].codeExtraInformation.SetFunctionName("getSpeed"); - autExpressions["AngularMaxSpeed"].codeExtraInformation.SetFunctionName("getAngularMaxSpeed"); - autExpressions["AngleOffset"].codeExtraInformation.SetFunctionName("getAngleOffset"); - autExpressions["ExtraBorder"].codeExtraInformation.SetFunctionName("getExtraBorder"); - autExpressions["CellWidth"].codeExtraInformation.SetFunctionName("getCellWidth"); - autExpressions["CellHeight"].codeExtraInformation.SetFunctionName("getCellHeight"); + autExpressions["Acceleration"].SetFunctionName("getAcceleration"); + autExpressions["MaxSpeed"].SetFunctionName("getMaxSpeed"); + autExpressions["Speed"].SetFunctionName("getSpeed"); + autExpressions["AngularMaxSpeed"].SetFunctionName("getAngularMaxSpeed"); + autExpressions["AngleOffset"].SetFunctionName("getAngleOffset"); + autExpressions["ExtraBorder"].SetFunctionName("getExtraBorder"); + autExpressions["CellWidth"].SetFunctionName("getCellWidth"); + autExpressions["CellHeight"].SetFunctionName("getCellHeight"); } GetAutomatismMetadata("PathfindingAutomatism::PathfindingObstacleAutomatism") @@ -96,12 +96,12 @@ public: std::map & autConditions = GetAllConditionsForAutomatism("PathfindingAutomatism::PathfindingObstacleAutomatism"); std::map & autExpressions = GetAllExpressionsForAutomatism("PathfindingAutomatism::PathfindingObstacleAutomatism"); - autActions["PathfindingObstacleAutomatism::Cost"].codeExtraInformation.SetFunctionName("setCost").SetAssociatedGetter("getCost"); - autConditions["PathfindingObstacleAutomatism::Cost"].codeExtraInformation.SetFunctionName("getCost"); - autActions["PathfindingObstacleAutomatism::SetImpassable"].codeExtraInformation.SetFunctionName("setImpassable"); - autConditions["PathfindingObstacleAutomatism::IsImpassable"].codeExtraInformation.SetFunctionName("isImpassable"); + autActions["PathfindingObstacleAutomatism::Cost"].SetFunctionName("setCost").SetGetter("getCost"); + autConditions["PathfindingObstacleAutomatism::Cost"].SetFunctionName("getCost"); + autActions["PathfindingObstacleAutomatism::SetImpassable"].SetFunctionName("setImpassable"); + autConditions["PathfindingObstacleAutomatism::IsImpassable"].SetFunctionName("isImpassable"); - autExpressions["Cost"].codeExtraInformation.SetFunctionName("getCost"); + autExpressions["Cost"].SetFunctionName("getCost"); } StripUnimplementedInstructionsAndExpressions(); diff --git a/Extensions/PhysicsAutomatism/Extension.cpp b/Extensions/PhysicsAutomatism/Extension.cpp index a3777df90c..ab93541f69 100644 --- a/Extensions/PhysicsAutomatism/Extension.cpp +++ b/Extensions/PhysicsAutomatism/Extension.cpp @@ -57,7 +57,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetStatic").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetStatic").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetDynamic", _("Make the object dynamic"), @@ -69,7 +69,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetDynamic").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetDynamic").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("IsDynamic", _("The object is dynamic"), @@ -80,7 +80,7 @@ public: "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") - .codeExtraInformation.SetFunctionName("IsDynamic").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("IsDynamic").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetFixedRotation", _("Fix rotation"), @@ -92,7 +92,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetFixedRotation").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetFixedRotation").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("AddRevoluteJoint", _("Add a hinge"), @@ -106,7 +106,7 @@ public: .AddParameter("expression", _("Hinge X position")) .AddParameter("expression", _("Hinge Y position")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("AddRevoluteJoint").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("AddRevoluteJoint").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("AddRevoluteJointBetweenObjects", _("Add a hinge between two objects"), @@ -121,7 +121,7 @@ public: .AddCodeOnlyParameter("currentScene", "") .AddParameter("expression", _("X position of the hinge, from the first object mass center"), "", true).SetDefaultValue("0") .AddParameter("expression", _("Y position of the hinge, from the first object mass center"), "", true).SetDefaultValue("0") - .codeExtraInformation.SetFunctionName("AddRevoluteJointBetweenObjects").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("AddRevoluteJointBetweenObjects").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ActAddGearJointBetweenObjects", _("Add a gear between two objects"), @@ -135,7 +135,7 @@ public: .AddParameter("objectPtr", _("Object")) .AddParameter("expression", _("Ratio"), "", true).SetDefaultValue("1") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("AddGearJointBetweenObjects").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("AddGearJointBetweenObjects").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetFreeRotation", _("Make object's rotation free"), @@ -147,7 +147,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetFreeRotation").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetFreeRotation").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("IsFixedRotation", _("Fixed rotation"), @@ -159,7 +159,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("IsFixedRotation").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("IsFixedRotation").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetAsBullet", _("Consider as a bullet."), @@ -171,7 +171,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetAsBullet").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetAsBullet").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("DontSetAsBullet", _("Do not consider as a bullet"), @@ -183,7 +183,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("DontSetAsBullet").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("DontSetAsBullet").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("IsBullet", _("Object is considered as a bullet"), @@ -195,7 +195,7 @@ public: .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("IsBullet").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("IsBullet").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyImpulse", _("Apply an impulse"), @@ -209,7 +209,7 @@ public: .AddParameter("expression", _("X component ( Newtons/Seconds )")) .AddParameter("expression", _("Y component ( Newtons/Seconds )")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("ApplyImpulse").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("ApplyImpulse").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyImpulseUsingPolarCoordinates", _("Apply an impulse (angle)"), @@ -223,7 +223,7 @@ public: .AddParameter("expression", _("Angle")) .AddParameter("expression", _("Impulse value ( Newton/seconds )")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("ApplyImpulseUsingPolarCoordinates").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("ApplyImpulseUsingPolarCoordinates").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyImpulseTowardPosition", _("Apply an impulse toward a position"), @@ -238,7 +238,7 @@ public: .AddParameter("expression", _("Y position")) .AddParameter("expression", _("Impulse value ( Newton/seconds )")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("ApplyImpulseTowardPosition").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("ApplyImpulseTowardPosition").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyForce", _("Add a force"), @@ -252,7 +252,7 @@ public: .AddParameter("expression", _("X component ( Newtons )")) .AddParameter("expression", _("Y component ( Newtons )")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("ApplyForce").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("ApplyForce").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyForceUsingPolarCoordinates", _("Apply a force ( angle )"), @@ -266,7 +266,7 @@ public: .AddParameter("expression", _("Angle")) .AddParameter("expression", _("Length of the force ( Newtons )")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("ApplyForceUsingPolarCoordinates").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("ApplyForceUsingPolarCoordinates").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyForceTowardPosition", _("Apply a force toward a position"), @@ -281,7 +281,7 @@ public: .AddParameter("expression", _("Y position")) .AddParameter("expression", _("Length of the force ( Newtons )")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("ApplyForceTowardPosition").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("ApplyForceTowardPosition").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("ApplyTorque", _("Add a torque (a rotation)"), @@ -294,7 +294,7 @@ public: .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddParameter("expression", _("Torque value")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("ApplyTorque").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("ApplyTorque").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetLinearVelocity", _("Linear velocity"), @@ -308,7 +308,7 @@ public: .AddParameter("expression", _("X Coordinate")) .AddParameter("expression", _("Y Coordinate")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetLinearVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetLinearVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("LinearVelocityX", _("X component"), @@ -322,7 +322,7 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetLinearVelocityX").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetLinearVelocityX").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("LinearVelocityY", _("Y component"), @@ -336,7 +336,7 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetLinearVelocityY").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetLinearVelocityY").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("LinearVelocity", _("Linear speed"), @@ -350,7 +350,7 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetLinearVelocity").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetLinearVelocity").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetAngularVelocity", _("Angular speed"), @@ -363,7 +363,7 @@ public: .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddParameter("expression", _("New value")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetAngularVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetAngularVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("AngularVelocity", _("Angular speed"), @@ -377,7 +377,7 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetAngularVelocity").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetAngularVelocity").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("LinearDamping", _("Linear damping"), @@ -391,7 +391,7 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetLinearDamping").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetLinearDamping").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("CollisionWith", _("Collision"), @@ -404,7 +404,7 @@ public: .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddParameter("objectList", _("Object")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("CollisionWith").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("CollisionWith").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetLinearDamping", _("Linear damping"), @@ -417,7 +417,7 @@ public: .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddParameter("expression", _("Value")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetLinearDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetLinearDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("AngularDamping", _("Angular damping"), @@ -431,7 +431,7 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetAngularDamping").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetAngularDamping").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetAngularDamping", _("Angular damping"), @@ -444,7 +444,7 @@ public: .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddParameter("expression", _("Value")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetAngularDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetAngularDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetGravity", _("Gravity"), @@ -458,7 +458,7 @@ public: .AddParameter("expression", _("X Coordinate")) .AddParameter("expression", _("Y Coordinate")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetGravity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetGravity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetPolygonScaleX", _("Change collision polygon X scale"), @@ -471,7 +471,7 @@ public: .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddParameter("expression", _("Scale")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetPolygonScaleY", _("Change collision polygon Y scale"), @@ -484,7 +484,7 @@ public: .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddParameter("expression", _("Scale")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("GetPolygonScaleX", _("Collision polygon X scale"), @@ -498,7 +498,7 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetPolygonScaleX").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetPolygonScaleX").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("GetPolygonScaleY", _("Collision polygon Y scale"), @@ -512,55 +512,55 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetPolygonScaleY").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetPolygonScaleY").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddExpression("PolygonScaleX", _("Collision polygon X scale"), _("Collision polygon X scale"), _("Collision polygon"), "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddExpression("PolygonScaleY", _("Collision polygon Y scale"), _("Collision polygon Y scale"), _("Collision polygon"), "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddExpression("LinearVelocity", _("Linear speed"), _("Linear speed"), _("Displacement"), "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetLinearVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetLinearVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddExpression("LinearVelocityX", _("X component"), _("X component"), _("Displacement"), "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetLinearVelocityX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetLinearVelocityX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddExpression("LinearVelocityY", _("Y component"), _("Y component"), _("Displacement"), "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetLinearVelocityY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetLinearVelocityY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddExpression("AngularVelocity", _("Angular speed"), _("Angular speed"), _("Rotation"), "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetAngularVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetAngularVelocity").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddExpression("LinearDamping", _("Linear damping"), _("Linear damping"), _("Displacement"), "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetLinearDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetLinearDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddExpression("AngularDamping", _("Angular damping"), _("Angular damping"), _("Rotation"), "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetAngularDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetAngularDamping").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); #endif diff --git a/Extensions/PhysicsAutomatism/JsExtension.cpp b/Extensions/PhysicsAutomatism/JsExtension.cpp index a097bcaea2..6a427b8478 100644 --- a/Extensions/PhysicsAutomatism/JsExtension.cpp +++ b/Extensions/PhysicsAutomatism/JsExtension.cpp @@ -38,43 +38,43 @@ public: std::map & autConditions = GetAllConditionsForAutomatism("PhysicsAutomatism::PhysicsAutomatism"); std::map & autExpressions = GetAllExpressionsForAutomatism("PhysicsAutomatism::PhysicsAutomatism"); - autActions["PhysicsAutomatism::SetStatic"].codeExtraInformation.SetFunctionName("setStatic"); - autActions["PhysicsAutomatism::SetDynamic"].codeExtraInformation.SetFunctionName("setDynamic"); - autConditions["PhysicsAutomatism::SetDynamic"].codeExtraInformation.SetFunctionName("isDynamic"); - autActions["PhysicsAutomatism::SetFixedRotation"].codeExtraInformation.SetFunctionName("setFixedRotation"); - autActions["PhysicsAutomatism::SetFreeRotation"].codeExtraInformation.SetFunctionName("setFreeRotation"); - autActions["PhysicsAutomatism::AddRevoluteJoint"].codeExtraInformation.SetFunctionName("addRevoluteJoint"); - autActions["PhysicsAutomatism::AddRevoluteJointBetweenObjects"].codeExtraInformation.SetFunctionName("addRevoluteJointBetweenObjects"); - autActions["PhysicsAutomatism::ActAddGearJointBetweenObjects"].codeExtraInformation.SetFunctionName("addGearJointBetweenObjects"); - autConditions["PhysicsAutomatism::IsFixedRotation"].codeExtraInformation.SetFunctionName("isFixedRotation"); - autActions["PhysicsAutomatism::SetAsBullet"].codeExtraInformation.SetFunctionName("setAsBullet"); - autActions["PhysicsAutomatism::DontSetAsBullet"].codeExtraInformation.SetFunctionName("dontSetAsBullet"); - autConditions["PhysicsAutomatism::IsBullet"].codeExtraInformation.SetFunctionName("isBullet"); - autActions["PhysicsAutomatism::ApplyImpulse"].codeExtraInformation.SetFunctionName("applyImpulse"); - autActions["PhysicsAutomatism::ApplyImpulseUsingPolarCoordinates"].codeExtraInformation.SetFunctionName("applyImpulseUsingPolarCoordinates"); - autActions["PhysicsAutomatism::ApplyImpulseTowardPosition"].codeExtraInformation.SetFunctionName("applyImpulseTowardPosition"); - autActions["PhysicsAutomatism::ApplyForce"].codeExtraInformation.SetFunctionName("applyForce"); - autActions["PhysicsAutomatism::ApplyForceUsingPolarCoordinates"].codeExtraInformation.SetFunctionName("applyForceUsingPolarCoordinates"); - autActions["PhysicsAutomatism::ApplyForceTowardPosition"].codeExtraInformation.SetFunctionName("applyForceTowardPosition"); - autActions["PhysicsAutomatism::ApplyTorque"].codeExtraInformation.SetFunctionName("applyTorque"); - autActions["PhysicsAutomatism::SetLinearVelocity"].codeExtraInformation.SetFunctionName("setLinearVelocity"); - autConditions["PhysicsAutomatism::LinearVelocityX"].codeExtraInformation.SetFunctionName("getLinearVelocityX"); - autConditions["PhysicsAutomatism::LinearVelocityY"].codeExtraInformation.SetFunctionName("getLinearVelocityY"); - autConditions["PhysicsAutomatism::LinearVelocity"].codeExtraInformation.SetFunctionName("getLinearVelocity"); - autActions["PhysicsAutomatism::SetAngularVelocity"].codeExtraInformation.SetFunctionName("setAngularVelocity"); - autConditions["PhysicsAutomatism::AngularVelocity"].codeExtraInformation.SetFunctionName("getAngularVelocity"); - autConditions["PhysicsAutomatism::CollisionWith"].codeExtraInformation.SetFunctionName("collisionWith"); - autConditions["PhysicsAutomatism::LinearDamping"].codeExtraInformation.SetFunctionName("getLinearDamping"); - autActions["PhysicsAutomatism::SetLinearDamping"].codeExtraInformation.SetFunctionName("setLinearDamping"); - autConditions["PhysicsAutomatism::AngularDamping"].codeExtraInformation.SetFunctionName("getAngularDamping"); - autActions["PhysicsAutomatism::SetAngularDamping"].codeExtraInformation.SetFunctionName("setAngularDamping"); - autActions["PhysicsAutomatism::SetGravity"].codeExtraInformation.SetFunctionName("setGravity"); - autExpressions["LinearVelocity"].codeExtraInformation.SetFunctionName("getLinearVelocity"); - autExpressions["LinearVelocityX"].codeExtraInformation.SetFunctionName("getLinearVelocityX"); - autExpressions["LinearVelocityY"].codeExtraInformation.SetFunctionName("getLinearVelocityY"); - autExpressions["AngularVelocity"].codeExtraInformation.SetFunctionName("getAngularVelocity"); - autExpressions["LinearDamping"].codeExtraInformation.SetFunctionName("getLinearDamping"); - autExpressions["AngularDamping"].codeExtraInformation.SetFunctionName("getAngularDamping"); + autActions["PhysicsAutomatism::SetStatic"].SetFunctionName("setStatic"); + autActions["PhysicsAutomatism::SetDynamic"].SetFunctionName("setDynamic"); + autConditions["PhysicsAutomatism::SetDynamic"].SetFunctionName("isDynamic"); + autActions["PhysicsAutomatism::SetFixedRotation"].SetFunctionName("setFixedRotation"); + autActions["PhysicsAutomatism::SetFreeRotation"].SetFunctionName("setFreeRotation"); + autActions["PhysicsAutomatism::AddRevoluteJoint"].SetFunctionName("addRevoluteJoint"); + autActions["PhysicsAutomatism::AddRevoluteJointBetweenObjects"].SetFunctionName("addRevoluteJointBetweenObjects"); + autActions["PhysicsAutomatism::ActAddGearJointBetweenObjects"].SetFunctionName("addGearJointBetweenObjects"); + autConditions["PhysicsAutomatism::IsFixedRotation"].SetFunctionName("isFixedRotation"); + autActions["PhysicsAutomatism::SetAsBullet"].SetFunctionName("setAsBullet"); + autActions["PhysicsAutomatism::DontSetAsBullet"].SetFunctionName("dontSetAsBullet"); + autConditions["PhysicsAutomatism::IsBullet"].SetFunctionName("isBullet"); + autActions["PhysicsAutomatism::ApplyImpulse"].SetFunctionName("applyImpulse"); + autActions["PhysicsAutomatism::ApplyImpulseUsingPolarCoordinates"].SetFunctionName("applyImpulseUsingPolarCoordinates"); + autActions["PhysicsAutomatism::ApplyImpulseTowardPosition"].SetFunctionName("applyImpulseTowardPosition"); + autActions["PhysicsAutomatism::ApplyForce"].SetFunctionName("applyForce"); + autActions["PhysicsAutomatism::ApplyForceUsingPolarCoordinates"].SetFunctionName("applyForceUsingPolarCoordinates"); + autActions["PhysicsAutomatism::ApplyForceTowardPosition"].SetFunctionName("applyForceTowardPosition"); + autActions["PhysicsAutomatism::ApplyTorque"].SetFunctionName("applyTorque"); + autActions["PhysicsAutomatism::SetLinearVelocity"].SetFunctionName("setLinearVelocity"); + autConditions["PhysicsAutomatism::LinearVelocityX"].SetFunctionName("getLinearVelocityX"); + autConditions["PhysicsAutomatism::LinearVelocityY"].SetFunctionName("getLinearVelocityY"); + autConditions["PhysicsAutomatism::LinearVelocity"].SetFunctionName("getLinearVelocity"); + autActions["PhysicsAutomatism::SetAngularVelocity"].SetFunctionName("setAngularVelocity"); + autConditions["PhysicsAutomatism::AngularVelocity"].SetFunctionName("getAngularVelocity"); + autConditions["PhysicsAutomatism::CollisionWith"].SetFunctionName("collisionWith"); + autConditions["PhysicsAutomatism::LinearDamping"].SetFunctionName("getLinearDamping"); + autActions["PhysicsAutomatism::SetLinearDamping"].SetFunctionName("setLinearDamping"); + autConditions["PhysicsAutomatism::AngularDamping"].SetFunctionName("getAngularDamping"); + autActions["PhysicsAutomatism::SetAngularDamping"].SetFunctionName("setAngularDamping"); + autActions["PhysicsAutomatism::SetGravity"].SetFunctionName("setGravity"); + autExpressions["LinearVelocity"].SetFunctionName("getLinearVelocity"); + autExpressions["LinearVelocityX"].SetFunctionName("getLinearVelocityX"); + autExpressions["LinearVelocityY"].SetFunctionName("getLinearVelocityY"); + autExpressions["AngularVelocity"].SetFunctionName("getAngularVelocity"); + autExpressions["LinearDamping"].SetFunctionName("getLinearDamping"); + autExpressions["AngularDamping"].SetFunctionName("getAngularDamping"); /* aut.AddAction("SetPolygonScaleX", @@ -88,7 +88,7 @@ public: .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddParameter("expression", _("Scale")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddAction("SetPolygonScaleY", _("Change collision polygon Y scale"), @@ -101,7 +101,7 @@ public: .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddParameter("expression", _("Scale")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("SetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("SetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("GetPolygonScaleX", _("Collision polygon X scale"), @@ -115,7 +115,7 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetPolygonScaleX").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetPolygonScaleX").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddCondition("GetPolygonScaleY", _("Collision polygon Y scale"), @@ -129,19 +129,19 @@ public: .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetPolygonScaleY").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetPolygonScaleY").SetManipulatedType("number").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddExpression("PolygonScaleX", _("Collision polygon X scale"), _("Collision polygon X scale"), _("Collision polygon"), "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetPolygonScaleX").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); aut.AddExpression("PolygonScaleY", _("Collision polygon Y scale"), _("Collision polygon Y scale"), _("Collision polygon"), "res/physics16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PhysicsAutomatism") .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); + .SetFunctionName("GetPolygonScaleY").SetIncludeFile("PhysicsAutomatism/PhysicsAutomatism.h"); */ StripUnimplementedInstructionsAndExpressions(); diff --git a/Extensions/PlatformAutomatism/Extension.cpp b/Extensions/PlatformAutomatism/Extension.cpp index 45c07fcbb5..dbd9615471 100644 --- a/Extensions/PlatformAutomatism/Extension.cpp +++ b/Extensions/PlatformAutomatism/Extension.cpp @@ -44,7 +44,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsSimple() - .codeExtraInformation.SetFunctionName("IsMoving").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("IsMoving").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("IsOnFloor", _("Is on floor"), @@ -56,7 +56,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsSimple() - .codeExtraInformation.SetFunctionName("IsOnFloor").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("IsOnFloor").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("IsOnLadder", _("Is on ladder"), @@ -68,7 +68,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("IsOnLadder").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("IsOnLadder").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("IsJumping", _("Is jumping"), @@ -80,7 +80,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsSimple() - .codeExtraInformation.SetFunctionName("IsJumping").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("IsJumping").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("IsFalling", _("Is falling"), @@ -91,7 +91,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) "CppPlatform/Extensions/platformerobjecticon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") - .codeExtraInformation.SetFunctionName("IsFalling").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("IsFalling").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("Gravity", _("Gravity"), @@ -105,7 +105,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetGravity").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetGravity").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("Gravity", _("Gravity"), @@ -119,7 +119,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetGravity").SetManipulatedType("number").SetAssociatedGetter("GetGravity").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SetGravity").SetManipulatedType("number").SetGetter("GetGravity").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("MaxFallingSpeed", _("Maximum falling speed"), @@ -133,7 +133,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetMaxFallingSpeed").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetMaxFallingSpeed").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("MaxFallingSpeed", _("Maximum falling speed"), @@ -147,7 +147,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetMaxFallingSpeed").SetManipulatedType("number").SetAssociatedGetter("GetMaxFallingSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SetMaxFallingSpeed").SetManipulatedType("number").SetGetter("GetMaxFallingSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("Acceleration", _("Acceleration"), @@ -161,7 +161,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetAcceleration").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetAcceleration").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("Acceleration", _("Acceleration"), @@ -175,7 +175,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetAcceleration").SetManipulatedType("number").SetAssociatedGetter("GetAcceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SetAcceleration").SetManipulatedType("number").SetGetter("GetAcceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("Deceleration", _("Deceleration"), @@ -189,7 +189,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetDeceleration").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetDeceleration").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("Deceleration", _("Deceleration"), @@ -203,7 +203,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetDeceleration").SetManipulatedType("number").SetAssociatedGetter("GetDeceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SetDeceleration").SetManipulatedType("number").SetGetter("GetDeceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("MaxSpeed", _("Maximum speed"), @@ -216,7 +216,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("MaxSpeed", _("Maximum speed"), @@ -230,7 +230,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetMaxSpeed").SetManipulatedType("number").SetAssociatedGetter("GetMaxSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SetMaxSpeed").SetManipulatedType("number").SetGetter("GetMaxSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddCondition("JumpSpeed", _("Jump speed"), @@ -244,7 +244,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Comparison sign")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetJumpSpeed").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetJumpSpeed").SetManipulatedType("number").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("JumpSpeed", _("Jump speed"), @@ -257,7 +257,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetJumpSpeed").SetManipulatedType("number").SetAssociatedGetter("GetJumpSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SetJumpSpeed").SetManipulatedType("number").SetGetter("GetJumpSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SetCanJump", _("Allow again jumping"), @@ -269,7 +269,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsSimple() - .codeExtraInformation.SetFunctionName("SetCanJump").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SetCanJump").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateLeftKey", _("Simulate left key press"), @@ -281,7 +281,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateLeftKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SimulateLeftKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateRightKey", _("Simulate right key press"), @@ -293,7 +293,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateRightKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SimulateRightKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateUpKey", _("Simulate up key press"), @@ -305,7 +305,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateUpKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SimulateUpKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateDownKey", _("Simulate down key press"), @@ -317,7 +317,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateDownKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SimulateDownKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateLadderKey", _("Simulate ladder key press"), @@ -329,7 +329,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateLadderKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SimulateLadderKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateJumpKey", _("Simulate jump key press"), @@ -340,7 +340,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) "res/conditions/keyboard.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") - .codeExtraInformation.SetFunctionName("SimulateJumpKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SimulateJumpKey").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("SimulateControl", _("Simulate control"), @@ -353,7 +353,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .AddParameter("string", _("Key")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateControl").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("SimulateControl").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddAction("IgnoreDefaultControls", _("Ignore default controls"), @@ -366,37 +366,37 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") .AddParameter("yesorno", _("Ignore controls")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("IgnoreDefaultControls").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("IgnoreDefaultControls").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddExpression("Gravity", _("Gravity"), _("Get the gravity applied on the object"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") - .codeExtraInformation.SetFunctionName("GetGravity").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetGravity").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddExpression("MaxFallingSpeed", _("Maximum falling speed"), _("Get the maximum falling speed"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") - .codeExtraInformation.SetFunctionName("GetMaxFallingSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetMaxFallingSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddExpression("Acceleration", _("Acceleration"), _("Acceleration"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") - .codeExtraInformation.SetFunctionName("GetAcceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetAcceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddExpression("Deceleration", _("Deceleration"), _("Deceleration"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") - .codeExtraInformation.SetFunctionName("GetDeceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetDeceleration").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddExpression("MaxSpeed", _("Maximum speed"), _("Maximum speed"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") - .codeExtraInformation.SetFunctionName("GetMaxSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetMaxSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); aut.AddExpression("JumpSpeed", _("Jump speed"), _("Jump speed"), _("Options"), "CppPlatform/Extensions/platformerobjecticon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "PlatformerObjectAutomatism") - .codeExtraInformation.SetFunctionName("GetJumpSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); + .SetFunctionName("GetJumpSpeed").SetIncludeFile("PlatformAutomatism/PlatformerObjectAutomatism.h"); #endif } { @@ -424,7 +424,7 @@ void DeclarePlatformAutomatismExtension(gd::PlatformExtension & extension) .AddParameter("automatism", _("Automatism"), "PlatformAutomatism") .AddParameter("string", _("Platform type (\"Platform\", \"Jumpthru\" or \"Ladder\")")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("ChangePlatformType").SetIncludeFile("PlatformAutomatism/PlatformAutomatism.h"); + .SetFunctionName("ChangePlatformType").SetIncludeFile("PlatformAutomatism/PlatformAutomatism.h"); #endif } } diff --git a/Extensions/PlatformAutomatism/JsExtension.cpp b/Extensions/PlatformAutomatism/JsExtension.cpp index 9814cbd1de..b7bd9c59dc 100644 --- a/Extensions/PlatformAutomatism/JsExtension.cpp +++ b/Extensions/PlatformAutomatism/JsExtension.cpp @@ -46,45 +46,45 @@ public: std::map & autConditions = GetAllConditionsForAutomatism("PlatformAutomatism::PlatformerObjectAutomatism"); std::map & autExpressions = GetAllExpressionsForAutomatism("PlatformAutomatism::PlatformerObjectAutomatism"); - autConditions["PlatformAutomatism::IsMoving"].codeExtraInformation.SetFunctionName("isMoving"); - autConditions["PlatformAutomatism::IsOnFloor"].codeExtraInformation.SetFunctionName("isOnFloor"); - autConditions["PlatformAutomatism::IsOnLadder"].codeExtraInformation.SetFunctionName("isOnLadder"); - autConditions["PlatformAutomatism::IsJumping"].codeExtraInformation.SetFunctionName("isJumping"); - autConditions["PlatformAutomatism::IsFalling"].codeExtraInformation.SetFunctionName("isFalling"); + autConditions["PlatformAutomatism::IsMoving"].SetFunctionName("isMoving"); + autConditions["PlatformAutomatism::IsOnFloor"].SetFunctionName("isOnFloor"); + autConditions["PlatformAutomatism::IsOnLadder"].SetFunctionName("isOnLadder"); + autConditions["PlatformAutomatism::IsJumping"].SetFunctionName("isJumping"); + autConditions["PlatformAutomatism::IsFalling"].SetFunctionName("isFalling"); - autConditions["PlatformAutomatism::Gravity"].codeExtraInformation.SetFunctionName("getGravity"); - autActions["PlatformAutomatism::Gravity"].codeExtraInformation.SetFunctionName("setGravity").SetAssociatedGetter("getGravity"); - autExpressions["Gravity"].codeExtraInformation.SetFunctionName("getGravity"); - autConditions["PlatformAutomatism::MaxFallingSpeed"].codeExtraInformation.SetFunctionName("getMaxFallingSpeed"); - autActions["PlatformAutomatism::MaxFallingSpeed"].codeExtraInformation.SetFunctionName("setMaxFallingSpeed").SetAssociatedGetter("getMaxFallingSpeed"); - autExpressions["MaxFallingSpeed"].codeExtraInformation.SetFunctionName("getMaxFallingSpeed"); - autConditions["PlatformAutomatism::Acceleration"].codeExtraInformation.SetFunctionName("getAcceleration"); - autActions["PlatformAutomatism::Acceleration"].codeExtraInformation.SetFunctionName("setAcceleration").SetAssociatedGetter("getAcceleration"); - autExpressions["Acceleration"].codeExtraInformation.SetFunctionName("getAcceleration"); - autConditions["PlatformAutomatism::Deceleration"].codeExtraInformation.SetFunctionName("getDeceleration"); - autActions["PlatformAutomatism::Deceleration"].codeExtraInformation.SetFunctionName("setDeceleration").SetAssociatedGetter("getDeceleration"); - autExpressions["Deceleration"].codeExtraInformation.SetFunctionName("getDeceleration"); - autConditions["PlatformAutomatism::MaxSpeed"].codeExtraInformation.SetFunctionName("getMaxSpeed"); - autActions["PlatformAutomatism::MaxSpeed"].codeExtraInformation.SetFunctionName("setMaxSpeed").SetAssociatedGetter("getMaxSpeed"); - autExpressions["MaxSpeed"].codeExtraInformation.SetFunctionName("getMaxSpeed"); - autConditions["PlatformAutomatism::JumpSpeed"].codeExtraInformation.SetFunctionName("getJumpSpeed"); - autActions["PlatformAutomatism::JumpSpeed"].codeExtraInformation.SetFunctionName("setJumpSpeed").SetAssociatedGetter("getJumpSpeed"); - autExpressions["JumpSpeed"].codeExtraInformation.SetFunctionName("getJumpSpeed"); + autConditions["PlatformAutomatism::Gravity"].SetFunctionName("getGravity"); + autActions["PlatformAutomatism::Gravity"].SetFunctionName("setGravity").SetGetter("getGravity"); + autExpressions["Gravity"].SetFunctionName("getGravity"); + autConditions["PlatformAutomatism::MaxFallingSpeed"].SetFunctionName("getMaxFallingSpeed"); + autActions["PlatformAutomatism::MaxFallingSpeed"].SetFunctionName("setMaxFallingSpeed").SetGetter("getMaxFallingSpeed"); + autExpressions["MaxFallingSpeed"].SetFunctionName("getMaxFallingSpeed"); + autConditions["PlatformAutomatism::Acceleration"].SetFunctionName("getAcceleration"); + autActions["PlatformAutomatism::Acceleration"].SetFunctionName("setAcceleration").SetGetter("getAcceleration"); + autExpressions["Acceleration"].SetFunctionName("getAcceleration"); + autConditions["PlatformAutomatism::Deceleration"].SetFunctionName("getDeceleration"); + autActions["PlatformAutomatism::Deceleration"].SetFunctionName("setDeceleration").SetGetter("getDeceleration"); + autExpressions["Deceleration"].SetFunctionName("getDeceleration"); + autConditions["PlatformAutomatism::MaxSpeed"].SetFunctionName("getMaxSpeed"); + autActions["PlatformAutomatism::MaxSpeed"].SetFunctionName("setMaxSpeed").SetGetter("getMaxSpeed"); + autExpressions["MaxSpeed"].SetFunctionName("getMaxSpeed"); + autConditions["PlatformAutomatism::JumpSpeed"].SetFunctionName("getJumpSpeed"); + autActions["PlatformAutomatism::JumpSpeed"].SetFunctionName("setJumpSpeed").SetGetter("getJumpSpeed"); + autExpressions["JumpSpeed"].SetFunctionName("getJumpSpeed"); - autActions["PlatformAutomatism::SetCanJump"].codeExtraInformation.SetFunctionName("setCanJump"); - autActions["PlatformAutomatism::SimulateLeftKey"].codeExtraInformation.SetFunctionName("simulateLeftKey"); - autActions["PlatformAutomatism::SimulateRightKey"].codeExtraInformation.SetFunctionName("simulateRightKey"); - autActions["PlatformAutomatism::SimulateUpKey"].codeExtraInformation.SetFunctionName("simulateUpKey"); - autActions["PlatformAutomatism::SimulateDownKey"].codeExtraInformation.SetFunctionName("simulateDownKey"); - autActions["PlatformAutomatism::SimulateLadderKey"].codeExtraInformation.SetFunctionName("simulateLadderKey"); - autActions["PlatformAutomatism::SimulateJumpKey"].codeExtraInformation.SetFunctionName("simulateJumpKey"); - autActions["PlatformAutomatism::SimulateControl"].codeExtraInformation.SetFunctionName("simulateControl"); - autActions["PlatformAutomatism::IgnoreDefaultControls"].codeExtraInformation.SetFunctionName("ignoreDefaultControls"); + autActions["PlatformAutomatism::SetCanJump"].SetFunctionName("setCanJump"); + autActions["PlatformAutomatism::SimulateLeftKey"].SetFunctionName("simulateLeftKey"); + autActions["PlatformAutomatism::SimulateRightKey"].SetFunctionName("simulateRightKey"); + autActions["PlatformAutomatism::SimulateUpKey"].SetFunctionName("simulateUpKey"); + autActions["PlatformAutomatism::SimulateDownKey"].SetFunctionName("simulateDownKey"); + autActions["PlatformAutomatism::SimulateLadderKey"].SetFunctionName("simulateLadderKey"); + autActions["PlatformAutomatism::SimulateJumpKey"].SetFunctionName("simulateJumpKey"); + autActions["PlatformAutomatism::SimulateControl"].SetFunctionName("simulateControl"); + autActions["PlatformAutomatism::IgnoreDefaultControls"].SetFunctionName("ignoreDefaultControls"); } { std::map & autActions = GetAllActionsForAutomatism("PlatformAutomatism::PlatformAutomatism"); - autActions["PlatformAutomatism::ChangePlatformType"].codeExtraInformation.SetFunctionName("changePlatformType"); + autActions["PlatformAutomatism::ChangePlatformType"].SetFunctionName("changePlatformType"); } GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION(); }; diff --git a/Extensions/PrimitiveDrawing/Extension.cpp b/Extensions/PrimitiveDrawing/Extension.cpp index 79f164af72..37f08e6f46 100644 --- a/Extensions/PrimitiveDrawing/Extension.cpp +++ b/Extensions/PrimitiveDrawing/Extension.cpp @@ -40,7 +40,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) .AddParameter("expression", _("Top left side : Y Position")) .AddParameter("expression", _("Bottom right side : X Position")) .AddParameter("expression", _("Bottom right side : Y Position")) - .codeExtraInformation.SetFunctionName("DrawRectangle").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("DrawRectangle").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("Circle", _("Circle"), @@ -53,7 +53,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) .AddParameter("expression", _("X position of center")) .AddParameter("expression", _("Y position of center")) .AddParameter("expression", _("Radius ( in pixels )")) - .codeExtraInformation.SetFunctionName("DrawCircle").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("DrawCircle").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("Line", _("Line"), @@ -68,7 +68,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) .AddParameter("expression", _("X Position of end point")) .AddParameter("expression", _("Y Position of end point")) .AddParameter("expression", _("Thickness ( in pixels )")) - .codeExtraInformation.SetFunctionName("DrawLine").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("DrawLine").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("FillColor", _("Fill color"), @@ -79,7 +79,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) "res/actions/text.png") .AddParameter("object", _("Shape Painter object"), "Drawer", false) .AddParameter("color", _("Fill color")) - .codeExtraInformation.SetFunctionName("SetFillColor").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("SetFillColor").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("OutlineColor", _("Outline color"), @@ -90,7 +90,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) "res/actions/color.png") .AddParameter("object", _("Shape Painter object"), "Drawer", false) .AddParameter("color", _("Color")) - .codeExtraInformation.SetFunctionName("SetOutlineColor").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("SetOutlineColor").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("OutlineSize", _("Outline size"), @@ -102,7 +102,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Shape Painter object"), "Drawer", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Size in pixels")) - .codeExtraInformation.SetFunctionName("SetOutlineSize").SetManipulatedType("number").SetAssociatedGetter("GetOutlineSize").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("SetOutlineSize").SetManipulatedType("number").SetGetter("GetOutlineSize").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddCondition("OutlineSize", _("Outline size"), @@ -114,7 +114,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Shape Painter object"), "Drawer", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Size to test")) - .codeExtraInformation.SetFunctionName("GetOutlineSize").SetManipulatedType("number").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("GetOutlineSize").SetManipulatedType("number").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("FillOpacity", _("Fill opacity"), @@ -126,7 +126,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Shape Painter object"), "Drawer", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetFillOpacity").SetManipulatedType("number").SetAssociatedGetter("GetFillOpacity").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("SetFillOpacity").SetManipulatedType("number").SetGetter("GetFillOpacity").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddCondition("FillOpacity", @@ -139,7 +139,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Shape Painter object"), "Drawer", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetFillOpacity").SetManipulatedType("number").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("GetFillOpacity").SetManipulatedType("number").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddAction("OutlineOpacity", _("Outline opacity"), @@ -151,7 +151,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Shape Painter object"), "Drawer", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetOutlineOpacity").SetManipulatedType("number").SetAssociatedGetter("GetOutlineOpacity").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("SetOutlineOpacity").SetManipulatedType("number").SetGetter("GetOutlineOpacity").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); obj.AddCondition("OutlineOpacity", _("Outline opacity"), @@ -163,7 +163,7 @@ void DeclarePrimitiveDrawingExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Shape Painter object"), "Drawer", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetOutlineOpacity").SetManipulatedType("number").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); + .SetFunctionName("GetOutlineOpacity").SetManipulatedType("number").SetIncludeFile("PrimitiveDrawing/ShapePainterObject.h"); #endif } @@ -199,7 +199,7 @@ public: .AddParameter("yesorno", _("Should the copy take in account the source transparency\?"), "",false) .AddCodeOnlyParameter("currentScene", "") - .codeExtraInformation.SetFunctionName("GDpriv::PrimitiveDrawingTools::CopyImageOnAnother").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); + .SetFunctionName("GDpriv::PrimitiveDrawingTools::CopyImageOnAnother").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); AddAction("CaptureScreen", @@ -214,7 +214,7 @@ public: .AddParameter("string", _("File where save capture"), "", true).SetDefaultValue("") .AddParameter("string", _("Name of the image where capture must be saved"), "", true).SetDefaultValue("") - .codeExtraInformation.SetFunctionName("GDpriv::PrimitiveDrawingTools::CaptureScreen").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); + .SetFunctionName("GDpriv::PrimitiveDrawingTools::CaptureScreen").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); AddAction("CreateSFMLTexture", _("Create an image in memory"), @@ -230,7 +230,7 @@ public: .AddParameter("expression", _("Height"), "", true) .AddParameter("color", _("Initial color"), "", true).SetDefaultValue("0;0;0") - .codeExtraInformation.SetFunctionName("GDpriv::PrimitiveDrawingTools::CreateSFMLTexture").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); + .SetFunctionName("GDpriv::PrimitiveDrawingTools::CreateSFMLTexture").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); AddAction("OpenSFMLTextureFromFile", _("Open an image from a file"), @@ -244,7 +244,7 @@ public: .AddParameter("file", _("File")) .AddParameter("string", _("Name of the image")) - .codeExtraInformation.SetFunctionName("GDpriv::PrimitiveDrawingTools::OpenSFMLTextureFromFile").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); + .SetFunctionName("GDpriv::PrimitiveDrawingTools::OpenSFMLTextureFromFile").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); AddAction("SaveSFMLTextureToFile", _("Save an image to a file"), @@ -258,7 +258,7 @@ public: .AddParameter("file", _("File")) .AddParameter("string", _("Name of the image")) - .codeExtraInformation.SetFunctionName("GDpriv::PrimitiveDrawingTools::SaveSFMLTextureToFile").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); + .SetFunctionName("GDpriv::PrimitiveDrawingTools::SaveSFMLTextureToFile").SetIncludeFile("PrimitiveDrawing/PrimitiveDrawingTools.h"); #endif GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION(); diff --git a/Extensions/PrimitiveDrawing/JsExtension.cpp b/Extensions/PrimitiveDrawing/JsExtension.cpp index 9f7adc5151..74ebf05001 100644 --- a/Extensions/PrimitiveDrawing/JsExtension.cpp +++ b/Extensions/PrimitiveDrawing/JsExtension.cpp @@ -28,28 +28,17 @@ public: DeclarePrimitiveDrawingExtension(*this); GetObjectMetadata("PrimitiveDrawing::Drawer").SetIncludeFile("PrimitiveDrawing/shapepainterruntimeobject.js"); - GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::Rectangle"].codeExtraInformation - .SetFunctionName("drawRectangle"); - GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::Circle"].codeExtraInformation - .SetFunctionName("drawCircle"); - GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::Line"].codeExtraInformation - .SetFunctionName("drawLine"); - GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::FillColor"].codeExtraInformation - .SetFunctionName("setFillColor"); - GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::OutlineColor"].codeExtraInformation - .SetFunctionName("setOutlineColor"); - GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::OutlineSize"].codeExtraInformation - .SetFunctionName("setOutlineSize").SetAssociatedGetter("getOutlineSize"); - GetAllConditionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::OutlineSize"].codeExtraInformation - .SetFunctionName("getOutlineSize"); - GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::FillOpacity"].codeExtraInformation - .SetFunctionName("setFillOpacity").SetAssociatedGetter("getFillOpacity"); - GetAllConditionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::FillOpacity"].codeExtraInformation - .SetFunctionName("getFillOpacity"); - GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::OutlineOpacity"].codeExtraInformation - .SetFunctionName("setOutlineOpacity").SetAssociatedGetter("getOutlineOpacity"); - GetAllConditionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::OutlineOpacity"].codeExtraInformation - .SetFunctionName("getOutlineOpacity"); + GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::Rectangle"].SetFunctionName("drawRectangle"); + GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::Circle"].SetFunctionName("drawCircle"); + GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::Line"].SetFunctionName("drawLine"); + GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::FillColor"].SetFunctionName("setFillColor"); + GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::OutlineColor"].SetFunctionName("setOutlineColor"); + GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::OutlineSize"].SetFunctionName("setOutlineSize").SetGetter("getOutlineSize"); + GetAllConditionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::OutlineSize"].SetFunctionName("getOutlineSize"); + GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::FillOpacity"].SetFunctionName("setFillOpacity").SetGetter("getFillOpacity"); + GetAllConditionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::FillOpacity"].SetFunctionName("getFillOpacity"); + GetAllActionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::OutlineOpacity"].SetFunctionName("setOutlineOpacity").SetGetter("getOutlineOpacity"); + GetAllConditionsForObject("PrimitiveDrawing::Drawer")["PrimitiveDrawing::OutlineOpacity"].SetFunctionName("getOutlineOpacity"); GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION(); }; diff --git a/Extensions/SoundObject/Extension.cpp b/Extensions/SoundObject/Extension.cpp index d3bb28f969..492dbc0ea7 100644 --- a/Extensions/SoundObject/Extension.cpp +++ b/Extensions/SoundObject/Extension.cpp @@ -58,7 +58,7 @@ public: .AddParameter("object", _("Object"), "Sound", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetVolume").SetManipulatedType("number").SetAssociatedGetter("GetVolume").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("SetVolume").SetManipulatedType("number").SetGetter("GetVolume").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Pitch", @@ -71,7 +71,7 @@ public: .AddParameter("object", _("Object"), "Sound", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetPitch").SetManipulatedType("number").SetAssociatedGetter("GetPitch").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("SetPitch").SetManipulatedType("number").SetGetter("GetPitch").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Attenuation", @@ -84,7 +84,7 @@ public: .AddParameter("object", _("Object"), "Sound", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetAttenuation").SetManipulatedType("number").SetAssociatedGetter("GetAttenuation").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("SetAttenuation").SetManipulatedType("number").SetGetter("GetAttenuation").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("ZPos", @@ -97,7 +97,7 @@ public: .AddParameter("object", _("Object"), "Sound", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetZPos").SetManipulatedType("number").SetAssociatedGetter("GetZPos").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("SetZPos").SetManipulatedType("number").SetGetter("GetZPos").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Loop", @@ -109,7 +109,7 @@ public: "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) .AddParameter("yesorno", _("Loop")) - .codeExtraInformation.SetFunctionName("SetLoop").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("SetLoop").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("RelativeToListener", @@ -121,7 +121,7 @@ public: "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) .AddParameter("yesorno", _("Relative to the listener")) - .codeExtraInformation.SetFunctionName("SetRelativeToListener").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("SetRelativeToListener").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Play", @@ -132,7 +132,7 @@ public: "res/actions/son24.png", "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("Play").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("Play").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Stop", @@ -143,7 +143,7 @@ public: "res/actions/son24.png", "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("Stop").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("Stop").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddAction("Pause", @@ -154,7 +154,7 @@ public: "res/actions/son24.png", "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("Pause").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("Pause").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Volume", @@ -167,7 +167,7 @@ public: .AddParameter("object", _("Object"), "Sound", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetVolume").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetVolume").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Pitch", @@ -180,7 +180,7 @@ public: .AddParameter("object", _("Object"), "Sound", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetPitch").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetPitch").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Attenuation", @@ -193,7 +193,7 @@ public: .AddParameter("object", _("Object"), "Sound", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetAttenuation").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetAttenuation").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("MinDistance", @@ -206,7 +206,7 @@ public: .AddParameter("object", _("Object"), "Sound", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetMinDistance").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetMinDistance").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("ZPos", @@ -219,7 +219,7 @@ public: .AddParameter("object", _("Object"), "Sound", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetZPos").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetZPos").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Loop", @@ -230,7 +230,7 @@ public: "res/actions/son24.png", "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("GetLoop").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetLoop").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Playing", @@ -241,7 +241,7 @@ public: "res/actions/son24.png", "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("IsPlaying").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("IsPlaying").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Paused", @@ -252,7 +252,7 @@ public: "res/actions/son24.png", "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("IsPaused").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("IsPaused").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("Stopped", @@ -263,7 +263,7 @@ public: "res/actions/son24.png", "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("IsStopped").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("IsStopped").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddCondition("RelativeToListener", @@ -274,32 +274,32 @@ public: "res/conditions/son24.png", "res/conditions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("IsRelativeToListener").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("IsRelativeToListener").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddExpression("Volume", _("Sound level"), _("Sound level"), _("Parameters"), "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("GetVolume").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetVolume").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddExpression("Pitch", _("Pitch"), _("Pitch"), _("Parameters"), "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("GetPitch").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetPitch").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddExpression("Attenuation", _("Attenuation"), _("Attenuation"), _("Parameters"), "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("GetAttenuation").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetAttenuation").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddExpression("MinDistance", _("Minimal distance"), _("Minimal distance"), _("Parameters"), "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("GetMinDistance").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetMinDistance").SetIncludeFile("SoundObject/SoundObject.h"); obj.AddExpression("ZPos", _("Z Position"), _("Z Position"), _("Position"), "res/actions/son.png") .AddParameter("object", _("Object"), "Sound", false) - .codeExtraInformation.SetFunctionName("GetZPos").SetIncludeFile("SoundObject/SoundObject.h"); + .SetFunctionName("GetZPos").SetIncludeFile("SoundObject/SoundObject.h"); #endif } @@ -317,7 +317,7 @@ public: .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetListenerX").SetManipulatedType("number").SetAssociatedGetter("GetListenerX").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("SetListenerX").SetManipulatedType("number").SetGetter("GetListenerX").SetIncludeFile("SoundObject/SoundListener.h"); AddAction("ListenerY", @@ -331,7 +331,7 @@ public: .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetListenerY").SetManipulatedType("number").SetAssociatedGetter("GetListenerY").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("SetListenerY").SetManipulatedType("number").SetGetter("GetListenerY").SetIncludeFile("SoundObject/SoundListener.h"); AddAction("ListenerZ", @@ -345,7 +345,7 @@ public: .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetListenerZ").SetManipulatedType("number").SetAssociatedGetter("GetListenerZ").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("SetListenerZ").SetManipulatedType("number").SetGetter("GetListenerZ").SetIncludeFile("SoundObject/SoundListener.h"); AddAction("ListenerDirectionX", @@ -359,7 +359,7 @@ public: .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetListenerDirectionX").SetManipulatedType("number").SetAssociatedGetter("GetListenerDirectionX").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("SetListenerDirectionX").SetManipulatedType("number").SetGetter("GetListenerDirectionX").SetIncludeFile("SoundObject/SoundListener.h"); AddAction("ListenerDirectionY", @@ -373,7 +373,7 @@ public: .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetListenerDirectionY").SetManipulatedType("number").SetAssociatedGetter("GetListenerDirectionY").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("SetListenerDirectionY").SetManipulatedType("number").SetGetter("GetListenerDirectionY").SetIncludeFile("SoundObject/SoundListener.h"); AddAction("ListenerDirectionZ", @@ -387,7 +387,7 @@ public: .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetListenerDirectionZ").SetManipulatedType("number").SetAssociatedGetter("GetListenerDirectionZ").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("SetListenerDirectionZ").SetManipulatedType("number").SetGetter("GetListenerDirectionZ").SetIncludeFile("SoundObject/SoundListener.h"); // Conditions liées à l'écouteur @@ -401,7 +401,7 @@ public: .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetListenerX").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerX").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); AddCondition("ListenerY", _("Y position"), @@ -413,7 +413,7 @@ public: .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetListenerY").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerY").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); AddCondition("ListenerZ", _("Z position"), @@ -425,7 +425,7 @@ public: .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetListenerZ").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerZ").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); AddCondition("ListenerDirectionX", _("X direction"), @@ -437,7 +437,7 @@ public: .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetListenerDirectionX").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerDirectionX").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); AddCondition("ListenerDirectionY", _("Y direction"), @@ -450,7 +450,7 @@ public: .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetListenerDirectionY").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerDirectionY").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); @@ -466,33 +466,33 @@ public: .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetListenerDirectionZ").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerDirectionZ").SetManipulatedType("number").SetIncludeFile("SoundObject/SoundListener.h"); AddExpression("ListenerX", _("X position"), _("Listener X position"), _("Listener"), "res/actions/son.png") - .codeExtraInformation.SetFunctionName("GetListenerX").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerX").SetIncludeFile("SoundObject/SoundListener.h"); AddExpression("ListenerY", _("Y position"), _("Listener Y position"), _("Listener"), "res/actions/son.png") - .codeExtraInformation.SetFunctionName("GetListenerY").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerY").SetIncludeFile("SoundObject/SoundListener.h"); AddExpression("ListenerZ", _("Z position"), _("Listener Z position"), _("Listener"), "res/actions/son.png") - .codeExtraInformation.SetFunctionName("GetListenerZ").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerZ").SetIncludeFile("SoundObject/SoundListener.h"); AddExpression("ListenerDirectionX", _("Direction on X axis"), _("Listener x direction"), _("Listener"), "res/actions/son.png") - .codeExtraInformation.SetFunctionName("GetListenerDirectionX").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerDirectionX").SetIncludeFile("SoundObject/SoundListener.h"); AddExpression("ListenerDirectionY", _("Direction on Y axis"), _("Listener y direction"), _("Listener"), "res/actions/son.png") - .codeExtraInformation.SetFunctionName("GetListenerDirectionY").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerDirectionY").SetIncludeFile("SoundObject/SoundListener.h"); AddExpression("ListenerDirectionZ", _("Direction on Z axis"), _("Listener z direction"), _("Listener"), "res/actions/son.png") - .codeExtraInformation.SetFunctionName("GetListenerDirectionZ").SetIncludeFile("SoundObject/SoundListener.h"); + .SetFunctionName("GetListenerDirectionZ").SetIncludeFile("SoundObject/SoundListener.h"); #endif diff --git a/Extensions/TextEntryObject/Extension.cpp b/Extensions/TextEntryObject/Extension.cpp index d96752e923..6e687ff103 100644 --- a/Extensions/TextEntryObject/Extension.cpp +++ b/Extensions/TextEntryObject/Extension.cpp @@ -38,7 +38,7 @@ void DeclareTextEntryObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "TextEntry", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("string", _("Text")) - .codeExtraInformation.SetFunctionName("SetString").SetManipulatedType("string").SetAssociatedGetter("GetString").SetIncludeFile("TextEntryObject/TextEntryObject.h"); + .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString").SetIncludeFile("TextEntryObject/TextEntryObject.h"); obj.AddCondition("String", _("Text in memory"), @@ -50,7 +50,7 @@ void DeclareTextEntryObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "TextEntry", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("string", _("Text to test")) - .codeExtraInformation.SetFunctionName("GetString").SetManipulatedType("string").SetIncludeFile("TextEntryObject/TextEntryObject.h"); + .SetFunctionName("GetString").SetManipulatedType("string").SetIncludeFile("TextEntryObject/TextEntryObject.h"); obj.AddAction("Activate", _("De/activate capturing text input"), @@ -61,7 +61,7 @@ void DeclareTextEntryObjectExtension(gd::PlatformExtension & extension) "CppPlatform/Extensions/textentryicon.png") .AddParameter("object", _("Object"), "TextEntry", false) .AddParameter("yesorno", _("Activate")) - .codeExtraInformation.SetFunctionName("Activate").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("Activate").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("Activated", @@ -72,11 +72,11 @@ void DeclareTextEntryObjectExtension(gd::PlatformExtension & extension) "CppPlatform/Extensions/textentry24.png", "CppPlatform/Extensions/textentryicon.png") .AddParameter("object", _("Object"), "TextEntry", false) - .codeExtraInformation.SetFunctionName("IsActivated").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("IsActivated").SetIncludeFile("TextObject/TextObject.h"); obj.AddStrExpression("String", _("Text entered with keyboard"), _("Text entered with keyboard"), _("Text entered with keyboard"), "res/texteicon.png") .AddParameter("object", _("Object"), "TextEntry", false) - .codeExtraInformation.SetFunctionName("GetString").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("GetString").SetIncludeFile("TextObject/TextObject.h"); #endif } diff --git a/Extensions/TextEntryObject/JsExtension.cpp b/Extensions/TextEntryObject/JsExtension.cpp index d6b5521ed3..669a260e06 100644 --- a/Extensions/TextEntryObject/JsExtension.cpp +++ b/Extensions/TextEntryObject/JsExtension.cpp @@ -36,17 +36,13 @@ public: GetObjectMetadata("TextEntryObject::TextEntry").SetIncludeFile("TextEntryObject/textentryruntimeobject.js"); - GetAllActionsForObject("TextEntryObject::TextEntry")["TextEntryObject::String"].codeExtraInformation - .SetFunctionName("setString").SetAssociatedGetter("getString"); - GetAllConditionsForObject("TextEntryObject::TextEntry")["TextEntryObject::String"].codeExtraInformation - .SetFunctionName("getString"); - GetAllActionsForObject("TextEntryObject::TextEntry")["TextEntryObject::Activate"].codeExtraInformation - .SetFunctionName("activate"); - GetAllConditionsForObject("TextEntryObject::TextEntry")["TextEntryObject::Activated"].codeExtraInformation - .SetFunctionName("isActivated"); + GetAllActionsForObject("TextEntryObject::TextEntry")["TextEntryObject::String"].SetFunctionName("setString").SetGetter("getString"); + GetAllConditionsForObject("TextEntryObject::TextEntry")["TextEntryObject::String"].SetFunctionName("getString"); + GetAllActionsForObject("TextEntryObject::TextEntry")["TextEntryObject::Activate"].SetFunctionName("activate"); + GetAllConditionsForObject("TextEntryObject::TextEntry")["TextEntryObject::Activated"].SetFunctionName("isActivated"); GetAllStrExpressionsForObject("TextEntryObject::TextEntry")["String"] - .codeExtraInformation.SetFunctionName("getString"); + .SetFunctionName("getString"); GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION(); }; diff --git a/Extensions/TextObject/Extension.cpp b/Extensions/TextObject/Extension.cpp index 8744599e8a..b8d8cfb2c3 100644 --- a/Extensions/TextObject/Extension.cpp +++ b/Extensions/TextObject/Extension.cpp @@ -42,7 +42,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "Text", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("string", _("Text")) - .codeExtraInformation.SetFunctionName("SetString").SetManipulatedType("string").SetAssociatedGetter("GetString").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("SetString").SetManipulatedType("string").SetGetter("GetString").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("String", _("Compare the text"), @@ -54,7 +54,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "Text", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("string", _("Text to test")) - .codeExtraInformation.SetFunctionName("GetString").SetManipulatedType("string").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("GetString").SetManipulatedType("string").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("Font", _("Font"), @@ -65,7 +65,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) "res/actions/font.png") .AddParameter("object", _("Object"), "Text", false) .AddParameter("police", _("Font")) - .codeExtraInformation.SetFunctionName("ChangeFont").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("ChangeFont").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("Size", _("Size"), @@ -77,7 +77,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "Text", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetCharacterSize").SetManipulatedType("number").SetAssociatedGetter("GetCharacterSize").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("SetCharacterSize").SetManipulatedType("number").SetGetter("GetCharacterSize").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("Size", _("Size"), @@ -89,7 +89,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "Text", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Size to test")) - .codeExtraInformation.SetFunctionName("GetCharacterSize").SetManipulatedType("number").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("GetCharacterSize").SetManipulatedType("number").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("ChangeColor", _("Color"), @@ -100,7 +100,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) "res/actions/color.png") .AddParameter("object", _("Object"), "Text", false) .AddParameter("color", _("Color")) - .codeExtraInformation.SetFunctionName("SetColor").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("SetColor").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("Opacity", _("Opacity"), @@ -112,7 +112,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "Text", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetOpacity").SetManipulatedType("number").SetAssociatedGetter("GetOpacity").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("SetOpacity").SetManipulatedType("number").SetGetter("GetOpacity").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("Opacity", _("Opacity"), @@ -124,7 +124,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "Text", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetOpacity").SetManipulatedType("number").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("GetOpacity").SetManipulatedType("number").SetIncludeFile("TextObject/TextObject.h"); @@ -137,7 +137,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) "res/actions/opacity.png") .AddParameter("object", _("Object"), "Text", false) .AddParameter("yesorno", _("Smooth the text")) - .codeExtraInformation.SetFunctionName("SetSmooth").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("SetSmooth").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("Smoothed", _("Smoothing"), @@ -147,7 +147,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) "res/conditions/opacity24.png", "res/conditions/opacity.png") .AddParameter("object", _("Object"), "Text", false) - .codeExtraInformation.SetFunctionName("IsSmoothed").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("IsSmoothed").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("SetBold", _("Bold"), @@ -158,7 +158,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) "res/actions/bold16.png") .AddParameter("object", _("Object"), "Text", false) .AddParameter("yesorno", _("Set bold style")) - .codeExtraInformation.SetFunctionName("SetBold").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("SetBold").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("IsBold", _("Bold"), @@ -168,7 +168,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) "res/conditions/bold.png", "res/conditions/bold16.png") .AddParameter("object", _("Object"), "Text", false) - .codeExtraInformation.SetFunctionName("IsBold").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("IsBold").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("SetItalic", _("Italic"), @@ -179,7 +179,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) "res/actions/italic16.png") .AddParameter("object", _("Object"), "Text", false) .AddParameter("yesorno", _("Set italic")) - .codeExtraInformation.SetFunctionName("SetItalic").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("SetItalic").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("IsItalic", _("Italic"), @@ -189,7 +189,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) "res/conditions/italic.png", "res/conditions/italic16.png") .AddParameter("object", _("Object"), "Text", false) - .codeExtraInformation.SetFunctionName("IsItalic").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("IsItalic").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("SetUnderlined", _("Underlined"), @@ -200,7 +200,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) "res/actions/underline16.png") .AddParameter("object", _("Object"), "Text", false) .AddParameter("yesorno", _("Underline")) - .codeExtraInformation.SetFunctionName("SetUnderlined").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("SetUnderlined").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("IsUnderlined", _("Underlined"), @@ -210,7 +210,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) "res/conditions/underline.png", "res/conditions/underline16.png") .AddParameter("object", _("Object"), "Text", false) - .codeExtraInformation.SetFunctionName("IsUnderlined").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("IsUnderlined").SetIncludeFile("TextObject/TextObject.h"); obj.AddAction("Angle", _("Angle"), @@ -223,7 +223,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "Text", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetAngle").SetManipulatedType("number").SetAssociatedGetter("GetAngle").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("SetAngle").SetManipulatedType("number").SetGetter("GetAngle").SetIncludeFile("TextObject/TextObject.h"); obj.AddCondition("Angle", _("Angle"), @@ -236,20 +236,20 @@ void DeclareTextObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "Text", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("TextObject/TextObject.h"); obj.AddExpression("Opacity", _("Opacity"), _("Opacity"), _("Opacity"), "res/actions/opacity.png") .AddParameter("object", _("Object"), "Text", false) - .codeExtraInformation.SetFunctionName("GetOpacity").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("GetOpacity").SetIncludeFile("TextObject/TextObject.h"); obj.AddExpression("Angle", _("Angle"), _("Angle"), _("Rotation"), "res/actions/rotate.png") .SetHidden() //Deprecated, now available for all objects .AddParameter("object", _("Object"), "Text", false) - .codeExtraInformation.SetFunctionName("GetAngle").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("GetAngle").SetIncludeFile("TextObject/TextObject.h"); obj.AddStrExpression("String", _("Text"), _("Text"), _("Text"), "res/texteicon.png") .AddParameter("object", _("Object"), "Text", false) - .codeExtraInformation.SetFunctionName("GetString").SetIncludeFile("TextObject/TextObject.h"); + .SetFunctionName("GetString").SetIncludeFile("TextObject/TextObject.h"); #endif } diff --git a/Extensions/TextObject/JsExtension.cpp b/Extensions/TextObject/JsExtension.cpp index 9a2e3100cd..c8ced3f46a 100644 --- a/Extensions/TextObject/JsExtension.cpp +++ b/Extensions/TextObject/JsExtension.cpp @@ -36,50 +36,31 @@ public: GetObjectMetadata("TextObject::Text").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllActionsForObject("TextObject::Text")["TextObject::String"].codeExtraInformation - .SetFunctionName("setString").SetAssociatedGetter("getString").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllConditionsForObject("TextObject::Text")["TextObject::String"].codeExtraInformation - .SetFunctionName("getString").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllActionsForObject("TextObject::Text")["TextObject::Size"].codeExtraInformation - .SetFunctionName("setCharacterSize").SetAssociatedGetter("getCharacterSize").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllConditionsForObject("TextObject::Text")["TextObject::Size"].codeExtraInformation - .SetFunctionName("getCharacterSize").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllActionsForObject("TextObject::Text")["TextObject::Angle"].codeExtraInformation - .SetFunctionName("setAngle").SetAssociatedGetter("getAngle").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllConditionsForObject("TextObject::Text")["TextObject::Angle"].codeExtraInformation - .SetFunctionName("getAngle").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllActionsForObject("TextObject::Text")["TextObject::Opacity"].codeExtraInformation - .SetFunctionName("setOpacity").SetAssociatedGetter("getOpacity").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllConditionsForObject("TextObject::Text")["TextObject::Opacity"].codeExtraInformation - .SetFunctionName("getOpacity").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllActionsForObject("TextObject::Text")["TextObject::String"].SetFunctionName("setString").SetGetter("getString").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllConditionsForObject("TextObject::Text")["TextObject::String"].SetFunctionName("getString").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllActionsForObject("TextObject::Text")["TextObject::Size"].SetFunctionName("setCharacterSize").SetGetter("getCharacterSize").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllConditionsForObject("TextObject::Text")["TextObject::Size"].SetFunctionName("getCharacterSize").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllActionsForObject("TextObject::Text")["TextObject::Angle"].SetFunctionName("setAngle").SetGetter("getAngle").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllConditionsForObject("TextObject::Text")["TextObject::Angle"].SetFunctionName("getAngle").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllActionsForObject("TextObject::Text")["TextObject::Opacity"].SetFunctionName("setOpacity").SetGetter("getOpacity").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllConditionsForObject("TextObject::Text")["TextObject::Opacity"].SetFunctionName("getOpacity").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllActionsForObject("TextObject::Text")["TextObject::SetBold"].codeExtraInformation - .SetFunctionName("setBold").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllConditionsForObject("TextObject::Text")["TextObject::IsBold"].codeExtraInformation - .SetFunctionName("isBold").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllActionsForObject("TextObject::Text")["TextObject::SetBold"].SetFunctionName("setBold").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllConditionsForObject("TextObject::Text")["TextObject::IsBold"].SetFunctionName("isBold").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllActionsForObject("TextObject::Text")["TextObject::SetItalic"].codeExtraInformation - .SetFunctionName("setItalic").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllConditionsForObject("TextObject::Text")["TextObject::IsItalic"].codeExtraInformation - .SetFunctionName("isItalic").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllActionsForObject("TextObject::Text")["TextObject::SetItalic"].SetFunctionName("setItalic").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllConditionsForObject("TextObject::Text")["TextObject::IsItalic"].SetFunctionName("isItalic").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllExpressionsForObject("TextObject::Text")["Opacity"].codeExtraInformation - .SetFunctionName("getOpacity").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllExpressionsForObject("TextObject::Text")["Angle"].codeExtraInformation - .SetFunctionName("getAngle").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllStrExpressionsForObject("TextObject::Text")["String"].codeExtraInformation - .SetFunctionName("getString").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllExpressionsForObject("TextObject::Text")["Opacity"].SetFunctionName("getOpacity").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllExpressionsForObject("TextObject::Text")["Angle"].SetFunctionName("getAngle").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllStrExpressionsForObject("TextObject::Text")["String"].SetFunctionName("getString").SetIncludeFile("TextObject/textruntimeobject.js"); - GetAllActionsForObject("TextObject::Text")["TextObject::ChangeColor"].codeExtraInformation - .SetFunctionName("setColor").SetIncludeFile("TextObject/textruntimeobject.js"); + GetAllActionsForObject("TextObject::Text")["TextObject::ChangeColor"].SetFunctionName("setColor").SetIncludeFile("TextObject/textruntimeobject.js"); //Unimplemented actions and conditions: - GetAllActionsForObject("TextObject::Text")["TextObject::Font"].codeExtraInformation - .SetFunctionName(""); - GetAllActionsForObject("TextObject::Text")["TextObject::SetUnderlined"].codeExtraInformation - .SetFunctionName(""); - GetAllConditionsForObject("TextObject::Text")["TextObject::IsUnderlined"].codeExtraInformation - .SetFunctionName(""); + GetAllActionsForObject("TextObject::Text")["TextObject::Font"].SetFunctionName(""); + GetAllActionsForObject("TextObject::Text")["TextObject::SetUnderlined"].SetFunctionName(""); + GetAllConditionsForObject("TextObject::Text")["TextObject::IsUnderlined"].SetFunctionName(""); StripUnimplementedInstructionsAndExpressions(); diff --git a/Extensions/TileMapObject/Extension.cpp b/Extensions/TileMapObject/Extension.cpp index fe74457712..086ee20362 100644 --- a/Extensions/TileMapObject/Extension.cpp +++ b/Extensions/TileMapObject/Extension.cpp @@ -44,7 +44,7 @@ void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddCondition("Height", _("Height"), @@ -57,7 +57,7 @@ void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetHeight").SetManipulatedType("number").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("GetHeight").SetManipulatedType("number").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); extension.AddCondition("SingleTileCollision", _("Collision with one tile"), @@ -73,25 +73,25 @@ void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) .AddParameter("objectList", _("Object")) .AddCodeOnlyParameter("conditionInverted", "") .MarkAsSimple() - .codeExtraInformation.SetFunctionName("SingleTileCollision").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("SingleTileCollision").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddExpression("TileWidth", _("Tile width"), _("Tile width"), _("Tiles"), "res/TileMapIcon16.png") .AddParameter("object", _("Object"), "TileMap", false) - .codeExtraInformation.SetFunctionName("GetTileWidth").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("GetTileWidth").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddExpression("TileHeight", _("Tile height"), _("Tile height"), _("Tiles"), "res/TileMapIcon16.png") .AddParameter("object", _("Object"), "TileMap", false) - .codeExtraInformation.SetFunctionName("GetTileHeight").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("GetTileHeight").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddExpression("MapWidth", _("Map width (tiles)"), _("Map width"), _("Map"), "res/TileMapIcon16.png") .AddParameter("object", _("Object"), "TileMap", false) - .codeExtraInformation.SetFunctionName("GetMapWidth").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("GetMapWidth").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddExpression("MapHeight", _("Map height (tiles)"), _("Map height"), _("Map"), "res/TileMapIcon16.png") .AddParameter("object", _("Object"), "TileMap", false) - .codeExtraInformation.SetFunctionName("GetMapHeight").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("GetMapHeight").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); @@ -100,7 +100,7 @@ void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) .AddParameter("expression", _("Layer"), "", false) .AddParameter("expression", _("Column"), "", false) .AddParameter("expression", _("Row"), "", false) - .codeExtraInformation.SetFunctionName("GetTile").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("GetTile").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddAction("SetTile", _("Change a tile"), @@ -115,25 +115,25 @@ void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) .AddParameter("expression", _("Tile row")) .AddParameter("expression", _("New tile Id (-1 to delete the tile)")) .MarkAsSimple() - .codeExtraInformation.SetFunctionName("SetTile").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("SetTile").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddExpression("GetColumnAt", _("Get tile column from X coordinates"), _("Get tile column from X coordinates"), _("Map"), "res/TileMapIcon16.png") .AddParameter("object", _("Object"), "TileMap", false) .AddParameter("expression", _("X"), "", false) - .codeExtraInformation.SetFunctionName("GetColumnAt").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("GetColumnAt").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddExpression("GetRowAt", _("Get tile row from Y coordinates"), _("Get tile row from Y coordinates"), _("Map"), "res/TileMapIcon16.png") .AddParameter("object", _("Object"), "TileMap", false) .AddParameter("expression", _("Y"), "", false) - .codeExtraInformation.SetFunctionName("GetRowAt").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("GetRowAt").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddStrExpression("SaveTiles", _("Save the tile map"), _("Save the tile map content in a string"), _("Saving"), "res/TileMapIcon16.png") .AddParameter("object", _("Object"), "TileMap", false) - .codeExtraInformation.SetFunctionName("SaveAsString").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("SaveAsString").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); obj.AddAction("LoadTiles", _("Load the tiles from a string"), @@ -145,7 +145,7 @@ void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) .AddParameter("objectList", _("Tile Map Object"), "TileMap", false) .AddParameter("string", _("The string representing the tiles")) .MarkAsSimple() - .codeExtraInformation.SetFunctionName("LoadFromString").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("LoadFromString").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); @@ -160,7 +160,7 @@ void DeclareTileMapObjectExtension(gd::PlatformExtension & extension) .AddParameter("string", _("The new texture name")) .AddCodeOnlyParameter("currentScene", "") .MarkAsSimple() - .codeExtraInformation.SetFunctionName("ChangeTexture").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); + .SetFunctionName("ChangeTexture").SetIncludeFile("TileMapObject/RuntimeTileMapObject.h"); #endif } diff --git a/Extensions/TiledSpriteObject/Extension.cpp b/Extensions/TiledSpriteObject/Extension.cpp index efade651e1..1908eac58a 100644 --- a/Extensions/TiledSpriteObject/Extension.cpp +++ b/Extensions/TiledSpriteObject/Extension.cpp @@ -39,7 +39,7 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "TiledSprite", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetWidth").SetManipulatedType("number").SetAssociatedGetter("GetWidth").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); + .SetFunctionName("SetWidth").SetManipulatedType("number").SetGetter("GetWidth").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddCondition("Width", _("Width"), @@ -52,7 +52,7 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); + .SetFunctionName("GetWidth").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddAction("Height", @@ -65,7 +65,7 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "TiledSprite", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetHeight").SetManipulatedType("number").SetAssociatedGetter("GetHeight").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); + .SetFunctionName("SetHeight").SetManipulatedType("number").SetGetter("GetHeight").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddCondition("Height", @@ -79,7 +79,7 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetHeight").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); + .SetFunctionName("GetHeight").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddAction("Angle", @@ -94,7 +94,7 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetAngle").SetManipulatedType("number").SetAssociatedGetter("GetAngle").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); + .SetFunctionName("SetAngle").SetManipulatedType("number").SetGetter("GetAngle").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddCondition("Angle", @@ -108,7 +108,7 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("object", _("Object"), "TiledSprite", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) - .codeExtraInformation.SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); + .SetFunctionName("GetAngle").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddAction("XOffset", _("Image X Offset"), @@ -121,7 +121,7 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetXOffset").SetManipulatedType("number").SetAssociatedGetter("GetXOffset").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); + .SetFunctionName("SetXOffset").SetManipulatedType("number").SetGetter("GetXOffset").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddCondition("XOffset", @@ -135,7 +135,7 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetXOffset").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); + .SetFunctionName("GetXOffset").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddAction("YOffset", _("Image Y Offset"), @@ -148,7 +148,7 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetYOffset").SetManipulatedType("number").SetAssociatedGetter("GetYOffset").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); + .SetFunctionName("SetYOffset").SetManipulatedType("number").SetGetter("GetYOffset").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); obj.AddCondition("YOffset", @@ -162,7 +162,7 @@ void DeclareTiledSpriteObjectExtension(gd::PlatformExtension & extension) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value to test")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetYOffset").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); + .SetFunctionName("GetYOffset").SetManipulatedType("number").SetIncludeFile("TiledSpriteObject/TiledSpriteObject.h"); #endif } diff --git a/Extensions/TiledSpriteObject/JsExtension.cpp b/Extensions/TiledSpriteObject/JsExtension.cpp index ed37aaeba4..af7d099752 100644 --- a/Extensions/TiledSpriteObject/JsExtension.cpp +++ b/Extensions/TiledSpriteObject/JsExtension.cpp @@ -31,26 +31,16 @@ public: GetObjectMetadata("TiledSpriteObject::TiledSprite").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); - GetAllActionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Width"].codeExtraInformation - .SetFunctionName("setWidth").SetAssociatedGetter("getWidth").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); - GetAllConditionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Width"].codeExtraInformation - .SetFunctionName("getWidth").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); - GetAllActionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Height"].codeExtraInformation - .SetFunctionName("setHeight").SetAssociatedGetter("getHeight").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); - GetAllConditionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Height"].codeExtraInformation - .SetFunctionName("getHeight").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); - GetAllActionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Angle"].codeExtraInformation - .SetFunctionName("setAngle").SetAssociatedGetter("getAngle").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); - GetAllConditionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Angle"].codeExtraInformation - .SetFunctionName("getAngle").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); - GetAllActionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::XOffset"].codeExtraInformation - .SetFunctionName("setXOffset").SetAssociatedGetter("getXOffset").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); - GetAllConditionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::XOffset"].codeExtraInformation - .SetFunctionName("getXOffset").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); - GetAllActionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::YOffset"].codeExtraInformation - .SetFunctionName("setYOffset").SetAssociatedGetter("getYOffset").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); - GetAllConditionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::YOffset"].codeExtraInformation - .SetFunctionName("getYOffset").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); + GetAllActionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Width"].SetFunctionName("setWidth").SetGetter("getWidth").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); + GetAllConditionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Width"].SetFunctionName("getWidth").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); + GetAllActionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Height"].SetFunctionName("setHeight").SetGetter("getHeight").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); + GetAllConditionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Height"].SetFunctionName("getHeight").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); + GetAllActionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Angle"].SetFunctionName("setAngle").SetGetter("getAngle").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); + GetAllConditionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::Angle"].SetFunctionName("getAngle").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); + GetAllActionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::XOffset"].SetFunctionName("setXOffset").SetGetter("getXOffset").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); + GetAllConditionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::XOffset"].SetFunctionName("getXOffset").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); + GetAllActionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::YOffset"].SetFunctionName("setYOffset").SetGetter("getYOffset").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); + GetAllConditionsForObject("TiledSpriteObject::TiledSprite")["TiledSpriteObject::YOffset"].SetFunctionName("getYOffset").SetIncludeFile("TiledSpriteObject/tiledspriteruntimeobject.js"); GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION(); }; diff --git a/Extensions/TopDownMovementAutomatism/Extension.cpp b/Extensions/TopDownMovementAutomatism/Extension.cpp index 6ef04ef58c..2be89d96da 100644 --- a/Extensions/TopDownMovementAutomatism/Extension.cpp +++ b/Extensions/TopDownMovementAutomatism/Extension.cpp @@ -43,7 +43,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateLeftKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SimulateLeftKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("SimulateRightKey", _("Simulate right key press"), @@ -55,7 +55,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateRightKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SimulateRightKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("SimulateUpKey", _("Simulate up key press"), @@ -67,7 +67,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateUpKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SimulateUpKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("SimulateDownKey", _("Simulate down key press"), @@ -79,7 +79,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateDownKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SimulateDownKey").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("SimulateControl", _("Simulate control"), @@ -92,7 +92,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .AddParameter("string", _("Key")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SimulateControl").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SimulateControl").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("IgnoreDefaultControls", _("Ignore default controls"), @@ -105,7 +105,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .AddParameter("yesorno", _("Ignore controls")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("IgnoreDefaultControls").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("IgnoreDefaultControls").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("IsMoving", _("Is moving"), @@ -116,7 +116,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension "CppPlatform/Extensions/topdownmovementicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) - .codeExtraInformation.SetFunctionName("IsMoving").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("IsMoving").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("Acceleration", _("Acceleration"), @@ -130,7 +130,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetAcceleration").SetAssociatedGetter("GetAcceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SetAcceleration").SetGetter("GetAcceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("Acceleration", _("Acceleration"), @@ -144,7 +144,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetAcceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetAcceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("Deceleration", _("Deceleration"), @@ -158,7 +158,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetDeceleration").SetAssociatedGetter("GetDeceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SetDeceleration").SetGetter("GetDeceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("Deceleration", _("Deceleration"), @@ -172,7 +172,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetDeceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetDeceleration").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("MaxSpeed", _("Maximum speed"), @@ -185,7 +185,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("SetMaxSpeed").SetAssociatedGetter("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SetMaxSpeed").SetGetter("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("MaxSpeed", _("Maximum speed"), @@ -199,7 +199,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("Speed", _("Speed"), @@ -212,7 +212,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) - .codeExtraInformation.SetFunctionName("GetSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("AngularMaxSpeed", _("Angular maximum speed"), @@ -226,7 +226,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetAngularMaxSpeed").SetAssociatedGetter("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SetAngularMaxSpeed").SetGetter("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("AngularMaxSpeed", _("Angular maximum speed"), @@ -240,7 +240,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetAngularMaxSpeed").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("AngleOffset", _("Rotation offset"), @@ -254,7 +254,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("operator", _("Modification's sign")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetAngleOffset").SetAssociatedGetter("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SetAngleOffset").SetGetter("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("AngleOffset", _("Rotation offset"), @@ -268,7 +268,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("relationalOperator", _("Sign of the test")) .AddParameter("expression", _("Value")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetAngleOffset").SetManipulatedType("number").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("AllowDiagonals", _("Diagonals moves"), @@ -280,7 +280,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .AddParameter("yesorno", _("Allow?")) - .codeExtraInformation.SetFunctionName("SetAllowDiagonals").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SetAllowDiagonals").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("DiagonalsAllowed", _("Diagonals moves"), @@ -292,7 +292,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("DiagonalsAllowed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("DiagonalsAllowed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddAction("RotateObject", _("Rotate the object"), @@ -305,7 +305,7 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .AddParameter("yesorno", _("Rotate object?")) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("SetRotateObject").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("SetRotateObject").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddCondition("ObjectRotated", _("Object rotated"), @@ -317,37 +317,37 @@ void DeclareTopDownMovementAutomatismExtension(gd::PlatformExtension & extension .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) .MarkAsAdvanced() - .codeExtraInformation.SetFunctionName("IsObjectRotated").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("IsObjectRotated").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddExpression("Acceleration", _("Acceleration"), _("Acceleration of the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) - .codeExtraInformation.SetFunctionName("GetAcceleration").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetAcceleration").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddExpression("Deceleration", _("Deceleration"), _("Deceleration of the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) - .codeExtraInformation.SetFunctionName("GetDeceleration").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetDeceleration").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddExpression("MaxSpeed", _("Maximum speed"), _("Maximum speed of the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) - .codeExtraInformation.SetFunctionName("GetMaxSpeed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetMaxSpeed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddExpression("Speed", _("Speed"), _("Speed of the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) - .codeExtraInformation.SetFunctionName("GetSpeed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetSpeed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddExpression("AngularMaxSpeed", _("Angular maximum speed"), _("Angular maximum speed of the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) - .codeExtraInformation.SetFunctionName("GetAngularMaxSpeed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetAngularMaxSpeed").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); aut.AddExpression("AngleOffset", _("Rotation offset"), _("Rotation offset applied to the object"), _("Movement"), "CppPlatform/Extensions/topdownmovementicon16.png") .AddParameter("object", _("Object")) .AddParameter("automatism", _("Automatism"), "TopDownMovementAutomatism", false) - .codeExtraInformation.SetFunctionName("GetAngleOffset").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); + .SetFunctionName("GetAngleOffset").SetIncludeFile("TopDownMovementAutomatism/TopDownMovementAutomatism.h"); #endif } diff --git a/Extensions/TopDownMovementAutomatism/JsExtension.cpp b/Extensions/TopDownMovementAutomatism/JsExtension.cpp index 1a4e51c89c..ec4dc16ce0 100644 --- a/Extensions/TopDownMovementAutomatism/JsExtension.cpp +++ b/Extensions/TopDownMovementAutomatism/JsExtension.cpp @@ -34,38 +34,38 @@ public: std::map & autConditions = GetAllConditionsForAutomatism("TopDownMovementAutomatism::TopDownMovementAutomatism"); std::map & autExpressions = GetAllExpressionsForAutomatism("TopDownMovementAutomatism::TopDownMovementAutomatism"); - autConditions["TopDownMovementAutomatism::IsMoving"].codeExtraInformation.SetFunctionName("isMoving"); + autConditions["TopDownMovementAutomatism::IsMoving"].SetFunctionName("isMoving"); - autActions["TopDownMovementAutomatism::Acceleration"].codeExtraInformation.SetFunctionName("setAcceleration").SetAssociatedGetter("getAcceleration"); - autConditions["TopDownMovementAutomatism::Acceleration"].codeExtraInformation.SetFunctionName("getAcceleration"); - autActions["TopDownMovementAutomatism::Deceleration"].codeExtraInformation.SetFunctionName("setDeceleration").SetAssociatedGetter("getDeceleration"); - autConditions["TopDownMovementAutomatism::Deceleration"].codeExtraInformation.SetFunctionName("getDeceleration"); - autActions["TopDownMovementAutomatism::MaxSpeed"].codeExtraInformation.SetFunctionName("setMaxSpeed").SetAssociatedGetter("getMaxSpeed"); - autConditions["TopDownMovementAutomatism::MaxSpeed"].codeExtraInformation.SetFunctionName("getMaxSpeed"); - autConditions["TopDownMovementAutomatism::Speed"].codeExtraInformation.SetFunctionName("getSpeed"); - autActions["TopDownMovementAutomatism::AngularMaxSpeed"].codeExtraInformation.SetFunctionName("setAngularMaxSpeed").SetAssociatedGetter("getAngularMaxSpeed"); - autConditions["TopDownMovementAutomatism::AngularMaxSpeed"].codeExtraInformation.SetFunctionName("getAngularMaxSpeed"); - autActions["TopDownMovementAutomatism::AngleOffset"].codeExtraInformation.SetFunctionName("setAngleOffset").SetAssociatedGetter("getAngleOffset"); - autConditions["TopDownMovementAutomatism::AngleOffset"].codeExtraInformation.SetFunctionName("getAngleOffset"); + autActions["TopDownMovementAutomatism::Acceleration"].SetFunctionName("setAcceleration").SetGetter("getAcceleration"); + autConditions["TopDownMovementAutomatism::Acceleration"].SetFunctionName("getAcceleration"); + autActions["TopDownMovementAutomatism::Deceleration"].SetFunctionName("setDeceleration").SetGetter("getDeceleration"); + autConditions["TopDownMovementAutomatism::Deceleration"].SetFunctionName("getDeceleration"); + autActions["TopDownMovementAutomatism::MaxSpeed"].SetFunctionName("setMaxSpeed").SetGetter("getMaxSpeed"); + autConditions["TopDownMovementAutomatism::MaxSpeed"].SetFunctionName("getMaxSpeed"); + autConditions["TopDownMovementAutomatism::Speed"].SetFunctionName("getSpeed"); + autActions["TopDownMovementAutomatism::AngularMaxSpeed"].SetFunctionName("setAngularMaxSpeed").SetGetter("getAngularMaxSpeed"); + autConditions["TopDownMovementAutomatism::AngularMaxSpeed"].SetFunctionName("getAngularMaxSpeed"); + autActions["TopDownMovementAutomatism::AngleOffset"].SetFunctionName("setAngleOffset").SetGetter("getAngleOffset"); + autConditions["TopDownMovementAutomatism::AngleOffset"].SetFunctionName("getAngleOffset"); - autActions["TopDownMovementAutomatism::AllowDiagonals"].codeExtraInformation.SetFunctionName("allowDiagonals"); - autConditions["TopDownMovementAutomatism::DiagonalsAllowed"].codeExtraInformation.SetFunctionName("diagonalsAllowed"); - autActions["TopDownMovementAutomatism::RotateObject"].codeExtraInformation.SetFunctionName("setRotateObject"); - autConditions["TopDownMovementAutomatism::ObjectRotated"].codeExtraInformation.SetFunctionName("isObjectRotated"); + autActions["TopDownMovementAutomatism::AllowDiagonals"].SetFunctionName("allowDiagonals"); + autConditions["TopDownMovementAutomatism::DiagonalsAllowed"].SetFunctionName("diagonalsAllowed"); + autActions["TopDownMovementAutomatism::RotateObject"].SetFunctionName("setRotateObject"); + autConditions["TopDownMovementAutomatism::ObjectRotated"].SetFunctionName("isObjectRotated"); - autActions["TopDownMovementAutomatism::SimulateLeftKey"].codeExtraInformation.SetFunctionName("simulateLeftKey"); - autActions["TopDownMovementAutomatism::SimulateRightKey"].codeExtraInformation.SetFunctionName("simulateRightKey"); - autActions["TopDownMovementAutomatism::SimulateUpKey"].codeExtraInformation.SetFunctionName("simulateUpKey"); - autActions["TopDownMovementAutomatism::SimulateDownKey"].codeExtraInformation.SetFunctionName("simulateDownKey"); - autActions["TopDownMovementAutomatism::SimulateControl"].codeExtraInformation.SetFunctionName("simulateControl"); - autActions["TopDownMovementAutomatism::IgnoreDefaultControls"].codeExtraInformation.SetFunctionName("ignoreDefaultControls"); + autActions["TopDownMovementAutomatism::SimulateLeftKey"].SetFunctionName("simulateLeftKey"); + autActions["TopDownMovementAutomatism::SimulateRightKey"].SetFunctionName("simulateRightKey"); + autActions["TopDownMovementAutomatism::SimulateUpKey"].SetFunctionName("simulateUpKey"); + autActions["TopDownMovementAutomatism::SimulateDownKey"].SetFunctionName("simulateDownKey"); + autActions["TopDownMovementAutomatism::SimulateControl"].SetFunctionName("simulateControl"); + autActions["TopDownMovementAutomatism::IgnoreDefaultControls"].SetFunctionName("ignoreDefaultControls"); - autExpressions["Acceleration"].codeExtraInformation.SetFunctionName("getAcceleration"); - autExpressions["Deceleration"].codeExtraInformation.SetFunctionName("getDeceleration"); - autExpressions["MaxSpeed"].codeExtraInformation.SetFunctionName("getMaxSpeed"); - autExpressions["Speed"].codeExtraInformation.SetFunctionName("getSpeed"); - autExpressions["AngularMaxSpeed"].codeExtraInformation.SetFunctionName("getAngularMaxSpeed"); - autExpressions["AngleOffset"].codeExtraInformation.SetFunctionName("getAngleOffset"); + autExpressions["Acceleration"].SetFunctionName("getAcceleration"); + autExpressions["Deceleration"].SetFunctionName("getDeceleration"); + autExpressions["MaxSpeed"].SetFunctionName("getMaxSpeed"); + autExpressions["Speed"].SetFunctionName("getSpeed"); + autExpressions["AngularMaxSpeed"].SetFunctionName("getAngularMaxSpeed"); + autExpressions["AngleOffset"].SetFunctionName("getAngleOffset"); GD_COMPLETE_EXTENSION_COMPILATION_INFORMATION(); }; diff --git a/GDCpp/GDCpp/BuiltinExtensions/AdvancedExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/AdvancedExtension.cpp index b1ec3cb150..7b97a8522f 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/AdvancedExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/AdvancedExtension.cpp @@ -16,7 +16,7 @@ AdvancedExtension::AdvancedExtension() gd::BuiltinExtensionsImplementer::ImplementsAdvancedExtension(*this); #if defined(GD_IDE_ONLY) - GetAllConditions()["Toujours"].codeExtraInformation.SetFunctionName("GDpriv::CommonInstructions::LogicalNegation").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); + GetAllConditions()["Toujours"].SetFunctionName("GDpriv::CommonInstructions::LogicalNegation").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/AudioExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/AudioExtension.cpp index 84d1226704..278a7d2757 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/AudioExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/AudioExtension.cpp @@ -22,45 +22,45 @@ AudioExtension::AudioExtension() gd::BuiltinExtensionsImplementer::ImplementsAudioExtension(*this); #if defined(GD_IDE_ONLY) - GetAllActions()["PlaySoundCanal"].codeExtraInformation.SetFunctionName("PlaySoundOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["StopSoundCanal"].codeExtraInformation.SetFunctionName("StopSoundOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["PauseSoundCanal"].codeExtraInformation.SetFunctionName("PauseSoundOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["RePlaySoundCanal"].codeExtraInformation.SetFunctionName("RePlaySoundOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["PlayMusicCanal"].codeExtraInformation.SetFunctionName("PlayMusicOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["StopMusicCanal"].codeExtraInformation.SetFunctionName("StopMusicOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["PauseMusicCanal"].codeExtraInformation.SetFunctionName("PauseMusicOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["RePlayMusicCanal"].codeExtraInformation.SetFunctionName("RePlayMusicOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["ModVolumeSoundCanal"].codeExtraInformation.SetFunctionName("SetSoundVolumeOnChannel").SetManipulatedType("number").SetAssociatedGetter("GetSoundVolumeOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["ModVolumeMusicCanal"].codeExtraInformation.SetFunctionName("SetMusicVolumeOnChannel").SetManipulatedType("number").SetAssociatedGetter("GetMusicVolumeOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["ModGlobalVolume"].codeExtraInformation.SetFunctionName("SetGlobalVolume").SetAssociatedGetter("GetGlobalVolume").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["ModPitchSoundChannel"].codeExtraInformation.SetFunctionName("SetSoundPitchOnChannel").SetAssociatedGetter("GetSoundPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["ModPitchMusicChannel"].codeExtraInformation.SetFunctionName("SetMusicPitchOnChannel").SetAssociatedGetter("GetMusicPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["ModPlayingOffsetSoundChannel"].codeExtraInformation.SetFunctionName("SetSoundPlayingOffsetOnChannel").SetAssociatedGetter("GetSoundPlayingOffsetOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["ModPlayingOffsetMusicChannel"].codeExtraInformation.SetFunctionName("SetMusicPlayingOffsetOnChannel").SetAssociatedGetter("GetMusicPlayingOffsetOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["PlaySound"].codeExtraInformation.SetFunctionName("PlaySound").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllActions()["PlayMusic"].codeExtraInformation.SetFunctionName("PlayMusic").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["PlaySoundCanal"].SetFunctionName("PlaySoundOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["StopSoundCanal"].SetFunctionName("StopSoundOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["PauseSoundCanal"].SetFunctionName("PauseSoundOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["RePlaySoundCanal"].SetFunctionName("RePlaySoundOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["PlayMusicCanal"].SetFunctionName("PlayMusicOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["StopMusicCanal"].SetFunctionName("StopMusicOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["PauseMusicCanal"].SetFunctionName("PauseMusicOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["RePlayMusicCanal"].SetFunctionName("RePlayMusicOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["ModVolumeSoundCanal"].SetFunctionName("SetSoundVolumeOnChannel").SetManipulatedType("number").SetGetter("GetSoundVolumeOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["ModVolumeMusicCanal"].SetFunctionName("SetMusicVolumeOnChannel").SetManipulatedType("number").SetGetter("GetMusicVolumeOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["ModGlobalVolume"].SetFunctionName("SetGlobalVolume").SetGetter("GetGlobalVolume").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["ModPitchSoundChannel"].SetFunctionName("SetSoundPitchOnChannel").SetGetter("GetSoundPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["ModPitchMusicChannel"].SetFunctionName("SetMusicPitchOnChannel").SetGetter("GetMusicPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["ModPlayingOffsetSoundChannel"].SetFunctionName("SetSoundPlayingOffsetOnChannel").SetGetter("GetSoundPlayingOffsetOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["ModPlayingOffsetMusicChannel"].SetFunctionName("SetMusicPlayingOffsetOnChannel").SetGetter("GetMusicPlayingOffsetOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["PlaySound"].SetFunctionName("PlaySound").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllActions()["PlayMusic"].SetFunctionName("PlayMusic").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["MusicPlaying"].codeExtraInformation.SetFunctionName("MusicPlaying").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["MusicPaused"].codeExtraInformation.SetFunctionName("MusicPaused").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["MusicStopped"].codeExtraInformation.SetFunctionName("MusicStopped").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["SoundPlaying"].codeExtraInformation.SetFunctionName("SoundPlaying").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["SoundPaused"].codeExtraInformation.SetFunctionName("SoundPaused").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["SoundStopped"].codeExtraInformation.SetFunctionName("SoundStopped").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["SoundCanalVolume"].codeExtraInformation.SetFunctionName("GetSoundVolumeOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["MusicCanalVolume"].codeExtraInformation.SetFunctionName("GetMusicVolumeOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["GlobalVolume"].codeExtraInformation.SetFunctionName("GetGlobalVolume").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["SoundChannelPitch"].codeExtraInformation.SetFunctionName("GetSoundPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["MusicChannelPitch"].codeExtraInformation.SetFunctionName("GetMusicPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["SoundChannelPlayingOffset"].codeExtraInformation.SetFunctionName("GetSoundPlayingOffsetOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllConditions()["MusicChannelPlayingOffset"].codeExtraInformation.SetFunctionName("GetMusicPlayingOffsetOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["MusicPlaying"].SetFunctionName("MusicPlaying").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["MusicPaused"].SetFunctionName("MusicPaused").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["MusicStopped"].SetFunctionName("MusicStopped").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["SoundPlaying"].SetFunctionName("SoundPlaying").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["SoundPaused"].SetFunctionName("SoundPaused").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["SoundStopped"].SetFunctionName("SoundStopped").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["SoundCanalVolume"].SetFunctionName("GetSoundVolumeOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["MusicCanalVolume"].SetFunctionName("GetMusicVolumeOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["GlobalVolume"].SetFunctionName("GetGlobalVolume").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["SoundChannelPitch"].SetFunctionName("GetSoundPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["MusicChannelPitch"].SetFunctionName("GetMusicPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["SoundChannelPlayingOffset"].SetFunctionName("GetSoundPlayingOffsetOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllConditions()["MusicChannelPlayingOffset"].SetFunctionName("GetMusicPlayingOffsetOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllExpressions()["SoundChannelPlayingOffset"].codeExtraInformation.SetFunctionName("GetSoundPlayingOffsetOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllExpressions()["MusicChannelPlayingOffset"].codeExtraInformation.SetFunctionName("GetMusicPlayingOffsetOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllExpressions()["SoundChannelVolume"].codeExtraInformation.SetFunctionName("GetSoundVolumeOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllExpressions()["MusicChannelVolume"].codeExtraInformation.SetFunctionName("GetMusicVolumeOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllExpressions()["SoundChannelPitch"].codeExtraInformation.SetFunctionName("GetSoundPitchOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllExpressions()["MusicChannelPitch"].codeExtraInformation.SetFunctionName("GetMusicPitchOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); - GetAllExpressions()["GlobalVolume"].codeExtraInformation.SetFunctionName("GetGlobalVolume").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllExpressions()["SoundChannelPlayingOffset"].SetFunctionName("GetSoundPlayingOffsetOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllExpressions()["MusicChannelPlayingOffset"].SetFunctionName("GetMusicPlayingOffsetOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllExpressions()["SoundChannelVolume"].SetFunctionName("GetSoundVolumeOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllExpressions()["MusicChannelVolume"].SetFunctionName("GetMusicVolumeOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllExpressions()["SoundChannelPitch"].SetFunctionName("GetSoundPitchOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllExpressions()["MusicChannelPitch"].SetFunctionName("GetMusicPitchOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + GetAllExpressions()["GlobalVolume"].SetFunctionName("GetGlobalVolume").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/BaseObjectExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/BaseObjectExtension.cpp index cd78370fc7..89458e9ec5 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/BaseObjectExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/BaseObjectExtension.cpp @@ -20,91 +20,91 @@ BaseObjectExtension::BaseObjectExtension() std::map & objectExpressions = GetAllExpressionsForObject(""); std::map & objectStrExpressions = GetAllStrExpressionsForObject(""); - objectConditions["PosX"].codeExtraInformation.SetFunctionName("GetX").SetManipulatedType("number"); - objectActions["MettreX"].codeExtraInformation.SetFunctionName("SetX").SetManipulatedType("number").SetAssociatedGetter("GetX"); - objectConditions["PosY"].codeExtraInformation.SetFunctionName("GetY").SetManipulatedType("number"); - objectActions["MettreY"].codeExtraInformation.SetFunctionName("SetY").SetManipulatedType("number").SetAssociatedGetter("GetY"); - objectActions["MettreXY"].codeExtraInformation.SetFunctionName("SetXY"); - objectConditions["Angle"].codeExtraInformation.SetFunctionName("GetAngle"); + objectConditions["PosX"].SetFunctionName("GetX").SetManipulatedType("number"); + objectActions["MettreX"].SetFunctionName("SetX").SetManipulatedType("number").SetGetter("GetX"); + objectConditions["PosY"].SetFunctionName("GetY").SetManipulatedType("number"); + objectActions["MettreY"].SetFunctionName("SetY").SetManipulatedType("number").SetGetter("GetY"); + objectActions["MettreXY"].SetFunctionName("SetXY"); + objectConditions["Angle"].SetFunctionName("GetAngle"); - objectActions["SetAngle"].codeExtraInformation.SetFunctionName("SetAngle").SetManipulatedType("number").SetAssociatedGetter("GetAngle"); - objectActions["Rotate"].codeExtraInformation.SetFunctionName("Rotate"); - objectActions["RotateTowardAngle"].codeExtraInformation.SetFunctionName("RotateTowardAngle"); - objectActions["RotateTowardPosition"].codeExtraInformation.SetFunctionName("RotateTowardPosition"); + objectActions["SetAngle"].SetFunctionName("SetAngle").SetManipulatedType("number").SetGetter("GetAngle"); + objectActions["Rotate"].SetFunctionName("Rotate"); + objectActions["RotateTowardAngle"].SetFunctionName("RotateTowardAngle"); + objectActions["RotateTowardPosition"].SetFunctionName("RotateTowardPosition"); - objectActions["MettreAutourPos"].codeExtraInformation.SetFunctionName("PutAroundAPosition"); - objectActions["AddForceXY"].codeExtraInformation.SetFunctionName("AddForce"); - objectActions["AddForceAL"].codeExtraInformation.SetFunctionName("AddForceUsingPolarCoordinates"); - objectActions["AddForceVersPos"].codeExtraInformation.SetFunctionName("AddForceTowardPosition"); - objectActions["AddForceTournePos"].codeExtraInformation.SetFunctionName("AddForceToMoveAround"); - objectActions["Arreter"].codeExtraInformation.SetFunctionName("ClearForce"); - objectActions["Delete"].codeExtraInformation.SetFunctionName("DeleteFromScene"); - objectActions["ChangePlan"].codeExtraInformation.SetFunctionName("SetZOrder").SetAssociatedGetter("GetZOrder").SetManipulatedType("number"); - objectActions["ChangeLayer"].codeExtraInformation.SetFunctionName("SetLayer"); + objectActions["MettreAutourPos"].SetFunctionName("PutAroundAPosition"); + objectActions["AddForceXY"].SetFunctionName("AddForce"); + objectActions["AddForceAL"].SetFunctionName("AddForceUsingPolarCoordinates"); + objectActions["AddForceVersPos"].SetFunctionName("AddForceTowardPosition"); + objectActions["AddForceTournePos"].SetFunctionName("AddForceToMoveAround"); + objectActions["Arreter"].SetFunctionName("ClearForce"); + objectActions["Delete"].SetFunctionName("DeleteFromScene"); + objectActions["ChangePlan"].SetFunctionName("SetZOrder").SetGetter("GetZOrder").SetManipulatedType("number"); + objectActions["ChangeLayer"].SetFunctionName("SetLayer"); - objectActions["ModVarObjet"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("number"); - objectActions["ModVarObjetTxt"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("string"); - objectConditions["ObjectVariableChildExists"].codeExtraInformation.SetFunctionName("VariableChildExists"); - objectActions["ObjectVariableRemoveChild"].codeExtraInformation.SetFunctionName("VariableRemoveChild"); + objectActions["ModVarObjet"].SetFunctionName("ReturnVariable").SetManipulatedType("number"); + objectActions["ModVarObjetTxt"].SetFunctionName("ReturnVariable").SetManipulatedType("string"); + objectConditions["ObjectVariableChildExists"].SetFunctionName("VariableChildExists"); + objectActions["ObjectVariableRemoveChild"].SetFunctionName("VariableRemoveChild"); - objectActions["Cache"].codeExtraInformation.SetFunctionName("SetHidden"); - objectActions["Montre"].codeExtraInformation.SetFunctionName("SetHidden"); + objectActions["Cache"].SetFunctionName("SetHidden"); + objectActions["Montre"].SetFunctionName("SetHidden"); - objectConditions["Plan"].codeExtraInformation.SetFunctionName("GetZOrder").SetManipulatedType("number"); - objectConditions["Layer"].codeExtraInformation.SetFunctionName("IsOnLayer"); - objectConditions["Visible"].codeExtraInformation.SetFunctionName("IsVisible"); - objectConditions["Invisible"].codeExtraInformation.SetFunctionName("IsHidden"); - objectConditions["Arret"].codeExtraInformation.SetFunctionName("IsStopped"); - objectConditions["Vitesse"].codeExtraInformation.SetFunctionName("TotalForceLength").SetManipulatedType("number"); - objectConditions["AngleOfDisplacement"].codeExtraInformation.SetFunctionName("TestAngleOfDisplacement"); - objectConditions["VarObjet"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("number"); - objectConditions["VarObjetTxt"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("string"); - objectConditions["VarObjetDef"].codeExtraInformation.SetFunctionName("VariableExists"); - objectConditions["AutomatismActivated"].codeExtraInformation.SetFunctionName("AutomatismActivated"); - objectActions["ActivateAutomatism"].codeExtraInformation.SetFunctionName("ActivateAutomatism"); - objectActions["AddForceVers"].codeExtraInformation.SetFunctionName("AddForceTowardObject").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - objectActions["AddForceTourne"].codeExtraInformation.SetFunctionName("AddForceToMoveAroundObject").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - objectActions["MettreAutour"].codeExtraInformation.SetFunctionName("PutAroundObject").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - objectActions["Rebondir"].codeExtraInformation.SetFunctionName("SeparateObjectsWithForces").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - objectActions["Ecarter"].codeExtraInformation.SetFunctionName("SeparateObjectsWithoutForces").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - objectActions["SeparateFromObjects"].codeExtraInformation.SetFunctionName("SeparateFromObjects").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + objectConditions["Plan"].SetFunctionName("GetZOrder").SetManipulatedType("number"); + objectConditions["Layer"].SetFunctionName("IsOnLayer"); + objectConditions["Visible"].SetFunctionName("IsVisible"); + objectConditions["Invisible"].SetFunctionName("IsHidden"); + objectConditions["Arret"].SetFunctionName("IsStopped"); + objectConditions["Vitesse"].SetFunctionName("TotalForceLength").SetManipulatedType("number"); + objectConditions["AngleOfDisplacement"].SetFunctionName("TestAngleOfDisplacement"); + objectConditions["VarObjet"].SetFunctionName("ReturnVariable").SetManipulatedType("number"); + objectConditions["VarObjetTxt"].SetFunctionName("ReturnVariable").SetManipulatedType("string"); + objectConditions["VarObjetDef"].SetFunctionName("VariableExists"); + objectConditions["AutomatismActivated"].SetFunctionName("AutomatismActivated"); + objectActions["ActivateAutomatism"].SetFunctionName("ActivateAutomatism"); + objectActions["AddForceVers"].SetFunctionName("AddForceTowardObject").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + objectActions["AddForceTourne"].SetFunctionName("AddForceToMoveAroundObject").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + objectActions["MettreAutour"].SetFunctionName("PutAroundObject").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + objectActions["Rebondir"].SetFunctionName("SeparateObjectsWithForces").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + objectActions["Ecarter"].SetFunctionName("SeparateObjectsWithoutForces").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + objectActions["SeparateFromObjects"].SetFunctionName("SeparateFromObjects").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - objectExpressions["X"].codeExtraInformation.SetFunctionName("GetX"); - objectExpressions["Y"].codeExtraInformation.SetFunctionName("GetY"); - objectExpressions["ForceX"].codeExtraInformation.SetFunctionName("TotalForceX"); - objectExpressions["ForceY"].codeExtraInformation.SetFunctionName("TotalForceY"); - objectExpressions["ForceAngle"].codeExtraInformation.SetFunctionName("TotalForceAngle"); - objectExpressions["Angle"].codeExtraInformation.SetFunctionName("GetAngle"); - objectExpressions["ForceLength"].codeExtraInformation.SetFunctionName("TotalForceLength"); - objectExpressions["Longueur"].codeExtraInformation.SetFunctionName("TotalForceLength"); - objectExpressions["Width"].codeExtraInformation.SetFunctionName("GetWidth"); - objectExpressions["Largeur"].codeExtraInformation.SetFunctionName("GetWidth"); - objectExpressions["Height"].codeExtraInformation.SetFunctionName("GetHeight"); - objectExpressions["Hauteur"].codeExtraInformation.SetFunctionName("GetHeight"); - objectExpressions["ZOrder"].codeExtraInformation.SetFunctionName("GetZOrder"); - objectExpressions["Plan"].codeExtraInformation.SetFunctionName("GetZOrder"); - objectExpressions["Distance"].codeExtraInformation.SetFunctionName("GetDistanceWithObject"); - objectExpressions["SqDistance"].codeExtraInformation.SetFunctionName("GetSqDistanceWithObject"); - objectExpressions["Variable"].codeExtraInformation.SetFunctionName("GetVariableValue").SetStatic(); - objectStrExpressions["VariableString"].codeExtraInformation.SetFunctionName("GetVariableString").SetStatic(); + objectExpressions["X"].SetFunctionName("GetX"); + objectExpressions["Y"].SetFunctionName("GetY"); + objectExpressions["ForceX"].SetFunctionName("TotalForceX"); + objectExpressions["ForceY"].SetFunctionName("TotalForceY"); + objectExpressions["ForceAngle"].SetFunctionName("TotalForceAngle"); + objectExpressions["Angle"].SetFunctionName("GetAngle"); + objectExpressions["ForceLength"].SetFunctionName("TotalForceLength"); + objectExpressions["Longueur"].SetFunctionName("TotalForceLength"); + objectExpressions["Width"].SetFunctionName("GetWidth"); + objectExpressions["Largeur"].SetFunctionName("GetWidth"); + objectExpressions["Height"].SetFunctionName("GetHeight"); + objectExpressions["Hauteur"].SetFunctionName("GetHeight"); + objectExpressions["ZOrder"].SetFunctionName("GetZOrder"); + objectExpressions["Plan"].SetFunctionName("GetZOrder"); + objectExpressions["Distance"].SetFunctionName("GetDistanceWithObject"); + objectExpressions["SqDistance"].SetFunctionName("GetSqDistanceWithObject"); + objectExpressions["Variable"].SetFunctionName("GetVariableValue").SetStatic(); + objectStrExpressions["VariableString"].SetFunctionName("GetVariableString").SetStatic(); - GetAllActions()["Create"].codeExtraInformation.SetFunctionName("CreateObjectOnScene").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["CreateByName"].codeExtraInformation.SetFunctionName("CreateObjectFromGroupOnScene").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["AjoutObjConcern"].codeExtraInformation.SetFunctionName("PickAllObjects").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["AjoutHasard"].codeExtraInformation.SetFunctionName("PickRandomObject").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["MoveObjects"].codeExtraInformation.SetFunctionName("MoveObjects").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["Create"].SetFunctionName("CreateObjectOnScene").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["CreateByName"].SetFunctionName("CreateObjectFromGroupOnScene").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["AjoutObjConcern"].SetFunctionName("PickAllObjects").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["AjoutHasard"].SetFunctionName("PickRandomObject").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["MoveObjects"].SetFunctionName("MoveObjects").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["SeDirige"].codeExtraInformation.SetFunctionName("MovesToward").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - GetAllConditions()["Distance"].codeExtraInformation.SetFunctionName("DistanceBetweenObjects").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - GetAllConditions()["AjoutObjConcern"].codeExtraInformation.SetFunctionName("PickAllObjects").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["AjoutHasard"].codeExtraInformation.SetFunctionName("PickRandomObject").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["PickNearest"].codeExtraInformation.SetFunctionName("PickNearestObject").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["NbObjet"].codeExtraInformation.SetFunctionName("PickedObjectsCount").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - GetAllConditions()["CollisionNP"].codeExtraInformation.SetFunctionName("HitBoxesCollision").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - GetAllConditions()["EstTourne"].codeExtraInformation.SetFunctionName("ObjectsTurnedToward").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + GetAllConditions()["SeDirige"].SetFunctionName("MovesToward").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + GetAllConditions()["Distance"].SetFunctionName("DistanceBetweenObjects").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + GetAllConditions()["AjoutObjConcern"].SetFunctionName("PickAllObjects").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["AjoutHasard"].SetFunctionName("PickRandomObject").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["PickNearest"].SetFunctionName("PickNearestObject").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["NbObjet"].SetFunctionName("PickedObjectsCount").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + GetAllConditions()["CollisionNP"].SetFunctionName("HitBoxesCollision").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + GetAllConditions()["EstTourne"].SetFunctionName("ObjectsTurnedToward").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); - GetAllExpressions()["Count"].codeExtraInformation.SetFunctionName("PickedObjectsCount").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + GetAllExpressions()["Count"].SetFunctionName("PickedObjectsCount").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/CameraExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/CameraExtension.cpp index 585b6cae26..8d430dedfc 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/CameraExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/CameraExtension.cpp @@ -17,50 +17,50 @@ CameraExtension::CameraExtension() #if defined(GD_IDE_ONLY) - GetAllConditions()["CameraX"].codeExtraInformation.SetFunctionName("GetCameraX").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllConditions()["CameraY"].codeExtraInformation.SetFunctionName("GetCameraY").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllConditions()["CameraX"].SetFunctionName("GetCameraX").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllConditions()["CameraY"].SetFunctionName("GetCameraY").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["CameraX"].codeExtraInformation.SetFunctionName("SetCameraX").SetManipulatedType("number").SetAssociatedGetter("GetCameraX").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["CameraY"].codeExtraInformation.SetFunctionName("SetCameraY").SetManipulatedType("number").SetAssociatedGetter("GetCameraY").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllActions()["CameraX"].SetFunctionName("SetCameraX").SetManipulatedType("number").SetGetter("GetCameraX").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllActions()["CameraY"].SetFunctionName("SetCameraY").SetManipulatedType("number").SetGetter("GetCameraY").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllConditions()["CameraWidth"].codeExtraInformation.SetFunctionName("GetCameraWidth").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllConditions()["CameraHeight"].codeExtraInformation.SetFunctionName("GetCameraHeight").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllConditions()["CameraAngle"].codeExtraInformation.SetFunctionName("GetCameraAngle").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllConditions()["CameraWidth"].SetFunctionName("GetCameraWidth").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllConditions()["CameraHeight"].SetFunctionName("GetCameraHeight").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllConditions()["CameraAngle"].SetFunctionName("GetCameraAngle").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["RotateCamera"].codeExtraInformation.SetFunctionName("SetCameraAngle").SetAssociatedGetter("GetCameraAngle").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllActions()["RotateCamera"].SetFunctionName("SetCameraAngle").SetGetter("GetCameraAngle").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["AddCamera"].codeExtraInformation.SetFunctionName("AddCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllActions()["AddCamera"].SetFunctionName("AddCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["DeleteCamera"].codeExtraInformation.SetFunctionName("DeleteCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllActions()["DeleteCamera"].SetFunctionName("DeleteCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["CameraSize"].codeExtraInformation.SetFunctionName("SetCameraSize").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllActions()["CameraSize"].SetFunctionName("SetCameraSize").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["CameraViewport"].codeExtraInformation.SetFunctionName("SetCameraViewport").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllActions()["CameraViewport"].SetFunctionName("SetCameraViewport").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["ZoomCamera"].codeExtraInformation.SetFunctionName("SetCameraZoom").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllActions()["ZoomCamera"].SetFunctionName("SetCameraZoom").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["FixCamera"].codeExtraInformation.SetFunctionName("CenterCameraOnObjectWithLimits").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllActions()["FixCamera"].SetFunctionName("CenterCameraOnObjectWithLimits").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["CentreCamera"].codeExtraInformation.SetFunctionName("CenterCameraOnObject").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllActions()["CentreCamera"].SetFunctionName("CenterCameraOnObject").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllActions()["ShowLayer"].codeExtraInformation.SetFunctionName("ShowLayer").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["ShowLayer"].SetFunctionName("ShowLayer").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["HideLayer"].codeExtraInformation.SetFunctionName("HideLayer").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h");; + GetAllActions()["HideLayer"].SetFunctionName("HideLayer").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h");; - GetAllConditions()["LayerVisible"].codeExtraInformation.SetFunctionName("LayerVisible").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["LayerVisible"].SetFunctionName("LayerVisible").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllExpressions()["CameraWidth"].codeExtraInformation.SetFunctionName("GetCameraWidth").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["CameraHeight"].codeExtraInformation.SetFunctionName("GetCameraHeight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["CameraViewportLeft"].codeExtraInformation.SetFunctionName("GetCameraViewportLeft").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["CameraViewportTop"].codeExtraInformation.SetFunctionName("GetCameraViewportTop").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["CameraViewportRight"].codeExtraInformation.SetFunctionName("GetCameraViewportRight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["CameraViewportBottom"].codeExtraInformation.SetFunctionName("GetCameraViewportBottom").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["CameraX"].codeExtraInformation.SetFunctionName("GetCameraX").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["VueX"].codeExtraInformation.SetFunctionName("GetCameraX").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["CameraY"].codeExtraInformation.SetFunctionName("GetCameraY").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["VueY"].codeExtraInformation.SetFunctionName("GetCameraY").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["CameraRotation"].codeExtraInformation.SetFunctionName("GetCameraRotation").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); - GetAllExpressions()["VueRotation"].codeExtraInformation.SetFunctionName("GetCameraRotation").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["CameraWidth"].SetFunctionName("GetCameraWidth").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["CameraHeight"].SetFunctionName("GetCameraHeight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["CameraViewportLeft"].SetFunctionName("GetCameraViewportLeft").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["CameraViewportTop"].SetFunctionName("GetCameraViewportTop").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["CameraViewportRight"].SetFunctionName("GetCameraViewportRight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["CameraViewportBottom"].SetFunctionName("GetCameraViewportBottom").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["CameraX"].SetFunctionName("GetCameraX").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["VueX"].SetFunctionName("GetCameraX").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["CameraY"].SetFunctionName("GetCameraY").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["VueY"].SetFunctionName("GetCameraY").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["CameraRotation"].SetFunctionName("GetCameraRotation").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + GetAllExpressions()["VueRotation"].SetFunctionName("GetCameraRotation").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/CommonConversionsExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/CommonConversionsExtension.cpp index b80f5b824b..1c64660282 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/CommonConversionsExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/CommonConversionsExtension.cpp @@ -9,11 +9,11 @@ CommonConversionsExtension::CommonConversionsExtension() gd::BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(*this); #if defined(GD_IDE_ONLY) - GetAllExpressions()["ToNumber"].codeExtraInformation.SetFunctionName("GDpriv::CommonInstructions::ToDouble").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); - GetAllStrExpressions()["ToString"].codeExtraInformation.SetFunctionName("GDpriv::CommonInstructions::ToString").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); - GetAllStrExpressions()["LargeNumberToString"].codeExtraInformation.SetFunctionName("GDpriv::CommonInstructions::LargeNumberToString").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); - GetAllExpressions()["ToRad"].codeExtraInformation.SetFunctionName("GDpriv::CommonInstructions::ToRad").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); - GetAllExpressions()["ToDeg"].codeExtraInformation.SetFunctionName("GDpriv::CommonInstructions::ToDeg").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); + GetAllExpressions()["ToNumber"].SetFunctionName("GDpriv::CommonInstructions::ToDouble").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); + GetAllStrExpressions()["ToString"].SetFunctionName("GDpriv::CommonInstructions::ToString").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); + GetAllStrExpressions()["LargeNumberToString"].SetFunctionName("GDpriv::CommonInstructions::LargeNumberToString").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); + GetAllExpressions()["ToRad"].SetFunctionName("GDpriv::CommonInstructions::ToRad").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); + GetAllExpressions()["ToDeg"].SetFunctionName("GDpriv::CommonInstructions::ToDeg").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/ExternalLayoutsExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/ExternalLayoutsExtension.cpp index a6327a0977..8f0c5c0024 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/ExternalLayoutsExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/ExternalLayoutsExtension.cpp @@ -10,7 +10,7 @@ ExternalLayoutsExtension::ExternalLayoutsExtension() gd::BuiltinExtensionsImplementer::ImplementsExternalLayoutsExtension(*this); #if defined(GD_IDE_ONLY) - GetAllActions()["BuiltinExternalLayouts::CreateObjectsFromExternalLayout"].codeExtraInformation.SetFunctionName("ExternalLayoutsTools::CreateObjectsFromExternalLayout").SetIncludeFile("GDCpp/BuiltinExtensions/ExternalLayoutsTools.h"); + GetAllActions()["BuiltinExternalLayouts::CreateObjectsFromExternalLayout"].SetFunctionName("ExternalLayoutsTools::CreateObjectsFromExternalLayout").SetIncludeFile("GDCpp/BuiltinExtensions/ExternalLayoutsTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/FileExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/FileExtension.cpp index 7e52fb5927..6793650e54 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/FileExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/FileExtension.cpp @@ -10,18 +10,18 @@ FileExtension::FileExtension() gd::BuiltinExtensionsImplementer::ImplementsFileExtension(*this); #if defined(GD_IDE_ONLY) - GetAllConditions()["GroupExists"].codeExtraInformation.SetFunctionName("GroupExists").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllActions()["LoadFile"].codeExtraInformation.SetFunctionName("LoadFileInMemory").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllActions()["UnloadFile"].codeExtraInformation.SetFunctionName("UnloadFileFromMemory").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllActions()["EcrireFichierExp"].codeExtraInformation.SetFunctionName("WriteValueInFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllActions()["EcrireFichierTxt"].codeExtraInformation.SetFunctionName("WriteStringInFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllActions()["LireFichierExp"].codeExtraInformation.SetFunctionName("ReadValueFromFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllActions()["LireFichierTxt"].codeExtraInformation.SetFunctionName("ReadStringFromFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllActions()["DeleteGroupFichier"].codeExtraInformation.SetFunctionName("DeleteGroupFromFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllActions()["DeleteFichier"].codeExtraInformation.SetFunctionName("GDDeleteFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllConditions()["FileExists"].codeExtraInformation.SetFunctionName("FileExists").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllActions()["LaunchFile"].codeExtraInformation.SetFunctionName("LaunchFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); - GetAllActions()["ExecuteCmd"].codeExtraInformation.SetFunctionName("ExecuteCmd").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllConditions()["GroupExists"].SetFunctionName("GroupExists").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllActions()["LoadFile"].SetFunctionName("LoadFileInMemory").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllActions()["UnloadFile"].SetFunctionName("UnloadFileFromMemory").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllActions()["EcrireFichierExp"].SetFunctionName("WriteValueInFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllActions()["EcrireFichierTxt"].SetFunctionName("WriteStringInFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllActions()["LireFichierExp"].SetFunctionName("ReadValueFromFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllActions()["LireFichierTxt"].SetFunctionName("ReadStringFromFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllActions()["DeleteGroupFichier"].SetFunctionName("DeleteGroupFromFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllActions()["DeleteFichier"].SetFunctionName("GDDeleteFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllConditions()["FileExists"].SetFunctionName("FileExists").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllActions()["LaunchFile"].SetFunctionName("LaunchFile").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + GetAllActions()["ExecuteCmd"].SetFunctionName("ExecuteCmd").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/JoystickExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/JoystickExtension.cpp index 0a023087f8..977a63758d 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/JoystickExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/JoystickExtension.cpp @@ -15,12 +15,12 @@ JoystickExtension::JoystickExtension() #if defined(GD_IDE_ONLY) - GetAllConditions()["JoystickButtonDown"].codeExtraInformation.SetFunctionName("JoystickButtonDown").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); - GetAllConditions()["JoystickAxis"].codeExtraInformation.SetFunctionName("GetJoystickAxisValue").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); + GetAllConditions()["JoystickButtonDown"].SetFunctionName("JoystickButtonDown").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); + GetAllConditions()["JoystickAxis"].SetFunctionName("GetJoystickAxisValue").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); - GetAllActions()["GetJoystickAxis"].codeExtraInformation.SetFunctionName("JoystickAxisValueToVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); + GetAllActions()["GetJoystickAxis"].SetFunctionName("JoystickAxisValueToVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); - GetAllExpressions()["GetJoystickAxis"].codeExtraInformation.SetFunctionName("GetJoystickAxisValue").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); + GetAllExpressions()["GetJoystickAxis"].SetFunctionName("GetJoystickAxisValue").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/KeyboardExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/KeyboardExtension.cpp index 895a872420..63358ea3bf 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/KeyboardExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/KeyboardExtension.cpp @@ -16,10 +16,10 @@ KeyboardExtension::KeyboardExtension() gd::BuiltinExtensionsImplementer::ImplementsKeyboardExtension(*this); #if defined(GD_IDE_ONLY) - GetAllConditions()["KeyPressed"].codeExtraInformation.SetFunctionName("IsKeyPressed").SetIncludeFile("GDCpp/BuiltinExtensions/KeyboardTools.h"); - GetAllConditions()["KeyFromTextPressed"].codeExtraInformation.SetFunctionName("IsKeyPressed").SetIncludeFile("GDCpp/BuiltinExtensions/KeyboardTools.h"); - GetAllConditions()["AnyKeyPressed"].codeExtraInformation.SetFunctionName("AnyKeyIsPressed").SetIncludeFile("GDCpp/BuiltinExtensions/KeyboardTools.h"); - GetAllStrExpressions()["LastPressedKey"].codeExtraInformation.SetFunctionName("LastPressedKey").SetIncludeFile("GDCpp/BuiltinExtensions/KeyboardTools.h"); + GetAllConditions()["KeyPressed"].SetFunctionName("IsKeyPressed").SetIncludeFile("GDCpp/BuiltinExtensions/KeyboardTools.h"); + GetAllConditions()["KeyFromTextPressed"].SetFunctionName("IsKeyPressed").SetIncludeFile("GDCpp/BuiltinExtensions/KeyboardTools.h"); + GetAllConditions()["AnyKeyPressed"].SetFunctionName("AnyKeyIsPressed").SetIncludeFile("GDCpp/BuiltinExtensions/KeyboardTools.h"); + GetAllStrExpressions()["LastPressedKey"].SetFunctionName("LastPressedKey").SetIncludeFile("GDCpp/BuiltinExtensions/KeyboardTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/MathematicalToolsExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/MathematicalToolsExtension.cpp index 86a33982e0..317b2fc94e 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/MathematicalToolsExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/MathematicalToolsExtension.cpp @@ -16,44 +16,44 @@ MathematicalToolsExtension::MathematicalToolsExtension() #if defined(GD_IDE_ONLY) - GetAllExpressions()["AngleDifference"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::angleDifference").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["mod"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::mod").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["min"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::Minimal").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["max"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::Maximal").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["abs"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::abs").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["acos"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::acos").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["acosh"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::acosh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["asin"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::asin").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["asinh"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::asinh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["atan"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::atan").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["atan2"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::atan2").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["atanh"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::atanh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["cbrt"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::cbrt").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["ceil"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::ceil").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["floor"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::floor").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["cos"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::cos").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["cosh"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::cosh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["cot"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::cot").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["csc"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::csc").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["int"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::Round").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["rint"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::Round").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["round"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::Round").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["exp"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::exp").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["log"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::log").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["ln"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::log").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["log2"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::log2").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["log10"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::log10").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["nthroot"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::nthroot").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["pow"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::pow").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["sec"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::sec").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["sign"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::sign").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["sin"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::sin").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["sinh"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::sinh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["sqrt"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::sqrt").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["tan"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::tan").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["tanh"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::tanh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["trunc"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::trunc").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); - GetAllExpressions()["lerp"].codeExtraInformation.SetFunctionName("GDpriv::MathematicalTools::lerp").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["AngleDifference"].SetFunctionName("GDpriv::MathematicalTools::angleDifference").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["mod"].SetFunctionName("GDpriv::MathematicalTools::mod").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["min"].SetFunctionName("GDpriv::MathematicalTools::Minimal").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["max"].SetFunctionName("GDpriv::MathematicalTools::Maximal").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["abs"].SetFunctionName("GDpriv::MathematicalTools::abs").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["acos"].SetFunctionName("GDpriv::MathematicalTools::acos").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["acosh"].SetFunctionName("GDpriv::MathematicalTools::acosh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["asin"].SetFunctionName("GDpriv::MathematicalTools::asin").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["asinh"].SetFunctionName("GDpriv::MathematicalTools::asinh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["atan"].SetFunctionName("GDpriv::MathematicalTools::atan").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["atan2"].SetFunctionName("GDpriv::MathematicalTools::atan2").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["atanh"].SetFunctionName("GDpriv::MathematicalTools::atanh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["cbrt"].SetFunctionName("GDpriv::MathematicalTools::cbrt").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["ceil"].SetFunctionName("GDpriv::MathematicalTools::ceil").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["floor"].SetFunctionName("GDpriv::MathematicalTools::floor").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["cos"].SetFunctionName("GDpriv::MathematicalTools::cos").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["cosh"].SetFunctionName("GDpriv::MathematicalTools::cosh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["cot"].SetFunctionName("GDpriv::MathematicalTools::cot").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["csc"].SetFunctionName("GDpriv::MathematicalTools::csc").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["int"].SetFunctionName("GDpriv::MathematicalTools::Round").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["rint"].SetFunctionName("GDpriv::MathematicalTools::Round").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["round"].SetFunctionName("GDpriv::MathematicalTools::Round").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["exp"].SetFunctionName("GDpriv::MathematicalTools::exp").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["log"].SetFunctionName("GDpriv::MathematicalTools::log").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["ln"].SetFunctionName("GDpriv::MathematicalTools::log").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["log2"].SetFunctionName("GDpriv::MathematicalTools::log2").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["log10"].SetFunctionName("GDpriv::MathematicalTools::log10").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["nthroot"].SetFunctionName("GDpriv::MathematicalTools::nthroot").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["pow"].SetFunctionName("GDpriv::MathematicalTools::pow").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["sec"].SetFunctionName("GDpriv::MathematicalTools::sec").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["sign"].SetFunctionName("GDpriv::MathematicalTools::sign").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["sin"].SetFunctionName("GDpriv::MathematicalTools::sin").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["sinh"].SetFunctionName("GDpriv::MathematicalTools::sinh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["sqrt"].SetFunctionName("GDpriv::MathematicalTools::sqrt").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["tan"].SetFunctionName("GDpriv::MathematicalTools::tan").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["tanh"].SetFunctionName("GDpriv::MathematicalTools::tanh").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["trunc"].SetFunctionName("GDpriv::MathematicalTools::trunc").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); + GetAllExpressions()["lerp"].SetFunctionName("GDpriv::MathematicalTools::lerp").SetIncludeFile("GDCpp/BuiltinExtensions/MathematicalTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/MouseExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/MouseExtension.cpp index c7ef820447..c14b9e1fa0 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/MouseExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/MouseExtension.cpp @@ -16,24 +16,24 @@ MouseExtension::MouseExtension() gd::BuiltinExtensionsImplementer::ImplementsMouseExtension(*this); #if defined(GD_IDE_ONLY) - GetAllActions()["CentreSourisX"].codeExtraInformation.SetFunctionName("CenterCursorHorizontally").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllActions()["CentreSourisY"].codeExtraInformation.SetFunctionName("CenterCursorVertically").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllActions()["CacheSouris"].codeExtraInformation.SetFunctionName("HideCursor").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllActions()["MontreSouris"].codeExtraInformation.SetFunctionName("ShowCursor").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllActions()["SetSourisXY"].codeExtraInformation.SetFunctionName("SetCursorPosition").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllActions()["CentreSouris"].codeExtraInformation.SetFunctionName("CenterCursor").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllActions()["CentreSourisX"].SetFunctionName("CenterCursorHorizontally").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllActions()["CentreSourisY"].SetFunctionName("CenterCursorVertically").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllActions()["CacheSouris"].SetFunctionName("HideCursor").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllActions()["MontreSouris"].SetFunctionName("ShowCursor").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllActions()["SetSourisXY"].SetFunctionName("SetCursorPosition").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllActions()["CentreSouris"].SetFunctionName("CenterCursor").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllConditions()["SourisX"].codeExtraInformation.SetFunctionName("GetCursorXPosition").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllConditions()["SourisY"].codeExtraInformation.SetFunctionName("GetCursorYPosition").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllConditions()["SourisBouton"].codeExtraInformation.SetFunctionName("MouseButtonPressed").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllConditions()["SourisX"].SetFunctionName("GetCursorXPosition").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllConditions()["SourisY"].SetFunctionName("GetCursorYPosition").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllConditions()["SourisBouton"].SetFunctionName("MouseButtonPressed").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllConditions()["SourisSurObjet"].codeExtraInformation.SetFunctionName("CursorOnObject").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllConditions()["SourisSurObjet"].SetFunctionName("CursorOnObject").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllExpressions()["MouseX"].codeExtraInformation.SetFunctionName("GetCursorXPosition").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllExpressions()["SourisX"].codeExtraInformation.SetFunctionName("GetCursorXPosition").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllExpressions()["MouseY"].codeExtraInformation.SetFunctionName("GetCursorYPosition").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllExpressions()["SourisY"].codeExtraInformation.SetFunctionName("GetCursorYPosition").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); - GetAllExpressions()["MouseWheelDelta"].codeExtraInformation.SetFunctionName("GetMouseWheelDelta").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllExpressions()["MouseX"].SetFunctionName("GetCursorXPosition").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllExpressions()["SourisX"].SetFunctionName("GetCursorXPosition").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllExpressions()["MouseY"].SetFunctionName("GetCursorYPosition").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllExpressions()["SourisY"].SetFunctionName("GetCursorYPosition").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); + GetAllExpressions()["MouseWheelDelta"].SetFunctionName("GetMouseWheelDelta").SetIncludeFile("GDCpp/BuiltinExtensions/MouseTools.h"); StripUnimplementedInstructionsAndExpressions(); //Touch support is not implemented #endif diff --git a/GDCpp/GDCpp/BuiltinExtensions/NetworkExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/NetworkExtension.cpp index 5bc1cff99b..365dfd0daf 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/NetworkExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/NetworkExtension.cpp @@ -15,12 +15,12 @@ NetworkExtension::NetworkExtension() gd::BuiltinExtensionsImplementer::ImplementsNetworkExtension(*this); #if defined(GD_IDE_ONLY) - GetAllActions()["EnvoiDataNet"].codeExtraInformation.SetFunctionName("SendDataToPhpWebPage").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); - GetAllActions()["SendRequest"].codeExtraInformation.SetFunctionName("SendHttpRequest").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); - GetAllActions()["DownloadFile"].codeExtraInformation.SetFunctionName("DownloadFile").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); - GetAllActions()["JSONToVariableStructure"].codeExtraInformation.SetFunctionName("JSONToVariableStructure").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); + GetAllActions()["EnvoiDataNet"].SetFunctionName("SendDataToPhpWebPage").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); + GetAllActions()["SendRequest"].SetFunctionName("SendHttpRequest").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); + GetAllActions()["DownloadFile"].SetFunctionName("DownloadFile").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); + GetAllActions()["JSONToVariableStructure"].SetFunctionName("JSONToVariableStructure").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); - GetAllStrExpressions()["ToJSON"].codeExtraInformation.SetFunctionName("VariableStructureToJSON").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); + GetAllStrExpressions()["ToJSON"].SetFunctionName("VariableStructureToJSON").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/SceneExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/SceneExtension.cpp index bac98172d1..96f0339b3c 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/SceneExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/SceneExtension.cpp @@ -22,13 +22,13 @@ SceneExtension::SceneExtension() gd::BuiltinExtensionsImplementer::ImplementsSceneExtension(*this); #if defined(GD_IDE_ONLY) - GetAllExpressions()["Random"].codeExtraInformation.SetFunctionName("GDpriv::CommonInstructions::Random").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); - GetAllStrExpressions()["CurrentSceneName"].codeExtraInformation.SetFunctionName("GetSceneName").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["DepartScene"].codeExtraInformation.SetFunctionName("SceneJustBegins").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["Scene"].codeExtraInformation.SetFunctionName("ChangeScene").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["Quit"].codeExtraInformation.SetFunctionName("StopGame").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["SceneBackground"].codeExtraInformation.SetFunctionName("ChangeSceneBackground").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["DisableInputWhenFocusIsLost"].codeExtraInformation.SetFunctionName("DisableInputWhenFocusIsLost").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllExpressions()["Random"].SetFunctionName("GDpriv::CommonInstructions::Random").SetIncludeFile("GDCpp/BuiltinExtensions/CommonInstructionsTools.h"); + GetAllStrExpressions()["CurrentSceneName"].SetFunctionName("GetSceneName").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["DepartScene"].SetFunctionName("SceneJustBegins").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["Scene"].SetFunctionName("ChangeScene").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["Quit"].SetFunctionName("StopGame").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["SceneBackground"].SetFunctionName("ChangeSceneBackground").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["DisableInputWhenFocusIsLost"].SetFunctionName("DisableInputWhenFocusIsLost").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); { class CodeGenerator : public gd::InstructionMetadata::ExtraInformation::CustomCodeGenerator diff --git a/GDCpp/GDCpp/BuiltinExtensions/SpriteExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/SpriteExtension.cpp index 23126923ef..2a26ad6489 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/SpriteExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/SpriteExtension.cpp @@ -26,53 +26,53 @@ SpriteExtension::SpriteExtension() std::map & objectExpressions = GetAllExpressionsForObject("Sprite"); std::map & objectStrExpressions = GetAllStrExpressionsForObject("Sprite"); - objectActions["Opacity"].codeExtraInformation.SetFunctionName("SetOpacity").SetAssociatedGetter("GetOpacity").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["ChangeAnimation"].codeExtraInformation.SetFunctionName("SetCurrentAnimation").SetAssociatedGetter("GetCurrentAnimation").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["ChangeDirection"].codeExtraInformation.SetFunctionName("SetDirection").SetAssociatedGetter("GetCurrentDirectionOrAngle").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["ChangeSprite"].codeExtraInformation.SetFunctionName("SetSprite").SetAssociatedGetter("GetSpriteNb").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["PauseAnimation"].codeExtraInformation.SetFunctionName("StopAnimation").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["PlayAnimation"].codeExtraInformation.SetFunctionName("PlayAnimation").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["ChangeAnimationSpeedScale"].codeExtraInformation.SetFunctionName("SetAnimationSpeedScale").SetAssociatedGetter("GetAnimationSpeedScale").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["TourneVersPos"].codeExtraInformation.SetFunctionName("RotateTowardPosition").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["ChangeScale"].codeExtraInformation.SetFunctionName("ChangeScale").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["ChangeScaleWidth"].codeExtraInformation.SetFunctionName("SetScaleX").SetAssociatedGetter("GetScaleX").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["ChangeScaleHeight"].codeExtraInformation.SetFunctionName("SetScaleY").SetAssociatedGetter("GetScaleY").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["Opacity"].SetFunctionName("SetOpacity").SetGetter("GetOpacity").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["ChangeAnimation"].SetFunctionName("SetCurrentAnimation").SetGetter("GetCurrentAnimation").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["ChangeDirection"].SetFunctionName("SetDirection").SetGetter("GetCurrentDirectionOrAngle").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["ChangeSprite"].SetFunctionName("SetSprite").SetGetter("GetSpriteNb").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["PauseAnimation"].SetFunctionName("StopAnimation").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["PlayAnimation"].SetFunctionName("PlayAnimation").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["ChangeAnimationSpeedScale"].SetFunctionName("SetAnimationSpeedScale").SetGetter("GetAnimationSpeedScale").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["TourneVersPos"].SetFunctionName("RotateTowardPosition").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["ChangeScale"].SetFunctionName("ChangeScale").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["ChangeScaleWidth"].SetFunctionName("SetScaleX").SetGetter("GetScaleX").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["ChangeScaleHeight"].SetFunctionName("SetScaleY").SetGetter("GetScaleY").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["Animation"].codeExtraInformation.SetFunctionName("GetCurrentAnimation").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["Direction"].codeExtraInformation.SetFunctionName("GetCurrentDirectionOrAngle").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["Sprite"].codeExtraInformation.SetFunctionName("GetSpriteNb").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["AnimStopped"].codeExtraInformation.SetFunctionName("IsAnimationStopped").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["AnimationEnded"].codeExtraInformation.SetFunctionName("AnimationEnded").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["ScaleWidth"].codeExtraInformation.SetFunctionName("GetScaleX").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["ScaleHeight"].codeExtraInformation.SetFunctionName("GetScaleY").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["Opacity"].codeExtraInformation.SetFunctionName("GetOpacity").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["BlendMode"].codeExtraInformation.SetFunctionName("GetBlendMode").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["Animation"].SetFunctionName("GetCurrentAnimation").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["Direction"].SetFunctionName("GetCurrentDirectionOrAngle").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["Sprite"].SetFunctionName("GetSpriteNb").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["AnimStopped"].SetFunctionName("IsAnimationStopped").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["AnimationEnded"].SetFunctionName("AnimationEnded").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["ScaleWidth"].SetFunctionName("GetScaleX").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["ScaleHeight"].SetFunctionName("GetScaleY").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["Opacity"].SetFunctionName("GetOpacity").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["BlendMode"].SetFunctionName("GetBlendMode").SetManipulatedType("number").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["CopyImageOnImageOfSprite"].codeExtraInformation.SetFunctionName("CopyImageOnImageOfCurrentSprite").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["CreateMaskFromColorOnActualImage"].codeExtraInformation.SetFunctionName("MakeColorTransparent").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["ChangeColor"].codeExtraInformation.SetFunctionName("SetColor").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["ChangeBlendMode"].codeExtraInformation.SetFunctionName("SetBlendMode").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["CopyImageOnImageOfSprite"].SetFunctionName("CopyImageOnImageOfCurrentSprite").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["CreateMaskFromColorOnActualImage"].SetFunctionName("MakeColorTransparent").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["ChangeColor"].SetFunctionName("SetColor").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["ChangeBlendMode"].SetFunctionName("SetBlendMode").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["FlipX"].codeExtraInformation.SetFunctionName("FlipX").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["FlipY"].codeExtraInformation.SetFunctionName("FlipY").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["FlippedX"].codeExtraInformation.SetFunctionName("IsFlippedX").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectConditions["FlippedY"].codeExtraInformation.SetFunctionName("IsFlippedY").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["FlipX"].SetFunctionName("FlipX").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectActions["FlipY"].SetFunctionName("FlipY").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["FlippedX"].SetFunctionName("IsFlippedX").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectConditions["FlippedY"].SetFunctionName("IsFlippedY").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectActions["TourneVers"].codeExtraInformation.SetFunctionName("TurnTowardObject").SetIncludeFile("GDCpp/BuiltinExtensions/SpriteTools.h"); + objectActions["TourneVers"].SetFunctionName("TurnTowardObject").SetIncludeFile("GDCpp/BuiltinExtensions/SpriteTools.h"); - objectExpressions["X"].codeExtraInformation.SetFunctionName("GetPointX").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["Y"].codeExtraInformation.SetFunctionName("GetPointY").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["PointX"].codeExtraInformation.SetFunctionName("GetPointX").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["PointY"].codeExtraInformation.SetFunctionName("GetPointY").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["Direc"].codeExtraInformation.SetFunctionName("GetCurrentDirectionOrAngle").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["Direction"].codeExtraInformation.SetFunctionName("GetCurrentDirectionOrAngle").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["Anim"].codeExtraInformation.SetFunctionName("GetCurrentAnimation").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["Animation"].codeExtraInformation.SetFunctionName("GetCurrentAnimation").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["Sprite"].codeExtraInformation.SetFunctionName("GetSpriteNb").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["AnimationSpeedScale"].codeExtraInformation.SetFunctionName("GetAnimationSpeedScale").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["ScaleX"].codeExtraInformation.SetFunctionName("GetScaleX").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - objectExpressions["ScaleY"].codeExtraInformation.SetFunctionName("GetScaleY").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["X"].SetFunctionName("GetPointX").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["Y"].SetFunctionName("GetPointY").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["PointX"].SetFunctionName("GetPointX").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["PointY"].SetFunctionName("GetPointY").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["Direc"].SetFunctionName("GetCurrentDirectionOrAngle").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["Direction"].SetFunctionName("GetCurrentDirectionOrAngle").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["Anim"].SetFunctionName("GetCurrentAnimation").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["Animation"].SetFunctionName("GetCurrentAnimation").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["Sprite"].SetFunctionName("GetSpriteNb").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["AnimationSpeedScale"].SetFunctionName("GetAnimationSpeedScale").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["ScaleX"].SetFunctionName("GetScaleX").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + objectExpressions["ScaleY"].SetFunctionName("GetScaleY").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); - GetAllConditions()["Collision"].codeExtraInformation.SetFunctionName("SpriteCollision").SetIncludeFile("GDCpp/BuiltinExtensions/SpriteTools.h"); + GetAllConditions()["Collision"].SetFunctionName("SpriteCollision").SetIncludeFile("GDCpp/BuiltinExtensions/SpriteTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/StringInstructionsExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/StringInstructionsExtension.cpp index bb5533b50d..a690e11e1f 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/StringInstructionsExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/StringInstructionsExtension.cpp @@ -16,14 +16,14 @@ StringInstructionsExtension::StringInstructionsExtension() gd::BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(*this); #if defined(GD_IDE_ONLY) - GetAllStrExpressions()["NewLine"].codeExtraInformation.SetFunctionName("GDpriv::StringTools::NewLine").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); - GetAllStrExpressions()["SubStr"].codeExtraInformation.SetFunctionName("GDpriv::StringTools::SubStr").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); - GetAllStrExpressions()["StrAt"].codeExtraInformation.SetFunctionName("GDpriv::StringTools::StrAt").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); - GetAllExpressions()["StrLength"].codeExtraInformation.SetFunctionName("GDpriv::StringTools::StrLen").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); - GetAllExpressions()["StrFind"].codeExtraInformation.SetFunctionName("GDpriv::StringTools::StrFind").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); - GetAllExpressions()["StrRFind"].codeExtraInformation.SetFunctionName("GDpriv::StringTools::StrRFind").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); - GetAllExpressions()["StrFindFrom"].codeExtraInformation.SetFunctionName("GDpriv::StringTools::StrFindFrom").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); - GetAllExpressions()["StrRFindFrom"].codeExtraInformation.SetFunctionName("GDpriv::StringTools::StrRFindFrom").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); + GetAllStrExpressions()["NewLine"].SetFunctionName("GDpriv::StringTools::NewLine").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); + GetAllStrExpressions()["SubStr"].SetFunctionName("GDpriv::StringTools::SubStr").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); + GetAllStrExpressions()["StrAt"].SetFunctionName("GDpriv::StringTools::StrAt").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); + GetAllExpressions()["StrLength"].SetFunctionName("GDpriv::StringTools::StrLen").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); + GetAllExpressions()["StrFind"].SetFunctionName("GDpriv::StringTools::StrFind").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); + GetAllExpressions()["StrRFind"].SetFunctionName("GDpriv::StringTools::StrRFind").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); + GetAllExpressions()["StrFindFrom"].SetFunctionName("GDpriv::StringTools::StrFindFrom").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); + GetAllExpressions()["StrRFindFrom"].SetFunctionName("GDpriv::StringTools::StrRFindFrom").SetIncludeFile("GDCpp/BuiltinExtensions/StringTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/TimeExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/TimeExtension.cpp index e64f9b450a..4ea2336488 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/TimeExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/TimeExtension.cpp @@ -18,25 +18,25 @@ TimeExtension::TimeExtension() gd::BuiltinExtensionsImplementer::ImplementsTimeExtension(*this); #if defined(GD_IDE_ONLY) - GetAllConditions()["Timer"].codeExtraInformation.SetFunctionName("TimerElapsedTime").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllConditions()["TimeScale"].codeExtraInformation.SetFunctionName("GetTimeScale").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllConditions()["TimerPaused"].codeExtraInformation.SetFunctionName("TimerPaused").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllConditions()["Timer"].SetFunctionName("TimerElapsedTime").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllConditions()["TimeScale"].SetFunctionName("GetTimeScale").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllConditions()["TimerPaused"].SetFunctionName("TimerPaused").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllActions()["ResetTimer"].codeExtraInformation.SetFunctionName("ResetTimer").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllActions()["PauseTimer"].codeExtraInformation.SetFunctionName("PauseTimer").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllActions()["UnPauseTimer"].codeExtraInformation.SetFunctionName("UnPauseTimer").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllActions()["RemoveTimer"].codeExtraInformation.SetFunctionName("RemoveTimer").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllActions()["ChangeTimeScale"].codeExtraInformation.SetFunctionName("SetTimeScale").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllActions()["ResetTimer"].SetFunctionName("ResetTimer").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllActions()["PauseTimer"].SetFunctionName("PauseTimer").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllActions()["UnPauseTimer"].SetFunctionName("UnPauseTimer").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllActions()["RemoveTimer"].SetFunctionName("RemoveTimer").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllActions()["ChangeTimeScale"].SetFunctionName("SetTimeScale").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllExpressions()["TimeDelta"].codeExtraInformation.SetFunctionName("GetElapsedTimeInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllExpressions()["TempsFrame"].codeExtraInformation.SetFunctionName("GetElapsedTimeInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllExpressions()["ElapsedTime"].codeExtraInformation.SetFunctionName("GetElapsedTimeInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllExpressions()["TimerElapsedTime"].codeExtraInformation.SetFunctionName("GetTimerElapsedTimeInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllExpressions()["TimeFromStart"].codeExtraInformation.SetFunctionName("GetTimeFromStartInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllExpressions()["TempsDebut"].codeExtraInformation.SetFunctionName("GetTimeFromStartInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllExpressions()["TimeScale"].codeExtraInformation.SetFunctionName("GetTimeScale").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllExpressions()["TimeScale"].codeExtraInformation.SetFunctionName("GetTimeScale").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); - GetAllExpressions()["Time"].codeExtraInformation.SetFunctionName("GetTime").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllExpressions()["TimeDelta"].SetFunctionName("GetElapsedTimeInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllExpressions()["TempsFrame"].SetFunctionName("GetElapsedTimeInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllExpressions()["ElapsedTime"].SetFunctionName("GetElapsedTimeInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllExpressions()["TimerElapsedTime"].SetFunctionName("GetTimerElapsedTimeInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllExpressions()["TimeFromStart"].SetFunctionName("GetTimeFromStartInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllExpressions()["TempsDebut"].SetFunctionName("GetTimeFromStartInSeconds").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllExpressions()["TimeScale"].SetFunctionName("GetTimeScale").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllExpressions()["TimeScale"].SetFunctionName("GetTimeScale").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); + GetAllExpressions()["Time"].SetFunctionName("GetTime").SetIncludeFile("GDCpp/BuiltinExtensions/TimeTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/VariablesExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/VariablesExtension.cpp index 4cc2c3c7a4..e15ab82a02 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/VariablesExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/VariablesExtension.cpp @@ -21,32 +21,32 @@ VariablesExtension::VariablesExtension() gd::BuiltinExtensionsImplementer::ImplementsVariablesExtension(*this); #if defined(GD_IDE_ONLY) - GetAllConditions()["VarScene"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["VarSceneTxt"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("string").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["VarScene"].SetFunctionName("ReturnVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["VarSceneTxt"].SetFunctionName("ReturnVariable").SetManipulatedType("string").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["VariableChildExists"].codeExtraInformation.SetFunctionName("VariableChildExists").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["GlobalVariableChildExists"].codeExtraInformation.SetFunctionName("VariableChildExists").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["VariableChildExists"].SetFunctionName("VariableChildExists").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["GlobalVariableChildExists"].SetFunctionName("VariableChildExists").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["VarSceneDef"].codeExtraInformation.SetFunctionName("VariableExists").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["VarGlobalDef"].codeExtraInformation.SetFunctionName("VariableExists").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["VarSceneDef"].SetFunctionName("VariableExists").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["VarGlobalDef"].SetFunctionName("VariableExists").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["VarGlobal"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllConditions()["VarGlobalTxt"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("string").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["VarGlobal"].SetFunctionName("ReturnVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllConditions()["VarGlobalTxt"].SetFunctionName("ReturnVariable").SetManipulatedType("string").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["ModVarScene"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["ModVarSceneTxt"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("string").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["ModVarScene"].SetFunctionName("ReturnVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["ModVarSceneTxt"].SetFunctionName("ReturnVariable").SetManipulatedType("string").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["ModVarGlobal"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["ModVarGlobalTxt"].codeExtraInformation.SetFunctionName("ReturnVariable").SetManipulatedType("string").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["ModVarGlobal"].SetFunctionName("ReturnVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["ModVarGlobalTxt"].SetFunctionName("ReturnVariable").SetManipulatedType("string").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["VariableRemoveChild"].codeExtraInformation.SetFunctionName("VariableRemoveChild").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["GlobalVariableRemoveChild"].codeExtraInformation.SetFunctionName("VariableRemoveChild").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["VariableRemoveChild"].SetFunctionName("VariableRemoveChild").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["GlobalVariableRemoveChild"].SetFunctionName("VariableRemoveChild").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllExpressions()["Variable"].codeExtraInformation.SetFunctionName("GetVariableValue").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllStrExpressions()["VariableString"].codeExtraInformation.SetFunctionName("GetVariableString").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllExpressions()["Variable"].SetFunctionName("GetVariableValue").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllStrExpressions()["VariableString"].SetFunctionName("GetVariableString").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllExpressions()["GlobalVariable"].codeExtraInformation.SetFunctionName("GetVariableValue").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllStrExpressions()["GlobalVariableString"].codeExtraInformation.SetFunctionName("GetVariableString").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllExpressions()["GlobalVariable"].SetFunctionName("GetVariableValue").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllStrExpressions()["GlobalVariableString"].SetFunctionName("GetVariableString").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); #endif } diff --git a/GDCpp/GDCpp/BuiltinExtensions/WindowExtension.cpp b/GDCpp/GDCpp/BuiltinExtensions/WindowExtension.cpp index 5b97d5ed09..3de3280c92 100644 --- a/GDCpp/GDCpp/BuiltinExtensions/WindowExtension.cpp +++ b/GDCpp/GDCpp/BuiltinExtensions/WindowExtension.cpp @@ -20,19 +20,19 @@ WindowExtension::WindowExtension() #if defined(GD_IDE_ONLY) - GetAllActions()["EcrireTexte"].codeExtraInformation.SetFunctionName("DisplayLegacyTextOnScene").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["SetFullScreen"].codeExtraInformation.SetFunctionName("SetFullScreen").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["SetWindowSize"].codeExtraInformation.SetFunctionName("SetWindowSize").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["SetWindowIcon"].codeExtraInformation.SetFunctionName("SetWindowIcon").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllActions()["SetWindowTitle"].codeExtraInformation.SetFunctionName("SetWindowTitle").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["EcrireTexte"].SetFunctionName("DisplayLegacyTextOnScene").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["SetFullScreen"].SetFunctionName("SetFullScreen").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["SetWindowSize"].SetFunctionName("SetWindowSize").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["SetWindowIcon"].SetFunctionName("SetWindowIcon").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllActions()["SetWindowTitle"].SetFunctionName("SetWindowTitle").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllExpressions()["SceneWindowWidth"].codeExtraInformation.SetFunctionName("GetSceneWindowWidth").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllExpressions()["SceneWindowHeight"].codeExtraInformation.SetFunctionName("GetSceneWindowHeight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllExpressions()["ScreenWidth"].codeExtraInformation.SetFunctionName("GetScreenWidth").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllExpressions()["ScreenHeight"].codeExtraInformation.SetFunctionName("GetScreenHeight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllExpressions()["ColorDepth"].codeExtraInformation.SetFunctionName("GetColorDepth").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllExpressions()["SceneWindowWidth"].SetFunctionName("GetSceneWindowWidth").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllExpressions()["SceneWindowHeight"].SetFunctionName("GetSceneWindowHeight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllExpressions()["ScreenWidth"].SetFunctionName("GetScreenWidth").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllExpressions()["ScreenHeight"].SetFunctionName("GetScreenHeight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllExpressions()["ColorDepth"].SetFunctionName("GetColorDepth").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); - GetAllStrExpressions()["WindowTitle"].codeExtraInformation.SetFunctionName("GetWindowTitle").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + GetAllStrExpressions()["WindowTitle"].SetFunctionName("GetWindowTitle").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); #endif } diff --git a/GDJS/GDJS/BuiltinExtensions/AdvancedExtension.cpp b/GDJS/GDJS/BuiltinExtensions/AdvancedExtension.cpp index 0b1f9822ee..98051cc329 100644 --- a/GDJS/GDJS/BuiltinExtensions/AdvancedExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/AdvancedExtension.cpp @@ -22,7 +22,7 @@ AdvancedExtension::AdvancedExtension() "Florian Rival", "Open source (MIT License)"); - GetAllConditions()["Toujours"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.returnFalse").SetIncludeFile("commontools.js"); + GetAllConditions()["Toujours"].SetFunctionName("gdjs.evtTools.common.returnFalse").SetIncludeFile("commontools.js"); } } diff --git a/GDJS/GDJS/BuiltinExtensions/AudioExtension.cpp b/GDJS/GDJS/BuiltinExtensions/AudioExtension.cpp index 33acf54582..d5d850335b 100644 --- a/GDJS/GDJS/BuiltinExtensions/AudioExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/AudioExtension.cpp @@ -23,73 +23,42 @@ AudioExtension::AudioExtension() "Florian Rival", "Open source (MIT License)"); - GetAllActions()["PlaySound"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.playSound"); - GetAllActions()["PlaySoundCanal"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.playSoundOnChannel"); - GetAllActions()["PlayMusic"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.playMusic"); - GetAllActions()["PlayMusicCanal"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.playMusicOnChannel"); - GetAllActions()["StopSoundCanal"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.stopSoundOnChannel"); - GetAllActions()["PauseSoundCanal"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.pauseSoundOnChannel"); - GetAllActions()["RePlaySoundCanal"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.continueSoundOnChannel"); - GetAllActions()["StopMusicCanal"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.stopMusicOnChannel"); - GetAllActions()["PauseMusicCanal"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.pauseMusicOnChannel"); - GetAllActions()["RePlayMusicCanal"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.continueMusicOnChannel"); - GetAllConditions()["MusicPlaying"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.isMusicOnChannelPlaying"); - GetAllConditions()["MusicPaused"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.isMusicOnChannelPaused"); - GetAllConditions()["MusicStopped"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.isMusicOnChannelStopped"); - GetAllConditions()["SoundPlaying"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.isSoundOnChannelPlaying"); - GetAllConditions()["SoundPaused"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.isSoundOnChannelPaused"); - GetAllConditions()["SoundStopped"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.isSoundOnChannelStopped"); + GetAllActions()["PlaySound"].SetFunctionName("gdjs.evtTools.sound.playSound"); + GetAllActions()["PlaySoundCanal"].SetFunctionName("gdjs.evtTools.sound.playSoundOnChannel"); + GetAllActions()["PlayMusic"].SetFunctionName("gdjs.evtTools.sound.playMusic"); + GetAllActions()["PlayMusicCanal"].SetFunctionName("gdjs.evtTools.sound.playMusicOnChannel"); + GetAllActions()["StopSoundCanal"].SetFunctionName("gdjs.evtTools.sound.stopSoundOnChannel"); + GetAllActions()["PauseSoundCanal"].SetFunctionName("gdjs.evtTools.sound.pauseSoundOnChannel"); + GetAllActions()["RePlaySoundCanal"].SetFunctionName("gdjs.evtTools.sound.continueSoundOnChannel"); + GetAllActions()["StopMusicCanal"].SetFunctionName("gdjs.evtTools.sound.stopMusicOnChannel"); + GetAllActions()["PauseMusicCanal"].SetFunctionName("gdjs.evtTools.sound.pauseMusicOnChannel"); + GetAllActions()["RePlayMusicCanal"].SetFunctionName("gdjs.evtTools.sound.continueMusicOnChannel"); + GetAllConditions()["MusicPlaying"].SetFunctionName("gdjs.evtTools.sound.isMusicOnChannelPlaying"); + GetAllConditions()["MusicPaused"].SetFunctionName("gdjs.evtTools.sound.isMusicOnChannelPaused"); + GetAllConditions()["MusicStopped"].SetFunctionName("gdjs.evtTools.sound.isMusicOnChannelStopped"); + GetAllConditions()["SoundPlaying"].SetFunctionName("gdjs.evtTools.sound.isSoundOnChannelPlaying"); + GetAllConditions()["SoundPaused"].SetFunctionName("gdjs.evtTools.sound.isSoundOnChannelPaused"); + GetAllConditions()["SoundStopped"].SetFunctionName("gdjs.evtTools.sound.isSoundOnChannelStopped"); - GetAllActions()["ModGlobalVolume"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.setGlobalVolume").SetAssociatedGetter("gdjs.evtTools.sound.getGlobalVolume"); - GetAllConditions()["GlobalVolume"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.getGlobalVolume"); - GetAllExpressions()["GlobalVolume"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.getGlobalVolume"); + GetAllActions()["ModGlobalVolume"].SetFunctionName("gdjs.evtTools.sound.setGlobalVolume").SetGetter("gdjs.evtTools.sound.getGlobalVolume"); + GetAllConditions()["GlobalVolume"].SetFunctionName("gdjs.evtTools.sound.getGlobalVolume"); + GetAllExpressions()["GlobalVolume"].SetFunctionName("gdjs.evtTools.sound.getGlobalVolume"); - GetAllActions()["ModVolumeSoundCanal"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.setSoundOnChannelVolume").SetAssociatedGetter("gdjs.evtTools.sound.getSoundOnChannelVolume"); - GetAllActions()["ModVolumeMusicCanal"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.setMusicOnChannelVolume").SetAssociatedGetter("gdjs.evtTools.sound.getMusicOnChannelVolume"); - GetAllConditions()["SoundCanalVolume"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.getSoundOnChannelVolume"); - GetAllConditions()["MusicCanalVolume"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.getMusicOnChannelVolume"); + GetAllActions()["ModVolumeSoundCanal"].SetFunctionName("gdjs.evtTools.sound.setSoundOnChannelVolume").SetGetter("gdjs.evtTools.sound.getSoundOnChannelVolume"); + GetAllActions()["ModVolumeMusicCanal"].SetFunctionName("gdjs.evtTools.sound.setMusicOnChannelVolume").SetGetter("gdjs.evtTools.sound.getMusicOnChannelVolume"); + GetAllConditions()["SoundCanalVolume"].SetFunctionName("gdjs.evtTools.sound.getSoundOnChannelVolume"); + GetAllConditions()["MusicCanalVolume"].SetFunctionName("gdjs.evtTools.sound.getMusicOnChannelVolume"); - GetAllActions()["ModPlayingOffsetSoundChannel"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.setSoundOnChannelPlayingOffset").SetAssociatedGetter("gdjs.evtTools.sound.getSoundOnChannelPlayingOffset"); - GetAllActions()["ModPlayingOffsetMusicChannel"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.setMusicOnChannelPlayingOffset").SetAssociatedGetter("gdjs.evtTools.sound.getMusicOnChannelPlayingOffset"); - GetAllConditions()["SoundChannelPlayingOffset"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.getSoundOnChannelPlayingOffset"); - GetAllConditions()["MusicChannelPlayingOffset"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.getMusicOnChannelPlayingOffset"); + GetAllActions()["ModPlayingOffsetSoundChannel"].SetFunctionName("gdjs.evtTools.sound.setSoundOnChannelPlayingOffset").SetGetter("gdjs.evtTools.sound.getSoundOnChannelPlayingOffset"); + GetAllActions()["ModPlayingOffsetMusicChannel"].SetFunctionName("gdjs.evtTools.sound.setMusicOnChannelPlayingOffset").SetGetter("gdjs.evtTools.sound.getMusicOnChannelPlayingOffset"); + GetAllConditions()["SoundChannelPlayingOffset"].SetFunctionName("gdjs.evtTools.sound.getSoundOnChannelPlayingOffset"); + GetAllConditions()["MusicChannelPlayingOffset"].SetFunctionName("gdjs.evtTools.sound.getMusicOnChannelPlayingOffset"); - GetAllExpressions()["SoundChannelVolume"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.getSoundOnChannelVolume"); - GetAllExpressions()["MusicChannelVolume"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.getMusicOnChannelVolume"); + GetAllExpressions()["SoundChannelVolume"].SetFunctionName("gdjs.evtTools.sound.getSoundOnChannelVolume"); + GetAllExpressions()["MusicChannelVolume"].SetFunctionName("gdjs.evtTools.sound.getMusicOnChannelVolume"); - GetAllExpressions()["SoundChannelPlayingOffset"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.getSoundOnChannelPlayingOffset"); - GetAllExpressions()["MusicChannelPlayingOffset"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.sound.getMusicOnChannelPlayingOffset"); + GetAllExpressions()["SoundChannelPlayingOffset"].SetFunctionName("gdjs.evtTools.sound.getSoundOnChannelPlayingOffset"); + GetAllExpressions()["MusicChannelPlayingOffset"].SetFunctionName("gdjs.evtTools.sound.getMusicOnChannelPlayingOffset"); StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: /* @@ -105,7 +74,7 @@ AudioExtension::AudioExtension() .AddParameter("expression", _("Canal ( 0 - 15 )"), "",false) .AddParameter("operator", _("Modification's sign"), "",false) .AddParameter("expression", _("Value"), "",false) - .codeExtraInformation.SetFunctionName("SetSoundPitchOnChannel").SetAssociatedGetter("GetSoundPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + .SetFunctionName("SetSoundPitchOnChannel").SetGetter("GetSoundPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); AddAction("ModPitchMusicChannel", @@ -119,7 +88,7 @@ AudioExtension::AudioExtension() .AddParameter("expression", _("Canal ( 0 - 15 )"), "",false) .AddParameter("operator", _("Modification's sign"), "",false) .AddParameter("expression", _("Value"), "",false) - .codeExtraInformation.SetFunctionName("SetMusicPitchOnChannel").SetAssociatedGetter("GetMusicPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + .SetFunctionName("SetMusicPitchOnChannel").SetGetter("GetMusicPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); AddCondition("SoundChannelPitch", _("Pitch of the sound of a channel"), @@ -132,7 +101,7 @@ AudioExtension::AudioExtension() .AddParameter("expression", _("Canal ( 0 - 15 )"), "",false) .AddParameter("relationalOperator", _("Sign of the test"), "",false) .AddParameter("expression", _("Pitch to test"), "",false) - .codeExtraInformation.SetFunctionName("GetSoundPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + .SetFunctionName("GetSoundPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); @@ -147,17 +116,17 @@ AudioExtension::AudioExtension() .AddParameter("expression", _("Canal ( 0 - 15 )"), "",false) .AddParameter("relationalOperator", _("Sign of the test"), "",false) .AddParameter("expression", _("Pitch to test"), "",false) - .codeExtraInformation.SetFunctionName("GetMusicPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + .SetFunctionName("GetMusicPitchOnChannel").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); AddExpression("SoundChannelPitch", _("Sound's pitch"), _("Sound's pitch"), _("Sounds"), "res/actions/son.png") .AddCodeOnlyParameter("currentScene", "") .AddParameter("expression", _("Channel"), "",false) - .codeExtraInformation.SetFunctionName("GetSoundPitchOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + .SetFunctionName("GetSoundPitchOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); AddExpression("MusicChannelPitch", _("Music's pitch"), _("Music's pitch"), _("Musics"), "res/actions/music.png") .AddCodeOnlyParameter("currentScene", "") .AddParameter("expression", _("Channel"), "",false) - .codeExtraInformation.SetFunctionName("GetMusicPitchOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); + .SetFunctionName("GetMusicPitchOnChannel").SetIncludeFile("GDCpp/BuiltinExtensions/AudioTools.h"); */ } diff --git a/GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp b/GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp index 2efeff5394..24e741960b 100644 --- a/GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp @@ -30,136 +30,85 @@ BaseObjectExtension::BaseObjectExtension() std::map & objectExpressions = GetAllExpressionsForObject(""); std::map & objectStrExpressions = GetAllStrExpressionsForObject(""); - objectActions["MettreX"].codeExtraInformation - .SetFunctionName("setX").SetAssociatedGetter("getX").SetIncludeFile("runtimeobject.js"); - objectActions["MettreY"].codeExtraInformation - .SetFunctionName("setY").SetAssociatedGetter("getY").SetIncludeFile("runtimeobject.js"); - objectConditions["PosX"].codeExtraInformation - .SetFunctionName("getX").SetIncludeFile("runtimeobject.js"); - objectConditions["PosY"].codeExtraInformation - .SetFunctionName("getY").SetIncludeFile("runtimeobject.js"); - objectActions["SetAngle"].codeExtraInformation - .SetFunctionName("setAngle").SetAssociatedGetter("getAngle").SetIncludeFile("runtimeobject.js"); - objectConditions["Angle"].codeExtraInformation - .SetFunctionName("getAngle").SetIncludeFile("runtimeobject.js"); - objectActions["Rotate"].codeExtraInformation - .SetFunctionName("rotate").SetIncludeFile("runtimeobject.js"); - objectActions["RotateTowardAngle"].codeExtraInformation - .SetFunctionName("rotateTowardAngle").SetIncludeFile("runtimeobject.js"); - objectActions["RotateTowardPosition"].codeExtraInformation - .SetFunctionName("rotateTowardPosition").SetIncludeFile("runtimeobject.js"); - objectActions["ChangeLayer"].codeExtraInformation - .SetFunctionName("setLayer").SetIncludeFile("runtimeobject.js"); - objectConditions["Layer"].codeExtraInformation - .SetFunctionName("isOnLayer").SetIncludeFile("runtimeobject.js"); - objectActions["ChangePlan"].codeExtraInformation - .SetFunctionName("setZOrder").SetAssociatedGetter("getZOrder").SetIncludeFile("runtimeobject.js"); - objectConditions["Plan"].codeExtraInformation - .SetFunctionName("getZOrder").SetIncludeFile("runtimeobject.js"); - objectActions["Cache"].codeExtraInformation - .SetFunctionName("hide").SetIncludeFile("runtimeobject.js"); - objectActions["Montre"].codeExtraInformation - .SetFunctionName("hide").SetIncludeFile("runtimeobject.js"); - objectConditions["Visible"].codeExtraInformation - .SetFunctionName("isVisible").SetIncludeFile("runtimeobject.js"); - objectConditions["Invisible"].codeExtraInformation - .SetFunctionName("isHidden").SetIncludeFile("runtimeobject.js"); - objectActions["Delete"].codeExtraInformation - .SetFunctionName("deleteFromScene"); - objectActions["MettreAutourPos"].codeExtraInformation - .SetFunctionName("putAround"); - objectActions["MettreAutour"].codeExtraInformation - .SetFunctionName("putAroundObject").SetIncludeFile("runtimeobject.js"); - objectConditions["VarObjet"].codeExtraInformation - .SetFunctionName("getVariableNumber").SetIncludeFile("runtimeobject.js"); - objectConditions["VarObjetTxt"].codeExtraInformation - .SetFunctionName("getVariableString").SetIncludeFile("runtimeobject.js"); - objectConditions["VarObjetDef"].codeExtraInformation - .SetFunctionName("hasVariable").SetIncludeFile("runtimeobject.js"); - objectActions["ModVarObjet"].codeExtraInformation - .SetFunctionName("setVariableNumber").SetManipulatedType("number").SetAssociatedGetter("getVariableNumber").SetIncludeFile("runtimeobject.js"); - objectActions["ModVarObjetTxt"].codeExtraInformation - .SetFunctionName("setVariableString").SetManipulatedType("number").SetAssociatedGetter("getVariableString").SetIncludeFile("runtimeobject.js"); - objectActions["AddForceXY"].codeExtraInformation - .SetFunctionName("addForce").SetIncludeFile("runtimeobject.js"); - objectActions["AddForceAL"].codeExtraInformation - .SetFunctionName("addPolarForce").SetIncludeFile("runtimeobject.js"); - objectActions["AddForceVersPos"].codeExtraInformation - .SetFunctionName("addForceTowardPosition").SetIncludeFile("runtimeobject.js"); - objectActions["AddForceVers"].codeExtraInformation - .SetFunctionName("addForceTowardObject").SetIncludeFile("runtimeobject.js"); - objectActions["Arreter"].codeExtraInformation - .SetFunctionName("clearForces").SetIncludeFile("runtimeobject.js"); - objectConditions["Arret"].codeExtraInformation - .SetFunctionName("hasNoForces").SetIncludeFile("runtimeobject.js"); - objectConditions["Vitesse"].codeExtraInformation - .SetFunctionName("getAverageForce().getLength").SetIncludeFile("runtimeobject.js"); - objectConditions["AngleOfDisplacement"].codeExtraInformation - .SetFunctionName("averageForceAngleIs").SetIncludeFile("runtimeobject.js"); - objectActions["SeparateFromObjects"].codeExtraInformation - .SetFunctionName("separateFromObjects").SetIncludeFile("runtimeobject.js"); + objectActions["MettreX"].SetFunctionName("setX").SetGetter("getX").SetIncludeFile("runtimeobject.js"); + objectActions["MettreY"].SetFunctionName("setY").SetGetter("getY").SetIncludeFile("runtimeobject.js"); + objectConditions["PosX"].SetFunctionName("getX").SetIncludeFile("runtimeobject.js"); + objectConditions["PosY"].SetFunctionName("getY").SetIncludeFile("runtimeobject.js"); + objectActions["SetAngle"].SetFunctionName("setAngle").SetGetter("getAngle").SetIncludeFile("runtimeobject.js"); + objectConditions["Angle"].SetFunctionName("getAngle").SetIncludeFile("runtimeobject.js"); + objectActions["Rotate"].SetFunctionName("rotate").SetIncludeFile("runtimeobject.js"); + objectActions["RotateTowardAngle"].SetFunctionName("rotateTowardAngle").SetIncludeFile("runtimeobject.js"); + objectActions["RotateTowardPosition"].SetFunctionName("rotateTowardPosition").SetIncludeFile("runtimeobject.js"); + objectActions["ChangeLayer"].SetFunctionName("setLayer").SetIncludeFile("runtimeobject.js"); + objectConditions["Layer"].SetFunctionName("isOnLayer").SetIncludeFile("runtimeobject.js"); + objectActions["ChangePlan"].SetFunctionName("setZOrder").SetGetter("getZOrder").SetIncludeFile("runtimeobject.js"); + objectConditions["Plan"].SetFunctionName("getZOrder").SetIncludeFile("runtimeobject.js"); + objectActions["Cache"].SetFunctionName("hide").SetIncludeFile("runtimeobject.js"); + objectActions["Montre"].SetFunctionName("hide").SetIncludeFile("runtimeobject.js"); + objectConditions["Visible"].SetFunctionName("isVisible").SetIncludeFile("runtimeobject.js"); + objectConditions["Invisible"].SetFunctionName("isHidden").SetIncludeFile("runtimeobject.js"); + objectActions["Delete"].SetFunctionName("deleteFromScene"); + objectActions["MettreAutourPos"].SetFunctionName("putAround"); + objectActions["MettreAutour"].SetFunctionName("putAroundObject").SetIncludeFile("runtimeobject.js"); + objectConditions["VarObjet"].SetFunctionName("getVariableNumber").SetIncludeFile("runtimeobject.js"); + objectConditions["VarObjetTxt"].SetFunctionName("getVariableString").SetIncludeFile("runtimeobject.js"); + objectConditions["VarObjetDef"].SetFunctionName("hasVariable").SetIncludeFile("runtimeobject.js"); + objectActions["ModVarObjet"].SetFunctionName("setVariableNumber").SetManipulatedType("number").SetGetter("getVariableNumber").SetIncludeFile("runtimeobject.js"); + objectActions["ModVarObjetTxt"].SetFunctionName("setVariableString").SetManipulatedType("number").SetGetter("getVariableString").SetIncludeFile("runtimeobject.js"); + objectActions["AddForceXY"].SetFunctionName("addForce").SetIncludeFile("runtimeobject.js"); + objectActions["AddForceAL"].SetFunctionName("addPolarForce").SetIncludeFile("runtimeobject.js"); + objectActions["AddForceVersPos"].SetFunctionName("addForceTowardPosition").SetIncludeFile("runtimeobject.js"); + objectActions["AddForceVers"].SetFunctionName("addForceTowardObject").SetIncludeFile("runtimeobject.js"); + objectActions["Arreter"].SetFunctionName("clearForces").SetIncludeFile("runtimeobject.js"); + objectConditions["Arret"].SetFunctionName("hasNoForces").SetIncludeFile("runtimeobject.js"); + objectConditions["Vitesse"].SetFunctionName("getAverageForce().getLength").SetIncludeFile("runtimeobject.js"); + objectConditions["AngleOfDisplacement"].SetFunctionName("averageForceAngleIs").SetIncludeFile("runtimeobject.js"); + objectActions["SeparateFromObjects"].SetFunctionName("separateFromObjects").SetIncludeFile("runtimeobject.js"); objectActions["Ecarter"].codeExtraInformation //Deprecated .SetFunctionName("separateObjectsWithoutForces").SetIncludeFile("runtimeobject.js"); objectActions["Rebondir"].codeExtraInformation //Deprecated .SetFunctionName("separateObjectsWithForces").SetIncludeFile("runtimeobject.js"); - objectConditions["AutomatismActivated"].codeExtraInformation - .SetFunctionName("automatismActivated").SetIncludeFile("runtimeobject.js"); - objectActions["ActivateAutomatism"].codeExtraInformation - .SetFunctionName("activateAutomatism").SetIncludeFile("runtimeobject.js"); - objectConditions["ObjectVariableChildExists"].codeExtraInformation - .SetFunctionName("variableChildExists").SetIncludeFile("runtimeobject.js"); - objectActions["ObjectVariableRemoveChild"].codeExtraInformation - .SetFunctionName("variableRemoveChild").SetIncludeFile("runtimeobject.js"); + objectConditions["AutomatismActivated"].SetFunctionName("automatismActivated").SetIncludeFile("runtimeobject.js"); + objectActions["ActivateAutomatism"].SetFunctionName("activateAutomatism").SetIncludeFile("runtimeobject.js"); + objectConditions["ObjectVariableChildExists"].SetFunctionName("variableChildExists").SetIncludeFile("runtimeobject.js"); + objectActions["ObjectVariableRemoveChild"].SetFunctionName("variableRemoveChild").SetIncludeFile("runtimeobject.js"); - objectExpressions["X"].codeExtraInformation.SetFunctionName("getX"); - objectExpressions["Y"].codeExtraInformation.SetFunctionName("getY"); - objectExpressions["ZOrder"].codeExtraInformation.SetFunctionName("getZOrder"); - objectExpressions["Plan"].codeExtraInformation.SetFunctionName("getZOrder"); //Deprecated - objectExpressions["Width"].codeExtraInformation.SetFunctionName("getWidth"); - objectExpressions["Height"].codeExtraInformation.SetFunctionName("getHeight"); - objectExpressions["Largeur"].codeExtraInformation.SetFunctionName("getWidth"); //Deprecated - objectExpressions["Hauteur"].codeExtraInformation.SetFunctionName("getHeight"); //Deprecated - objectExpressions["Variable"].codeExtraInformation.SetFunctionName("gdjs.RuntimeObject.getVariableNumber").SetStatic(); - objectStrExpressions["VariableString"].codeExtraInformation.SetFunctionName("gdjs.RuntimeObject.getVariableString").SetStatic(); - objectExpressions["ForceX"].codeExtraInformation.SetFunctionName("getAverageForce().getX"); - objectExpressions["ForceY"].codeExtraInformation.SetFunctionName("getAverageForce().getY"); - objectExpressions["ForceAngle"].codeExtraInformation.SetFunctionName("getAverageForce().getAngle"); - objectExpressions["Angle"].codeExtraInformation.SetFunctionName("getAngle"); - objectExpressions["ForceLength"].codeExtraInformation.SetFunctionName("getAverageForce().getLength"); - objectExpressions["Longueur"].codeExtraInformation.SetFunctionName("getAverageForce().getLength"); //Deprecated - objectExpressions["Distance"].codeExtraInformation.SetFunctionName("getDistanceToObject"); - objectExpressions["SqDistance"].codeExtraInformation.SetFunctionName("getSqDistanceToObject"); + objectExpressions["X"].SetFunctionName("getX"); + objectExpressions["Y"].SetFunctionName("getY"); + objectExpressions["ZOrder"].SetFunctionName("getZOrder"); + objectExpressions["Plan"].SetFunctionName("getZOrder"); //Deprecated + objectExpressions["Width"].SetFunctionName("getWidth"); + objectExpressions["Height"].SetFunctionName("getHeight"); + objectExpressions["Largeur"].SetFunctionName("getWidth"); //Deprecated + objectExpressions["Hauteur"].SetFunctionName("getHeight"); //Deprecated + objectExpressions["Variable"].SetFunctionName("gdjs.RuntimeObject.getVariableNumber").SetStatic(); + objectStrExpressions["VariableString"].SetFunctionName("gdjs.RuntimeObject.getVariableString").SetStatic(); + objectExpressions["ForceX"].SetFunctionName("getAverageForce().getX"); + objectExpressions["ForceY"].SetFunctionName("getAverageForce().getY"); + objectExpressions["ForceAngle"].SetFunctionName("getAverageForce().getAngle"); + objectExpressions["Angle"].SetFunctionName("getAngle"); + objectExpressions["ForceLength"].SetFunctionName("getAverageForce().getLength"); + objectExpressions["Longueur"].SetFunctionName("getAverageForce().getLength"); //Deprecated + objectExpressions["Distance"].SetFunctionName("getDistanceToObject"); + objectExpressions["SqDistance"].SetFunctionName("getSqDistanceToObject"); - GetAllActions()["Create"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.createObjectOnScene"); - GetAllActions()["CreateByName"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.createObjectFromGroupOnScene"); - GetAllExpressions()["Count"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.pickedObjectsCount"); - GetAllConditions()["NbObjet"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.pickedObjectsCount"); + GetAllActions()["Create"].SetFunctionName("gdjs.evtTools.object.createObjectOnScene"); + GetAllActions()["CreateByName"].SetFunctionName("gdjs.evtTools.object.createObjectFromGroupOnScene"); + GetAllExpressions()["Count"].SetFunctionName("gdjs.evtTools.object.pickedObjectsCount"); + GetAllConditions()["NbObjet"].SetFunctionName("gdjs.evtTools.object.pickedObjectsCount"); GetAllConditions()["CollisionNP"] .AddCodeOnlyParameter("currentScene", "") //We need an extra parameter pointing to the scene. - .codeExtraInformation .SetFunctionName("gdjs.evtTools.object.hitBoxesCollisionTest"); - GetAllConditions()["Distance"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.distanceTest"); - GetAllConditions()["SeDirige"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.movesTowardTest"); - GetAllConditions()["EstTourne"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.turnedTowardTest"); + GetAllConditions()["Distance"].SetFunctionName("gdjs.evtTools.object.distanceTest"); + GetAllConditions()["SeDirige"].SetFunctionName("gdjs.evtTools.object.movesTowardTest"); + GetAllConditions()["EstTourne"].SetFunctionName("gdjs.evtTools.object.turnedTowardTest"); - GetAllActions()["AjoutObjConcern"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.pickAllObjects"); - GetAllConditions()["AjoutObjConcern"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.pickAllObjects"); - GetAllActions()["AjoutHasard"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.pickRandomObject"); - GetAllConditions()["AjoutHasard"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.pickRandomObject"); - GetAllConditions()["PickNearest"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.object.pickNearestObject"); + GetAllActions()["AjoutObjConcern"].SetFunctionName("gdjs.evtTools.object.pickAllObjects"); + GetAllConditions()["AjoutObjConcern"].SetFunctionName("gdjs.evtTools.object.pickAllObjects"); + GetAllActions()["AjoutHasard"].SetFunctionName("gdjs.evtTools.object.pickRandomObject"); + GetAllConditions()["AjoutHasard"].SetFunctionName("gdjs.evtTools.object.pickRandomObject"); + GetAllConditions()["PickNearest"].SetFunctionName("gdjs.evtTools.object.pickNearestObject"); { @@ -258,7 +207,7 @@ BaseObjectExtension::BaseObjectExtension() .AddParameter("expression", _("Speed ( in Degrees per seconds )")) .AddParameter("expression", _("Distance ( in pixels )")) .AddParameter("expression", _("Damping ( Default : 0 )")) - .codeExtraInformation.SetFunctionName("AddForceToMoveAround"); + .SetFunctionName("AddForceToMoveAround"); obj.AddAction("AddForceTourne", _("Add a force so as to move around an object"), @@ -273,7 +222,7 @@ BaseObjectExtension::BaseObjectExtension() .AddParameter("expression", _("Speed ( Degrees per second )")) .AddParameter("expression", _("Distance ( in pixel )")) .AddParameter("expression", _("Damping ( Default : 0 )")) - .codeExtraInformation.SetFunctionName("AddForceToMoveAroundObject").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); + .SetFunctionName("AddForceToMoveAroundObject").SetIncludeFile("GDCpp/BuiltinExtensions/ObjectTools.h"); */ } diff --git a/GDJS/GDJS/BuiltinExtensions/CameraExtension.cpp b/GDJS/GDJS/BuiltinExtensions/CameraExtension.cpp index 06c3361248..e2fd61b4fe 100644 --- a/GDJS/GDJS/BuiltinExtensions/CameraExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/CameraExtension.cpp @@ -21,52 +21,30 @@ CameraExtension::CameraExtension() "Florian Rival", "Open source (MIT License)"); - GetAllActions()["CameraX"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.setCameraX").SetAssociatedGetter("gdjs.evtTools.camera.getCameraX"); - GetAllActions()["CameraY"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.setCameraY").SetAssociatedGetter("gdjs.evtTools.camera.getCameraY"); - GetAllConditions()["CameraX"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraX"); - GetAllConditions()["CameraY"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraY"); - GetAllConditions()["CameraWidth"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraWidth"); - GetAllConditions()["CameraHeight"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraHeight"); - GetAllActions()["ShowLayer"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.showLayer"); - GetAllActions()["HideLayer"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.hideLayer"); - GetAllConditions()["LayerVisible"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.layerIsVisible"); - GetAllConditions()["CameraAngle"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraRotation"); - GetAllActions()["RotateCamera"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.setCameraRotation").SetAssociatedGetter("gdjs.evtTools.camera.getCameraRotation"); - GetAllActions()["ZoomCamera"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.setCameraZoom"); + GetAllActions()["CameraX"].SetFunctionName("gdjs.evtTools.camera.setCameraX").SetGetter("gdjs.evtTools.camera.getCameraX"); + GetAllActions()["CameraY"].SetFunctionName("gdjs.evtTools.camera.setCameraY").SetGetter("gdjs.evtTools.camera.getCameraY"); + GetAllConditions()["CameraX"].SetFunctionName("gdjs.evtTools.camera.getCameraX"); + GetAllConditions()["CameraY"].SetFunctionName("gdjs.evtTools.camera.getCameraY"); + GetAllConditions()["CameraWidth"].SetFunctionName("gdjs.evtTools.camera.getCameraWidth"); + GetAllConditions()["CameraHeight"].SetFunctionName("gdjs.evtTools.camera.getCameraHeight"); + GetAllActions()["ShowLayer"].SetFunctionName("gdjs.evtTools.camera.showLayer"); + GetAllActions()["HideLayer"].SetFunctionName("gdjs.evtTools.camera.hideLayer"); + GetAllConditions()["LayerVisible"].SetFunctionName("gdjs.evtTools.camera.layerIsVisible"); + GetAllConditions()["CameraAngle"].SetFunctionName("gdjs.evtTools.camera.getCameraRotation"); + GetAllActions()["RotateCamera"].SetFunctionName("gdjs.evtTools.camera.setCameraRotation").SetGetter("gdjs.evtTools.camera.getCameraRotation"); + GetAllActions()["ZoomCamera"].SetFunctionName("gdjs.evtTools.camera.setCameraZoom"); - GetAllExpressions()["CameraX"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraX"); - GetAllExpressions()["VueX"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraX"); - GetAllExpressions()["CameraY"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraY"); - GetAllExpressions()["VueY"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraY"); - GetAllExpressions()["CameraRotation"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraRotation"); - GetAllExpressions()["VueRotation"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraRotation"); - GetAllExpressions()["CameraWidth"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraWidth"); - GetAllExpressions()["CameraHeight"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.getCameraHeight"); + GetAllExpressions()["CameraX"].SetFunctionName("gdjs.evtTools.camera.getCameraX"); + GetAllExpressions()["VueX"].SetFunctionName("gdjs.evtTools.camera.getCameraX"); + GetAllExpressions()["CameraY"].SetFunctionName("gdjs.evtTools.camera.getCameraY"); + GetAllExpressions()["VueY"].SetFunctionName("gdjs.evtTools.camera.getCameraY"); + GetAllExpressions()["CameraRotation"].SetFunctionName("gdjs.evtTools.camera.getCameraRotation"); + GetAllExpressions()["VueRotation"].SetFunctionName("gdjs.evtTools.camera.getCameraRotation"); + GetAllExpressions()["CameraWidth"].SetFunctionName("gdjs.evtTools.camera.getCameraWidth"); + GetAllExpressions()["CameraHeight"].SetFunctionName("gdjs.evtTools.camera.getCameraHeight"); - GetAllActions()["FixCamera"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.centerCameraWithinLimits"); - GetAllActions()["CentreCamera"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.camera.centerCamera"); + GetAllActions()["FixCamera"].SetFunctionName("gdjs.evtTools.camera.centerCameraWithinLimits"); + GetAllActions()["CentreCamera"].SetFunctionName("gdjs.evtTools.camera.centerCamera"); StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: /* @@ -85,7 +63,7 @@ CameraExtension::CameraExtension() .AddParameter("expression", _("Render zone: Top left side: Y Position ( Between 0 and 1 )"), "",true) .AddParameter("expression", _("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",true) .AddParameter("expression", _("Render zone: Bottom right side: Y Position ( Between 0 and 1 )"), "",true) - .codeExtraInformation.SetFunctionName("AddCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + .SetFunctionName("AddCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); AddAction("DeleteCamera", _("Delete a camera of a layer"), @@ -97,7 +75,7 @@ CameraExtension::CameraExtension() .AddCodeOnlyParameter("currentScene", "") .AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"") .AddParameter("expression", _("Camera number"), "",false) - .codeExtraInformation.SetFunctionName("DeleteCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + .SetFunctionName("DeleteCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); AddAction("CameraSize", _("Modify the size of a camera"), @@ -111,7 +89,7 @@ CameraExtension::CameraExtension() .AddParameter("expression", _("Camera number"), "",false) .AddParameter("expression", _("Width"), "",false) .AddParameter("expression", _("Height"), "",false) - .codeExtraInformation.SetFunctionName("SetCameraSize").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + .SetFunctionName("SetCameraSize").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); AddAction("CameraViewport", _("Modify the render zone of a camera"), @@ -127,34 +105,34 @@ CameraExtension::CameraExtension() .AddParameter("expression", _("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",false) .AddParameter("expression", _("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",false) .AddParameter("expression", _("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",false) - .codeExtraInformation.SetFunctionName("SetCameraViewport").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + .SetFunctionName("SetCameraViewport").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); AddExpression("CameraViewportLeft", _("X position of the top left side point of a render zone"), _("X position of the top left side point of a render zone"), _("Camera"), "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") .AddParameter("layer", _("Layer"), "",false) .AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") - .codeExtraInformation.SetFunctionName("GetCameraViewportLeft").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + .SetFunctionName("GetCameraViewportLeft").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); AddExpression("CameraViewportTop", _("Y position of the top left side point of a render zone"), _("Y position of the top left side point of a render zone"), _("Camera"), "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") .AddParameter("layer", _("Layer"), "",false) .AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") - .codeExtraInformation.SetFunctionName("GetCameraViewportTop").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + .SetFunctionName("GetCameraViewportTop").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); AddExpression("CameraViewportRight", _("X position of the bottom right side point of a render zone"), _("X position of the bottom right side point of a render zone"), _("Camera"), "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") .AddParameter("layer", _("Layer"), "",false) .AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") - .codeExtraInformation.SetFunctionName("GetCameraViewportRight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + .SetFunctionName("GetCameraViewportRight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); AddExpression("CameraViewportBottom", _("Y position of the bottom right side point of a render zone"), _("Y position of the bottom right side point of a render zone"), _("Camera"), "res/actions/camera.png") .AddCodeOnlyParameter("currentScene", "") .AddParameter("layer", _("Layer"), "",false) .AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0") - .codeExtraInformation.SetFunctionName("GetCameraViewportBottom").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); + .SetFunctionName("GetCameraViewportBottom").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h"); */ diff --git a/GDJS/GDJS/BuiltinExtensions/CommonConversionsExtension.cpp b/GDJS/GDJS/BuiltinExtensions/CommonConversionsExtension.cpp index 2aa5b6c5c7..ed404da9fb 100644 --- a/GDJS/GDJS/BuiltinExtensions/CommonConversionsExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/CommonConversionsExtension.cpp @@ -23,16 +23,11 @@ CommonConversionsExtension::CommonConversionsExtension() "Florian Rival", "Open source (MIT License)"); - GetAllExpressions()["ToNumber"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.common.toNumber").SetIncludeFile("commontools.js"); - GetAllStrExpressions()["ToString"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.common.toString").SetIncludeFile("commontools.js"); - GetAllStrExpressions()["LargeNumberToString"].codeExtraInformation //TODO: Check if scientific notation is added or not by toString. - .SetFunctionName("gdjs.evtTools.common.toString").SetIncludeFile("commontools.js"); - GetAllExpressions()["ToRad"].codeExtraInformation - .SetFunctionName("gdjs.toRad"); - GetAllExpressions()["ToDeg"].codeExtraInformation - .SetFunctionName("gdjs.toDegrees"); + GetAllExpressions()["ToNumber"].SetFunctionName("gdjs.evtTools.common.toNumber").SetIncludeFile("commontools.js"); + GetAllStrExpressions()["ToString"].SetFunctionName("gdjs.evtTools.common.toString").SetIncludeFile("commontools.js"); + GetAllStrExpressions()["LargeNumberToString"].SetFunctionName("gdjs.evtTools.common.toString").SetIncludeFile("commontools.js"); + GetAllExpressions()["ToRad"].SetFunctionName("gdjs.toRad"); + GetAllExpressions()["ToDeg"].SetFunctionName("gdjs.toDegrees"); } } diff --git a/GDJS/GDJS/BuiltinExtensions/ExternalLayoutsExtension.cpp b/GDJS/GDJS/BuiltinExtensions/ExternalLayoutsExtension.cpp index d00631c853..7d53128778 100644 --- a/GDJS/GDJS/BuiltinExtensions/ExternalLayoutsExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/ExternalLayoutsExtension.cpp @@ -23,8 +23,7 @@ ExternalLayoutsExtension::ExternalLayoutsExtension() "Florian Rival", "Open source (MIT License)"); - GetAllActions()["BuiltinExternalLayouts::CreateObjectsFromExternalLayout"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.createObjectsFromExternalLayout"); + GetAllActions()["BuiltinExternalLayouts::CreateObjectsFromExternalLayout"].SetFunctionName("gdjs.evtTools.runtimeScene.createObjectsFromExternalLayout"); StripUnimplementedInstructionsAndExpressions(); } diff --git a/GDJS/GDJS/BuiltinExtensions/FileExtension.cpp b/GDJS/GDJS/BuiltinExtensions/FileExtension.cpp index a21f4e6f6f..b36c6904a7 100644 --- a/GDJS/GDJS/BuiltinExtensions/FileExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/FileExtension.cpp @@ -24,25 +24,25 @@ FileExtension::FileExtension() "Open source (MIT License)"); GetAllActions()["LoadFile"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.loadJSONFileFromStorage"); + .SetFunctionName("gdjs.evtTools.storage.loadJSONFileFromStorage"); GetAllConditions()["GroupExists"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.elementExistsInJSONFile"); + .SetFunctionName("gdjs.evtTools.storage.elementExistsInJSONFile"); GetAllActions()["UnloadFile"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.unloadJSONFile"); + .SetFunctionName("gdjs.evtTools.storage.unloadJSONFile"); GetAllActions()["EcrireFichierExp"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.writeNumberInJSONFile"); + .SetFunctionName("gdjs.evtTools.storage.writeNumberInJSONFile"); GetAllActions()["EcrireFichierTxt"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.writeStringInJSONFile"); + .SetFunctionName("gdjs.evtTools.storage.writeStringInJSONFile"); GetAllActions()["LireFichierExp"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.readNumberFromJSONFile"); + .SetFunctionName("gdjs.evtTools.storage.readNumberFromJSONFile"); GetAllActions()["LireFichierTxt"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.readStringFromJSONFile"); + .SetFunctionName("gdjs.evtTools.storage.readStringFromJSONFile"); GetAllActions()["DeleteGroupFichier"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.deleteElementFromJSONFile"); + .SetFunctionName("gdjs.evtTools.storage.deleteElementFromJSONFile"); GetAllActions()["DeleteFichier"].SetGroup(_("Storage")) - .codeExtraInformation.SetFunctionName("gdjs.evtTools.storage.clearJSONFile"); + .SetFunctionName("gdjs.evtTools.storage.clearJSONFile"); GetAllActions()["LaunchFile"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.window.openURL"); + .SetFunctionName("gdjs.evtTools.window.openURL"); StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: /* @@ -54,7 +54,7 @@ FileExtension::FileExtension() "res/conditions/fichier24.png", "res/conditions/fichier.png") .AddParameter("file", _("Filename"), "",false) - .codeExtraInformation.SetFunctionName("FileExists").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + .SetFunctionName("FileExists").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); AddAction("ExecuteCmd", _("Execute a command"), @@ -64,7 +64,7 @@ FileExtension::FileExtension() "res/actions/launchFile24.png", "res/actions/launchFile.png") .AddParameter("string", _("Command"), "",false) - .codeExtraInformation.SetFunctionName("ExecuteCmd").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); + .SetFunctionName("ExecuteCmd").SetIncludeFile("GDCpp/BuiltinExtensions/FileTools.h"); */ } diff --git a/GDJS/GDJS/BuiltinExtensions/JoystickExtension.cpp b/GDJS/GDJS/BuiltinExtensions/JoystickExtension.cpp index 1fc4e1ed55..9087957e3a 100644 --- a/GDJS/GDJS/BuiltinExtensions/JoystickExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/JoystickExtension.cpp @@ -38,7 +38,7 @@ JoystickExtension::JoystickExtension() .AddCodeOnlyParameter("currentScene", "") .AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false) .AddParameter("expression", _("Button"), "",false) - .codeExtraInformation.SetFunctionName("JoystickButtonDown").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); + .SetFunctionName("JoystickButtonDown").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); @@ -54,7 +54,7 @@ JoystickExtension::JoystickExtension() .AddParameter("joyaxis", _("Axis"), "",false) .AddParameter("relationalOperator", _("Sign of the test"), "",false) .AddParameter("expression", _("Value to test"), "",false) - .codeExtraInformation.SetFunctionName("GetJoystickAxisValue").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); + .SetFunctionName("GetJoystickAxisValue").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); @@ -69,7 +69,7 @@ JoystickExtension::JoystickExtension() .AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false) .AddParameter("joyaxis", _("Axis"), "",false) .AddParameter("scenevar", _("Save result to scene variable"), "",false) - .codeExtraInformation.SetFunctionName("JoystickAxisValueToVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); + .SetFunctionName("JoystickAxisValueToVariable").SetManipulatedType("number").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); AddExpression("GetJoystickAxis", _("Joystick axis"), @@ -80,7 +80,7 @@ JoystickExtension::JoystickExtension() .AddCodeOnlyParameter("currentScene", "") .AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false) .AddParameter("joyaxis", _("Axis"), "",false) - .codeExtraInformation.SetFunctionName("GetJoystickAxisValue").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); + .SetFunctionName("GetJoystickAxisValue").SetIncludeFile("GDCpp/BuiltinExtensions/JoystickTools.h"); */ } diff --git a/GDJS/GDJS/BuiltinExtensions/KeyboardExtension.cpp b/GDJS/GDJS/BuiltinExtensions/KeyboardExtension.cpp index 13883c8da7..15a1759bab 100644 --- a/GDJS/GDJS/BuiltinExtensions/KeyboardExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/KeyboardExtension.cpp @@ -19,14 +19,10 @@ KeyboardExtension::KeyboardExtension() { gd::BuiltinExtensionsImplementer::ImplementsKeyboardExtension(*this); - GetAllConditions()["KeyPressed"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.isKeyPressed").SetIncludeFile("inputtools.js"); - GetAllConditions()["KeyFromTextPressed"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.isKeyPressed").SetIncludeFile("inputtools.js"); - GetAllConditions()["AnyKeyPressed"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.anyKeyPressed").SetIncludeFile("inputtools.js"); - GetAllStrExpressions()["LastPressedKey"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.lastPressedKey").SetIncludeFile("inputtools.js"); + GetAllConditions()["KeyPressed"].SetFunctionName("gdjs.evtTools.input.isKeyPressed").SetIncludeFile("inputtools.js"); + GetAllConditions()["KeyFromTextPressed"].SetFunctionName("gdjs.evtTools.input.isKeyPressed").SetIncludeFile("inputtools.js"); + GetAllConditions()["AnyKeyPressed"].SetFunctionName("gdjs.evtTools.input.anyKeyPressed").SetIncludeFile("inputtools.js"); + GetAllStrExpressions()["LastPressedKey"].SetFunctionName("gdjs.evtTools.input.lastPressedKey").SetIncludeFile("inputtools.js"); } } diff --git a/GDJS/GDJS/BuiltinExtensions/MathematicalToolsExtension.cpp b/GDJS/GDJS/BuiltinExtensions/MathematicalToolsExtension.cpp index d7f9717a43..df4102701d 100644 --- a/GDJS/GDJS/BuiltinExtensions/MathematicalToolsExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/MathematicalToolsExtension.cpp @@ -26,81 +26,81 @@ MathematicalToolsExtension::MathematicalToolsExtension() "Open source (MIT License)"); GetAllExpressions()["cos"] - .codeExtraInformation.SetFunctionName("Math.cos"); + .SetFunctionName("Math.cos"); GetAllExpressions()["sin"] - .codeExtraInformation.SetFunctionName("Math.sin"); + .SetFunctionName("Math.sin"); GetAllExpressions()["tan"] - .codeExtraInformation.SetFunctionName("Math.tan"); + .SetFunctionName("Math.tan"); GetAllExpressions()["abs"] - .codeExtraInformation.SetFunctionName("Math.abs"); + .SetFunctionName("Math.abs"); GetAllExpressions()["min"] - .codeExtraInformation.SetFunctionName("Math.min"); + .SetFunctionName("Math.min"); GetAllExpressions()["max"] - .codeExtraInformation.SetFunctionName("Math.max"); + .SetFunctionName("Math.max"); GetAllExpressions()["sqrt"] - .codeExtraInformation.SetFunctionName("Math.sqrt"); + .SetFunctionName("Math.sqrt"); GetAllExpressions()["acos"] - .codeExtraInformation.SetFunctionName("Math.acos"); + .SetFunctionName("Math.acos"); GetAllExpressions()["acosh"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.acosh"); + .SetFunctionName("gdjs.evtTools.common.acosh"); GetAllExpressions()["asin"] - .codeExtraInformation.SetFunctionName("Math.asin"); + .SetFunctionName("Math.asin"); GetAllExpressions()["asinh"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.asinh"); + .SetFunctionName("gdjs.evtTools.common.asinh"); GetAllExpressions()["atan"] - .codeExtraInformation.SetFunctionName("Math.atan"); + .SetFunctionName("Math.atan"); GetAllExpressions()["atan2"] - .codeExtraInformation.SetFunctionName("Math.atan2"); + .SetFunctionName("Math.atan2"); GetAllExpressions()["atanh"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.atanh"); + .SetFunctionName("gdjs.evtTools.common.atanh"); GetAllExpressions()["cbrt"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.cbrt"); + .SetFunctionName("gdjs.evtTools.common.cbrt"); GetAllExpressions()["ceil"] - .codeExtraInformation.SetFunctionName("Math.ceil"); + .SetFunctionName("Math.ceil"); GetAllExpressions()["floor"] - .codeExtraInformation.SetFunctionName("Math.floor"); + .SetFunctionName("Math.floor"); GetAllExpressions()["cosh"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.cosh"); + .SetFunctionName("gdjs.evtTools.common.cosh"); GetAllExpressions()["sinh"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.sinh"); + .SetFunctionName("gdjs.evtTools.common.sinh"); GetAllExpressions()["tanh"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.tanh"); + .SetFunctionName("gdjs.evtTools.common.tanh"); GetAllExpressions()["cot"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.cot"); + .SetFunctionName("gdjs.evtTools.common.cot"); GetAllExpressions()["csc"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.csc"); + .SetFunctionName("gdjs.evtTools.common.csc"); GetAllExpressions()["sec"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.sec"); + .SetFunctionName("gdjs.evtTools.common.sec"); GetAllExpressions()["exp"] - .codeExtraInformation.SetFunctionName("Math.exp"); + .SetFunctionName("Math.exp"); GetAllExpressions()["log10"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.log10"); + .SetFunctionName("gdjs.evtTools.common.log10"); GetAllExpressions()["log2"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.log2"); + .SetFunctionName("gdjs.evtTools.common.log2"); GetAllExpressions()["log"] - .codeExtraInformation.SetFunctionName("Math.log"); + .SetFunctionName("Math.log"); GetAllExpressions()["ln"] - .codeExtraInformation.SetFunctionName("Math.ln"); + .SetFunctionName("Math.ln"); GetAllExpressions()["pow"] - .codeExtraInformation.SetFunctionName("Math.pow"); + .SetFunctionName("Math.pow"); GetAllExpressions()["nthroot"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.nthroot"); + .SetFunctionName("gdjs.evtTools.common.nthroot"); GetAllExpressions()["sign"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.sign"); + .SetFunctionName("gdjs.evtTools.common.sign"); GetAllExpressions()["mod"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.mod"); + .SetFunctionName("gdjs.evtTools.common.mod"); GetAllExpressions()["AngleDifference"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.angleDifference"); + .SetFunctionName("gdjs.evtTools.common.angleDifference"); GetAllExpressions()["int"] - .codeExtraInformation.SetFunctionName("Math.round"); + .SetFunctionName("Math.round"); GetAllExpressions()["rint"] - .codeExtraInformation.SetFunctionName("Math.round"); + .SetFunctionName("Math.round"); GetAllExpressions()["round"] - .codeExtraInformation.SetFunctionName("Math.round"); + .SetFunctionName("Math.round"); GetAllExpressions()["trunc"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.trunc"); + .SetFunctionName("gdjs.evtTools.common.trunc"); GetAllExpressions()["lerp"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.common.lerp"); + .SetFunctionName("gdjs.evtTools.common.lerp"); StripUnimplementedInstructionsAndExpressions(); } diff --git a/GDJS/GDJS/BuiltinExtensions/MouseExtension.cpp b/GDJS/GDJS/BuiltinExtensions/MouseExtension.cpp index 9adb4ebb5b..5d95fd79a9 100644 --- a/GDJS/GDJS/BuiltinExtensions/MouseExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/MouseExtension.cpp @@ -25,49 +25,30 @@ MouseExtension::MouseExtension() "Florian Rival", "Open source (MIT License)"); - GetAllConditions()["SourisX"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getMouseX").SetIncludeFile("inputtools.js"); - GetAllConditions()["SourisY"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getMouseY").SetIncludeFile("inputtools.js"); - GetAllConditions()["SourisBouton"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.isMouseButtonPressed").SetIncludeFile("inputtools.js"); - GetAllActions()["CacheSouris"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.hideCursor").SetIncludeFile("inputtools.js"); - GetAllActions()["MontreSouris"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.showCursor").SetIncludeFile("inputtools.js"); - GetAllActions()["TouchSimulateMouse"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.touchSimulateMouse").SetIncludeFile("inputtools.js"); + GetAllConditions()["SourisX"].SetFunctionName("gdjs.evtTools.input.getMouseX").SetIncludeFile("inputtools.js"); + GetAllConditions()["SourisY"].SetFunctionName("gdjs.evtTools.input.getMouseY").SetIncludeFile("inputtools.js"); + GetAllConditions()["SourisBouton"].SetFunctionName("gdjs.evtTools.input.isMouseButtonPressed").SetIncludeFile("inputtools.js"); + GetAllActions()["CacheSouris"].SetFunctionName("gdjs.evtTools.input.hideCursor").SetIncludeFile("inputtools.js"); + GetAllActions()["MontreSouris"].SetFunctionName("gdjs.evtTools.input.showCursor").SetIncludeFile("inputtools.js"); + GetAllActions()["TouchSimulateMouse"].SetFunctionName("gdjs.evtTools.input.touchSimulateMouse").SetIncludeFile("inputtools.js"); - GetAllConditions()["SourisSurObjet"].codeExtraInformation. - SetFunctionName("gdjs.evtTools.input.cursorOnObject").SetIncludeFile("inputtools.js"); + GetAllConditions()["SourisSurObjet"].SetFunctionName("gdjs.evtTools.input.cursorOnObject").SetIncludeFile("inputtools.js"); - GetAllExpressions()["MouseX"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getMouseX").SetIncludeFile("inputtools.js"); - GetAllExpressions()["SourisX"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getMouseX").SetIncludeFile("inputtools.js"); //Deprecated - GetAllExpressions()["MouseY"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getMouseY").SetIncludeFile("inputtools.js"); - GetAllExpressions()["SourisY"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getMouseY").SetIncludeFile("inputtools.js"); //Deprecated + GetAllExpressions()["MouseX"].SetFunctionName("gdjs.evtTools.input.getMouseX").SetIncludeFile("inputtools.js"); + GetAllExpressions()["SourisX"].SetFunctionName("gdjs.evtTools.input.getMouseX").SetIncludeFile("inputtools.js"); //Deprecated + GetAllExpressions()["MouseY"].SetFunctionName("gdjs.evtTools.input.getMouseY").SetIncludeFile("inputtools.js"); + GetAllExpressions()["SourisY"].SetFunctionName("gdjs.evtTools.input.getMouseY").SetIncludeFile("inputtools.js"); //Deprecated - GetAllConditions()["PopStartedTouch"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.popStartedTouch").SetIncludeFile("inputtools.js"); - GetAllConditions()["PopEndedTouch"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.popEndedTouch").SetIncludeFile("inputtools.js"); + GetAllConditions()["PopStartedTouch"].SetFunctionName("gdjs.evtTools.input.popStartedTouch").SetIncludeFile("inputtools.js"); + GetAllConditions()["PopEndedTouch"].SetFunctionName("gdjs.evtTools.input.popEndedTouch").SetIncludeFile("inputtools.js"); - GetAllConditions()["TouchX"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getTouchX").SetIncludeFile("inputtools.js"); - GetAllConditions()["TouchY"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getTouchY").SetIncludeFile("inputtools.js"); - GetAllExpressions()["TouchX"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getTouchX").SetIncludeFile("inputtools.js"); - GetAllExpressions()["TouchY"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getTouchY").SetIncludeFile("inputtools.js"); + GetAllConditions()["TouchX"].SetFunctionName("gdjs.evtTools.input.getTouchX").SetIncludeFile("inputtools.js"); + GetAllConditions()["TouchY"].SetFunctionName("gdjs.evtTools.input.getTouchY").SetIncludeFile("inputtools.js"); + GetAllExpressions()["TouchX"].SetFunctionName("gdjs.evtTools.input.getTouchX").SetIncludeFile("inputtools.js"); + GetAllExpressions()["TouchY"].SetFunctionName("gdjs.evtTools.input.getTouchY").SetIncludeFile("inputtools.js"); - GetAllExpressions()["LastTouchId"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getLastTouchId").SetIncludeFile("inputtools.js"); - GetAllExpressions()["LastEndedTouchId"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.input.getLastEndedTouchId").SetIncludeFile("inputtools.js"); + GetAllExpressions()["LastTouchId"].SetFunctionName("gdjs.evtTools.input.getLastTouchId").SetIncludeFile("inputtools.js"); + GetAllExpressions()["LastEndedTouchId"].SetFunctionName("gdjs.evtTools.input.getLastEndedTouchId").SetIncludeFile("inputtools.js"); StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: } diff --git a/GDJS/GDJS/BuiltinExtensions/NetworkExtension.cpp b/GDJS/GDJS/BuiltinExtensions/NetworkExtension.cpp index 309641a548..a66bdd46c4 100644 --- a/GDJS/GDJS/BuiltinExtensions/NetworkExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/NetworkExtension.cpp @@ -23,45 +23,12 @@ NetworkExtension::NetworkExtension() "Florian Rival", "Open source (MIT License)"); - GetAllActions()["SendRequest"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.network.sendHttpRequest").SetIncludeFile("networktools.js"); - GetAllActions()["JSONToVariableStructure"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.network.jsonToVariableStructure").SetIncludeFile("networktools.js"); + GetAllActions()["SendRequest"].SetFunctionName("gdjs.evtTools.network.sendHttpRequest").SetIncludeFile("networktools.js"); + GetAllActions()["JSONToVariableStructure"].SetFunctionName("gdjs.evtTools.network.jsonToVariableStructure").SetIncludeFile("networktools.js"); - GetAllStrExpressions()["ToJSON"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.network.variableStructureToJSON").SetIncludeFile("networktools.js"); + GetAllStrExpressions()["ToJSON"].SetFunctionName("gdjs.evtTools.network.variableStructureToJSON").SetIncludeFile("networktools.js"); - StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: - /* - AddAction("EnvoiDataNet", - _("Send datas to a website"), - _("Send datas to a specified web site.\nYou need to set up a .php page on your web site so as to receive this datas.\nEnter here a password, and enter the same in the configuration of your .php page.\nRead the help file to get more informations."), - _("Send to _PARAM0_ the following datas : _PARAM2_, _PARAM3_,_PARAM4_,_PARAM5_,_PARAM6_,_PARAM7_"), - _("Network"), - "res/actions/net24.png", - "res/actions/net.png") - .AddParameter("string", _(".php page URL ( Don't forget the protocol http:// ) "), "",false) - .AddParameter("password", _("Password"), "",false) - .AddParameter("string", _("Data 1"), "",false) - .AddParameter("string", _("Data 2"), "",true) - .AddParameter("string", _("Data 3"), "",true) - .AddParameter("string", _("Data 4"), "",true) - .AddParameter("string", _("Data 5"), "",true) - .AddParameter("string", _("Data 6"), "",true) - .codeExtraInformation.SetFunctionName("SendDataToPhpWebPage").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); - - AddAction("DownloadFile", - _("Download a file"), - _("Download a file from a web site"), - _("Download file _PARAM1_ from _PARAM0_ under the name of _PARAM2_"), - _("Network"), - "res/actions/net24.png", - "res/actions/net.png") - .AddParameter("string", _("Host ( For example : http://www.website.com )"), "",false) - .AddParameter("string", _("Path to file ( For example : /folder/file.txt )"), "",false) - .AddParameter("string", _("Save as"), "",false) - .codeExtraInformation.SetFunctionName("DownloadFile").SetIncludeFile("GDCpp/BuiltinExtensions/NetworkTools.h"); - */ + StripUnimplementedInstructionsAndExpressions(); } } diff --git a/GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp b/GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp index bf7ad550f5..26405a5781 100644 --- a/GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp @@ -25,19 +25,13 @@ SceneExtension::SceneExtension() "Florian Rival", "Open source (MIT License)"); - GetAllExpressions()["Random"].codeExtraInformation - .SetFunctionName("gdjs.random"); - GetAllStrExpressions()["CurrentSceneName"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.getSceneName"); + GetAllExpressions()["Random"].SetFunctionName("gdjs.random"); + GetAllStrExpressions()["CurrentSceneName"].SetFunctionName("gdjs.evtTools.runtimeScene.getSceneName"); - GetAllConditions()["DepartScene"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.sceneJustBegins"); - GetAllActions()["SceneBackground"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.setBackgroundColor"); - GetAllActions()["Scene"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.changeScene"); - GetAllActions()["Quit"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.stopGame"); + GetAllConditions()["DepartScene"].SetFunctionName("gdjs.evtTools.runtimeScene.sceneJustBegins"); + GetAllActions()["SceneBackground"].SetFunctionName("gdjs.evtTools.runtimeScene.setBackgroundColor"); + GetAllActions()["Scene"].SetFunctionName("gdjs.evtTools.runtimeScene.changeScene"); + GetAllActions()["Quit"].SetFunctionName("gdjs.evtTools.runtimeScene.stopGame"); { class CodeGenerator : public gd::InstructionMetadata::ExtraInformation::CustomCodeGenerator @@ -94,7 +88,7 @@ SceneExtension::SceneExtension() "res/actions/window.png") .AddCodeOnlyParameter("currentScene", "") .AddParameter("yesorno", _("Deactivate input when focus is lost")) - .codeExtraInformation.SetFunctionName("DisableInputWhenFocusIsLost").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); + .SetFunctionName("DisableInputWhenFocusIsLost").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneTools.h"); */ } diff --git a/GDJS/GDJS/BuiltinExtensions/SpriteExtension.cpp b/GDJS/GDJS/BuiltinExtensions/SpriteExtension.cpp index f6a24c2bf1..0e91929e7d 100644 --- a/GDJS/GDJS/BuiltinExtensions/SpriteExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/SpriteExtension.cpp @@ -24,93 +24,53 @@ SpriteExtension::SpriteExtension() std::map & spriteActions = GetAllActionsForObject("Sprite"); std::map & spriteConditions = GetAllConditionsForObject("Sprite"); std::map & spriteExpressions = GetAllExpressionsForObject("Sprite"); - spriteActions["ChangeBlendMode"].codeExtraInformation. - SetFunctionName("setBlendMode").SetIncludeFile("spriteruntimeobject.js"); - spriteActions["Opacity"].codeExtraInformation. - SetFunctionName("setOpacity").SetAssociatedGetter("getOpacity").SetIncludeFile("spriteruntimeobject.js"); - spriteConditions["BlendMode"].codeExtraInformation. - SetFunctionName("getBlendMode").SetIncludeFile("spriteruntimeobject.js"); - spriteConditions["Opacity"].codeExtraInformation. - SetFunctionName("getOpacity").SetIncludeFile("spriteruntimeobject.js"); + spriteActions["ChangeBlendMode"].SetFunctionName("setBlendMode").SetIncludeFile("spriteruntimeobject.js"); + spriteActions["Opacity"].SetFunctionName("setOpacity").SetGetter("getOpacity").SetIncludeFile("spriteruntimeobject.js"); + spriteConditions["BlendMode"].SetFunctionName("getBlendMode").SetIncludeFile("spriteruntimeobject.js"); + spriteConditions["Opacity"].SetFunctionName("getOpacity").SetIncludeFile("spriteruntimeobject.js"); - spriteActions["ChangeAnimation"].codeExtraInformation. - SetFunctionName("setAnimation").SetAssociatedGetter("getAnimation"); - spriteActions["ChangeDirection"].codeExtraInformation. - SetFunctionName("setDirectionOrAngle").SetAssociatedGetter("getDirectionOrAngle"); - spriteActions["ChangeSprite"].codeExtraInformation. - SetFunctionName("setAnimationFrame").SetAssociatedGetter("getAnimationFrame"); - spriteConditions["Animation"].codeExtraInformation. - SetFunctionName("getAnimation"); - spriteConditions["Direction"].codeExtraInformation. - SetFunctionName("getDirectionOrAngle"); - spriteConditions["Sprite"].codeExtraInformation. - SetFunctionName("getAnimationFrame"); - spriteConditions["AnimationEnded"].codeExtraInformation. - SetFunctionName("hasAnimationEnded"); - spriteActions["PauseAnimation"].codeExtraInformation. - SetFunctionName("pauseAnimation"); - spriteActions["PlayAnimation"].codeExtraInformation. - SetFunctionName("playAnimation"); - spriteConditions["AnimStopped"].codeExtraInformation. - SetFunctionName("animationPaused"); - spriteActions["ChangeAnimationSpeedScale"].codeExtraInformation. - SetFunctionName("setAnimationSpeedScale").SetAssociatedGetter("getAnimationSpeedScale").SetManipulatedType("number").SetIncludeFile("spriteruntimeobject.js"); - + spriteActions["ChangeAnimation"].SetFunctionName("setAnimation").SetGetter("getAnimation"); + spriteActions["ChangeDirection"].SetFunctionName("setDirectionOrAngle").SetGetter("getDirectionOrAngle"); + spriteActions["ChangeSprite"].SetFunctionName("setAnimationFrame").SetGetter("getAnimationFrame"); + spriteConditions["Animation"].SetFunctionName("getAnimation"); + spriteConditions["Direction"].SetFunctionName("getDirectionOrAngle"); + spriteConditions["Sprite"].SetFunctionName("getAnimationFrame"); + spriteConditions["AnimationEnded"].SetFunctionName("hasAnimationEnded"); + spriteActions["PauseAnimation"].SetFunctionName("pauseAnimation"); + spriteActions["PlayAnimation"].SetFunctionName("playAnimation"); + spriteConditions["AnimStopped"].SetFunctionName("animationPaused"); + spriteActions["ChangeAnimationSpeedScale"].SetFunctionName("setAnimationSpeedScale").SetGetter("getAnimationSpeedScale").SetManipulatedType("number").SetIncludeFile("spriteruntimeobject.js"); - spriteActions["ChangeScaleWidth"].codeExtraInformation. - SetFunctionName("setScaleX").SetAssociatedGetter("getScaleX"); - spriteActions["ChangeScaleHeight"].codeExtraInformation. - SetFunctionName("setScaleY").SetAssociatedGetter("getScaleY"); - spriteActions["ChangeScale"].codeExtraInformation. - SetFunctionName("setScale").SetManipulatedType("number").SetAssociatedGetter("getScale"); - spriteConditions["ScaleWidth"].codeExtraInformation - .SetFunctionName("getScaleX"); - spriteConditions["ScaleHeight"].codeExtraInformation - .SetFunctionName("getScaleY"); - spriteActions["TourneVersPos"].codeExtraInformation. - SetFunctionName("rotateTowardPosition"); - spriteActions["TourneVers"].codeExtraInformation. - SetFunctionName("turnTowardObject"); - spriteActions["ChangeColor"].codeExtraInformation. - SetFunctionName("setColor"); - spriteActions["FlipX"].codeExtraInformation. - SetFunctionName("flipX"); - spriteActions["FlipY"].codeExtraInformation. - SetFunctionName("flipY"); - spriteConditions["FlippedX"].codeExtraInformation. - SetFunctionName("isFlippedX"); - spriteConditions["FlippedY"].codeExtraInformation. - SetFunctionName("isFlippedY"); + + spriteActions["ChangeScaleWidth"].SetFunctionName("setScaleX").SetGetter("getScaleX"); + spriteActions["ChangeScaleHeight"].SetFunctionName("setScaleY").SetGetter("getScaleY"); + spriteActions["ChangeScale"].SetFunctionName("setScale").SetManipulatedType("number").SetGetter("getScale"); + spriteConditions["ScaleWidth"].SetFunctionName("getScaleX"); + spriteConditions["ScaleHeight"].SetFunctionName("getScaleY"); + spriteActions["TourneVersPos"].SetFunctionName("rotateTowardPosition"); + spriteActions["TourneVers"].SetFunctionName("turnTowardObject"); + spriteActions["ChangeColor"].SetFunctionName("setColor"); + spriteActions["FlipX"].SetFunctionName("flipX"); + spriteActions["FlipY"].SetFunctionName("flipY"); + spriteConditions["FlippedX"].SetFunctionName("isFlippedX"); + spriteConditions["FlippedY"].SetFunctionName("isFlippedY"); GetAllConditions()["Collision"] .AddCodeOnlyParameter("currentScene", "") //We need an extra parameter pointing to the scene. - .codeExtraInformation //No pixel perfect collision for now on the JS platform. - .SetFunctionName("gdjs.evtTools.object.hitBoxesCollisionTest"); + .SetFunctionName("gdjs.evtTools.object.hitBoxesCollisionTest"); //No pixel perfect collision for now on the JS platform. - spriteExpressions["X"].codeExtraInformation. - SetFunctionName("getPointX"); - spriteExpressions["Y"].codeExtraInformation. - SetFunctionName("getPointY"); - spriteExpressions["PointX"].codeExtraInformation. - SetFunctionName("getPointX"); - spriteExpressions["PointY"].codeExtraInformation. - SetFunctionName("getPointY"); - spriteExpressions["Direc"].codeExtraInformation. //Deprecated - SetFunctionName("getDirectionOrAngle"); - spriteExpressions["Direction"].codeExtraInformation. - SetFunctionName("getDirectionOrAngle"); - spriteExpressions["Anim"].codeExtraInformation. //Deprecated - SetFunctionName("getAnimation"); - spriteExpressions["Animation"].codeExtraInformation. - SetFunctionName("getAnimation"); - spriteExpressions["Sprite"].codeExtraInformation. - SetFunctionName("getAnimationFrame"); - spriteExpressions["AnimationSpeedScale"].codeExtraInformation. - SetFunctionName("getAnimationSpeedScale"); - spriteExpressions["ScaleX"].codeExtraInformation. - SetFunctionName("getScaleX"); - spriteExpressions["ScaleY"].codeExtraInformation. - SetFunctionName("getScaleY"); + spriteExpressions["X"].SetFunctionName("getPointX"); + spriteExpressions["Y"].SetFunctionName("getPointY"); + spriteExpressions["PointX"].SetFunctionName("getPointX"); + spriteExpressions["PointY"].SetFunctionName("getPointY"); + spriteExpressions["Direc"].SetFunctionName("getDirectionOrAngle"); //Deprecated + spriteExpressions["Direction"].SetFunctionName("getDirectionOrAngle"); + spriteExpressions["Anim"].SetFunctionName("getAnimation"); //Deprecated + spriteExpressions["Animation"].SetFunctionName("getAnimation"); + spriteExpressions["Sprite"].SetFunctionName("getAnimationFrame"); + spriteExpressions["AnimationSpeedScale"].SetFunctionName("getAnimationSpeedScale"); + spriteExpressions["ScaleX"].SetFunctionName("getScaleX"); + spriteExpressions["ScaleY"].SetFunctionName("getScaleY"); StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: @@ -131,7 +91,7 @@ SpriteExtension::SpriteExtension() .AddParameter("expression", _("X position"), "",false) .AddParameter("expression", _("Y position"), "",false) .AddParameter("yesorno", _("Should the copy take in account the source transparency\?"), "",false) - .codeExtraInformation.SetFunctionName("CopyImageOnImageOfCurrentSprite").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + .SetFunctionName("CopyImageOnImageOfCurrentSprite").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); @@ -145,7 +105,7 @@ SpriteExtension::SpriteExtension() .AddParameter("object", _("Object"), "Sprite", false) .AddParameter("color", _("Color to make transparent"), "",false) - .codeExtraInformation.SetFunctionName("MakeColorTransparent").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); + .SetFunctionName("MakeColorTransparent").SetIncludeFile("GDCpp/RuntimeSpriteObject.h"); } */ diff --git a/GDJS/GDJS/BuiltinExtensions/StringInstructionsExtension.cpp b/GDJS/GDJS/BuiltinExtensions/StringInstructionsExtension.cpp index 06907418d0..b1aed16608 100644 --- a/GDJS/GDJS/BuiltinExtensions/StringInstructionsExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/StringInstructionsExtension.cpp @@ -24,23 +24,23 @@ StringInstructionsExtension::StringInstructionsExtension() "Open source (MIT License)"); GetAllStrExpressions()["NewLine"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.string.newLine"); + .SetFunctionName("gdjs.evtTools.string.newLine"); GetAllStrExpressions()["SubStr"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.string.subStr"); + .SetFunctionName("gdjs.evtTools.string.subStr"); GetAllStrExpressions()["StrAt"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.string.strAt"); + .SetFunctionName("gdjs.evtTools.string.strAt"); GetAllExpressions()["StrLength"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.string.strLen"); + .SetFunctionName("gdjs.evtTools.string.strLen"); GetAllExpressions()["StrFind"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.string.strFind"); + .SetFunctionName("gdjs.evtTools.string.strFind"); GetAllExpressions()["StrRFind"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.string.strRFind"); + .SetFunctionName("gdjs.evtTools.string.strRFind"); GetAllExpressions()["StrFindFrom"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.string.strFindFrom"); + .SetFunctionName("gdjs.evtTools.string.strFindFrom"); GetAllExpressions()["StrRFindFrom"] - .codeExtraInformation.SetFunctionName("gdjs.evtTools.string.strRFindFrom"); + .SetFunctionName("gdjs.evtTools.string.strRFindFrom"); - StripUnimplementedInstructionsAndExpressions(); //Unimplemented things are listed here: + StripUnimplementedInstructionsAndExpressions(); } } diff --git a/GDJS/GDJS/BuiltinExtensions/TimeExtension.cpp b/GDJS/GDJS/BuiltinExtensions/TimeExtension.cpp index cb835d823a..cf77df81ae 100644 --- a/GDJS/GDJS/BuiltinExtensions/TimeExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/TimeExtension.cpp @@ -25,39 +25,23 @@ TimeExtension::TimeExtension() "Florian Rival", "Open source (MIT License)"); - GetAllConditions()["Timer"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.timerElapsedTime"); - GetAllConditions()["TimerPaused"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.timerPaused"); - GetAllActions()["ResetTimer"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.resetTimer"); - GetAllActions()["PauseTimer"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.pauseTimer"); - GetAllActions()["UnPauseTimer"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.unpauseTimer"); - GetAllActions()["RemoveTimer"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.removeTimer"); - GetAllConditions()["TimeScale"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.getTimeScale"); - GetAllActions()["ChangeTimeScale"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.setTimeScale"); + GetAllConditions()["Timer"].SetFunctionName("gdjs.evtTools.runtimeScene.timerElapsedTime"); + GetAllConditions()["TimerPaused"].SetFunctionName("gdjs.evtTools.runtimeScene.timerPaused"); + GetAllActions()["ResetTimer"].SetFunctionName("gdjs.evtTools.runtimeScene.resetTimer"); + GetAllActions()["PauseTimer"].SetFunctionName("gdjs.evtTools.runtimeScene.pauseTimer"); + GetAllActions()["UnPauseTimer"].SetFunctionName("gdjs.evtTools.runtimeScene.unpauseTimer"); + GetAllActions()["RemoveTimer"].SetFunctionName("gdjs.evtTools.runtimeScene.removeTimer"); + GetAllConditions()["TimeScale"].SetFunctionName("gdjs.evtTools.runtimeScene.getTimeScale"); + GetAllActions()["ChangeTimeScale"].SetFunctionName("gdjs.evtTools.runtimeScene.setTimeScale"); - GetAllExpressions()["TimeDelta"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.getElapsedTimeInSeconds"); - GetAllExpressions()["TempsFrame"].codeExtraInformation //Deprecated - .SetFunctionName("gdjs.evtTools.runtimeScene.getElapsedTimeInSeconds"); - GetAllExpressions()["ElapsedTime"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.getElapsedTimeInSeconds"); - GetAllExpressions()["TimerElapsedTime"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.getTimerElapsedTimeInSeconds"); - GetAllExpressions()["TimeFromStart"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.getTimeFromStartInSeconds"); - GetAllExpressions()["TempsDebut"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.getTimeFromStartInSeconds"); - GetAllExpressions()["TimeScale"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.getTimeScale"); - GetAllExpressions()["Time"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.runtimeScene.getTime"); + GetAllExpressions()["TimeDelta"].SetFunctionName("gdjs.evtTools.runtimeScene.getElapsedTimeInSeconds"); + GetAllExpressions()["TempsFrame"].SetFunctionName("gdjs.evtTools.runtimeScene.getElapsedTimeInSeconds"); //Deprecated + GetAllExpressions()["ElapsedTime"].SetFunctionName("gdjs.evtTools.runtimeScene.getElapsedTimeInSeconds"); + GetAllExpressions()["TimerElapsedTime"].SetFunctionName("gdjs.evtTools.runtimeScene.getTimerElapsedTimeInSeconds"); + GetAllExpressions()["TimeFromStart"].SetFunctionName("gdjs.evtTools.runtimeScene.getTimeFromStartInSeconds"); + GetAllExpressions()["TempsDebut"].SetFunctionName("gdjs.evtTools.runtimeScene.getTimeFromStartInSeconds"); + GetAllExpressions()["TimeScale"].SetFunctionName("gdjs.evtTools.runtimeScene.getTimeScale"); + GetAllExpressions()["Time"].SetFunctionName("gdjs.evtTools.runtimeScene.getTime"); } } diff --git a/GDJS/GDJS/BuiltinExtensions/VariablesExtension.cpp b/GDJS/GDJS/BuiltinExtensions/VariablesExtension.cpp index 950807fe76..3773ff5bd7 100644 --- a/GDJS/GDJS/BuiltinExtensions/VariablesExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/VariablesExtension.cpp @@ -30,22 +30,22 @@ VariablesExtension::VariablesExtension() "Florian Rival", "Open source (MIT License)"); - GetAllConditions()["VarScene"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.getVariableNumber"); - GetAllConditions()["VarSceneTxt"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.getVariableString"); - GetAllConditions()["VarGlobal"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.getVariableNumber"); - GetAllConditions()["VarGlobalTxt"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.getVariableString"); - GetAllExpressions()["Variable"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.getVariableNumber"); - GetAllStrExpressions()["VariableString"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.getVariableString"); - GetAllExpressions()["GlobalVariable"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.getVariableNumber"); - GetAllStrExpressions()["GlobalVariableString"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.getVariableString"); + GetAllConditions()["VarScene"].SetFunctionName("gdjs.evtTools.common.getVariableNumber"); + GetAllConditions()["VarSceneTxt"].SetFunctionName("gdjs.evtTools.common.getVariableString"); + GetAllConditions()["VarGlobal"].SetFunctionName("gdjs.evtTools.common.getVariableNumber"); + GetAllConditions()["VarGlobalTxt"].SetFunctionName("gdjs.evtTools.common.getVariableString"); + GetAllExpressions()["Variable"].SetFunctionName("gdjs.evtTools.common.getVariableNumber"); + GetAllStrExpressions()["VariableString"].SetFunctionName("gdjs.evtTools.common.getVariableString"); + GetAllExpressions()["GlobalVariable"].SetFunctionName("gdjs.evtTools.common.getVariableNumber"); + GetAllStrExpressions()["GlobalVariableString"].SetFunctionName("gdjs.evtTools.common.getVariableString"); - GetAllConditions()["VarSceneDef"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.sceneVariableExists"); - GetAllConditions()["VarGlobalDef"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.globalVariableExists"); + GetAllConditions()["VarSceneDef"].SetFunctionName("gdjs.evtTools.common.sceneVariableExists"); + GetAllConditions()["VarGlobalDef"].SetFunctionName("gdjs.evtTools.common.globalVariableExists"); - GetAllConditions()["VariableChildExists"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.variableChildExists"); - GetAllConditions()["GlobalVariableChildExists"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.variableChildExists"); - GetAllActions()["VariableRemoveChild"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.variableRemoveChild"); - GetAllActions()["GlobalVariableRemoveChild"].codeExtraInformation.SetFunctionName("gdjs.evtTools.common.variableRemoveChild"); + GetAllConditions()["VariableChildExists"].SetFunctionName("gdjs.evtTools.common.variableChildExists"); + GetAllConditions()["GlobalVariableChildExists"].SetFunctionName("gdjs.evtTools.common.variableChildExists"); + GetAllActions()["VariableRemoveChild"].SetFunctionName("gdjs.evtTools.common.variableRemoveChild"); + GetAllActions()["GlobalVariableRemoveChild"].SetFunctionName("gdjs.evtTools.common.variableRemoveChild"); { class CodeGenerator : public gd::InstructionMetadata::ExtraInformation::CustomCodeGenerator diff --git a/GDJS/GDJS/BuiltinExtensions/WindowExtension.cpp b/GDJS/GDJS/BuiltinExtensions/WindowExtension.cpp index 2aca716481..a8b1bd2f9f 100644 --- a/GDJS/GDJS/BuiltinExtensions/WindowExtension.cpp +++ b/GDJS/GDJS/BuiltinExtensions/WindowExtension.cpp @@ -23,25 +23,16 @@ WindowExtension::WindowExtension() "Florian Rival", "Open source (MIT License)"); - GetAllActions()["SetFullScreen"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.window.setFullScreen"); - GetAllActions()["SetWindowMargins"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.window.setMargins"); - GetAllActions()["SetWindowTitle"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.window.setWindowTitle"); - GetAllActions()["SetWindowSize"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.window.setCanvasSize"); + GetAllActions()["SetFullScreen"].SetFunctionName("gdjs.evtTools.window.setFullScreen"); + GetAllActions()["SetWindowMargins"].SetFunctionName("gdjs.evtTools.window.setMargins"); + GetAllActions()["SetWindowTitle"].SetFunctionName("gdjs.evtTools.window.setWindowTitle"); + GetAllActions()["SetWindowSize"].SetFunctionName("gdjs.evtTools.window.setCanvasSize"); - GetAllStrExpressions()["WindowTitle"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.window.getWindowTitle"); - GetAllExpressions()["SceneWindowWidth"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.window.getCanvasWidth"); - GetAllExpressions()["SceneWindowHeight"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.window.getCanvasHeight"); - GetAllExpressions()["ScreenWidth"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.window.getWindowWidth"); - GetAllExpressions()["ScreenHeight"].codeExtraInformation - .SetFunctionName("gdjs.evtTools.window.getWindowHeight"); + GetAllStrExpressions()["WindowTitle"].SetFunctionName("gdjs.evtTools.window.getWindowTitle"); + GetAllExpressions()["SceneWindowWidth"].SetFunctionName("gdjs.evtTools.window.getCanvasWidth"); + GetAllExpressions()["SceneWindowHeight"].SetFunctionName("gdjs.evtTools.window.getCanvasHeight"); + GetAllExpressions()["ScreenWidth"].SetFunctionName("gdjs.evtTools.window.getWindowWidth"); + GetAllExpressions()["ScreenHeight"].SetFunctionName("gdjs.evtTools.window.getWindowHeight"); StripUnimplementedInstructionsAndExpressions(); }