Browse Source

ScriptAPIDump.cpp: fix signed/unsigned mismatch warnings | Update script doc

1vanK 3 years ago
parent
commit
3448877994
3 changed files with 148 additions and 77 deletions
  1. 56 21
      Docs/AngelScriptAPI.h
  2. 55 21
      Docs/ScriptAPI.dox
  3. 37 35
      Source/Urho3D/AngelScript/ScriptAPIDump.cpp

+ 56 - 21
Docs/AngelScriptAPI.h

@@ -356,6 +356,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -383,6 +384,7 @@ Array<VertexBuffer> GetMorphVertexBuffers() const;
 float GetMorphWeight(StringHash) const;
 float GetMorphWeight(const String&) const;
 float GetMorphWeight(uint) const;
+Array<ModelMorph> GetMorphs() const;
 Node GetNode() const;
 uint GetNumAnimationStates() const;
 uint GetNumAttributes() const;
@@ -636,6 +638,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 BlendMode GetBlendMode() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
@@ -673,6 +676,7 @@ Scene GetScene() const;
 float GetShadowDistance() const;
 uint GetShadowMask() const;
 float GetSortValue() const;
+Array<SourceBatch2D> GetSourceBatches();
 float GetSpeed() const;
 Sprite2D GetSprite() const;
 ResourceRef GetSpriteAttr() const;
@@ -922,6 +926,7 @@ Object GetSubsystem(StringHash) const;
 AnimationTrack GetTrack(StringHash);
 AnimationTrack GetTrack(const String&);
 AnimationTrack GetTrack(uint);
+Array<AnimationTriggerPoint> GetTriggers() const;
 StringHash GetType() const;
 uint GetUseTimer();
 bool HasEventHandlers() const;
@@ -1835,6 +1840,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 Billboard GetBillboard(uint);
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
@@ -8845,6 +8851,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -9524,6 +9531,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -9951,6 +9959,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -10198,6 +10207,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -10229,6 +10239,7 @@ Scene GetScene() const;
 float GetShadowDistance() const;
 uint GetShadowMask() const;
 float GetSortValue() const;
+Array<SourceBatch2D> GetSourceBatches();
 Object GetSubsystem(StringHash) const;
 StringHash GetType() const;
 UpdateGeometryType GetUpdateGeometryType();
@@ -11959,7 +11970,7 @@ float advanceX;
 float height;
 float offsetX;
 float offsetY;
-uint page;
+int page;
 int16 texHeight;
 int16 texWidth;
 bool used;
@@ -13879,6 +13890,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 float GetBrightness() const;
 bool GetCastShadows() const;
@@ -14233,7 +14245,7 @@ bool GetClipChildren() const;
 IntRect GetCombinedScreenRect();
 BorderImage GetCursor() const;
 float GetCursorBlinkRate() const;
-uint GetCursorPosition() const;
+int GetCursorPosition() const;
 XMLFile GetDefaultStyle(bool = true) const;
 float GetDerivedOpacity() const;
 uint GetDragButtonCombo() const;
@@ -14258,7 +14270,7 @@ int GetLayoutSpacing() const;
 Material GetMaterial() const;
 ResourceRef GetMaterialAttr() const;
 int GetMaxHeight() const;
-uint GetMaxLength() const;
+int GetMaxLength() const;
 int GetMaxWidth() const;
 int GetMinHeight() const;
 int GetMinWidth() const;
@@ -14407,7 +14419,7 @@ void SetColor(Corner, const Color&);
 void SetColor(const Color&);
 void SetCursorBlinkRate(float);
 void SetCursorMovable(bool);
-void SetCursorPosition(uint);
+void SetCursorPosition(int);
 void SetDeepEnabled(bool);
 void SetDefaultStyle(XMLFile);
 void SetDisabledOffset(const IntVector2&);
@@ -14449,7 +14461,7 @@ void SetMaterialAttr(const ResourceRef&);
 void SetMaxAnchor(const Vector2&);
 void SetMaxAnchor(float, float);
 void SetMaxHeight(int);
-void SetMaxLength(uint);
+void SetMaxLength(int);
 void SetMaxOffset(const IntVector2&);
 void SetMaxSize(const IntVector2&);
 void SetMaxSize(int, int);
@@ -14556,7 +14568,7 @@ IntRect combinedScreenRect;
 BorderImage cursor;
 float cursorBlinkRate;
 bool cursorMovable;
-uint cursorPosition;
+int cursorPosition;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
@@ -14603,7 +14615,7 @@ int layoutSpacing;
 Material material;
 Vector2 maxAnchor;
 int maxHeight;
-uint maxLength;
+int maxLength;
 IntVector2 maxOffset;
 IntVector2 maxSize;
 int maxWidth;
@@ -15550,6 +15562,7 @@ CullMode GetShadowCullMode() const;
 bool GetSpecular() const;
 Object GetSubsystem(StringHash) const;
 Technique GetTechnique(uint) const;
+Array<TechniqueEntry> GetTechniques() const;
 Texture GetTexture(TextureUnit) const;
 StringHash GetType() const;
 uint GetUseTimer();
@@ -16434,6 +16447,7 @@ Array<IndexBuffer> GetIndexBuffers() const;
 uint GetMemoryUse() const;
 uint GetMorphRangeCount(uint) const;
 uint GetMorphRangeStart(uint) const;
+Array<ModelMorph> GetMorphs() const;
 StringHash GetNameHash() const;
 uint GetNumGeometries() const;
 uint GetNumGeometryLodLevels(uint) const;
@@ -16477,6 +16491,7 @@ bool SetGeometryCenter(uint, const Vector3&);
 void SetGlobalVar(StringHash, const Variant&);
 bool SetIndexBuffers(Array<IndexBuffer>);
 void SetMemoryUse(uint);
+void SetMorphs(Array<ModelMorph>);
 void SetName(const String&);
 void SetNumGeometries(uint);
 bool SetNumGeometryLodLevels(uint, uint);
@@ -17562,7 +17577,7 @@ public:
 Node();
 Node(const String&in);
 // Methods:
-void AddChild(Node, int = NINDEX);
+void AddChild(Node, int = ENDPOS);
 void AddComponent(Component, uint, CreateMode);
 void AddListener(Component);
 void AddTag(const String&);
@@ -19548,6 +19563,7 @@ WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
 AutoRemoveMode GetAutoRemoveMode() const;
+Array<SourceBatch> GetBatches() const;
 Billboard GetBillboard(uint);
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
@@ -19816,6 +19832,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 BlendMode GetBlendMode() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
@@ -19851,6 +19868,7 @@ Scene GetScene() const;
 float GetShadowDistance() const;
 uint GetShadowMask() const;
 float GetSortValue() const;
+Array<SourceBatch2D> GetSourceBatches();
 Sprite2D GetSprite() const;
 ResourceRef GetSpriteAttr() const;
 Object GetSubsystem(StringHash) const;
@@ -21963,8 +21981,8 @@ void AddCommand(const RenderPathCommand&);
 void AddRenderTarget(const RenderTargetInfo&);
 bool Append(XMLFile);
 RenderPath Clone();
-uint GetNumCommands() const;
-uint GetNumRenderTargets() const;
+int GetNumCommands() const;
+int GetNumRenderTargets() const;
 void InsertCommand(uint, const RenderPathCommand&);
 bool IsAdded(const String&) const;
 bool IsEnabled(const String&) const;
@@ -21992,9 +22010,9 @@ Array<RenderPathCommand> commands;
 /* readonly */
 Array<bool> enabled;
 /* readonly */
-uint numCommands;
+int numCommands;
 /* readonly */
-uint numRenderTargets;
+int numRenderTargets;
 /* readonly */
 int refs;
 Array<RenderTargetInfo> renderTargets;
@@ -22010,19 +22028,19 @@ public:
 RenderPathCommand();
 // Methods:
 RenderPathCommand&  operator=(const RenderPathCommand&);
-uint GetNumOutputs() const;
-CubeMapFace GetOutputFace(uint) const;
+int GetNumOutputs() const;
+CubeMapFace GetOutputFace(int) const;
 void Load(const XMLElement&);
 void RemoveShaderParameter(const String&);
 void SetDepthStencilName(const String&);
-void SetNumOutputs(uint);
-void SetOutput(uint, const String&, CubeMapFace = FACE_POSITIVE_X);
-void SetOutputFace(uint, CubeMapFace);
-void SetOutputName(uint, const String&);
+void SetNumOutputs(int);
+void SetOutput(int, const String&, CubeMapFace = FACE_POSITIVE_X);
+void SetOutputFace(int, CubeMapFace);
+void SetOutputName(int, const String&);
 void SetShaderParameter(const String&, const Variant&);
 void SetTextureName(TextureUnit, const String&);
 const String& GetDepthStencilName() const;
-const String& GetOutputName(uint) const;
+const String& GetOutputName(int) const;
 const String& GetTextureName(TextureUnit) const;
 const Variant& GetShaderParameter(const String&) const;
 
@@ -22038,7 +22056,7 @@ bool enabled;
 String eventName;
 bool markToStencil;
 String metadata;
-uint numOutputs;
+int numOutputs;
 Array<CubeMapFace> outputFaces;
 Array<String> outputNames;
 String pass;
@@ -22367,6 +22385,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -22987,6 +23006,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -23662,7 +23682,7 @@ public:
 Scene();
 Scene(const String&in);
 // Methods:
-void AddChild(Node, int = NINDEX);
+void AddChild(Node, int = ENDPOS);
 void AddComponent(Component, uint, CreateMode);
 void AddListener(Component);
 void AddRequiredPackageFile(PackageFile);
@@ -26026,6 +26046,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -27596,6 +27617,7 @@ public:
 ~Spline();
 Spline();
 Spline(InterpolationMode);
+Spline(Variant[]@, InterpolationMode = BEZIER_CURVE);
 Spline(const Spline&in);
 Spline(Variant[]@, InterpolationMode = BEZIER_CURVE);
 // Methods:
@@ -27611,6 +27633,7 @@ void RemoveKnot();
 void RemoveKnot(uint);
 void SetInterpolationMode(InterpolationMode);
 void SetKnot(const Variant&, uint);
+void SetKnots(Array<Variant>);
 
 // Properties:
 InterpolationMode interpolationMode;
@@ -28427,6 +28450,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -28684,6 +28708,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -28935,6 +28960,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 BlendMode GetBlendMode() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
@@ -28971,6 +28997,7 @@ Scene GetScene() const;
 float GetShadowDistance() const;
 uint GetShadowMask() const;
 float GetSortValue() const;
+Array<SourceBatch2D> GetSourceBatches();
 Sprite2D GetSprite() const;
 ResourceRef GetSpriteAttr() const;
 Object GetSubsystem(StringHash) const;
@@ -29224,6 +29251,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 BlendMode GetBlendMode() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
@@ -29260,6 +29288,7 @@ Scene GetScene() const;
 float GetShadowDistance() const;
 uint GetShadowMask() const;
 float GetSortValue() const;
+Array<SourceBatch2D> GetSourceBatches();
 Sprite2D GetSprite() const;
 ResourceRef GetSpriteAttr() const;
 Object GetSubsystem(StringHash) const;
@@ -30022,6 +30051,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -30746,6 +30776,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Vector2 GetCharPosition(int);
@@ -34527,6 +34558,7 @@ float GetEndTime() const;
 VariantMap& GetEventDataMap() const;
 Object GetEventSender() const;
 InterpMethod GetInterpolationMethod() const;
+Array<VAnimKeyFrame> GetKeyFrames() const;
 uint GetMemoryUse() const;
 StringHash GetNameHash() const;
 float GetSplineTension() const;
@@ -35262,6 +35294,7 @@ VariantMap& GetEventDataMap() const;
 Object GetEventSender() const;
 Array<Drawable> GetGeometries() const;
 Graphics GetGraphics() const;
+Array<LightBatchQueue> GetLightQueues() const;
 Array<Light> GetLights() const;
 uint GetNumActiveOccluders() const;
 Array<Drawable> GetOccluders() const;
@@ -36761,6 +36794,7 @@ float GetAttributeAnimationTime(const String&) const;
 WrapMode GetAttributeAnimationWrapMode(const String&) const;
 Variant GetAttributeDefault(const String&) const;
 Variant GetAttributeDefault(uint) const;
+Array<SourceBatch> GetBatches() const;
 bool GetBlockEvents() const;
 bool GetCastShadows() const;
 Component GetComponent(StringHash) const;
@@ -38273,6 +38307,7 @@ uint DRAWABLE_GEOMETRY2D;
 uint DRAWABLE_LIGHT;
 uint DRAWABLE_UNDEFINED;
 uint DRAWABLE_ZONE;
+int ENDPOS;
 String EP_AUTOLOAD_PATHS;
 String EP_BORDERLESS;
 String EP_DIRECT3D11;

+ 55 - 21
Docs/ScriptAPI.dox

@@ -3439,6 +3439,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -3466,6 +3467,7 @@ Methods:
 - float GetMorphWeight(StringHash) const
 - float GetMorphWeight(const String&) const
 - float GetMorphWeight(uint) const
+- ModelMorph[]@ GetMorphs() const
 - Node@ GetNode() const
 - uint GetNumAnimationStates() const
 - uint GetNumAttributes() const
@@ -3697,6 +3699,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - BlendMode GetBlendMode() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
@@ -3734,6 +3737,7 @@ Methods:
 - float GetShadowDistance() const
 - uint GetShadowMask() const
 - float GetSortValue() const
+- SourceBatch2D[]@ GetSourceBatches()
 - float GetSpeed() const
 - Sprite2D@ GetSprite() const
 - ResourceRef GetSpriteAttr() const
@@ -3967,6 +3971,7 @@ Methods:
 - AnimationTrack@ GetTrack(StringHash)
 - AnimationTrack@ GetTrack(const String&)
 - AnimationTrack@ GetTrack(uint)
+- AnimationTriggerPoint[]@ GetTriggers() const
 - StringHash GetType() const
 - uint GetUseTimer()
 - bool HasEventHandlers() const
@@ -4817,6 +4822,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - Billboard@ GetBillboard(uint)
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
@@ -11311,6 +11317,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -11933,6 +11940,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -12336,6 +12344,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -12568,6 +12577,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -12599,6 +12609,7 @@ Methods:
 - float GetShadowDistance() const
 - uint GetShadowMask() const
 - float GetSortValue() const
+- SourceBatch2D[]@ GetSourceBatches()
 - Object@ GetSubsystem(StringHash) const
 - StringHash GetType() const
 - UpdateGeometryType GetUpdateGeometryType()
@@ -14194,7 +14205,7 @@ Properties:
 - float height
 - float offsetX
 - float offsetY
-- uint page
+- int page
 - int16 texHeight
 - int16 texWidth
 - bool used
@@ -15913,6 +15924,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - float GetBrightness() const
 - bool GetCastShadows() const
@@ -16245,7 +16257,7 @@ Methods:
 - IntRect GetCombinedScreenRect()
 - BorderImage@ GetCursor() const
 - float GetCursorBlinkRate() const
-- uint GetCursorPosition() const
+- int GetCursorPosition() const
 - XMLFile@ GetDefaultStyle(bool = true) const
 - float GetDerivedOpacity() const
 - uint GetDragButtonCombo() const
@@ -16270,7 +16282,7 @@ Methods:
 - Material@ GetMaterial() const
 - ResourceRef GetMaterialAttr() const
 - int GetMaxHeight() const
-- uint GetMaxLength() const
+- int GetMaxLength() const
 - int GetMaxWidth() const
 - int GetMinHeight() const
 - int GetMinWidth() const
@@ -16419,7 +16431,7 @@ Methods:
 - void SetColor(const Color&)
 - void SetCursorBlinkRate(float)
 - void SetCursorMovable(bool)
-- void SetCursorPosition(uint)
+- void SetCursorPosition(int)
 - void SetDeepEnabled(bool)
 - void SetDefaultStyle(XMLFile@)
 - void SetDisabledOffset(const IntVector2&)
@@ -16461,7 +16473,7 @@ Methods:
 - void SetMaxAnchor(const Vector2&)
 - void SetMaxAnchor(float, float)
 - void SetMaxHeight(int)
-- void SetMaxLength(uint)
+- void SetMaxLength(int)
 - void SetMaxOffset(const IntVector2&)
 - void SetMaxSize(const IntVector2&)
 - void SetMaxSize(int, int)
@@ -16560,7 +16572,7 @@ Properties:
 - BorderImage@ cursor // readonly
 - float cursorBlinkRate
 - bool cursorMovable
-- uint cursorPosition
+- int cursorPosition
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
 - IntVector2 disabledOffset
@@ -16597,7 +16609,7 @@ Properties:
 - Material@ material
 - Vector2 maxAnchor
 - int maxHeight
-- uint maxLength
+- int maxLength
 - IntVector2 maxOffset
 - IntVector2 maxSize
 - int maxWidth
@@ -17462,6 +17474,7 @@ Methods:
 - bool GetSpecular() const
 - Object@ GetSubsystem(StringHash) const
 - Technique@ GetTechnique(uint) const
+- TechniqueEntry[]@ GetTechniques() const
 - Texture@ GetTexture(TextureUnit) const
 - StringHash GetType() const
 - uint GetUseTimer()
@@ -18292,6 +18305,7 @@ Methods:
 - uint GetMemoryUse() const
 - uint GetMorphRangeCount(uint) const
 - uint GetMorphRangeStart(uint) const
+- ModelMorph[]@ GetMorphs() const
 - StringHash GetNameHash() const
 - uint GetNumGeometries() const
 - uint GetNumGeometryLodLevels(uint) const
@@ -18335,6 +18349,7 @@ Methods:
 - void SetGlobalVar(StringHash, const Variant&)
 - bool SetIndexBuffers(IndexBuffer@[]@)
 - void SetMemoryUse(uint)
+- void SetMorphs(ModelMorph[]@)
 - void SetName(const String&)
 - void SetNumGeometries(uint)
 - bool SetNumGeometryLodLevels(uint, uint)
@@ -19331,7 +19346,7 @@ Properties:
 
 Methods:
 
-- void AddChild(Node@, int = NINDEX)
+- void AddChild(Node@, int = ENDPOS)
 - void AddComponent(Component@, uint, CreateMode)
 - void AddListener(Component@)
 - void AddTag(const String&)
@@ -21205,6 +21220,7 @@ Methods:
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
 - AutoRemoveMode GetAutoRemoveMode() const
+- SourceBatch[]@ GetBatches() const
 - Billboard@ GetBillboard(uint)
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
@@ -21456,6 +21472,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - BlendMode GetBlendMode() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
@@ -21491,6 +21508,7 @@ Methods:
 - float GetShadowDistance() const
 - uint GetShadowMask() const
 - float GetSortValue() const
+- SourceBatch2D[]@ GetSourceBatches()
 - Sprite2D@ GetSprite() const
 - ResourceRef GetSpriteAttr() const
 - Object@ GetSubsystem(StringHash) const
@@ -23477,8 +23495,8 @@ Methods:
 - void AddRenderTarget(const RenderTargetInfo&)
 - bool Append(XMLFile@)
 - RenderPath@ Clone()
-- uint GetNumCommands() const
-- uint GetNumRenderTargets() const
+- int GetNumCommands() const
+- int GetNumRenderTargets() const
 - void InsertCommand(uint, const RenderPathCommand&)
 - bool IsAdded(const String&) const
 - bool IsEnabled(const String&) const
@@ -23504,8 +23522,8 @@ Properties:
 - bool[] added // readonly
 - RenderPathCommand[] commands
 - bool[] enabled // readonly
-- uint numCommands // readonly
-- uint numRenderTargets // readonly
+- int numCommands // readonly
+- int numRenderTargets // readonly
 - int refs // readonly
 - RenderTargetInfo[] renderTargets
 - Variant[] shaderParameters
@@ -23518,19 +23536,19 @@ Properties:
 Methods:
 
 - RenderPathCommand&  operator=(const RenderPathCommand&)
-- uint GetNumOutputs() const
-- CubeMapFace GetOutputFace(uint) const
+- int GetNumOutputs() const
+- CubeMapFace GetOutputFace(int) const
 - void Load(const XMLElement&)
 - void RemoveShaderParameter(const String&)
 - void SetDepthStencilName(const String&)
-- void SetNumOutputs(uint)
-- void SetOutput(uint, const String&, CubeMapFace = FACE_POSITIVE_X)
-- void SetOutputFace(uint, CubeMapFace)
-- void SetOutputName(uint, const String&)
+- void SetNumOutputs(int)
+- void SetOutput(int, const String&, CubeMapFace = FACE_POSITIVE_X)
+- void SetOutputFace(int, CubeMapFace)
+- void SetOutputName(int, const String&)
 - void SetShaderParameter(const String&, const Variant&)
 - void SetTextureName(TextureUnit, const String&)
 - const String& GetDepthStencilName() const
-- const String& GetOutputName(uint) const
+- const String& GetOutputName(int) const
 - const String& GetTextureName(TextureUnit) const
 - const Variant& GetShaderParameter(const String&) const
 
@@ -23547,7 +23565,7 @@ Properties:
 - String eventName
 - bool markToStencil
 - String metadata
-- uint numOutputs
+- int numOutputs
 - CubeMapFace[] outputFaces
 - String[] outputNames
 - String pass
@@ -23854,6 +23872,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -24424,6 +24443,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -25055,7 +25075,7 @@ Properties:
 
 Methods:
 
-- void AddChild(Node@, int = NINDEX)
+- void AddChild(Node@, int = ENDPOS)
 - void AddComponent(Component@, uint, CreateMode)
 - void AddListener(Component@)
 - void AddRequiredPackageFile(PackageFile@)
@@ -27260,6 +27280,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -28718,6 +28739,7 @@ Methods:
 - void RemoveKnot(uint)
 - void SetInterpolationMode(InterpolationMode)
 - void SetKnot(const Variant&, uint)
+- void SetKnots(Variant[]@)
 
 Properties:
 
@@ -29478,6 +29500,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -29718,6 +29741,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -29950,6 +29974,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - BlendMode GetBlendMode() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
@@ -29986,6 +30011,7 @@ Methods:
 - float GetShadowDistance() const
 - uint GetShadowMask() const
 - float GetSortValue() const
+- SourceBatch2D[]@ GetSourceBatches()
 - Sprite2D@ GetSprite() const
 - ResourceRef GetSpriteAttr() const
 - Object@ GetSubsystem(StringHash) const
@@ -30222,6 +30248,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - BlendMode GetBlendMode() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
@@ -30258,6 +30285,7 @@ Methods:
 - float GetShadowDistance() const
 - uint GetShadowMask() const
 - float GetSortValue() const
+- SourceBatch2D[]@ GetSourceBatches()
 - Sprite2D@ GetSprite() const
 - ResourceRef GetSpriteAttr() const
 - Object@ GetSubsystem(StringHash) const
@@ -30960,6 +30988,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -31630,6 +31659,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Vector2 GetCharPosition(int)
@@ -35080,6 +35110,7 @@ Methods:
 - VariantMap& GetEventDataMap() const
 - Object@ GetEventSender() const
 - InterpMethod GetInterpolationMethod() const
+- VAnimKeyFrame[]@ GetKeyFrames() const
 - uint GetMemoryUse() const
 - StringHash GetNameHash() const
 - float GetSplineTension() const
@@ -35732,6 +35763,7 @@ Methods:
 - Object@ GetEventSender() const
 - Drawable@[]@ GetGeometries() const
 - Graphics@ GetGraphics() const
+- LightBatchQueue[]@ GetLightQueues() const
 - Light@[]@ GetLights() const
 - uint GetNumActiveOccluders() const
 - Drawable@[]@ GetOccluders() const
@@ -37126,6 +37158,7 @@ Methods:
 - WrapMode GetAttributeAnimationWrapMode(const String&) const
 - Variant GetAttributeDefault(const String&) const
 - Variant GetAttributeDefault(uint) const
+- SourceBatch[]@ GetBatches() const
 - bool GetBlockEvents() const
 - bool GetCastShadows() const
 - Component@ GetComponent(StringHash) const
@@ -38616,6 +38649,7 @@ Properties:
 - uint DRAWABLE_LIGHT
 - uint DRAWABLE_UNDEFINED
 - uint DRAWABLE_ZONE
+- int ENDPOS
 - String EP_AUTOLOAD_PATHS
 - String EP_BORDERLESS
 - String EP_DIRECT3D11

+ 37 - 35
Source/Urho3D/AngelScript/ScriptAPIDump.cpp

@@ -196,10 +196,10 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
 
         /// \hack Rename any Events2D to 2DEvents to work with the event category creation correctly (currently PhysicsEvents2D)
         Vector<HeaderFile> headerFiles;
-        for (unsigned i = 0; i < headerFileNames.Size(); ++i)
+        for (const String& headerFileName : headerFileNames)
         {
             HeaderFile entry;
-            entry.fileName = headerFileNames[i];
+            entry.fileName = headerFileName;
             entry.sectionName = GetFileNameAndExtension(entry.fileName).Replaced("Events2D", "2DEvents");
             if (entry.sectionName.EndsWith("Events.h"))
                 headerFiles.Push(entry);
@@ -210,13 +210,13 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
             Log::WriteRaw("\n\\page EventList Event list\n");
             Sort(headerFiles.Begin(), headerFiles.End(), CompareHeaderFiles);
 
-            for (unsigned i = 0; i < headerFiles.Size(); ++i)
+            for (const HeaderFile& headerFile : headerFiles)
             {
-                SharedPtr<File> file(new File(context_, path + headerFiles[i].fileName, FILE_READ));
+                SharedPtr<File> file(new File(context_, path + headerFile.fileName, FILE_READ));
                 if (!file->IsOpen())
                     continue;
 
-                const String& sectionName = headerFiles[i].sectionName;
+                const String& sectionName = headerFile.sectionName;
                 i32 start = sectionName.Find('/') + 1;
                 i32 end = sectionName.Find("Events.h");
                 Log::WriteRaw("\n## %" + sectionName.Substring(start, end - start) + " events\n");
@@ -257,38 +257,40 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
 
         Sort(objectTypes.Begin(), objectTypes.End());
 
-        for (unsigned i = 0; i < objectTypes.Size(); ++i)
+        for (const String& objectType : objectTypes)
         {
-            const Vector<AttributeInfo>& attrs = attributes.Find(objectTypes[i])->second_;
-            unsigned usableAttrs = 0;
-            for (unsigned j = 0; j < attrs.Size(); ++j)
+            const Vector<AttributeInfo>& attrs = attributes.Find(objectType)->second_;
+            bool hasEditableAttr = false;
+            for (const AttributeInfo& attr : attrs)
             {
                 // Attributes that are not shown in the editor are typically internal and not usable for eg. attribute
                 // animation
-                if (attrs[j].mode_ & AM_NOEDIT)
-                    continue;
-                ++usableAttrs;
+                if (!(attr.mode_ & AM_NOEDIT))
+                {
+                    hasEditableAttr = true;
+                    break;
+                }
             }
 
-            if (!usableAttrs)
+            if (!hasEditableAttr)
                 continue;
 
-            Log::WriteRaw("\n### " + objectTypes[i] + "\n");
+            Log::WriteRaw("\n### " + objectType + "\n");
 
-            for (unsigned j = 0; j < attrs.Size(); ++j)
+            for (const AttributeInfo& attr : attrs)
             {
-                if (attrs[j].mode_ & AM_NOEDIT)
+                if (attr.mode_ & AM_NOEDIT)
                     continue;
                 // Prepend each word in the attribute name with % to prevent unintended links
-                Vector<String> nameParts = attrs[j].name_.Split(' ');
-                for (unsigned k = 0; k < nameParts.Size(); ++k)
+                Vector<String> nameParts = attr.name_.Split(' ');
+                for (String& namePart : nameParts)
                 {
-                    if (nameParts[k].Length() > 1 && IsAlpha((unsigned)nameParts[k][0]))
-                        nameParts[k] = "%" + nameParts[k];
+                    if (namePart.Length() > 1 && IsAlpha((unsigned)namePart[0]))
+                        namePart = "%" + namePart;
                 }
                 String name;
                 name.Join(nameParts, " ");
-                String type = Variant::GetTypeName(attrs[j].type_);
+                String type = Variant::GetTypeName(attr.type_);
                 // Variant typenames are all uppercase. Convert primitive types to the proper lowercase form for the documentation
                 if (type == "Int" || type == "Bool" || type == "Float")
                     type[0] = (char)ToLower((unsigned)type[0]);
@@ -515,8 +517,8 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
                     Log::WriteRaw("\nMethods:\n\n");
                 else if (mode == C_HEADER)
                     Log::WriteRaw("// Methods:\n");
-                for (unsigned j = 0; j < methodDeclarations.Size(); ++j)
-                    OutputAPIRow(mode, methodDeclarations[j]);
+                for (const String& methodDeclaration : methodDeclarations)
+                    OutputAPIRow(mode, methodDeclaration);
             }
 
             if (!propertyInfos.Empty())
@@ -525,13 +527,13 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
                     Log::WriteRaw("\nProperties:\n\n");
                 else if (mode == C_HEADER)
                     Log::WriteRaw("\n// Properties:\n");
-                for (unsigned j = 0; j < propertyInfos.Size(); ++j)
+                for (const PropertyInfo& propertyInfo : propertyInfos)
                 {
                     String remark;
                     String cppdoc;
-                    if (!propertyInfos[j].write_)
+                    if (!propertyInfo.write_)
                         remark = "readonly";
-                    else if (!propertyInfos[j].read_)
+                    else if (!propertyInfo.read_)
                         remark = "writeonly";
                     if (!remark.Empty())
                     {
@@ -546,7 +548,7 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
                         }
                     }
 
-                    OutputAPIRow(mode, cppdoc + propertyInfos[j].type_ + " " + propertyInfos[j].name_ + remark);
+                    OutputAPIRow(mode, cppdoc + propertyInfo.type_ + " " + propertyInfo.name_ + remark);
                 }
             }
 
@@ -566,8 +568,8 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
                 }
 
                 const Vector<String>& constants = gcIt->second_;
-                for (unsigned j = 0; j < constants.Size(); ++j)
-                    OutputAPIRow(mode, prefix + constants[j]);
+                for (const String& constant : constants)
+                    OutputAPIRow(mode, prefix + constant);
             }
 
 
@@ -639,16 +641,16 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
     else if (mode == C_HEADER)
         Log::WriteRaw("\n// Global functions\n");
 
-    for (unsigned i = 0; i < globalFunctions.Size(); ++i)
-        OutputAPIRow(mode, globalFunctions[i]);
+    for (const String& globalFunction : globalFunctions)
+        OutputAPIRow(mode, globalFunction);
 
     if (mode == DOXYGEN)
         Log::WriteRaw("\\section ScriptAPI_GlobalProperties Global properties\n");
     else if (mode == C_HEADER)
         Log::WriteRaw("\n// Global properties\n");
 
-    for (unsigned i = 0; i < globalPropertyInfos.Size(); ++i)
-        OutputAPIRow(mode, globalPropertyInfos[i].type_ + " " + globalPropertyInfos[i].name_, true);
+    for (const PropertyInfo& globalPropertyInfo : globalPropertyInfos)
+        OutputAPIRow(mode, globalPropertyInfo.type_ + " " + globalPropertyInfo.name_, true);
 
     if (mode == DOXYGEN)
         Log::WriteRaw("\\section ScriptAPI_GlobalConstants Global constants\n");
@@ -656,8 +658,8 @@ void Script::DumpAPI(DumpMode mode, const String& sourceTree)
         Log::WriteRaw("\n// Global constants\n");
 
     const Vector<String>& noNameSpaceConstants = globalConstants[String()];
-    for (unsigned i = 0; i < noNameSpaceConstants.Size(); ++i)
-        OutputAPIRow(mode, noNameSpaceConstants[i], true);
+    for (const String& noNameSpaceConstant : noNameSpaceConstants)
+        OutputAPIRow(mode, noNameSpaceConstant, true);
 
     if (mode == DOXYGEN)
         Log::WriteRaw("*/\n\n}\n");