Browse Source

Travis CI: API documentation update at 2014-05-12 20:18:28 UTC.
[ci package]

urho3d-travis-ci 11 years ago
parent
commit
dec330e970
3 changed files with 41 additions and 30 deletions
  1. 12 6
      Docs/AngelScriptAPI.h
  2. 14 12
      Docs/LuaScriptAPI.dox
  3. 15 12
      Docs/ScriptAPI.dox

+ 12 - 6
Docs/AngelScriptAPI.h

@@ -590,8 +590,7 @@ float drawDistance;
 bool enabled;
 bool enabled;
 /* readonly */
 /* readonly */
 bool enabledEffective;
 bool enabledEffective;
-bool faceCamera;
-Vector3 faceCameraAxes;
+FaceCameraMode faceCameraMode;
 /* readonly */
 /* readonly */
 uint id;
 uint id;
 /* readonly */
 /* readonly */
@@ -6133,8 +6132,7 @@ bool emitting;
 bool enabled;
 bool enabled;
 /* readonly */
 /* readonly */
 bool enabledEffective;
 bool enabledEffective;
-bool faceCamera;
-Vector3 faceCameraAxes;
+FaceCameraMode faceCameraMode;
 /* readonly */
 /* readonly */
 uint id;
 uint id;
 /* readonly */
 /* readonly */
@@ -9475,8 +9473,7 @@ float effectDepthBias;
 bool enabled;
 bool enabled;
 /* readonly */
 /* readonly */
 bool enabledEffective;
 bool enabledEffective;
-bool faceCamera;
-Vector3 faceCameraAxes;
+FaceCameraMode faceCameraMode;
 /* readonly */
 /* readonly */
 Font font;
 Font font;
 /* readonly */
 /* readonly */
@@ -11169,6 +11166,15 @@ EMITTER_TYPE_GRAVITY,
 EMITTER_TYPE_RADIAL,
 EMITTER_TYPE_RADIAL,
 };
 };
 
 
+enum FaceCameraMode
+{
+FC_NONE,
+FC_ROTATE_XYZ,
+FC_ROTATE_Y,
+FC_LOOKAT_XYZ,
+FC_LOOKAT_Y,
+};
+
 enum FileMode
 enum FileMode
 {
 {
 FILE_READ,
 FILE_READ,

+ 14 - 12
Docs/LuaScriptAPI.dox

@@ -300,8 +300,7 @@ Methods:
 - void SetRelative(bool enable)
 - void SetRelative(bool enable)
 - void SetScaled(bool enable)
 - void SetScaled(bool enable)
 - void SetSorted(bool enable)
 - void SetSorted(bool enable)
-- void SetFaceCamera(bool enable)
-- void SetFaceCameraAxes(const Vector3& axes)
+- void SetFaceCameraMode(FaceCameraMode mode)
 - void SetAnimationLodBias(float bias)
 - void SetAnimationLodBias(float bias)
 - void Commit()
 - void Commit()
 - Material* GetMaterial() const
 - Material* GetMaterial() const
@@ -310,8 +309,7 @@ Methods:
 - bool IsRelative() const
 - bool IsRelative() const
 - bool IsScaled() const
 - bool IsScaled() const
 - bool IsSorted() const
 - bool IsSorted() const
-- bool GetFaceCamera() const
-- const Vector3& GetFaceCameraAxes() const
+- FaceCameraMode GetFaceCameraMode() const
 - float GetAnimationLodBias() const
 - float GetAnimationLodBias() const
 
 
 Properties:
 Properties:
@@ -321,8 +319,7 @@ Properties:
 - bool relative
 - bool relative
 - bool scaled
 - bool scaled
 - bool sorted
 - bool sorted
-- bool faceCamera
-- Vector3& faceCameraAxes
+- FaceCameraMode faceCameraMode
 - float animationLodBias
 - float animationLodBias
 
 
 ### Bone
 ### Bone
@@ -4921,8 +4918,7 @@ Methods:
 - void SetColor(const Color& color)
 - void SetColor(const Color& color)
 - void SetColor(Corner corner, const Color& color)
 - void SetColor(Corner corner, const Color& color)
 - void SetOpacity(float opacity)
 - void SetOpacity(float opacity)
-- void SetFaceCamera(bool enable)
-- void SetFaceCameraAxes(const Vector3& axes)
+- void SetFaceCameraMode(FaceCameraMode mode)
 - Font* GetFont() const
 - Font* GetFont() const
 - Material* GetMaterial() const
 - Material* GetMaterial() const
 - int GetFontSize() const
 - int GetFontSize() const
@@ -4944,8 +4940,7 @@ Methods:
 - IntVector2 GetCharSize(unsigned index)
 - IntVector2 GetCharSize(unsigned index)
 - const Color& GetColor(Corner corner) const
 - const Color& GetColor(Corner corner) const
 - float GetOpacity() const
 - float GetOpacity() const
-- bool GetFaceCamera() const
-- const Vector3& GetFaceCameraAxes() const
+- FaceCameraMode GetFaceCameraMode() const
 
 
 Properties:
 Properties:
 
 
@@ -4967,8 +4962,7 @@ Properties:
 - unsigned numRows (readonly)
 - unsigned numRows (readonly)
 - unsigned numChars (readonly)
 - unsigned numChars (readonly)
 - float opacity
 - float opacity
-- bool faceCamera
-- Vector3& faceCameraAxes
+- FaceCameraMode faceCameraMode
 
 
 ### Texture : Resource
 ### Texture : Resource
 
 
@@ -6165,6 +6159,14 @@ Properties:
 - int EMITTER_TYPE_GRAVITY
 - int EMITTER_TYPE_GRAVITY
 - int EMITTER_TYPE_RADIAL
 - int EMITTER_TYPE_RADIAL
 
 
+### FaceCameraMode
+
+- int FC_NONE
+- int FC_ROTATE_XYZ
+- int FC_ROTATE_Y
+- int FC_LOOKAT_XYZ
+- int FC_LOOKAT_Y
+
 ### FileMode
 ### FileMode
 
 
 - int FILE_READ
 - int FILE_READ

+ 15 - 12
Docs/ScriptAPI.dox

@@ -669,8 +669,7 @@ namespace Urho3D
 - %Sort %By %Distance : bool
 - %Sort %By %Distance : bool
 - %Can %Be %Occluded : bool
 - %Can %Be %Occluded : bool
 - %Cast %Shadows : bool
 - %Cast %Shadows : bool
-- %Face %Camera : bool
-- %Face %Camera %Axes : Vector3
+- %Face %Camera %Mode : int
 - %Draw %Distance : float
 - %Draw %Distance : float
 - %Shadow %Distance : float
 - %Shadow %Distance : float
 - %Animation %LOD %Bias : float
 - %Animation %LOD %Bias : float
@@ -1338,8 +1337,7 @@ namespace Urho3D
 - %Relative %Position : bool
 - %Relative %Position : bool
 - %Relative %Scale : bool
 - %Relative %Scale : bool
 - %Sort %By %Distance : bool
 - %Sort %By %Distance : bool
-- %Face %Camera : bool
-- %Face %Camera %Axes : Vector3
+- %Face %Camera %Mode : int
 - %Time %To %Live %Min : float
 - %Time %To %Live %Min : float
 - %Time %To %Live %Max : float
 - %Time %To %Live %Max : float
 - %Particle %Size %Min : Vector2
 - %Particle %Size %Min : Vector2
@@ -1779,8 +1777,7 @@ namespace Urho3D
 - %Row %Spacing : float
 - %Row %Spacing : float
 - %Word %Wrap : bool
 - %Word %Wrap : bool
 - %Can %Be %Occluded : bool
 - %Can %Be %Occluded : bool
-- %Face %Camera : bool
-- %Face %Camera %Axes : Vector3
+- %Face %Camera %Mode : int
 - %Draw %Distance : float
 - %Draw %Distance : float
 - %Width : int
 - %Width : int
 - %Horiz %Alignment : int
 - %Horiz %Alignment : int
@@ -2474,8 +2471,7 @@ Properties:
 - float drawDistance
 - float drawDistance
 - bool enabled
 - bool enabled
 - bool enabledEffective // readonly
 - bool enabledEffective // readonly
-- bool faceCamera
-- Vector3 faceCameraAxes
+- FaceCameraMode faceCameraMode
 - uint id // readonly
 - uint id // readonly
 - bool inView // readonly
 - bool inView // readonly
 - uint lightMask
 - uint lightMask
@@ -7141,8 +7137,7 @@ Properties:
 - bool emitting
 - bool emitting
 - bool enabled
 - bool enabled
 - bool enabledEffective // readonly
 - bool enabledEffective // readonly
-- bool faceCamera
-- Vector3 faceCameraAxes
+- FaceCameraMode faceCameraMode
 - uint id // readonly
 - uint id // readonly
 - bool inView // readonly
 - bool inView // readonly
 - float inactiveTime
 - float inactiveTime
@@ -10003,8 +9998,7 @@ Properties:
 - float effectDepthBias
 - float effectDepthBias
 - bool enabled
 - bool enabled
 - bool enabledEffective // readonly
 - bool enabledEffective // readonly
-- bool faceCamera
-- Vector3 faceCameraAxes
+- FaceCameraMode faceCameraMode
 - Font@ font // readonly
 - Font@ font // readonly
 - int fontSize // readonly
 - int fontSize // readonly
 - HorizontalAlignment horizontalAlignment
 - HorizontalAlignment horizontalAlignment
@@ -11458,6 +11452,15 @@ Properties:
 - EMITTER_TYPE_RADIAL
 - EMITTER_TYPE_RADIAL
 
 
 
 
+### FaceCameraMode
+
+- FC_NONE
+- FC_ROTATE_XYZ
+- FC_ROTATE_Y
+- FC_LOOKAT_XYZ
+- FC_LOOKAT_Y
+
+
 ### FileMode
 ### FileMode
 
 
 - FILE_READ
 - FILE_READ