Browse Source

Travis CI: API documentation update at 2014-12-13 16:35:32 UTC.
[ci package]

urho3d-travis-ci 11 years ago
parent
commit
4d399f9637
4 changed files with 54 additions and 44 deletions
  1. 16 12
      Docs/AngelScriptAPI.h
  2. 19 17
      Docs/LuaScriptAPI.dox
  3. 18 14
      Docs/ScriptAPI.dox
  4. 1 1
      Source/Engine/.soversion

+ 16 - 12
Docs/AngelScriptAPI.h

@@ -521,6 +521,7 @@ VariantType type;
 class Audio
 {
 // Methods:
+bool HasMasterGain(const String&) const;
 bool Play();
 void SendEvent(const String&, VariantMap& = VariantMap ( ));
 void SetMode(int, int, bool, bool = true);
@@ -3002,6 +3003,7 @@ void ApplyAttributes();
 void BringToFront();
 UIElement CreateChild(const String&, const String& = String ( ), uint = M_MAX_UNSIGNED);
 void DefineShape(CursorShape, Texture, const IntRect&, const IntVector2&);
+void DefineShape(const String&, Texture, const IntRect&, const IntVector2&);
 void DisableLayoutUpdate();
 IntVector2 ElementToScreen(const IntVector2&);
 void EnableLayoutUpdate();
@@ -3060,6 +3062,8 @@ void SetMaxSize(int, int);
 void SetMinSize(int, int);
 void SetParent(UIElement, uint = M_MAX_UNSIGNED);
 void SetPosition(int, int);
+void SetShape(CursorShape);
+void SetShape(const String&);
 void SetSize(int, int);
 bool SetStyle(const String&, XMLFile = null);
 bool SetStyle(const XMLElement&);
@@ -3157,7 +3161,7 @@ UIElement root;
 /* readonly */
 IntVector2 screenPosition;
 bool selected;
-CursorShape shape;
+String shape;
 IntVector2 size;
 bool sortChildren;
 String style;
@@ -8744,7 +8748,7 @@ bool playing;
 int refs;
 /* readonly */
 Sound sound;
-SoundType soundType;
+String soundType;
 bool temporary;
 /* readonly */
 float timePosition;
@@ -8827,7 +8831,7 @@ int refs;
 float rolloffFactor;
 /* readonly */
 Sound sound;
-SoundType soundType;
+String soundType;
 bool temporary;
 /* readonly */
 float timePosition;
@@ -11949,13 +11953,17 @@ CULL_CW,
 enum CursorShape
 {
 CS_NORMAL,
+CS_IBEAM,
+CS_CROSS,
 CS_RESIZEVERTICAL,
 CS_RESIZEDIAGONAL_TOPRIGHT,
 CS_RESIZEHORIZONTAL,
 CS_RESIZEDIAGONAL_TOPLEFT,
+CS_RESIZE_ALL,
 CS_ACCEPTDROP,
 CS_REJECTDROP,
 CS_BUSY,
+CS_BUSY_ARROW,
 };
 
 enum DumpMode
@@ -12169,15 +12177,6 @@ SHAPE_CONVEXHULL,
 SHAPE_TERRAIN,
 };
 
-enum SoundType
-{
-SOUND_EFFECT,
-SOUND_AMBIENT,
-SOUND_VOICE,
-SOUND_MUSIC,
-SOUND_MASTER,
-};
-
 enum TextEffect
 {
 TE_NONE,
@@ -12895,6 +12894,11 @@ int SHADOWQUALITY_HIGH_16BIT;
 int SHADOWQUALITY_HIGH_24BIT;
 int SHADOWQUALITY_LOW_16BIT;
 int SHADOWQUALITY_LOW_24BIT;
+String SOUND_AMBIENT;
+String SOUND_EFFECT;
+String SOUND_MASTER;
+String SOUND_MUSIC;
+String SOUND_VOICE;
 Color TRANSPARENT;
 uint VO_DISABLE_OCCLUSION;
 uint VO_DISABLE_SHADOWS;

+ 19 - 17
Docs/LuaScriptAPI.dox

@@ -460,7 +460,7 @@ Methods:
 - bool SetMode(int bufferLengthMSec, int mixRate, bool stereo, bool interpolation = true)
 - bool Play()
 - void Stop()
-- void SetMasterGain(SoundType type, float gain)
+- void SetMasterGain(const String type, float gain)
 - void SetListener(SoundListener* listener)
 - void StopSound(Sound* sound)
 - unsigned GetSampleSize() const
@@ -469,12 +469,12 @@ Methods:
 - bool IsStereo() const
 - bool IsPlaying() const
 - bool IsInitialized() const
-- float GetMasterGain(SoundType type) const
+- bool HasMasterGain(const String type) const
+- float GetMasterGain(const String type) const
 - SoundListener* GetListener() const
 - const PODVector<SoundSource*>& GetSoundSources() const
 - void AddSoundSource(SoundSource* soundSource)
 - void RemoveSoundSource(SoundSource* soundSource)
-- float GetSoundSourceMasterGain(SoundType type) const
 - void MixOutput(void* dest, unsigned samples)
 
 Properties:
@@ -1569,15 +1569,17 @@ Methods:
 - Cursor() (GC)
 - Cursor* new()
 - void delete()
+- void DefineShape(const String shape, Image* image, const IntRect& imageRect, const IntVector2& hotSpot)
 - void DefineShape(CursorShape shape, Image* image, const IntRect& imageRect, const IntVector2& hotSpot)
 - void SetShape(CursorShape shape)
+- void SetShape(const String shape)
 - void SetUseSystemShapes(bool enable)
-- CursorShape GetShape() const
+- String GetShape() const
 - bool GetUseSystemShapes() const
 
 Properties:
 
-- CursorShape shape
+- String shape
 - bool useSystemShapes
 
 <a name="Class_CustomGeometry"></a>
@@ -4879,14 +4881,14 @@ Methods:
 - void Play(Sound* sound, float frequency, float gain)
 - void Play(Sound* sound, float frequency, float gain, float panning)
 - void Stop()
-- void SetSoundType(SoundType type)
+- void SetSoundType(const String type)
 - void SetFrequency(float frequency)
 - void SetGain(float gain)
 - void SetAttenuation(float attenuation)
 - void SetPanning(float panning)
 - void SetAutoRemove(bool enable)
 - Sound* GetSound() const
-- SoundType GetSoundType() const
+- String GetSoundType() const
 - float GetTimePosition() const
 - float GetFrequency() const
 - float GetGain() const
@@ -4898,7 +4900,7 @@ Methods:
 Properties:
 
 - Sound* sound (readonly)
-- SoundType soundType
+- String soundType
 - float timePosition (readonly)
 - float frequency
 - float gain
@@ -6780,13 +6782,17 @@ Properties:
 ### CursorShape
 
 - int CS_NORMAL
+- int CS_IBEAM
+- int CS_CROSS
 - int CS_RESIZEVERTICAL
 - int CS_RESIZEDIAGONAL_TOPRIGHT
 - int CS_RESIZEHORIZONTAL
 - int CS_RESIZEDIAGONAL_TOPLEFT
+- int CS_RESIZE_ALL
 - int CS_ACCEPTDROP
 - int CS_REJECTDROP
 - int CS_BUSY
+- int CS_BUSY_ARROW
 - int CS_MAX_SHAPES
 
 ### EmitterType
@@ -6996,15 +7002,6 @@ Properties:
 - int SHAPE_CONVEXHULL
 - int SHAPE_TERRAIN
 
-### SoundType
-
-- int SOUND_EFFECT
-- int SOUND_AMBIENT
-- int SOUND_VOICE
-- int SOUND_MUSIC
-- int SOUND_MASTER
-- int MAX_SOUND_TYPES
-
 ### StencilOp
 
 - int OP_KEEP
@@ -7743,6 +7740,11 @@ Properties:
 - int SHADOWQUALITY_HIGH_24BIT
 - int SHADOWQUALITY_LOW_16BIT
 - int SHADOWQUALITY_LOW_24BIT
+- String SOUND_AMBIENT
+- String SOUND_EFFECT
+- String SOUND_MASTER
+- String SOUND_MUSIC
+- String SOUND_VOICE
 - unsigned VO_DISABLE_OCCLUSION
 - unsigned VO_DISABLE_SHADOWS
 - unsigned VO_LOW_MATERIAL_QUALITY

+ 18 - 14
Docs/ScriptAPI.dox

@@ -1615,7 +1615,7 @@ namespace Urho3D
 ### SoundSource
 - %Is %Enabled : bool
 - %Sound : ResourceRef
-- %Sound %Type : int
+- %Type : String
 - %Frequency : float
 - %Gain : float
 - %Attenuation : float
@@ -1627,7 +1627,7 @@ namespace Urho3D
 ### SoundSource3D
 - %Is %Enabled : bool
 - %Sound : ResourceRef
-- %Sound %Type : int
+- %Type : String
 - %Frequency : float
 - %Gain : float
 - %Is %Playing : bool
@@ -2650,6 +2650,7 @@ Properties:
 
 Methods:
 
+- bool HasMasterGain(const String&) const
 - bool Play()
 - void SendEvent(const String&, VariantMap& = VariantMap ( ))
 - void SetMode(int, int, bool, bool = true)
@@ -4782,6 +4783,7 @@ Methods:
 - void BringToFront()
 - UIElement@ CreateChild(const String&, const String& = String ( ), uint = M_MAX_UNSIGNED)
 - void DefineShape(CursorShape, Texture@, const IntRect&, const IntVector2&)
+- void DefineShape(const String&, Texture@, const IntRect&, const IntVector2&)
 - void DisableLayoutUpdate()
 - IntVector2 ElementToScreen(const IntVector2&)
 - void EnableLayoutUpdate()
@@ -4840,6 +4842,8 @@ Methods:
 - void SetMinSize(int, int)
 - void SetParent(UIElement@, uint = M_MAX_UNSIGNED)
 - void SetPosition(int, int)
+- void SetShape(CursorShape)
+- void SetShape(const String&)
 - void SetSize(int, int)
 - bool SetStyle(const String&, XMLFile@ = null)
 - bool SetStyle(const XMLElement&)
@@ -4914,7 +4918,7 @@ Properties:
 - UIElement@ root // readonly
 - IntVector2 screenPosition // readonly
 - bool selected
-- CursorShape shape
+- String shape
 - IntVector2 size
 - bool sortChildren
 - String style
@@ -9761,7 +9765,7 @@ Properties:
 - bool playing // readonly
 - int refs // readonly
 - Sound@ sound // readonly
-- SoundType soundType
+- String soundType
 - bool temporary
 - float timePosition // readonly
 - StringHash type // readonly
@@ -9831,7 +9835,7 @@ Properties:
 - int refs // readonly
 - float rolloffFactor
 - Sound@ sound // readonly
-- SoundType soundType
+- String soundType
 - bool temporary
 - float timePosition // readonly
 - StringHash type // readonly
@@ -12538,13 +12542,17 @@ Properties:
 ### CursorShape
 
 - CS_NORMAL
+- CS_IBEAM
+- CS_CROSS
 - CS_RESIZEVERTICAL
 - CS_RESIZEDIAGONAL_TOPRIGHT
 - CS_RESIZEHORIZONTAL
 - CS_RESIZEDIAGONAL_TOPLEFT
+- CS_RESIZE_ALL
 - CS_ACCEPTDROP
 - CS_REJECTDROP
 - CS_BUSY
+- CS_BUSY_ARROW
 
 
 ### DumpMode
@@ -12758,15 +12766,6 @@ Properties:
 - SHAPE_TERRAIN
 
 
-### SoundType
-
-- SOUND_EFFECT
-- SOUND_AMBIENT
-- SOUND_VOICE
-- SOUND_MUSIC
-- SOUND_MASTER
-
-
 ### TextEffect
 
 - TE_NONE
@@ -13481,6 +13480,11 @@ Properties:
 - int SHADOWQUALITY_HIGH_24BIT
 - int SHADOWQUALITY_LOW_16BIT
 - int SHADOWQUALITY_LOW_24BIT
+- String SOUND_AMBIENT
+- String SOUND_EFFECT
+- String SOUND_MASTER
+- String SOUND_MUSIC
+- String SOUND_VOICE
 - Color TRANSPARENT
 - uint VO_DISABLE_OCCLUSION
 - uint VO_DISABLE_SHADOWS

+ 1 - 1
Source/Engine/.soversion

@@ -1 +1 @@
-0.0.55
+0.0.56