Explorar el Código

Travis CI: API documentation update at 2014-11-07 18:14:07 UTC.
[ci package]

urho3d-travis-ci hace 11 años
padre
commit
a9e4e31ca3
Se han modificado 4 ficheros con 129 adiciones y 10 borrados
  1. 71 2
      Docs/AngelScriptAPI.h
  2. 9 6
      Docs/LuaScriptAPI.dox
  3. 48 1
      Docs/ScriptAPI.dox
  4. 1 1
      Source/Engine/.soversion

+ 71 - 2
Docs/AngelScriptAPI.h

@@ -778,6 +778,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -998,6 +1002,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -1291,6 +1299,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -3081,6 +3093,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -3807,6 +3823,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -4892,6 +4912,10 @@ uint cursorPosition;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 uint echoCharacter;
 bool editable;
@@ -5097,6 +5121,10 @@ UIElement contentElement;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -5489,6 +5517,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -7809,6 +7841,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 /* readonly */
@@ -7994,6 +8030,10 @@ UIElement contentElement;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -8356,6 +8396,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -8958,6 +9002,10 @@ Array<Color> colors;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 bool elementEventSender;
 int height;
 HorizontalAlignment horizontalAlignment;
@@ -9719,6 +9767,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 Color effectColor;
@@ -10539,6 +10591,10 @@ XMLFile defaultStyle;
 float delay;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -10630,6 +10686,7 @@ void DebugDraw(UIElement);
 UIElement GetElementAt(const IntVector2&, bool = true);
 UIElement GetElementAt(int, int, bool = true);
 bool HasModalElement() const;
+bool IsDragging() const;
 UIElement LoadLayout(File);
 UIElement LoadLayout(File, XMLFile);
 UIElement LoadLayout(VectorBuffer&);
@@ -10640,6 +10697,7 @@ bool SaveLayout(File, UIElement);
 bool SaveLayout(VectorBuffer&, UIElement);
 void SendEvent(const String&, VariantMap& = VariantMap ( ));
 void SetFocusElement(UIElement, bool = false);
+const Array<UIElement> GetDragElements();
 
 // Properties:
 /* readonly */
@@ -10654,8 +10712,6 @@ float defaultToolTipDelay;
 float doubleClickInterval;
 int dragBeginDistance;
 float dragBeginInterval;
-/* readonly */
-UIElement dragElement;
 UIElement focusElement;
 bool forceAutoHint;
 /* readonly */
@@ -10778,6 +10834,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -11196,6 +11256,10 @@ XMLFile defaultStyle;
 Texture2D depthTexture;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -11425,6 +11489,10 @@ IntRect combinedScreenRect;
 XMLFile defaultStyle;
 /* readonly */
 float derivedOpacity;
+/* readonly */
+uint dragButtonCombo;
+/* readonly */
+int dragButtonCount;
 uint dragDropMode;
 bool editable;
 bool elementEventSender;
@@ -12195,6 +12263,7 @@ int Clamp(int, int, int);
 void ClearDelayedExecute(const String& = String ( ));
 VectorBuffer CompressVectorBuffer(VectorBuffer&);
 float Cos(float);
+uint CountSetBits(uint);
 VectorBuffer DecompressVectorBuffer(VectorBuffer&);
 void DelayedExecute(float, bool, const String&);
 void DelayedExecute(float, bool, const String&, const Array<Variant>);

+ 9 - 6
Docs/LuaScriptAPI.dox

@@ -5750,7 +5750,7 @@ Methods:
 - UIElement* GetElementAt(int x, int y, bool enabledOnly = true)
 - UIElement* GetFocusElement() const
 - UIElement* GetFrontElement() const
-- UIElement* GetDragElement() const
+- UIElement* GetDragElement(unsigned index)
 - const String GetClipboardText() const
 - float GetDoubleClickInterval() const
 - float GetDragBeginInterval() const
@@ -5763,6 +5763,7 @@ Methods:
 - bool GetUseMutableGlyphs() const
 - bool GetForceAutoHint() const
 - bool HasModalElement() const
+- bool IsDragging() const
 
 Properties:
 
@@ -5772,7 +5773,6 @@ Properties:
 - IntVector2 cursorPosition (readonly)
 - UIElement* focusElement (readonly)
 - UIElement* frontElement (readonly)
-- UIElement* dragElement (readonly)
 - String clipboardText
 - float doubleClickInterval
 - float dragBeginInterval
@@ -5914,6 +5914,8 @@ Methods:
 - int GetLayoutSpacing() const
 - const IntRect& GetLayoutBorder() const
 - unsigned GetNumChildren(bool recursive = false) const
+- int GetDragButtonCombo() const
+- unsigned GetDragButtonCount() const
 - UIElement* GetChild(const String name, bool recursive = false) const
 - UIElement* GetChild(unsigned index) const
 - UIElement* GetParent() const
@@ -7177,6 +7179,7 @@ Properties:
 - int ClampInt(int value, int min, int max)
 - VectorBuffer CompressVectorBuffer(VectorBuffer& src)
 - float Cos(float angle)
+- unsigned CountSetBits(unsigned value)
 - VectorBuffer DecompressVectorBuffer(VectorBuffer& src)
 - bool Equals(float lhs, float rhs)
 - void ErrorDialog(const String title, const String message)
@@ -7226,11 +7229,11 @@ Properties:
 - void PrintLine(const String str, bool error = false)
 - int Rand()
 - float RandStandardNormal()
-- float Random(float range)
 - float Random(float min, float max)
+- float Random(float range)
 - float Random()
-- int RandomInt(int min, int max)
 - int RandomInt(int range)
+- int RandomInt(int min, int max)
 - float RandomNormal(float meanValue, float variance)
 - String RemoveTrailingSlash(const String pathName)
 - String ReplaceExtension(const String fullPath, const String newExtension)
@@ -7241,8 +7244,8 @@ Properties:
 - float Sign(float value)
 - float Sin(float angle)
 - float SmoothStep(float lhs, float rhs, float t)
-- void SubscribeToEvent(void* sender, const String eventName, const String functionName)
 - void SubscribeToEvent(const String eventName, const String functionName)
+- void SubscribeToEvent(void* sender, const String eventName, const String functionName)
 - float Tan(float angle)
 - bool ToBool(const String source)
 - Color ToColor(const String source)
@@ -7264,8 +7267,8 @@ Properties:
 - Vector3 ToVector3(const String source)
 - Vector4 ToVector4(const String source, bool allowMissingCoords = false)
 - void UnsubscribeFromAllEvents()
-- void UnsubscribeFromEvent(void* sender, const String eventName, const String functionName = String::EMPTY)
 - void UnsubscribeFromEvent(const String eventName, const String functionName = String::EMPTY)
+- void UnsubscribeFromEvent(void* sender, const String eventName, const String functionName = String::EMPTY)
 - void UnsubscribeFromEvents(void* sender)
 
 

+ 48 - 1
Docs/ScriptAPI.dox

@@ -521,6 +521,7 @@ namespace Urho3D
 ### TextFinished
 - %Element : UIElement pointer
 - %Text : String
+- %Value : Float
 
 ### MenuSelected
 - %Element : UIElement pointer
@@ -592,13 +593,19 @@ namespace Urho3D
 - %Y : int
 - %ElementX : int
 - %ElementY : int
+- %Buttons : int
+- %NumButtons : int
 
 ### DragMove
 - %Element : UIElement pointer
 - %X : int
 - %Y : int
+- %DX : int
+- %DY : int
 - %ElementX : int
 - %ElementY : int
+- %Buttons : int
+- %NumButtons : int
 
 ### DragEnd
 - %Element : UIElement pointer
@@ -606,6 +613,8 @@ namespace Urho3D
 - %Y : int
 - %ElementX : int
 - %ElementY : int
+- %Buttons : int
+- %NumButtons : int
 
 ### DragCancel
 - %Element : UIElement pointer
@@ -613,6 +622,8 @@ namespace Urho3D
 - %Y : int
 - %ElementX : int
 - %ElementY : int
+- %Buttons : int
+- %NumButtons : int
 
 ### UIDropFile
 - %FileName : String
@@ -2848,6 +2859,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -3045,6 +3058,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -3300,6 +3315,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -4828,6 +4845,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -5458,6 +5477,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -6375,6 +6396,8 @@ Properties:
 - uint cursorPosition
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - uint echoCharacter
 - bool editable
@@ -6555,6 +6578,8 @@ Properties:
 - UIElement@ contentElement // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -6910,6 +6935,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -8946,6 +8973,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - float effectiveScrollStep // readonly
@@ -9105,6 +9134,8 @@ Properties:
 - UIElement@ contentElement
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -9422,6 +9453,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -9942,6 +9975,8 @@ Properties:
 - Color[] colors
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - bool elementEventSender
 - int height
 - HorizontalAlignment horizontalAlignment
@@ -10601,6 +10636,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - Color effectColor
@@ -11263,6 +11300,8 @@ Properties:
 - XMLFile@ defaultStyle
 - float delay
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -11340,6 +11379,7 @@ Methods:
 - UIElement@ GetElementAt(const IntVector2&, bool = true)
 - UIElement@ GetElementAt(int, int, bool = true)
 - bool HasModalElement() const
+- bool IsDragging() const
 - UIElement@ LoadLayout(File@)
 - UIElement@ LoadLayout(File@, XMLFile@)
 - UIElement@ LoadLayout(VectorBuffer&)
@@ -11350,6 +11390,7 @@ Methods:
 - bool SaveLayout(VectorBuffer&, UIElement@)
 - void SendEvent(const String&, VariantMap& = VariantMap ( ))
 - void SetFocusElement(UIElement@, bool = false)
+- const UIElement@[]@ GetDragElements()
 
 Properties:
 
@@ -11362,7 +11403,6 @@ Properties:
 - float doubleClickInterval
 - int dragBeginDistance
 - float dragBeginInterval
-- UIElement@ dragElement // readonly
 - UIElement@ focusElement
 - bool forceAutoHint
 - UIElement@ frontElement // readonly
@@ -11471,6 +11511,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -11858,6 +11900,8 @@ Properties:
 - XMLFile@ defaultStyle
 - Texture2D@ depthTexture // readonly
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -12058,6 +12102,8 @@ Properties:
 - IntRect combinedScreenRect // readonly
 - XMLFile@ defaultStyle
 - float derivedOpacity // readonly
+- uint dragButtonCombo // readonly
+- int dragButtonCount // readonly
 - uint dragDropMode
 - bool editable
 - bool elementEventSender
@@ -12787,6 +12833,7 @@ Properties:
 - void ClearDelayedExecute(const String& = String ( ))
 - VectorBuffer CompressVectorBuffer(VectorBuffer&)
 - float Cos(float)
+- uint CountSetBits(uint)
 - VectorBuffer DecompressVectorBuffer(VectorBuffer&)
 - void DelayedExecute(float, bool, const String&)
 - void DelayedExecute(float, bool, const String&, const Variant[]@)

+ 1 - 1
Source/Engine/.soversion

@@ -1 +1 @@
-0.0.37
+0.0.38