Bläddra i källkod

Fix various order of exposition to lua

Mike3D 12 år sedan
förälder
incheckning
cde67d7391

+ 1 - 1
Source/Engine/LuaScript/pkgs/Graphics/AnimatedModel.pkg

@@ -30,7 +30,7 @@ class AnimatedModel : public StaticModel
     float GetMorphWeight(StringHash nameHash) const;
     float GetMorphWeight(unsigned index) const;
     bool IsMaster() const;
-    
+
     tolua_property__get_set Model* model;
     tolua_readonly tolua_property__get_set Skeleton& skeleton;
     tolua_readonly tolua_property__get_set unsigned numAnimationStates;

+ 2 - 2
Source/Engine/LuaScript/pkgs/Graphics/Animation.pkg

@@ -36,11 +36,11 @@ class Animation : public Resource
     StringHash GetAnimationNameHash() const;
     float GetLength() const;
     unsigned GetNumTracks() const;
-    const AnimationTrack* GetTrack(unsigned index) const;
     const AnimationTrack* GetTrack(const String name) const;
     const AnimationTrack* GetTrack(StringHash nameHash) const;
+    const AnimationTrack* GetTrack(unsigned index) const;
     unsigned GetNumTriggers() const;
-    
+
     tolua_readonly tolua_property__get_set String animationName;
     tolua_readonly tolua_property__get_set StringHash animationNameHash;
     tolua_readonly tolua_property__get_set float length;

+ 2 - 2
Source/Engine/LuaScript/pkgs/Graphics/AnimationState.pkg

@@ -10,18 +10,18 @@ class AnimationState
     void SetLooped(bool looped);
     void SetWeight(float weight);
     void SetTime(float time);
-    void SetBoneWeight(unsigned index, float weight, bool recursive = false);
     void SetBoneWeight(const String name, float weight, bool recursive = false);
     void SetBoneWeight(StringHash nameHash, float weight, bool recursive = false);
+    void SetBoneWeight(unsigned index, float weight, bool recursive = false);
     void AddWeight(float delta);
     void AddTime(float delta);
     void SetLayer(unsigned char layer);
 
     Animation* GetAnimation() const;
     Bone* GetStartBone() const;
-    float GetBoneWeight(unsigned index) const;
     float GetBoneWeight(const String name) const;
     float GetBoneWeight(StringHash nameHash) const;
+    float GetBoneWeight(unsigned index) const;
     unsigned GetTrackIndex(const String name) const;
     unsigned GetTrackIndex(StringHash nameHash) const;
     bool IsEnabled() const;

+ 1 - 1
Source/Engine/LuaScript/pkgs/Graphics/Model.pkg

@@ -8,9 +8,9 @@ class Model : public Resource
     unsigned GetNumGeometryLodLevels(unsigned index) const;
     Geometry* GetGeometry(unsigned index, unsigned lodLevel) const;
     unsigned GetNumMorphs() const;
-    const ModelMorph* GetMorph(unsigned index) const;
     const ModelMorph* GetMorph(const String name) const;
     const ModelMorph* GetMorph(StringHash nameHash) const;
+    const ModelMorph* GetMorph(unsigned index) const;
     unsigned GetMorphRangeStart(unsigned bufferIndex) const;
     unsigned GetMorphRangeCount(unsigned bufferIndex) const;
     

+ 1 - 1
Source/Engine/LuaScript/pkgs/Graphics/RenderPath.pkg

@@ -12,9 +12,9 @@ class RenderPath
     void ToggleEnabled(const String tag);
     void SetRenderTarget(unsigned index, const RenderTargetInfo& info);
     void AddRenderTarget(const RenderTargetInfo& info);
-    void RemoveRenderTarget(unsigned index);
 
     void RemoveRenderTarget(const String name);
+    void RemoveRenderTarget(unsigned index);
     void RemoveRenderTargets(const String tag);
     
     void SetCommand(unsigned index, const RenderPathCommand& command);

+ 2 - 2
Source/Engine/LuaScript/pkgs/Scene/Node.pkg

@@ -159,11 +159,11 @@ class Node : public Serializable
     Vector3 WorldToLocal(const Vector3& position) const;
     Vector3 WorldToLocal(const Vector4& vector) const;
     bool IsDirty() const;
-    
+
     unsigned GetNumChildren(bool recursive = false) const;
-    Node* GetChild(unsigned index) const;
     Node* GetChild(const String name, bool recursive = false) const;
     Node* GetChild(StringHash nameHash, bool recursive = false) const;
+    Node* GetChild(unsigned index) const;
 
     unsigned GetNumComponents() const;
     unsigned GetNumNetworkComponents() const;

+ 10 - 10
Source/Engine/LuaScript/pkgs/UI/UIElement.pkg

@@ -71,7 +71,7 @@ class UIElement : public Serializable
     bool FilterAttributes(XMLElement& dest) const;
 
     void SetName(const String name);
-    
+
     void SetPosition(const IntVector2& position);
     void SetPosition(int x, int y);
     void SetSize(const IntVector2& size);
@@ -112,13 +112,13 @@ class UIElement : public Serializable
     void SetDragDropMode(unsigned mode);
 
     bool SetStyle(const String styleName, XMLFile* file = 0);
-    
+
     bool SetStyle(const XMLElement& element);
     bool SetStyleAuto(XMLFile* file = 0);
     void SetDefaultStyle(XMLFile* style);
-    
+
     void SetLayout(LayoutMode mode, int spacing = 0, const IntRect& border = IntRect::ZERO);
-    
+
     void SetLayoutMode(LayoutMode mode);
     void SetLayoutSpacing(int spacing);
     void SetLayoutBorder(const IntRect& border);
@@ -128,9 +128,9 @@ class UIElement : public Serializable
     void DisableLayoutUpdate();
     void EnableLayoutUpdate();
     void BringToFront();
-    
+
     UIElement* CreateChild(const String type, const String name = String::EMPTY, unsigned index = M_MAX_UNSIGNED);
-    
+
     void AddChild(UIElement* element);
     void InsertChild(unsigned index, UIElement* element);
     void RemoveChild(UIElement* element, unsigned index = 0);
@@ -187,10 +187,10 @@ class UIElement : public Serializable
     int GetLayoutSpacing() const;
     const IntRect& GetLayoutBorder() const;
     unsigned GetNumChildren(bool recursive = false) const;
-    
-    UIElement* GetChild(unsigned index) const;
+
     UIElement* GetChild(const String name, bool recursive = false) const;
-    
+    UIElement* GetChild(unsigned index) const;
+
     UIElement* GetParent() const;
     UIElement* GetRoot() const;
     const Color& GetDerivedColor() const;
@@ -213,7 +213,7 @@ class UIElement : public Serializable
     TraversalMode GetTraversalMode() const;
     bool IsElementEventSender() const;
     UIElement* GetElementEventSender() const;
-    
+
     tolua_readonly tolua_property__get_set IntVector2& screenPosition;
     tolua_property__get_set String name;
     tolua_property__get_set IntVector2& position;