Browse Source

Update Lua api.

Aster Jian 12 years ago
parent
commit
4248c9f65b
31 changed files with 14 additions and 41 deletions
  1. 0 1
      Extras/LuaScript/pkgs/Audio/Audio.pkg
  2. 0 1
      Extras/LuaScript/pkgs/Audio/Sound.pkg
  3. 0 1
      Extras/LuaScript/pkgs/Audio/SoundSource.pkg
  4. 0 1
      Extras/LuaScript/pkgs/Audio/SoundSource3D.pkg
  5. 0 1
      Extras/LuaScript/pkgs/Core/Object.pkg
  6. 6 6
      Extras/LuaScript/pkgs/Core/ProcessUtils.pkg
  7. 1 2
      Extras/LuaScript/pkgs/Core/Variant.pkg
  8. 2 0
      Extras/LuaScript/pkgs/Engine/Engine.pkg
  9. 0 1
      Extras/LuaScript/pkgs/Graphics/BillboardSet.pkg
  10. 1 1
      Extras/LuaScript/pkgs/Graphics/ParticleEmitter.pkg
  11. 1 1
      Extras/LuaScript/pkgs/Graphics/RenderSurface.pkg
  12. 1 0
      Extras/LuaScript/pkgs/Graphics/Skeleton.pkg
  13. 0 1
      Extras/LuaScript/pkgs/Graphics/Skybox.pkg
  14. 1 2
      Extras/LuaScript/pkgs/Graphics/Viewport.pkg
  15. 0 1
      Extras/LuaScript/pkgs/IO/Deserializer.pkg
  16. 0 1
      Extras/LuaScript/pkgs/IO/FileSystem.pkg
  17. 0 2
      Extras/LuaScript/pkgs/IO/Serializer.pkg
  18. 0 1
      Extras/LuaScript/pkgs/Math/BoundingBox.pkg
  19. 0 1
      Extras/LuaScript/pkgs/Math/Plane.pkg
  20. 0 1
      Extras/LuaScript/pkgs/Math/Ray.pkg
  21. 0 1
      Extras/LuaScript/pkgs/Math/Sphere.pkg
  22. 0 2
      Extras/LuaScript/pkgs/Math/StringHash.pkg
  23. 0 1
      Extras/LuaScript/pkgs/Math/Vector3.pkg
  24. 0 1
      Extras/LuaScript/pkgs/Navigation/NavigationMesh.pkg
  25. 0 1
      Extras/LuaScript/pkgs/Navigation/OffMeshConnection.pkg
  26. 0 2
      Extras/LuaScript/pkgs/Network/Network.pkg
  27. 0 1
      Extras/LuaScript/pkgs/Physics/PhysicsWorld.pkg
  28. 1 2
      Extras/LuaScript/pkgs/Resource/Resource.pkg
  29. 0 1
      Extras/LuaScript/pkgs/Resource/XMLFile.pkg
  30. 0 1
      Extras/LuaScript/pkgs/Scene/Serializable.pkg
  31. 0 2
      Extras/LuaScript/pkgs/UI/ScrollView.pkg

+ 0 - 1
Extras/LuaScript/pkgs/Audio/Audio.pkg

@@ -12,7 +12,6 @@ enum SoundType
 
 class Audio : public Object
 {
-public:
     bool SetMode(int bufferLengthMSec, int mixRate, bool stereo, bool interpolation = true);
     bool Play();
     void Stop();

+ 0 - 1
Extras/LuaScript/pkgs/Audio/Sound.pkg

@@ -2,7 +2,6 @@ $#include "Sound.h"
 
 class Sound : public Resource
 {
-public:
     float GetLength() const;
     unsigned GetDataSize() const;
     unsigned GetSampleSize() const;

+ 0 - 1
Extras/LuaScript/pkgs/Audio/SoundSource.pkg

@@ -4,7 +4,6 @@ enum SoundType{};
 
 class SoundSource : public Component
 {
-public:
     void Play(Sound* sound);
     void Play(Sound* sound, float frequency);
     void Play(Sound* sound, float frequency, float gain);

+ 0 - 1
Extras/LuaScript/pkgs/Audio/SoundSource3D.pkg

@@ -2,7 +2,6 @@ $#include "SoundSource3D.h"
 
 class SoundSource3D : public SoundSource
 {
-public:
     void SetDistanceAttenuation(float nearDistance, float farDistance, float rolloffFactor);
     void SetNearDistance(float distance);
     void SetFarDistance(float distance);

+ 0 - 1
Extras/LuaScript/pkgs/Core/Object.pkg

@@ -2,7 +2,6 @@ $#include "Object.h"
 
 class Object : public RefCounted
 {
-public:
     virtual ShortStringHash GetType() const;
     
     // virtual const String& GetTypeName() const;

+ 6 - 6
Extras/LuaScript/pkgs/Core/ProcessUtils.pkg

@@ -26,16 +26,16 @@ ${
 
 static const char* GetConsoleInputCString()
 {
-    static String string;
-    string = GetConsoleInput();
-    return string.CString();
+    static String input;
+    input = GetConsoleInput();
+    return input.CString();
 }
 
 static const char* GetPlatformCString()
 {
-    static String string;
-    string = GetPlatform();
-    return string.CString();
+    static String platform;
+    platform = GetPlatform();
+    return platform.CString();
 }
 
 $}

+ 1 - 2
Extras/LuaScript/pkgs/Core/Variant.pkg

@@ -53,7 +53,6 @@ struct ResourceRefList
 
 class Variant
 {
-public:
     Variant();
     Variant(int value);
     Variant(unsigned value);
@@ -131,8 +130,8 @@ public:
 
 class VariantMap
 {
-public:
     VariantMap();
+    ~VariantMap();
     
     tolua_outside void VariantMapSetInt @ SetInt(const char* key, int value);
     tolua_outside void VariantMapSetBool @ SetBool(const char* key, bool value);

+ 2 - 0
Extras/LuaScript/pkgs/Engine/Engine.pkg

@@ -3,8 +3,10 @@ $#include "Engine.h"
 class Engine : public Object
 {
     void RunFrame();
+    
     Console* CreateConsole();
     DebugHud* CreateDebugHud();
+    
     void SetMinFps(int fps);
     void SetMaxFps(int fps);
     void SetMaxInactiveFps(int fps);

+ 0 - 1
Extras/LuaScript/pkgs/Graphics/BillboardSet.pkg

@@ -13,7 +13,6 @@ struct Billboard
 
 class BillboardSet : public Drawable
 {
-public:
     void SetMaterial(Material* material);
     void SetNumBillboards(unsigned num);
     void SetRelative(bool enable);

+ 1 - 1
Extras/LuaScript/pkgs/Graphics/ParticleEmitter.pkg

@@ -132,4 +132,4 @@ class ParticleEmitter : public BillboardSet
     tolua_property__get_set float sizeMul;
     tolua_property__get_set unsigned numColors;
     tolua_property__get_set unsigned numTextureFrames;
-    };
+};

+ 1 - 1
Extras/LuaScript/pkgs/Graphics/RenderSurface.pkg

@@ -1,7 +1,7 @@
 $#include "RenderSurface.h"
 
 class RenderSurface
-{    
+{
     RenderSurface(Texture* parentTexture);
     ~RenderSurface();
 

+ 1 - 0
Extras/LuaScript/pkgs/Graphics/Skeleton.pkg

@@ -3,6 +3,7 @@ $#include "Skeleton.h"
 struct Bone
 {
     Bone();
+    
     String name_ @ name;
     StringHash nameHash_ @ nameHash;
     unsigned parentIndex_ @ parentIndex;

+ 0 - 1
Extras/LuaScript/pkgs/Graphics/Skybox.pkg

@@ -1,6 +1,5 @@
 $#include "Skybox.h"
 
-/// Static model component with fixed position in relation to the camera.
 class Skybox : public StaticModel
 {
 };

+ 1 - 2
Extras/LuaScript/pkgs/Graphics/Viewport.pkg

@@ -1,8 +1,7 @@
 $#include "Viewport.h"
 
 class Viewport
-{    
-public:
+{
     Viewport(Context* context);
     Viewport(Context* context, Scene* scene, Camera* camera, RenderPath* renderPath = 0);
     Viewport(Context* context, Scene* scene, Camera* camera, const IntRect& rect, RenderPath* renderPath = 0);

+ 0 - 1
Extras/LuaScript/pkgs/IO/Deserializer.pkg

@@ -2,7 +2,6 @@ $#include "Deserializer.h"
 
 class Deserializer
 {
-    // virtual unsigned Read(void* dest, unsigned size);
     virtual unsigned Seek(unsigned position);
     
     virtual const String& GetName() const;

+ 0 - 1
Extras/LuaScript/pkgs/IO/FileSystem.pkg

@@ -56,7 +56,6 @@ class FileSystem : public Object
     String GetUserDocumentsDir() const;
 };
 
-// void SplitPath(const String& fullPath, String& pathName, String& fileName, String& extension);
 String GetPath(const String& fullPath);
 String GetFileName(const String& fullPath);
 String GetExtension(const String& fullPath);

+ 0 - 2
Extras/LuaScript/pkgs/IO/Serializer.pkg

@@ -2,8 +2,6 @@ $#include "Serializer.h"
 
 class Serializer
 {
-    // virtual unsigned Write(const void* data, unsigned size);
-    
     bool WriteInt(int value);
     bool WriteShort(short value);
     bool WriteByte(signed char value);

+ 0 - 1
Extras/LuaScript/pkgs/Math/BoundingBox.pkg

@@ -2,7 +2,6 @@ $#include "BoundingBox.h"
 
 class BoundingBox
 {
-public:
     BoundingBox();
     BoundingBox(const BoundingBox& box);
     BoundingBox(const Rect& rect);

+ 0 - 1
Extras/LuaScript/pkgs/Math/Plane.pkg

@@ -3,7 +3,6 @@ $#include "Plane.h"
 
 class Plane
 {
-public:
     Plane();
     Plane(const Plane& plane);
     Plane(const Vector3& v0, const Vector3& v1, const Vector3& v2);

+ 0 - 1
Extras/LuaScript/pkgs/Math/Ray.pkg

@@ -2,7 +2,6 @@ $#include "Ray.h"
 
 class Ray
 {
-public:
     Ray();
     Ray(const Vector3& origin, const Vector3& direction);
     Ray(const Ray& ray);

+ 0 - 1
Extras/LuaScript/pkgs/Math/Sphere.pkg

@@ -2,7 +2,6 @@ $#include "Sphere.h"
 
 class Sphere
 {
-public:
     Sphere();
     Sphere(const Sphere& sphere);
     Sphere(const Vector3& center, float radius);

+ 0 - 2
Extras/LuaScript/pkgs/Math/StringHash.pkg

@@ -22,10 +22,8 @@ class StringHash
     tolua_readonly tolua_property__no_prefix unsigned value;
 };
 
-
 class ShortStringHash
 {
-public:
     ShortStringHash();
     ShortStringHash(const ShortStringHash& rhs);
     explicit ShortStringHash(const StringHash& rhs);

+ 0 - 1
Extras/LuaScript/pkgs/Math/Vector3.pkg

@@ -1,6 +1,5 @@
 $#include "Vector3.h"
 
-
 class Vector3
 {
     Vector3();

+ 0 - 1
Extras/LuaScript/pkgs/Navigation/NavigationMesh.pkg

@@ -11,7 +11,6 @@ struct NavigationGeometryInfo
 
 class NavigationMesh : public Component
 {
-public:
     void SetTileSize(int size);
     void SetCellSize(float size);
     void SetCellHeight(float height);

+ 0 - 1
Extras/LuaScript/pkgs/Navigation/OffMeshConnection.pkg

@@ -2,7 +2,6 @@ $#include "OffMeshConnection.h"
 
 class OffMeshConnection : public Component
 {
-public:
     void SetEndPoint(Node* node);
     void SetRadius(float radius);
     void SetBidirectional(bool enabled);

+ 0 - 2
Extras/LuaScript/pkgs/Network/Network.pkg

@@ -11,8 +11,6 @@ class Network
     
     void BroadcastMessage(int msgID, bool reliable, bool inOrder, const VectorBuffer& msg, unsigned contentID = 0);
 
-    // void BroadcastMessage(int msgID, bool reliable, bool inOrder, const unsigned char* data, unsigned numBytes, unsigned contentID = 0);
-    
     void BroadcastRemoteEvent(StringHash eventType, bool inOrder, const VariantMap& eventData = Variant::emptyVariantMap);
     void BroadcastRemoteEvent(const char* eventType, bool inOrder, const VariantMap& eventData = Variant::emptyVariantMap);
     

+ 0 - 1
Extras/LuaScript/pkgs/Physics/PhysicsWorld.pkg

@@ -58,7 +58,6 @@ class PhysicsWorld : public Component
     void SetApplyingTransforms(bool enable);
     bool IsApplyingTransforms() const;
     
-    // Properties:
     tolua_property__get_set Vector3 gravity;
     tolua_property__get_set int numIterations;
     tolua_property__get_set bool interpolation;

+ 1 - 2
Extras/LuaScript/pkgs/Resource/Resource.pkg

@@ -1,8 +1,7 @@
 $#include "Resource.h"
 
 class Resource
-{    
-public:
+{
     const String& GetName() const;
     StringHash GetNameHash() const;
     unsigned GetMemoryUse() const;

+ 0 - 1
Extras/LuaScript/pkgs/Resource/XMLFile.pkg

@@ -2,7 +2,6 @@ $#include "XMLFile.h"
 
 class XMLFile : public Resource
 {
-public:
     XMLElement GetRoot(const String& name = String::EMPTY);
     XMLElement GetRoot(const char* name);
 };

+ 0 - 1
Extras/LuaScript/pkgs/Scene/Serializable.pkg

@@ -2,5 +2,4 @@ $#include "Serializable.h"
 
 class Serializable : public Object
 {
-public:
 };

+ 0 - 2
Extras/LuaScript/pkgs/UI/ScrollView.pkg

@@ -2,8 +2,6 @@ $#include "ScrollView.h"
 
 class ScrollView : public UIElement
 {
-public:
-    // Methods:
     ScrollView(Context* context);
     virtual ~ScrollView();