diff --git a/.gitignore b/.gitignore
index 0c432d5b6c..7a8200b674 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,18 @@ Thumbs.db
/Device-Profile
/Device-Release
/build
+/gameplay-internal
+/gameplay-api/xml
+
+/gameplay-encoder/Debug
+/gameplay-encoder/Release
+/gameplay-encoder/gameplay-encoder.xcodeproj/xcuserdata
+
+/gameplay-luagen/Release
+/gameplay-luagen/Debug
+/gameplay-luagen/doxygen_entrydb_680.tmp
+/gameplay-luagen/doxygen_objdb_680.tmp
+/gameplay-luagen/xml
/gameplay/Debug
/gameplay/DebugMem
@@ -33,21 +45,36 @@ Thumbs.db
/gameplay/gameplay.xcodeproj/xcuserdata
/gameplay/android/NUL
/gameplay/android/proguard.cfg
+/gameplay/android/proguard-project.txt
/gameplay/android/local.properties
/gameplay/android/project.properties
/gameplay/android/obj
+/gameplay/linux
-/gameplay-api/xml
-
-/gameplay-encoder/Debug
-/gameplay-encoder/Release
-/gameplay-encoder/gameplay-encoder.xcodeproj/xcuserdata
-
-/gameplay-luagen/Release
-/gameplay-luagen/Debug
-/gameplay-luagen/doxygen_entrydb_680.tmp
-/gameplay-luagen/doxygen_objdb_680.tmp
-/gameplay-luagen/xml
+/gameplay-tests/Debug
+/gameplay-tests/DebugMem
+/gameplay-tests/Release
+/gameplay-tests/Simulator
+/gameplay-tests/Simulator-Coverage
+/gameplay-tests/Simulator-Profile
+/gameplay-tests/Device-Debug
+/gameplay-tests/Device-Coverage
+/gameplay-tests/Device-Profile
+/gameplay-tests/Device-Release
+/gameplay-tests/res/shaders
+/gameplay-tests/res/logo_powered_white.png
+/gameplay-tests/gameplay-tests.xcodeproj/xcuserdata
+/gameplay-tests/android/src
+/gameplay-tests/android/assets
+/gameplay-tests/android/bin
+/gameplay-tests/android/gen
+/gameplay-tests/android/libs
+/gameplay-tests/android/obj
+/gameplay-tests/android/NUL
+/gameplay-tests/android/local.properties
+/gameplay-tests/android/proguard-project.txt
+/gameplay-tests/android/project.properties
+/gameplay-tests/linux
/gameplay-samples/sample00-mesh/Debug
/gameplay-samples/sample00-mesh/DebugMem
@@ -72,6 +99,7 @@ Thumbs.db
/gameplay-samples/sample00-mesh/android/local.properties
/gameplay-samples/sample00-mesh/android/proguard.cfg
/gameplay-samples/sample00-mesh/android/project.properties
+/gameplay-samples/sample00-mesh/linux
/gameplay-samples/sample01-longboard/Debug
/gameplay-samples/sample01-longboard/DebugMem
@@ -97,6 +125,7 @@ Thumbs.db
/gameplay-samples/sample01-longboard/android/proguard.cfg
/gameplay-samples/sample01-longboard/android/project.properties
/gameplay-samples/sample01-longboard/android/local.properties
+/gameplay-samples/sample01-longboard/linux
/gameplay-samples/sample02-spaceship/Debug
/gameplay-samples/sample02-spaceship/DebugMem
@@ -121,6 +150,7 @@ Thumbs.db
/gameplay-samples/sample02-spaceship/android/src
/gameplay-samples/sample02-spaceship/android/proguard.cfg
/gameplay-samples/sample02-spaceship/android/local.properties
+/gameplay-samples/sample02-spaceship/linux
/gameplay-samples/sample03-character/Debug
/gameplay-samples/sample03-character/DebugMem
@@ -147,6 +177,7 @@ Thumbs.db
/gameplay-samples/sample03-character/android/obj
/gameplay-samples/sample03-character/android/NUL
/gameplay-samples/sample03-character/res/gamepad.xcf
+/gameplay-samples/sample03-character/linux
/gameplay-samples/sample04-particles/Debug
/gameplay-samples/sample04-particles/DebugMem
@@ -173,6 +204,7 @@ Thumbs.db
/gameplay-samples/sample04-particles/android/proguard.cfg
/gameplay-samples/sample04-particles/android/local.properties
/gameplay-samples/sample04-particles/android/project.properties
+/gameplay-samples/sample04-particles/linux
/gameplay-samples/sample05-lua/Debug
/gameplay-samples/sample05-lua/DebugMem
@@ -197,6 +229,7 @@ Thumbs.db
/gameplay-samples/sample05-lua/android/local.properties
/gameplay-samples/sample05-lua/android/proguard.cfg
/gameplay-samples/sample05-lua/android/project.properties
+/gameplay-samples/sample05-lua/linux
/gameplay-samples/sample06-racer/Debug
/gameplay-samples/sample06-racer/DebugMem
@@ -226,31 +259,6 @@ Thumbs.db
/gameplay-samples/sample06-racer/android/local.properties
/gameplay-samples/sample06-racer/android/proguard.cfg
/gameplay-samples/sample06-racer/android/project.properties
+/gameplay-samples/sample06-racer/linux
-/gameplay-internal
-/gameplay/android/proguard-project.txt
-
-/gameplay-tests/Debug
-/gameplay-tests/DebugMem
-/gameplay-tests/Release
-/gameplay-tests/Simulator
-/gameplay-tests/Simulator-Coverage
-/gameplay-tests/Simulator-Profile
-/gameplay-tests/Device-Debug
-/gameplay-tests/Device-Coverage
-/gameplay-tests/Device-Profile
-/gameplay-tests/Device-Release
-/gameplay-tests/res/shaders
-/gameplay-tests/res/logo_powered_white.png
-/gameplay-tests/gameplay-tests.xcodeproj/xcuserdata
-/gameplay-tests/android/src
-/gameplay-tests/android/assets
-/gameplay-tests/android/bin
-/gameplay-tests/android/gen
-/gameplay-tests/android/libs
-/gameplay-tests/android/obj
-/gameplay-tests/android/NUL
-/gameplay-tests/android/local.properties
-/gameplay-tests/android/proguard-project.txt
-/gameplay-tests/android/project.properties
diff --git a/build/README.md b/cmake/README.md
similarity index 100%
rename from build/README.md
rename to cmake/README.md
diff --git a/gameplay-encoder/gameplay-bundle.txt b/gameplay-encoder/gameplay-bundle.txt
index 80da2494c3..eeea85acc6 100644
--- a/gameplay-encoder/gameplay-bundle.txt
+++ b/gameplay-encoder/gameplay-bundle.txt
@@ -153,7 +153,7 @@ Reference
5->AnimationChannel
targetId string
targetAttribute uint
- keyTimes unsigned long[] (milliseconds)
+ keyTimes uint[] (milliseconds)
values float[]
tangents_in float[]
tangents_out float[]
diff --git a/gameplay-samples/BuildHelpers.CMakeLists.txt b/gameplay-samples/BuildHelpers.CMakeLists.txt
index 87eb368ee7..d487196b8c 100644
--- a/gameplay-samples/BuildHelpers.CMakeLists.txt
+++ b/gameplay-samples/BuildHelpers.CMakeLists.txt
@@ -22,7 +22,7 @@ endmacro()
# convenience to call above with current directory and everything in "res"
macro(COPY_RES GAME_NAME)
- # a target for all addition asserts (will be done in defualt compile, but if you target the executable
+ # a target for all addition asserts (will be done in default compile, but if you target the executable
# it won't be done -- good for testing)
add_custom_target( ${GAME_NAME}_ASSETS ALL )
diff --git a/gameplay-samples/CMakeLists.txt b/gameplay-samples/CMakeLists.txt
index 2057d72435..95e74f345a 100644
--- a/gameplay-samples/CMakeLists.txt
+++ b/gameplay-samples/CMakeLists.txt
@@ -52,3 +52,4 @@ add_subdirectory(sample04-particles)
add_subdirectory(sample05-lua)
add_subdirectory(sample06-racer)
+
diff --git a/gameplay-samples/sample00-mesh/sample00-mesh.cbp b/gameplay-samples/sample00-mesh/sample00-mesh.cbp
new file mode 100644
index 0000000000..49d5f17dcf
--- /dev/null
+++ b/gameplay-samples/sample00-mesh/sample00-mesh.cbp
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gameplay-samples/sample01-longboard/sample01-longboard.cbp b/gameplay-samples/sample01-longboard/sample01-longboard.cbp
new file mode 100644
index 0000000000..92a4254cb5
--- /dev/null
+++ b/gameplay-samples/sample01-longboard/sample01-longboard.cbp
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gameplay-samples/sample02-spaceship/sample02-spaceship.cbp b/gameplay-samples/sample02-spaceship/sample02-spaceship.cbp
new file mode 100644
index 0000000000..404f1f6465
--- /dev/null
+++ b/gameplay-samples/sample02-spaceship/sample02-spaceship.cbp
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gameplay-samples/sample03-character/sample03-character.cbp b/gameplay-samples/sample03-character/sample03-character.cbp
new file mode 100644
index 0000000000..d9fb972ec6
--- /dev/null
+++ b/gameplay-samples/sample03-character/sample03-character.cbp
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gameplay-samples/sample04-particles/sample04-particles.cbp b/gameplay-samples/sample04-particles/sample04-particles.cbp
new file mode 100644
index 0000000000..2564d8620b
--- /dev/null
+++ b/gameplay-samples/sample04-particles/sample04-particles.cbp
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gameplay-samples/sample05-lua/sample05-lua.cbp b/gameplay-samples/sample05-lua/sample05-lua.cbp
new file mode 100644
index 0000000000..f571ab358c
--- /dev/null
+++ b/gameplay-samples/sample05-lua/sample05-lua.cbp
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gameplay-samples/sample06-racer/sample06-racer.cbp b/gameplay-samples/sample06-racer/sample06-racer.cbp
new file mode 100644
index 0000000000..00f95b9c1b
--- /dev/null
+++ b/gameplay-samples/sample06-racer/sample06-racer.cbp
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gameplay-tests/Default-568h@2x.png b/gameplay-tests/Default-568h@2x.png
deleted file mode 100644
index 0891b7aabf..0000000000
Binary files a/gameplay-tests/Default-568h@2x.png and /dev/null differ
diff --git a/gameplay-tests/gameplay-tests.cbp b/gameplay-tests/gameplay-tests.cbp
new file mode 100644
index 0000000000..53740d2bb3
--- /dev/null
+++ b/gameplay-tests/gameplay-tests.cbp
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gameplay.workspace b/gameplay.workspace
new file mode 100644
index 0000000000..c957984332
--- /dev/null
+++ b/gameplay.workspace
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gameplay/gameplay.cbp b/gameplay/gameplay.cbp
new file mode 100644
index 0000000000..b6b9da2d18
--- /dev/null
+++ b/gameplay/gameplay.cbp
@@ -0,0 +1,591 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gameplay/src/Animation.cpp b/gameplay/src/Animation.cpp
index d2f7b91df6..677a6d7d50 100644
--- a/gameplay/src/Animation.cpp
+++ b/gameplay/src/Animation.cpp
@@ -15,17 +15,18 @@
namespace gameplay
{
-Animation::Animation(const char* id, AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, unsigned int type)
- : _controller(Game::getInstance()->getAnimationController()), _id(id), _duration(0), _defaultClip(NULL), _clips(NULL)
+Animation::Animation(const char* id, AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, unsigned int type)
+ : _controller(Game::getInstance()->getAnimationController()), _id(id), _duration(0L), _defaultClip(NULL), _clips(NULL)
{
- createChannel(target, propertyId, keyCount, keyTimes, keyValues, type);
+ createChannel(target, propertyId, keyCount, keyTimes, keyValues, type);
+
// Release the animation because a newly created animation has a ref count of 1 and the channels hold the ref to animation.
release();
GP_ASSERT(getRefCount() == 1);
}
-Animation::Animation(const char* id, AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, unsigned int type)
- : _controller(Game::getInstance()->getAnimationController()), _id(id), _duration(0), _defaultClip(NULL), _clips(NULL)
+Animation::Animation(const char* id, AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, unsigned int type)
+ : _controller(Game::getInstance()->getAnimationController()), _id(id), _duration(0L), _defaultClip(NULL), _clips(NULL)
{
createChannel(target, propertyId, keyCount, keyTimes, keyValues, keyInValue, keyOutValue, type);
// Release the animation because a newly created animation has a ref count of 1 and the channels hold the ref to animation.
@@ -34,7 +35,7 @@ Animation::Animation(const char* id, AnimationTarget* target, int propertyId, un
}
Animation::Animation(const char* id)
- : _controller(Game::getInstance()->getAnimationController()), _id(id), _duration(0), _defaultClip(NULL), _clips(NULL)
+ : _controller(Game::getInstance()->getAnimationController()), _id(id), _duration(0L), _defaultClip(NULL), _clips(NULL)
{
}
@@ -55,9 +56,9 @@ Animation::~Animation()
if (_clips)
{
std::vector::iterator clipIter = _clips->begin();
-
+
while (clipIter != _clips->end())
- {
+ {
AnimationClip* clip = *clipIter;
GP_ASSERT(clip);
if (clip->isClipStateBitSet(AnimationClip::CLIP_IS_PLAYING_BIT))
@@ -127,7 +128,7 @@ void Animation::createClips(const char* url)
Properties* pAnimation = (strlen(properties->getNamespace()) > 0) ? properties : properties->getNextNamespace();
GP_ASSERT(pAnimation);
-
+
int frameCount = pAnimation->getInt("frameCount");
if (frameCount <= 0)
GP_ERROR("The animation's frame count must be greater than 0.");
@@ -180,7 +181,7 @@ void Animation::play(const char* clipId)
{
if (_defaultClip == NULL)
createDefaultClip();
-
+
_defaultClip->play();
}
else
@@ -245,9 +246,9 @@ void Animation::createDefaultClip()
void Animation::createClips(Properties* animationProperties, unsigned int frameCount)
{
GP_ASSERT(animationProperties);
-
+
Properties* pClip = animationProperties->getNextNamespace();
-
+
while (pClip != NULL && std::strcmp(pClip->getNamespace(), "clip") == 0)
{
int begin = pClip->getInt("begin");
@@ -310,7 +311,7 @@ AnimationClip* Animation::findClip(const char* id) const
return NULL;
}
-Animation::Channel* Animation::createChannel(AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, unsigned int type)
+Animation::Channel* Animation::createChannel(AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, unsigned int type)
{
GP_ASSERT(target);
GP_ASSERT(keyTimes);
@@ -324,7 +325,7 @@ Animation::Channel* Animation::createChannel(AnimationTarget* target, int proper
if (target->_targetType == AnimationTarget::TRANSFORM)
setTransformRotationOffset(curve, propertyId);
- unsigned long lowest = keyTimes[0];
+ unsigned int lowest = keyTimes[0];
unsigned long duration = keyTimes[keyCount-1] - lowest;
float* normalizedKeyTimes = new float[keyCount];
@@ -352,7 +353,7 @@ Animation::Channel* Animation::createChannel(AnimationTarget* target, int proper
return channel;
}
-Animation::Channel* Animation::createChannel(AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, unsigned int type)
+Animation::Channel* Animation::createChannel(AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, unsigned int type)
{
GP_ASSERT(target);
GP_ASSERT(keyTimes);
@@ -365,12 +366,12 @@ Animation::Channel* Animation::createChannel(AnimationTarget* target, int proper
GP_ASSERT(curve);
if (target->_targetType == AnimationTarget::TRANSFORM)
setTransformRotationOffset(curve, propertyId);
-
+
unsigned long lowest = keyTimes[0];
unsigned long duration = keyTimes[keyCount-1] - lowest;
float* normalizedKeyTimes = new float[keyCount];
-
+
normalizedKeyTimes[0] = 0.0f;
curve->setPoint(0, normalizedKeyTimes[0], keyValues, (Curve::InterpolationType) type, keyInValue, keyOutValue);
@@ -398,7 +399,7 @@ void Animation::addChannel(Channel* channel)
{
GP_ASSERT(channel);
_channels.push_back(channel);
-
+
if (channel->_duration > _duration)
_duration = channel->_duration;
}
@@ -409,7 +410,7 @@ void Animation::removeChannel(Channel* channel)
while (itr != _channels.end())
{
Animation::Channel* chan = *itr;
- if (channel == chan)
+ if (channel == chan)
{
_channels.erase(itr);
return;
diff --git a/gameplay/src/Animation.h b/gameplay/src/Animation.h
index 9a3ffa5191..d0dc521395 100644
--- a/gameplay/src/Animation.h
+++ b/gameplay/src/Animation.h
@@ -27,14 +27,14 @@ class Animation : public Ref
friend class Bundle;
public:
-
+
/**
* Gets the Animation's ID.
- *
+ *
* @return The Animation's ID.
*/
const char* getId() const;
-
+
/**
* Gets the Animation's duration.
*
@@ -43,29 +43,29 @@ class Animation : public Ref
unsigned long getDuration() const;
/**
- * Creates an AnimationClip from the Properties object defined at the specified URL,
+ * Creates an AnimationClip from the Properties object defined at the specified URL,
* where the URL is of the format ".#//.../"
* (and "#//.../" is optional).
- *
+ *
* @param url The URL pointing to the Properties object containing the clip definitions.
*/
void createClips(const char* url);
-
+
/**
* Creates an AnimationClip from the Animation.
- *
+ *
* @param id The ID to the give the AnimationClip.
* @param start The time (in milliseconds) that the AnimationClip will begin from.
* @param end The time (in milliseconds) that the AnimationClip will end.
- *
+ *
* @return The newly created AnimationClip; NULL if an AnimationClip already exists with the same ID.
* @script{create}
*/
AnimationClip* createClip(const char* id, unsigned long start, unsigned long end);
-
+
/**
* Finds the AnimationClip with the specified name. If NULL, gets the default clip.
- *
+ *
* @param clipId The ID of the AnimationClip to get.
*
* @return The AnimationClip with the specified ID; NULL if an AnimationClip with the given ID is not found.
@@ -83,22 +83,22 @@ class Animation : public Ref
* Returns the number of animation clips in this animation.
*/
unsigned int getClipCount() const;
-
+
/**
- * Plays the AnimationClip with the specified name.
+ * Plays the AnimationClip with the specified name.
*
* @param clipId The ID of the AnimationClip to play. If NULL, plays the default clip.
- */
+ */
void play(const char* clipId = NULL);
/**
- * Stops the AnimationClip with the specified name.
- *
+ * Stops the AnimationClip with the specified name.
+ *
* @param clipId The ID of the AnimationClip to stop. If NULL, stops the default clip.
*/
void stop(const char* clipId = NULL);
- /**
+ /**
* Pauses the AnimationClip with the specified name.
*
* @param clipId The ID of the AnimationClip to pause. If NULL, pauses the default clip.
@@ -109,7 +109,7 @@ class Animation : public Ref
* Returns true if this animation targets the given AnimationTarget.
*/
bool targets(AnimationTarget* target) const;
-
+
private:
/**
@@ -148,12 +148,12 @@ class Animation : public Ref
/**
* Constructor.
*/
- Animation(const char* id, AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, unsigned int type);
-
+ Animation(const char* id, AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, unsigned int type);
+
/**
* Constructor.
*/
- Animation(const char* id, AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, unsigned int type);
+ Animation(const char* id, AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, unsigned int type);
/**
* Constructor.
@@ -164,12 +164,12 @@ class Animation : public Ref
* Destructor.
*/
~Animation();
-
+
/**
* Hidden copy assignment operator.
*/
Animation& operator=(const Animation&);
-
+
/**
* Creates the default clip.
*/
@@ -192,13 +192,13 @@ class Animation : public Ref
/**
* Creates a channel within this animation.
- */
- Channel* createChannel(AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, unsigned int type);
+ */
+ Channel* createChannel(AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, unsigned int type);
/**
* Creates a channel within this animation.
*/
- Channel* createChannel(AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, unsigned int type);
+ Channel* createChannel(AnimationTarget* target, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, unsigned int type);
/**
* Adds a channel to the animation.
@@ -217,17 +217,17 @@ class Animation : public Ref
/**
* Clones this animation.
- *
+ *
* @param channel The channel to clone and add to the animation.
* @param target The target of the animation.
- *
+ *
* @return The newly created animation.
*/
Animation* clone(Channel* channel, AnimationTarget* target);
-
+
AnimationController* _controller; // The AnimationController that this Animation will run on.
std::string _id; // The Animation's ID.
- unsigned long _duration; // the length of the animation (in milliseconds).
+ unsigned long _duration; // the length of the animation (in milliseconds).
std::vector _channels; // The channels within this Animation.
AnimationClip* _defaultClip; // The Animation's default clip.
std::vector* _clips; // All the clips created from this Animation.
diff --git a/gameplay/src/AnimationTarget.cpp b/gameplay/src/AnimationTarget.cpp
index 2492bf58c3..25fe4836bc 100644
--- a/gameplay/src/AnimationTarget.cpp
+++ b/gameplay/src/AnimationTarget.cpp
@@ -31,7 +31,7 @@ AnimationTarget::~AnimationTarget()
}
}
-Animation* AnimationTarget::createAnimation(const char* id, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, Curve::InterpolationType type)
+Animation* AnimationTarget::createAnimation(const char* id, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, Curve::InterpolationType type)
{
GP_ASSERT(type != Curve::BEZIER && type != Curve::HERMITE);
GP_ASSERT(keyCount >= 1 && keyTimes && keyValues);
@@ -41,7 +41,7 @@ Animation* AnimationTarget::createAnimation(const char* id, int propertyId, unsi
return animation;
}
-Animation* AnimationTarget::createAnimation(const char* id, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, Curve::InterpolationType type)
+Animation* AnimationTarget::createAnimation(const char* id, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, Curve::InterpolationType type)
{
GP_ASSERT(keyCount >= 1 && keyTimes && keyValues && keyInValue && keyOutValue);
Animation* animation = new Animation(id, this, propertyId, keyCount, keyTimes, keyValues, keyInValue, keyOutValue, type);
@@ -73,9 +73,9 @@ Animation* AnimationTarget::createAnimationFromTo(const char* id, int propertyId
memcpy(keyValues, from, sizeof(float) * propertyComponentCount);
memcpy(keyValues + propertyComponentCount, to, sizeof(float) * propertyComponentCount);
- unsigned long* keyTimes = new unsigned long[2];
+ unsigned int* keyTimes = new unsigned int[2];
keyTimes[0] = 0;
- keyTimes[1] = duration;
+ keyTimes[1] = (unsigned int)duration;
Animation* animation = createAnimation(id, propertyId, 2, keyTimes, keyValues, type);
@@ -99,9 +99,9 @@ Animation* AnimationTarget::createAnimationFromBy(const char* id, int propertyId
convertByValues(propertyId, propertyComponentCount, from, by);
memcpy(keyValues + propertyComponentCount, by, sizeof(float) * propertyComponentCount);
- unsigned long* keyTimes = new unsigned long[2];
+ unsigned int* keyTimes = new unsigned int[2];
keyTimes[0] = 0;
- keyTimes[1] = duration;
+ keyTimes[1] = (unsigned int)duration;
Animation* animation = createAnimation(id, propertyId, 2, keyTimes, keyValues, type);
@@ -119,14 +119,14 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
GP_ERROR("Invalid animation namespace '%s'.", animationProperties->getNamespace());
return NULL;
}
-
+
const char* propertyIdStr = animationProperties->getString("property");
if (propertyIdStr == NULL)
{
GP_ERROR("Attribute 'property' must be specified for an animation.");
return NULL;
}
-
+
// Get animation target property id
int propertyId = AnimationTarget::getPropertyId(_targetType, propertyIdStr);
if (propertyId == -1)
@@ -134,7 +134,7 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
GP_ERROR("Property ID is invalid.");
return NULL;
}
-
+
unsigned int keyCount = animationProperties->getInt("keyCount");
if (keyCount == 0)
{
@@ -148,26 +148,26 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
GP_ERROR("Attribute 'keyTimes' must be specified for an animation.");
return NULL;
}
-
+
const char* keyValuesStr = animationProperties->getString("keyValues");
if (keyValuesStr == NULL)
{
GP_ERROR("Attribute 'keyValues' must be specified for an animation.");
return NULL;
}
-
+
const char* curveStr = animationProperties->getString("curve");
if (curveStr == NULL)
{
GP_ERROR("Attribute 'curve' must be specified for an animation.");
return NULL;
}
-
+
char delimeter = ' ';
size_t startOffset = 0;
size_t endOffset = std::string::npos;
-
- unsigned long* keyTimes = new unsigned long[keyCount];
+
+ unsigned int* keyTimes = new unsigned int[keyCount];
for (size_t i = 0; i < keyCount; i++)
{
endOffset = static_cast(keyTimesStr).find_first_of(delimeter, startOffset);
@@ -184,18 +184,18 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
startOffset = 0;
endOffset = std::string::npos;
-
+
int componentCount = getAnimationPropertyComponentCount(propertyId);
GP_ASSERT(componentCount > 0);
-
+
unsigned int components = keyCount * componentCount;
-
+
float* keyValues = new float[components];
for (unsigned int i = 0; i < components; i++)
{
endOffset = static_cast(keyValuesStr).find_first_of(delimeter, startOffset);
if (endOffset != std::string::npos)
- {
+ {
keyValues[i] = std::atof(static_cast(keyValuesStr).substr(startOffset, endOffset - startOffset).c_str());
}
else
@@ -216,7 +216,7 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
{
endOffset = static_cast(keyInStr).find_first_of(delimeter, startOffset);
if (endOffset != std::string::npos)
- {
+ {
keyIn[i] = std::atof(static_cast(keyInStr).substr(startOffset, endOffset - startOffset).c_str());
}
else
@@ -226,11 +226,11 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
startOffset = endOffset + 1;
}
}
-
+
const char* keyOutStr = animationProperties->getString("keyOut");
float* keyOut = NULL;
if (keyOutStr)
- {
+ {
keyOut = new float[components];
startOffset = 0;
endOffset = std::string::npos;
@@ -238,7 +238,7 @@ Animation* AnimationTarget::createAnimation(const char* id, Properties* animatio
{
endOffset = static_cast(keyOutStr).find_first_of(delimeter, startOffset);
if (endOffset != std::string::npos)
- {
+ {
keyOut[i] = std::atof(static_cast(keyOutStr).substr(startOffset, endOffset - startOffset).c_str());
}
else
@@ -325,7 +325,7 @@ Animation* AnimationTarget::getAnimation(const char* id) const
int AnimationTarget::getPropertyId(TargetType type, const char* propertyIdStr)
{
GP_ASSERT(propertyIdStr);
-
+
if (type == AnimationTarget::TRANSFORM)
{
if (strcmp(propertyIdStr, "ANIMATE_SCALE") == 0)
@@ -467,7 +467,7 @@ void AnimationTarget::cloneInto(AnimationTarget* target, NodeCloneContext &conte
void AnimationTarget::convertByValues(unsigned int propertyId, unsigned int componentCount, float* from, float* by)
{
if (_targetType == AnimationTarget::TRANSFORM)
- {
+ {
switch(propertyId)
{
case Transform::ANIMATE_SCALE:
@@ -497,7 +497,7 @@ void AnimationTarget::convertByValues(unsigned int propertyId, unsigned int comp
convertQuaternionByValues(from, by);
convertByValues(from + 4, by + 4, 3);
break;
- }
+ }
case Transform::ANIMATE_SCALE_ROTATE_TRANSLATE:
{
convertScaleByValues(from, by, 3);
diff --git a/gameplay/src/AnimationTarget.h b/gameplay/src/AnimationTarget.h
index 4c992ccfda..5f4b1bf7e1 100644
--- a/gameplay/src/AnimationTarget.h
+++ b/gameplay/src/AnimationTarget.h
@@ -23,9 +23,9 @@ class AnimationTarget
public:
/**
- * Creates an animation on this target from a set of key value and key time pairs.
+ * Creates an animation on this target from a set of key value and key time pairs.
* Cannot use Curve::BEZIER or CURVE::HERMITE as the interpolation type since they require tangents/control points.
- *
+ *
* @param id The ID of the animation.
* @param propertyId The property on this target to animate.
* @param keyCount The number of keyframes in the animation. Must be greater than one.
@@ -35,11 +35,11 @@ class AnimationTarget
*
* @return The newly created animation.
*/
- Animation* createAnimation(const char* id, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, Curve::InterpolationType type);
+ Animation* createAnimation(const char* id, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, Curve::InterpolationType type);
/**
* Creates an animation on this target from a set of key value and key time pairs.
- *
+ *
* @param id The ID of the animation.
* @param propertyId The property on this target to animate.
* @param keyCount The number of keyframes in the animation. Must be greater than one.
@@ -51,13 +51,13 @@ class AnimationTarget
*
* @return The newly created animation.
*/
- Animation* createAnimation(const char* id, int propertyId, unsigned int keyCount, unsigned long* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, Curve::InterpolationType type);
+ Animation* createAnimation(const char* id, int propertyId, unsigned int keyCount, unsigned int* keyTimes, float* keyValues, float* keyInValue, float* keyOutValue, Curve::InterpolationType type);
/**
- * Creates an animation on this target using the data from the Properties object defined at the specified URL,
+ * Creates an animation on this target using the data from the Properties object defined at the specified URL,
* where the URL is of the format ".#//.../"
- * (and "#//.../" is optional).
- *
+ * (and "#//.../" is optional).
+ *
* @param id The ID of the animation.
* @param url The URL pointing to the Properties object defining the animation data.
*
@@ -66,8 +66,8 @@ class AnimationTarget
Animation* createAnimation(const char* id, const char* url);
/**
- * Creates an animation on this target using the data from the given properties object.
- *
+ * Creates an animation on this target using the data from the given properties object.
+ *
* @param id The ID of the animation.
* @param animationProperties The properties object defining the animation data.
*
@@ -109,14 +109,14 @@ class AnimationTarget
* Destroys the animation with the specified ID. Destroys the first animation if ID is NULL.
*
* @param id The ID of the animation to destroy.
- */
+ */
void destroyAnimation(const char* id = NULL);
/**
* Abstract method to return the property component count of the given property ID on the AnimationTarget.
- *
+ *
* @param propertyId The ID of the property on the AnimationTarget to obtain the component count for.
- *
+ *
* @return The property component count of the given property.
*/
virtual unsigned int getAnimationPropertyComponentCount(int propertyId) const = 0;
@@ -131,14 +131,14 @@ class AnimationTarget
/**
* Abstract method for setting the animation property value for the given property ID on the AnimationTarget.
- *
+ *
* @param propertyId The ID of the property on the AnimationTarget to set the animation property value on.
* @param value The container to set the animation property value in.
* @param blendWeight The blend weight.
*/
virtual void setAnimationPropertyValue(int propertyId, AnimationValue* value, float blendWeight = 1.0f) = 0;
- /**
+ /**
* Gets the animation with the specified ID. If the ID is NULL, this function will return the first animation it finds.
*
* @param id The name of the animation to get.
@@ -146,9 +146,9 @@ class AnimationTarget
Animation* getAnimation(const char* id = NULL) const;
protected:
-
+
/**
- * The type of animation target.
+ * The type of animation target.
*/
enum TargetType
{
@@ -168,14 +168,14 @@ class AnimationTarget
/**
* Adds the given animation channel to this animation target.
- *
+ *
* @param channel The animation channel to add.
*/
void addChannel(Animation::Channel* channel);
/**
* Removes the given animation channel from this animation target.
- *
+ *
* @param channel The animation channel to delete.
*/
void removeChannel(Animation::Channel* channel);
@@ -189,14 +189,14 @@ class AnimationTarget
/**
* Copies data from this animation target into the given target for the purpose of cloning.
- *
+ *
* @param target The target to copy into.
* @param context The clone context.
*/
void cloneInto(AnimationTarget* target, NodeCloneContext &context) const;
/**
- * The target's type.
+ * The target's type.
*
* @see TargetType::SCALAR
* @see TargetType::TRANSFORM
@@ -212,7 +212,7 @@ class AnimationTarget
/**
* Gets the TargetType's property ID value for the specified property ID string.
- *
+ *
* @param type The TargetType of the AnimationTarget.
* @param propertyIdStr The property ID string.
* @return The property ID value for teh property ID string; -1 if the propertyIdStr does not exist
@@ -241,7 +241,7 @@ class AnimationTarget
void convertByValues(float* from, float* by, unsigned int componentCount);
std::vector* _animationChannels; // Collection of all animation channels that target the AnimationTarget
-
+
};
}
diff --git a/gameplay/src/Bundle.cpp b/gameplay/src/Bundle.cpp
index 81eabf4298..9dd72d7615 100644
--- a/gameplay/src/Bundle.cpp
+++ b/gameplay/src/Bundle.cpp
@@ -393,7 +393,7 @@ Scene* Bundle::loadScene(const char* id)
return NULL;
}
}
-
+
Scene* scene = Scene::create();
scene->setId(getIdFromOffset());
@@ -505,7 +505,7 @@ Node* Bundle::loadNode(const char* id, Scene* sceneContext)
SAFE_DELETE(_trackedNodes);
return NULL;
}
-
+
// Read the number of animations in this object.
unsigned int animationCount;
if (!read(&animationCount))
@@ -573,8 +573,8 @@ Node* Bundle::loadNode(const char* id, Scene* sceneContext)
SAFE_DELETE(_trackedNodes);
return NULL;
}
-
- // Skip the animation channel (passing a target attribute of
+
+ // Skip the animation channel (passing a target attribute of
// 0 causes the animation to not be created).
readAnimationChannelData(NULL, id.c_str(), NULL, 0);
}
@@ -636,7 +636,7 @@ bool Bundle::skipNode()
GP_ERROR("Failed to skip node type for node '%s'.", id);
return false;
}
-
+
// Skip over the node's transform and parent ID.
if (fseek(_file, sizeof(float) * 16, SEEK_CUR) != 0)
{
@@ -660,7 +660,7 @@ bool Bundle::skipNode()
return false;
}
}
-
+
// Skip over the node's camera, light, and model attachments.
Camera* camera = readCamera(); SAFE_RELEASE(camera);
Light* light = readLight(); SAFE_RELEASE(light);
@@ -1109,7 +1109,7 @@ void Bundle::resolveJointReferences(Scene* sceneContext, Node* nodeContext)
Node* node = rootJoint;
GP_ASSERT(node);
Node* parent = node->getParent();
-
+
std::vector loadedNodes;
while (true)
{
@@ -1151,7 +1151,7 @@ void Bundle::resolveJointReferences(Scene* sceneContext, Node* nodeContext)
return;
}
std::string parentID = readString(_file);
-
+
if (!parentID.empty())
nodeId = parentID;
else
@@ -1259,11 +1259,11 @@ Animation* Bundle::readAnimationChannelData(Animation* animation, const char* id
{
GP_ASSERT(id);
- std::vector keyTimes;
+ std::vector keyTimes;
std::vector values;
std::vector tangentsIn;
std::vector tangentsOut;
- std::vector interpolation;
+ std::vector interpolation;
// Length of the arrays.
unsigned int keyTimesCount;
@@ -1278,28 +1278,28 @@ Animation* Bundle::readAnimationChannelData(Animation* animation, const char* id
GP_ERROR("Failed to read key times for animation '%s'.", id);
return NULL;
}
-
+
// Read key values.
if (!readArray(&valuesCount, &values))
{
GP_ERROR("Failed to read key values for animation '%s'.", id);
return NULL;
}
-
+
// Read in-tangents.
if (!readArray(&tangentsInCount, &tangentsIn))
{
GP_ERROR("Failed to read in tangents for animation '%s'.", id);
return NULL;
}
-
+
// Read out-tangents.
if (!readArray(&tangentsOutCount, &tangentsOut))
{
GP_ERROR("Failed to read out tangents for animation '%s'.", id);
return NULL;
}
-
+
// Read interpolations.
if (!readArray(&interpolationCount, &interpolation, sizeof(unsigned int)))
{
@@ -1519,7 +1519,7 @@ Bundle::MeshData* Bundle::readMeshData()
partData->primitiveType = (Mesh::PrimitiveType)pType;
partData->indexFormat = (Mesh::IndexFormat)iFormat;
-
+
unsigned int indexSize = 0;
switch (partData->indexFormat)
{
@@ -1683,7 +1683,7 @@ Font* Bundle::loadFont(const char* id)
SAFE_DELETE_ARRAY(glyphs);
return NULL;
}
-
+
// Read texture data.
unsigned char* textureData = new unsigned char[textureByteCount];
if (fread(textureData, 1, textureByteCount, _file) != textureByteCount)
diff --git a/gameplay/src/Game.cpp b/gameplay/src/Game.cpp
index 194cbfbc41..d2581a4236 100644
--- a/gameplay/src/Game.cpp
+++ b/gameplay/src/Game.cpp
@@ -18,12 +18,12 @@ static Game* __gameInstance = NULL;
double Game::_pausedTimeLast = 0.0;
double Game::_pausedTimeTotal = 0.0;
-Game::Game()
+Game::Game()
: _initialized(false), _state(UNINITIALIZED), _pausedCount(0),
- _frameLastFPS(0), _frameCount(0), _frameRate(0),
+ _frameLastFPS(0), _frameCount(0), _frameRate(0),
_clearDepth(1.0f), _clearStencil(0), _properties(NULL),
- _animationController(NULL), _audioController(NULL),
- _physicsController(NULL), _aiController(NULL), _audioListener(NULL),
+ _animationController(NULL), _audioController(NULL),
+ _physicsController(NULL), _aiController(NULL), _audioListener(NULL),
_gamepads(NULL), _timeEvents(NULL), _scriptController(NULL), _scriptListeners(NULL)
{
GP_ASSERT(__gameInstance == NULL);
@@ -111,7 +111,7 @@ bool Game::startup()
setViewport(Rectangle(0.0f, 0.0f, (float)_width, (float)_height));
RenderState::initialize();
FrameBuffer::initialize();
-
+
// Load any gamepads, ui or physical.
loadGamepads();
@@ -183,7 +183,7 @@ void Game::shutdown()
Platform::signalShutdown();
finalize();
-
+
std::vector::iterator itr = _gamepads->begin();
std::vector::iterator end = _gamepads->end();
while (itr != end)
@@ -193,7 +193,7 @@ void Game::shutdown()
}
_gamepads->clear();
SAFE_DELETE(_gamepads);
-
+
_scriptController->finalizeGame();
_animationController->finalize();
@@ -294,7 +294,7 @@ void Game::frame()
// Fire time events to scheduled TimeListeners
fireTimeEvents(frameTime);
-
+
// Update the physics.
_physicsController->update(elapsedTime);
@@ -371,7 +371,7 @@ void Game::updateOnce()
void Game::setViewport(const Rectangle& viewport)
{
_viewport = viewport;
- glViewport((GLuint)viewport.x, (GLuint)viewport.y, (GLuint)viewport.width, (GLuint)viewport.height);
+ glViewport((GLuint)viewport.x, (GLuint)viewport.y, (GLuint)viewport.width, (GLuint)viewport.height);
}
void Game::clear(ClearFlags flags, const Vector4& clearColor, float clearDepth, int clearStencil)
@@ -400,7 +400,7 @@ void Game::clear(ClearFlags flags, const Vector4& clearColor, float clearDepth,
bits |= GL_DEPTH_BUFFER_BIT;
// We need to explicitly call the static enableDepthWrite() method on StateBlock
- // to ensure depth writing is enabled before clearing the depth buffer (and to
+ // to ensure depth writing is enabled before clearing the depth buffer (and to
// update the global StateBlock render state to reflect this).
RenderState::StateBlock::enableDepthWrite();
}
@@ -555,7 +555,7 @@ void Game::loadConfig()
if (FileSystem::fileExists("game.config"))
{
_properties = Properties::create("game.config");
-
+
// Load filesystem aliases.
Properties* aliases = _properties->getNamespace("aliases", true);
if (aliases)
diff --git a/gameplay/src/lua/lua_AnimationTarget.cpp b/gameplay/src/lua/lua_AnimationTarget.cpp
index 1cda1b74a7..e230f8284b 100644
--- a/gameplay/src/lua/lua_AnimationTarget.cpp
+++ b/gameplay/src/lua/lua_AnimationTarget.cpp
@@ -13,7 +13,7 @@ namespace gameplay
void luaRegister_AnimationTarget()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"createAnimation", lua_AnimationTarget_createAnimation},
{"createAnimationFromBy", lua_AnimationTarget_createAnimationFromBy},
@@ -129,7 +129,7 @@ int lua_AnimationTarget_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -183,7 +183,7 @@ int lua_AnimationTarget_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -385,7 +385,7 @@ int lua_AnimationTarget_destroyAnimation(lua_State* state)
{
AnimationTarget* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -405,7 +405,7 @@ int lua_AnimationTarget_destroyAnimation(lua_State* state)
AnimationTarget* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -566,7 +566,7 @@ int lua_AnimationTarget_getAnimationPropertyValue(lua_State* state)
AnimationTarget* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -608,7 +608,7 @@ int lua_AnimationTarget_setAnimationPropertyValue(lua_State* state)
AnimationTarget* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -636,7 +636,7 @@ int lua_AnimationTarget_setAnimationPropertyValue(lua_State* state)
AnimationTarget* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_Button.cpp b/gameplay/src/lua/lua_Button.cpp
index 08f635233d..553d77d032 100644
--- a/gameplay/src/lua/lua_Button.cpp
+++ b/gameplay/src/lua/lua_Button.cpp
@@ -23,7 +23,7 @@ namespace gameplay
void luaRegister_Button()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addListener", lua_Button_addListener},
{"addRef", lua_Button_addRef},
@@ -108,7 +108,7 @@ void luaRegister_Button()
{"setZIndex", lua_Button_setZIndex},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_OPACITY", lua_Button_static_ANIMATE_OPACITY},
{"ANIMATE_POSITION", lua_Button_static_ANIMATE_POSITION},
@@ -152,7 +152,7 @@ int lua_Button__gc(lua_State* state)
Button* instance = (Button*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -194,7 +194,7 @@ int lua_Button_addListener(lua_State* state)
Button* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -228,7 +228,7 @@ int lua_Button_addRef(lua_State* state)
{
Button* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -270,7 +270,7 @@ int lua_Button_addScriptCallback(lua_State* state)
Button* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -381,7 +381,7 @@ int lua_Button_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -435,7 +435,7 @@ int lua_Button_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -637,7 +637,7 @@ int lua_Button_destroyAnimation(lua_State* state)
{
Button* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -657,7 +657,7 @@ int lua_Button_destroyAnimation(lua_State* state)
Button* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -691,7 +691,7 @@ int lua_Button_disable(lua_State* state)
{
Button* instance = getInstance(state);
instance->disable();
-
+
return 0;
}
else
@@ -725,7 +725,7 @@ int lua_Button_enable(lua_State* state)
{
Button* instance = getInstance(state);
instance->enable();
-
+
return 0;
}
else
@@ -923,7 +923,7 @@ int lua_Button_getAnimationPropertyValue(lua_State* state)
Button* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2730,7 +2730,7 @@ int lua_Button_release(lua_State* state)
{
Button* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -2772,7 +2772,7 @@ int lua_Button_removeScriptCallback(lua_State* state)
Button* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -2810,7 +2810,7 @@ int lua_Button_setAlignment(lua_State* state)
Button* instance = getInstance(state);
instance->setAlignment(param1);
-
+
return 0;
}
else
@@ -2852,7 +2852,7 @@ int lua_Button_setAnimationPropertyValue(lua_State* state)
Button* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2880,7 +2880,7 @@ int lua_Button_setAnimationPropertyValue(lua_State* state)
Button* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -2918,7 +2918,7 @@ int lua_Button_setAutoHeight(lua_State* state)
Button* instance = getInstance(state);
instance->setAutoHeight(param1);
-
+
return 0;
}
else
@@ -2956,7 +2956,7 @@ int lua_Button_setAutoWidth(lua_State* state)
Button* instance = getInstance(state);
instance->setAutoWidth(param1);
-
+
return 0;
}
else
@@ -3006,7 +3006,7 @@ int lua_Button_setBorder(lua_State* state)
Button* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3042,7 +3042,7 @@ int lua_Button_setBorder(lua_State* state)
Button* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3080,7 +3080,7 @@ int lua_Button_setBounds(lua_State* state)
Button* instance = getInstance(state);
instance->setBounds(*param1);
-
+
return 0;
}
else
@@ -3118,7 +3118,7 @@ int lua_Button_setConsumeInputEvents(lua_State* state)
Button* instance = getInstance(state);
instance->setConsumeInputEvents(param1);
-
+
return 0;
}
else
@@ -3160,7 +3160,7 @@ int lua_Button_setCursorColor(lua_State* state)
Button* instance = getInstance(state);
instance->setCursorColor(*param1, param2);
-
+
return 0;
}
else
@@ -3202,7 +3202,7 @@ int lua_Button_setCursorRegion(lua_State* state)
Button* instance = getInstance(state);
instance->setCursorRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3240,7 +3240,7 @@ int lua_Button_setFocusIndex(lua_State* state)
Button* instance = getInstance(state);
instance->setFocusIndex(param1);
-
+
return 0;
}
else
@@ -3278,7 +3278,7 @@ int lua_Button_setFont(lua_State* state)
Button* instance = getInstance(state);
instance->setFont(param1);
-
+
return 0;
}
else
@@ -3302,7 +3302,7 @@ int lua_Button_setFont(lua_State* state)
Button* instance = getInstance(state);
instance->setFont(param1, param2);
-
+
return 0;
}
else
@@ -3340,7 +3340,7 @@ int lua_Button_setFontSize(lua_State* state)
Button* instance = getInstance(state);
instance->setFontSize(param1);
-
+
return 0;
}
else
@@ -3364,7 +3364,7 @@ int lua_Button_setFontSize(lua_State* state)
Button* instance = getInstance(state);
instance->setFontSize(param1, param2);
-
+
return 0;
}
else
@@ -3402,7 +3402,7 @@ int lua_Button_setHeight(lua_State* state)
Button* instance = getInstance(state);
instance->setHeight(param1);
-
+
return 0;
}
else
@@ -3444,7 +3444,7 @@ int lua_Button_setImageColor(lua_State* state)
Button* instance = getInstance(state);
instance->setImageColor(param1, *param2);
-
+
return 0;
}
else
@@ -3472,7 +3472,7 @@ int lua_Button_setImageColor(lua_State* state)
Button* instance = getInstance(state);
instance->setImageColor(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3514,7 +3514,7 @@ int lua_Button_setImageRegion(lua_State* state)
Button* instance = getInstance(state);
instance->setImageRegion(param1, *param2);
-
+
return 0;
}
else
@@ -3542,7 +3542,7 @@ int lua_Button_setImageRegion(lua_State* state)
Button* instance = getInstance(state);
instance->setImageRegion(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3592,7 +3592,7 @@ int lua_Button_setMargin(lua_State* state)
Button* instance = getInstance(state);
instance->setMargin(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3630,7 +3630,7 @@ int lua_Button_setOpacity(lua_State* state)
Button* instance = getInstance(state);
instance->setOpacity(param1);
-
+
return 0;
}
else
@@ -3654,7 +3654,7 @@ int lua_Button_setOpacity(lua_State* state)
Button* instance = getInstance(state);
instance->setOpacity(param1, param2);
-
+
return 0;
}
else
@@ -3704,7 +3704,7 @@ int lua_Button_setPadding(lua_State* state)
Button* instance = getInstance(state);
instance->setPadding(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3746,7 +3746,7 @@ int lua_Button_setPosition(lua_State* state)
Button* instance = getInstance(state);
instance->setPosition(param1, param2);
-
+
return 0;
}
else
@@ -3788,7 +3788,7 @@ int lua_Button_setSize(lua_State* state)
Button* instance = getInstance(state);
instance->setSize(param1, param2);
-
+
return 0;
}
else
@@ -3826,7 +3826,7 @@ int lua_Button_setSkinColor(lua_State* state)
Button* instance = getInstance(state);
instance->setSkinColor(*param1);
-
+
return 0;
}
else
@@ -3850,7 +3850,7 @@ int lua_Button_setSkinColor(lua_State* state)
Button* instance = getInstance(state);
instance->setSkinColor(*param1, param2);
-
+
return 0;
}
else
@@ -3888,7 +3888,7 @@ int lua_Button_setSkinRegion(lua_State* state)
Button* instance = getInstance(state);
instance->setSkinRegion(*param1);
-
+
return 0;
}
else
@@ -3912,7 +3912,7 @@ int lua_Button_setSkinRegion(lua_State* state)
Button* instance = getInstance(state);
instance->setSkinRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3950,7 +3950,7 @@ int lua_Button_setState(lua_State* state)
Button* instance = getInstance(state);
instance->setState(param1);
-
+
return 0;
}
else
@@ -3988,7 +3988,7 @@ int lua_Button_setStyle(lua_State* state)
Button* instance = getInstance(state);
instance->setStyle(param1);
-
+
return 0;
}
else
@@ -4026,7 +4026,7 @@ int lua_Button_setText(lua_State* state)
Button* instance = getInstance(state);
instance->setText(param1);
-
+
return 0;
}
else
@@ -4064,7 +4064,7 @@ int lua_Button_setTextAlignment(lua_State* state)
Button* instance = getInstance(state);
instance->setTextAlignment(param1);
-
+
return 0;
}
else
@@ -4088,7 +4088,7 @@ int lua_Button_setTextAlignment(lua_State* state)
Button* instance = getInstance(state);
instance->setTextAlignment(param1, param2);
-
+
return 0;
}
else
@@ -4126,7 +4126,7 @@ int lua_Button_setTextColor(lua_State* state)
Button* instance = getInstance(state);
instance->setTextColor(*param1);
-
+
return 0;
}
else
@@ -4150,7 +4150,7 @@ int lua_Button_setTextColor(lua_State* state)
Button* instance = getInstance(state);
instance->setTextColor(*param1, param2);
-
+
return 0;
}
else
@@ -4188,7 +4188,7 @@ int lua_Button_setTextRightToLeft(lua_State* state)
Button* instance = getInstance(state);
instance->setTextRightToLeft(param1);
-
+
return 0;
}
else
@@ -4212,7 +4212,7 @@ int lua_Button_setTextRightToLeft(lua_State* state)
Button* instance = getInstance(state);
instance->setTextRightToLeft(param1, param2);
-
+
return 0;
}
else
@@ -4250,7 +4250,7 @@ int lua_Button_setWidth(lua_State* state)
Button* instance = getInstance(state);
instance->setWidth(param1);
-
+
return 0;
}
else
@@ -4288,7 +4288,7 @@ int lua_Button_setZIndex(lua_State* state)
Button* instance = getInstance(state);
instance->setZIndex(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_CheckBox.cpp b/gameplay/src/lua/lua_CheckBox.cpp
index 79c22dcba5..162e664e98 100644
--- a/gameplay/src/lua/lua_CheckBox.cpp
+++ b/gameplay/src/lua/lua_CheckBox.cpp
@@ -24,7 +24,7 @@ namespace gameplay
void luaRegister_CheckBox()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addListener", lua_CheckBox_addListener},
{"addRef", lua_CheckBox_addRef},
@@ -114,7 +114,7 @@ void luaRegister_CheckBox()
{"setZIndex", lua_CheckBox_setZIndex},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_OPACITY", lua_CheckBox_static_ANIMATE_OPACITY},
{"ANIMATE_POSITION", lua_CheckBox_static_ANIMATE_POSITION},
@@ -158,7 +158,7 @@ int lua_CheckBox__gc(lua_State* state)
CheckBox* instance = (CheckBox*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -200,7 +200,7 @@ int lua_CheckBox_addListener(lua_State* state)
CheckBox* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -234,7 +234,7 @@ int lua_CheckBox_addRef(lua_State* state)
{
CheckBox* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -276,7 +276,7 @@ int lua_CheckBox_addScriptCallback(lua_State* state)
CheckBox* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -387,7 +387,7 @@ int lua_CheckBox_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -441,7 +441,7 @@ int lua_CheckBox_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -643,7 +643,7 @@ int lua_CheckBox_destroyAnimation(lua_State* state)
{
CheckBox* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -663,7 +663,7 @@ int lua_CheckBox_destroyAnimation(lua_State* state)
CheckBox* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -697,7 +697,7 @@ int lua_CheckBox_disable(lua_State* state)
{
CheckBox* instance = getInstance(state);
instance->disable();
-
+
return 0;
}
else
@@ -731,7 +731,7 @@ int lua_CheckBox_enable(lua_State* state)
{
CheckBox* instance = getInstance(state);
instance->enable();
-
+
return 0;
}
else
@@ -929,7 +929,7 @@ int lua_CheckBox_getAnimationPropertyValue(lua_State* state)
CheckBox* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2856,7 +2856,7 @@ int lua_CheckBox_release(lua_State* state)
{
CheckBox* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -2898,7 +2898,7 @@ int lua_CheckBox_removeScriptCallback(lua_State* state)
CheckBox* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -2936,7 +2936,7 @@ int lua_CheckBox_setAlignment(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setAlignment(param1);
-
+
return 0;
}
else
@@ -2978,7 +2978,7 @@ int lua_CheckBox_setAnimationPropertyValue(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -3006,7 +3006,7 @@ int lua_CheckBox_setAnimationPropertyValue(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -3044,7 +3044,7 @@ int lua_CheckBox_setAutoHeight(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setAutoHeight(param1);
-
+
return 0;
}
else
@@ -3082,7 +3082,7 @@ int lua_CheckBox_setAutoWidth(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setAutoWidth(param1);
-
+
return 0;
}
else
@@ -3132,7 +3132,7 @@ int lua_CheckBox_setBorder(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3168,7 +3168,7 @@ int lua_CheckBox_setBorder(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3206,7 +3206,7 @@ int lua_CheckBox_setBounds(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setBounds(*param1);
-
+
return 0;
}
else
@@ -3244,7 +3244,7 @@ int lua_CheckBox_setChecked(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setChecked(param1);
-
+
return 0;
}
else
@@ -3282,7 +3282,7 @@ int lua_CheckBox_setConsumeInputEvents(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setConsumeInputEvents(param1);
-
+
return 0;
}
else
@@ -3324,7 +3324,7 @@ int lua_CheckBox_setCursorColor(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setCursorColor(*param1, param2);
-
+
return 0;
}
else
@@ -3366,7 +3366,7 @@ int lua_CheckBox_setCursorRegion(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setCursorRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3404,7 +3404,7 @@ int lua_CheckBox_setFocusIndex(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setFocusIndex(param1);
-
+
return 0;
}
else
@@ -3442,7 +3442,7 @@ int lua_CheckBox_setFont(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setFont(param1);
-
+
return 0;
}
else
@@ -3466,7 +3466,7 @@ int lua_CheckBox_setFont(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setFont(param1, param2);
-
+
return 0;
}
else
@@ -3504,7 +3504,7 @@ int lua_CheckBox_setFontSize(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setFontSize(param1);
-
+
return 0;
}
else
@@ -3528,7 +3528,7 @@ int lua_CheckBox_setFontSize(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setFontSize(param1, param2);
-
+
return 0;
}
else
@@ -3566,7 +3566,7 @@ int lua_CheckBox_setHeight(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setHeight(param1);
-
+
return 0;
}
else
@@ -3608,7 +3608,7 @@ int lua_CheckBox_setImageColor(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setImageColor(param1, *param2);
-
+
return 0;
}
else
@@ -3636,7 +3636,7 @@ int lua_CheckBox_setImageColor(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setImageColor(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3678,7 +3678,7 @@ int lua_CheckBox_setImageRegion(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setImageRegion(param1, *param2);
-
+
return 0;
}
else
@@ -3706,7 +3706,7 @@ int lua_CheckBox_setImageRegion(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setImageRegion(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3748,7 +3748,7 @@ int lua_CheckBox_setImageSize(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setImageSize(param1, param2);
-
+
return 0;
}
else
@@ -3798,7 +3798,7 @@ int lua_CheckBox_setMargin(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setMargin(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3836,7 +3836,7 @@ int lua_CheckBox_setOpacity(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setOpacity(param1);
-
+
return 0;
}
else
@@ -3860,7 +3860,7 @@ int lua_CheckBox_setOpacity(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setOpacity(param1, param2);
-
+
return 0;
}
else
@@ -3910,7 +3910,7 @@ int lua_CheckBox_setPadding(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setPadding(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3952,7 +3952,7 @@ int lua_CheckBox_setPosition(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setPosition(param1, param2);
-
+
return 0;
}
else
@@ -3994,7 +3994,7 @@ int lua_CheckBox_setSize(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setSize(param1, param2);
-
+
return 0;
}
else
@@ -4032,7 +4032,7 @@ int lua_CheckBox_setSkinColor(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setSkinColor(*param1);
-
+
return 0;
}
else
@@ -4056,7 +4056,7 @@ int lua_CheckBox_setSkinColor(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setSkinColor(*param1, param2);
-
+
return 0;
}
else
@@ -4094,7 +4094,7 @@ int lua_CheckBox_setSkinRegion(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setSkinRegion(*param1);
-
+
return 0;
}
else
@@ -4118,7 +4118,7 @@ int lua_CheckBox_setSkinRegion(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setSkinRegion(*param1, param2);
-
+
return 0;
}
else
@@ -4156,7 +4156,7 @@ int lua_CheckBox_setState(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setState(param1);
-
+
return 0;
}
else
@@ -4194,7 +4194,7 @@ int lua_CheckBox_setStyle(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setStyle(param1);
-
+
return 0;
}
else
@@ -4232,7 +4232,7 @@ int lua_CheckBox_setText(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setText(param1);
-
+
return 0;
}
else
@@ -4270,7 +4270,7 @@ int lua_CheckBox_setTextAlignment(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setTextAlignment(param1);
-
+
return 0;
}
else
@@ -4294,7 +4294,7 @@ int lua_CheckBox_setTextAlignment(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setTextAlignment(param1, param2);
-
+
return 0;
}
else
@@ -4332,7 +4332,7 @@ int lua_CheckBox_setTextColor(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setTextColor(*param1);
-
+
return 0;
}
else
@@ -4356,7 +4356,7 @@ int lua_CheckBox_setTextColor(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setTextColor(*param1, param2);
-
+
return 0;
}
else
@@ -4394,7 +4394,7 @@ int lua_CheckBox_setTextRightToLeft(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setTextRightToLeft(param1);
-
+
return 0;
}
else
@@ -4418,7 +4418,7 @@ int lua_CheckBox_setTextRightToLeft(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setTextRightToLeft(param1, param2);
-
+
return 0;
}
else
@@ -4456,7 +4456,7 @@ int lua_CheckBox_setWidth(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setWidth(param1);
-
+
return 0;
}
else
@@ -4494,7 +4494,7 @@ int lua_CheckBox_setZIndex(lua_State* state)
CheckBox* instance = getInstance(state);
instance->setZIndex(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_Container.cpp b/gameplay/src/lua/lua_Container.cpp
index b9ebc9e441..0d77a844b7 100644
--- a/gameplay/src/lua/lua_Container.cpp
+++ b/gameplay/src/lua/lua_Container.cpp
@@ -35,7 +35,7 @@ namespace gameplay
void luaRegister_Container()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addControl", lua_Container_addControl},
{"addListener", lua_Container_addListener},
@@ -128,7 +128,7 @@ void luaRegister_Container()
{"setZIndex", lua_Container_setZIndex},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_OPACITY", lua_Container_static_ANIMATE_OPACITY},
{"ANIMATE_POSITION", lua_Container_static_ANIMATE_POSITION},
@@ -173,7 +173,7 @@ int lua_Container__gc(lua_State* state)
Container* instance = (Container*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -256,7 +256,7 @@ int lua_Container_addListener(lua_State* state)
Container* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -290,7 +290,7 @@ int lua_Container_addRef(lua_State* state)
{
Container* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -332,7 +332,7 @@ int lua_Container_addScriptCallback(lua_State* state)
Container* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -443,7 +443,7 @@ int lua_Container_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -497,7 +497,7 @@ int lua_Container_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -699,7 +699,7 @@ int lua_Container_destroyAnimation(lua_State* state)
{
Container* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -719,7 +719,7 @@ int lua_Container_destroyAnimation(lua_State* state)
Container* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -753,7 +753,7 @@ int lua_Container_disable(lua_State* state)
{
Container* instance = getInstance(state);
instance->disable();
-
+
return 0;
}
else
@@ -787,7 +787,7 @@ int lua_Container_enable(lua_State* state)
{
Container* instance = getInstance(state);
instance->enable();
-
+
return 0;
}
else
@@ -985,7 +985,7 @@ int lua_Container_getAnimationPropertyValue(lua_State* state)
Container* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2882,7 +2882,7 @@ int lua_Container_insertControl(lua_State* state)
Container* instance = getInstance(state);
instance->insertControl(param1, param2);
-
+
return 0;
}
else
@@ -3027,7 +3027,7 @@ int lua_Container_release(lua_State* state)
{
Container* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -3065,7 +3065,7 @@ int lua_Container_removeControl(lua_State* state)
Container* instance = getInstance(state);
instance->removeControl(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -3076,7 +3076,7 @@ int lua_Container_removeControl(lua_State* state)
Container* instance = getInstance(state);
instance->removeControl(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -3087,7 +3087,7 @@ int lua_Container_removeControl(lua_State* state)
Container* instance = getInstance(state);
instance->removeControl(param1);
-
+
return 0;
}
else
@@ -3129,7 +3129,7 @@ int lua_Container_removeScriptCallback(lua_State* state)
Container* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -3167,7 +3167,7 @@ int lua_Container_setAlignment(lua_State* state)
Container* instance = getInstance(state);
instance->setAlignment(param1);
-
+
return 0;
}
else
@@ -3209,7 +3209,7 @@ int lua_Container_setAnimationPropertyValue(lua_State* state)
Container* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -3237,7 +3237,7 @@ int lua_Container_setAnimationPropertyValue(lua_State* state)
Container* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -3275,7 +3275,7 @@ int lua_Container_setAutoHeight(lua_State* state)
Container* instance = getInstance(state);
instance->setAutoHeight(param1);
-
+
return 0;
}
else
@@ -3313,7 +3313,7 @@ int lua_Container_setAutoWidth(lua_State* state)
Container* instance = getInstance(state);
instance->setAutoWidth(param1);
-
+
return 0;
}
else
@@ -3363,7 +3363,7 @@ int lua_Container_setBorder(lua_State* state)
Container* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3399,7 +3399,7 @@ int lua_Container_setBorder(lua_State* state)
Container* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3437,7 +3437,7 @@ int lua_Container_setBounds(lua_State* state)
Container* instance = getInstance(state);
instance->setBounds(*param1);
-
+
return 0;
}
else
@@ -3475,7 +3475,7 @@ int lua_Container_setConsumeInputEvents(lua_State* state)
Container* instance = getInstance(state);
instance->setConsumeInputEvents(param1);
-
+
return 0;
}
else
@@ -3517,7 +3517,7 @@ int lua_Container_setCursorColor(lua_State* state)
Container* instance = getInstance(state);
instance->setCursorColor(*param1, param2);
-
+
return 0;
}
else
@@ -3559,7 +3559,7 @@ int lua_Container_setCursorRegion(lua_State* state)
Container* instance = getInstance(state);
instance->setCursorRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3597,7 +3597,7 @@ int lua_Container_setFocusIndex(lua_State* state)
Container* instance = getInstance(state);
instance->setFocusIndex(param1);
-
+
return 0;
}
else
@@ -3635,7 +3635,7 @@ int lua_Container_setFont(lua_State* state)
Container* instance = getInstance(state);
instance->setFont(param1);
-
+
return 0;
}
else
@@ -3659,7 +3659,7 @@ int lua_Container_setFont(lua_State* state)
Container* instance = getInstance(state);
instance->setFont(param1, param2);
-
+
return 0;
}
else
@@ -3697,7 +3697,7 @@ int lua_Container_setFontSize(lua_State* state)
Container* instance = getInstance(state);
instance->setFontSize(param1);
-
+
return 0;
}
else
@@ -3721,7 +3721,7 @@ int lua_Container_setFontSize(lua_State* state)
Container* instance = getInstance(state);
instance->setFontSize(param1, param2);
-
+
return 0;
}
else
@@ -3759,7 +3759,7 @@ int lua_Container_setHeight(lua_State* state)
Container* instance = getInstance(state);
instance->setHeight(param1);
-
+
return 0;
}
else
@@ -3801,7 +3801,7 @@ int lua_Container_setImageColor(lua_State* state)
Container* instance = getInstance(state);
instance->setImageColor(param1, *param2);
-
+
return 0;
}
else
@@ -3829,7 +3829,7 @@ int lua_Container_setImageColor(lua_State* state)
Container* instance = getInstance(state);
instance->setImageColor(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3871,7 +3871,7 @@ int lua_Container_setImageRegion(lua_State* state)
Container* instance = getInstance(state);
instance->setImageRegion(param1, *param2);
-
+
return 0;
}
else
@@ -3899,7 +3899,7 @@ int lua_Container_setImageRegion(lua_State* state)
Container* instance = getInstance(state);
instance->setImageRegion(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3949,7 +3949,7 @@ int lua_Container_setMargin(lua_State* state)
Container* instance = getInstance(state);
instance->setMargin(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3987,7 +3987,7 @@ int lua_Container_setOpacity(lua_State* state)
Container* instance = getInstance(state);
instance->setOpacity(param1);
-
+
return 0;
}
else
@@ -4011,7 +4011,7 @@ int lua_Container_setOpacity(lua_State* state)
Container* instance = getInstance(state);
instance->setOpacity(param1, param2);
-
+
return 0;
}
else
@@ -4061,7 +4061,7 @@ int lua_Container_setPadding(lua_State* state)
Container* instance = getInstance(state);
instance->setPadding(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -4103,7 +4103,7 @@ int lua_Container_setPosition(lua_State* state)
Container* instance = getInstance(state);
instance->setPosition(param1, param2);
-
+
return 0;
}
else
@@ -4141,7 +4141,7 @@ int lua_Container_setScroll(lua_State* state)
Container* instance = getInstance(state);
instance->setScroll(param1);
-
+
return 0;
}
else
@@ -4179,7 +4179,7 @@ int lua_Container_setScrollBarsAutoHide(lua_State* state)
Container* instance = getInstance(state);
instance->setScrollBarsAutoHide(param1);
-
+
return 0;
}
else
@@ -4221,7 +4221,7 @@ int lua_Container_setSize(lua_State* state)
Container* instance = getInstance(state);
instance->setSize(param1, param2);
-
+
return 0;
}
else
@@ -4259,7 +4259,7 @@ int lua_Container_setSkinColor(lua_State* state)
Container* instance = getInstance(state);
instance->setSkinColor(*param1);
-
+
return 0;
}
else
@@ -4283,7 +4283,7 @@ int lua_Container_setSkinColor(lua_State* state)
Container* instance = getInstance(state);
instance->setSkinColor(*param1, param2);
-
+
return 0;
}
else
@@ -4321,7 +4321,7 @@ int lua_Container_setSkinRegion(lua_State* state)
Container* instance = getInstance(state);
instance->setSkinRegion(*param1);
-
+
return 0;
}
else
@@ -4345,7 +4345,7 @@ int lua_Container_setSkinRegion(lua_State* state)
Container* instance = getInstance(state);
instance->setSkinRegion(*param1, param2);
-
+
return 0;
}
else
@@ -4383,7 +4383,7 @@ int lua_Container_setState(lua_State* state)
Container* instance = getInstance(state);
instance->setState(param1);
-
+
return 0;
}
else
@@ -4421,7 +4421,7 @@ int lua_Container_setStyle(lua_State* state)
Container* instance = getInstance(state);
instance->setStyle(param1);
-
+
return 0;
}
else
@@ -4459,7 +4459,7 @@ int lua_Container_setTextAlignment(lua_State* state)
Container* instance = getInstance(state);
instance->setTextAlignment(param1);
-
+
return 0;
}
else
@@ -4483,7 +4483,7 @@ int lua_Container_setTextAlignment(lua_State* state)
Container* instance = getInstance(state);
instance->setTextAlignment(param1, param2);
-
+
return 0;
}
else
@@ -4521,7 +4521,7 @@ int lua_Container_setTextColor(lua_State* state)
Container* instance = getInstance(state);
instance->setTextColor(*param1);
-
+
return 0;
}
else
@@ -4545,7 +4545,7 @@ int lua_Container_setTextColor(lua_State* state)
Container* instance = getInstance(state);
instance->setTextColor(*param1, param2);
-
+
return 0;
}
else
@@ -4583,7 +4583,7 @@ int lua_Container_setTextRightToLeft(lua_State* state)
Container* instance = getInstance(state);
instance->setTextRightToLeft(param1);
-
+
return 0;
}
else
@@ -4607,7 +4607,7 @@ int lua_Container_setTextRightToLeft(lua_State* state)
Container* instance = getInstance(state);
instance->setTextRightToLeft(param1, param2);
-
+
return 0;
}
else
@@ -4645,7 +4645,7 @@ int lua_Container_setWidth(lua_State* state)
Container* instance = getInstance(state);
instance->setWidth(param1);
-
+
return 0;
}
else
@@ -4683,7 +4683,7 @@ int lua_Container_setZIndex(lua_State* state)
Container* instance = getInstance(state);
instance->setZIndex(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_Control.cpp b/gameplay/src/lua/lua_Control.cpp
index 74cfd10709..cb44bb3c88 100644
--- a/gameplay/src/lua/lua_Control.cpp
+++ b/gameplay/src/lua/lua_Control.cpp
@@ -21,7 +21,7 @@ namespace gameplay
void luaRegister_Control()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addListener", lua_Control_addListener},
{"addRef", lua_Control_addRef},
@@ -105,7 +105,7 @@ void luaRegister_Control()
{"setZIndex", lua_Control_setZIndex},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_OPACITY", lua_Control_static_ANIMATE_OPACITY},
{"ANIMATE_POSITION", lua_Control_static_ANIMATE_POSITION},
@@ -148,7 +148,7 @@ int lua_Control__gc(lua_State* state)
Control* instance = (Control*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -190,7 +190,7 @@ int lua_Control_addListener(lua_State* state)
Control* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -224,7 +224,7 @@ int lua_Control_addRef(lua_State* state)
{
Control* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -266,7 +266,7 @@ int lua_Control_addScriptCallback(lua_State* state)
Control* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -377,7 +377,7 @@ int lua_Control_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -431,7 +431,7 @@ int lua_Control_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -633,7 +633,7 @@ int lua_Control_destroyAnimation(lua_State* state)
{
Control* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -653,7 +653,7 @@ int lua_Control_destroyAnimation(lua_State* state)
Control* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -687,7 +687,7 @@ int lua_Control_disable(lua_State* state)
{
Control* instance = getInstance(state);
instance->disable();
-
+
return 0;
}
else
@@ -721,7 +721,7 @@ int lua_Control_enable(lua_State* state)
{
Control* instance = getInstance(state);
instance->enable();
-
+
return 0;
}
else
@@ -919,7 +919,7 @@ int lua_Control_getAnimationPropertyValue(lua_State* state)
Control* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2726,7 +2726,7 @@ int lua_Control_release(lua_State* state)
{
Control* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -2768,7 +2768,7 @@ int lua_Control_removeScriptCallback(lua_State* state)
Control* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -2806,7 +2806,7 @@ int lua_Control_setAlignment(lua_State* state)
Control* instance = getInstance(state);
instance->setAlignment(param1);
-
+
return 0;
}
else
@@ -2848,7 +2848,7 @@ int lua_Control_setAnimationPropertyValue(lua_State* state)
Control* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2876,7 +2876,7 @@ int lua_Control_setAnimationPropertyValue(lua_State* state)
Control* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -2914,7 +2914,7 @@ int lua_Control_setAutoHeight(lua_State* state)
Control* instance = getInstance(state);
instance->setAutoHeight(param1);
-
+
return 0;
}
else
@@ -2952,7 +2952,7 @@ int lua_Control_setAutoWidth(lua_State* state)
Control* instance = getInstance(state);
instance->setAutoWidth(param1);
-
+
return 0;
}
else
@@ -3002,7 +3002,7 @@ int lua_Control_setBorder(lua_State* state)
Control* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3038,7 +3038,7 @@ int lua_Control_setBorder(lua_State* state)
Control* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3076,7 +3076,7 @@ int lua_Control_setBounds(lua_State* state)
Control* instance = getInstance(state);
instance->setBounds(*param1);
-
+
return 0;
}
else
@@ -3114,7 +3114,7 @@ int lua_Control_setConsumeInputEvents(lua_State* state)
Control* instance = getInstance(state);
instance->setConsumeInputEvents(param1);
-
+
return 0;
}
else
@@ -3156,7 +3156,7 @@ int lua_Control_setCursorColor(lua_State* state)
Control* instance = getInstance(state);
instance->setCursorColor(*param1, param2);
-
+
return 0;
}
else
@@ -3198,7 +3198,7 @@ int lua_Control_setCursorRegion(lua_State* state)
Control* instance = getInstance(state);
instance->setCursorRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3236,7 +3236,7 @@ int lua_Control_setFocusIndex(lua_State* state)
Control* instance = getInstance(state);
instance->setFocusIndex(param1);
-
+
return 0;
}
else
@@ -3274,7 +3274,7 @@ int lua_Control_setFont(lua_State* state)
Control* instance = getInstance(state);
instance->setFont(param1);
-
+
return 0;
}
else
@@ -3298,7 +3298,7 @@ int lua_Control_setFont(lua_State* state)
Control* instance = getInstance(state);
instance->setFont(param1, param2);
-
+
return 0;
}
else
@@ -3336,7 +3336,7 @@ int lua_Control_setFontSize(lua_State* state)
Control* instance = getInstance(state);
instance->setFontSize(param1);
-
+
return 0;
}
else
@@ -3360,7 +3360,7 @@ int lua_Control_setFontSize(lua_State* state)
Control* instance = getInstance(state);
instance->setFontSize(param1, param2);
-
+
return 0;
}
else
@@ -3398,7 +3398,7 @@ int lua_Control_setHeight(lua_State* state)
Control* instance = getInstance(state);
instance->setHeight(param1);
-
+
return 0;
}
else
@@ -3440,7 +3440,7 @@ int lua_Control_setImageColor(lua_State* state)
Control* instance = getInstance(state);
instance->setImageColor(param1, *param2);
-
+
return 0;
}
else
@@ -3468,7 +3468,7 @@ int lua_Control_setImageColor(lua_State* state)
Control* instance = getInstance(state);
instance->setImageColor(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3510,7 +3510,7 @@ int lua_Control_setImageRegion(lua_State* state)
Control* instance = getInstance(state);
instance->setImageRegion(param1, *param2);
-
+
return 0;
}
else
@@ -3538,7 +3538,7 @@ int lua_Control_setImageRegion(lua_State* state)
Control* instance = getInstance(state);
instance->setImageRegion(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3588,7 +3588,7 @@ int lua_Control_setMargin(lua_State* state)
Control* instance = getInstance(state);
instance->setMargin(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3626,7 +3626,7 @@ int lua_Control_setOpacity(lua_State* state)
Control* instance = getInstance(state);
instance->setOpacity(param1);
-
+
return 0;
}
else
@@ -3650,7 +3650,7 @@ int lua_Control_setOpacity(lua_State* state)
Control* instance = getInstance(state);
instance->setOpacity(param1, param2);
-
+
return 0;
}
else
@@ -3700,7 +3700,7 @@ int lua_Control_setPadding(lua_State* state)
Control* instance = getInstance(state);
instance->setPadding(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3742,7 +3742,7 @@ int lua_Control_setPosition(lua_State* state)
Control* instance = getInstance(state);
instance->setPosition(param1, param2);
-
+
return 0;
}
else
@@ -3784,7 +3784,7 @@ int lua_Control_setSize(lua_State* state)
Control* instance = getInstance(state);
instance->setSize(param1, param2);
-
+
return 0;
}
else
@@ -3822,7 +3822,7 @@ int lua_Control_setSkinColor(lua_State* state)
Control* instance = getInstance(state);
instance->setSkinColor(*param1);
-
+
return 0;
}
else
@@ -3846,7 +3846,7 @@ int lua_Control_setSkinColor(lua_State* state)
Control* instance = getInstance(state);
instance->setSkinColor(*param1, param2);
-
+
return 0;
}
else
@@ -3884,7 +3884,7 @@ int lua_Control_setSkinRegion(lua_State* state)
Control* instance = getInstance(state);
instance->setSkinRegion(*param1);
-
+
return 0;
}
else
@@ -3908,7 +3908,7 @@ int lua_Control_setSkinRegion(lua_State* state)
Control* instance = getInstance(state);
instance->setSkinRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3946,7 +3946,7 @@ int lua_Control_setState(lua_State* state)
Control* instance = getInstance(state);
instance->setState(param1);
-
+
return 0;
}
else
@@ -3984,7 +3984,7 @@ int lua_Control_setStyle(lua_State* state)
Control* instance = getInstance(state);
instance->setStyle(param1);
-
+
return 0;
}
else
@@ -4022,7 +4022,7 @@ int lua_Control_setTextAlignment(lua_State* state)
Control* instance = getInstance(state);
instance->setTextAlignment(param1);
-
+
return 0;
}
else
@@ -4046,7 +4046,7 @@ int lua_Control_setTextAlignment(lua_State* state)
Control* instance = getInstance(state);
instance->setTextAlignment(param1, param2);
-
+
return 0;
}
else
@@ -4084,7 +4084,7 @@ int lua_Control_setTextColor(lua_State* state)
Control* instance = getInstance(state);
instance->setTextColor(*param1);
-
+
return 0;
}
else
@@ -4108,7 +4108,7 @@ int lua_Control_setTextColor(lua_State* state)
Control* instance = getInstance(state);
instance->setTextColor(*param1, param2);
-
+
return 0;
}
else
@@ -4146,7 +4146,7 @@ int lua_Control_setTextRightToLeft(lua_State* state)
Control* instance = getInstance(state);
instance->setTextRightToLeft(param1);
-
+
return 0;
}
else
@@ -4170,7 +4170,7 @@ int lua_Control_setTextRightToLeft(lua_State* state)
Control* instance = getInstance(state);
instance->setTextRightToLeft(param1, param2);
-
+
return 0;
}
else
@@ -4208,7 +4208,7 @@ int lua_Control_setWidth(lua_State* state)
Control* instance = getInstance(state);
instance->setWidth(param1);
-
+
return 0;
}
else
@@ -4246,7 +4246,7 @@ int lua_Control_setZIndex(lua_State* state)
Control* instance = getInstance(state);
instance->setZIndex(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_Form.cpp b/gameplay/src/lua/lua_Form.cpp
index 3ad59386b5..0edda0aff5 100644
--- a/gameplay/src/lua/lua_Form.cpp
+++ b/gameplay/src/lua/lua_Form.cpp
@@ -38,7 +38,7 @@ namespace gameplay
void luaRegister_Form()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addControl", lua_Form_addControl},
{"addListener", lua_Form_addListener},
@@ -135,7 +135,7 @@ void luaRegister_Form()
{"update", lua_Form_update},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_OPACITY", lua_Form_static_ANIMATE_OPACITY},
{"ANIMATE_POSITION", lua_Form_static_ANIMATE_POSITION},
@@ -181,7 +181,7 @@ int lua_Form__gc(lua_State* state)
Form* instance = (Form*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -264,7 +264,7 @@ int lua_Form_addListener(lua_State* state)
Form* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -298,7 +298,7 @@ int lua_Form_addRef(lua_State* state)
{
Form* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -340,7 +340,7 @@ int lua_Form_addScriptCallback(lua_State* state)
Form* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -451,7 +451,7 @@ int lua_Form_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -505,7 +505,7 @@ int lua_Form_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -707,7 +707,7 @@ int lua_Form_destroyAnimation(lua_State* state)
{
Form* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -727,7 +727,7 @@ int lua_Form_destroyAnimation(lua_State* state)
Form* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -761,7 +761,7 @@ int lua_Form_disable(lua_State* state)
{
Form* instance = getInstance(state);
instance->disable();
-
+
return 0;
}
else
@@ -795,7 +795,7 @@ int lua_Form_draw(lua_State* state)
{
Form* instance = getInstance(state);
instance->draw();
-
+
return 0;
}
else
@@ -829,7 +829,7 @@ int lua_Form_enable(lua_State* state)
{
Form* instance = getInstance(state);
instance->enable();
-
+
return 0;
}
else
@@ -1027,7 +1027,7 @@ int lua_Form_getAnimationPropertyValue(lua_State* state)
Form* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2970,7 +2970,7 @@ int lua_Form_insertControl(lua_State* state)
Form* instance = getInstance(state);
instance->insertControl(param1, param2);
-
+
return 0;
}
else
@@ -3115,7 +3115,7 @@ int lua_Form_release(lua_State* state)
{
Form* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -3153,7 +3153,7 @@ int lua_Form_removeControl(lua_State* state)
Form* instance = getInstance(state);
instance->removeControl(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -3164,7 +3164,7 @@ int lua_Form_removeControl(lua_State* state)
Form* instance = getInstance(state);
instance->removeControl(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -3175,7 +3175,7 @@ int lua_Form_removeControl(lua_State* state)
Form* instance = getInstance(state);
instance->removeControl(param1);
-
+
return 0;
}
else
@@ -3217,7 +3217,7 @@ int lua_Form_removeScriptCallback(lua_State* state)
Form* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -3255,7 +3255,7 @@ int lua_Form_setAlignment(lua_State* state)
Form* instance = getInstance(state);
instance->setAlignment(param1);
-
+
return 0;
}
else
@@ -3297,7 +3297,7 @@ int lua_Form_setAnimationPropertyValue(lua_State* state)
Form* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -3325,7 +3325,7 @@ int lua_Form_setAnimationPropertyValue(lua_State* state)
Form* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -3363,7 +3363,7 @@ int lua_Form_setAutoHeight(lua_State* state)
Form* instance = getInstance(state);
instance->setAutoHeight(param1);
-
+
return 0;
}
else
@@ -3401,7 +3401,7 @@ int lua_Form_setAutoWidth(lua_State* state)
Form* instance = getInstance(state);
instance->setAutoWidth(param1);
-
+
return 0;
}
else
@@ -3451,7 +3451,7 @@ int lua_Form_setBorder(lua_State* state)
Form* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3487,7 +3487,7 @@ int lua_Form_setBorder(lua_State* state)
Form* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3525,7 +3525,7 @@ int lua_Form_setBounds(lua_State* state)
Form* instance = getInstance(state);
instance->setBounds(*param1);
-
+
return 0;
}
else
@@ -3563,7 +3563,7 @@ int lua_Form_setConsumeInputEvents(lua_State* state)
Form* instance = getInstance(state);
instance->setConsumeInputEvents(param1);
-
+
return 0;
}
else
@@ -3605,7 +3605,7 @@ int lua_Form_setCursorColor(lua_State* state)
Form* instance = getInstance(state);
instance->setCursorColor(*param1, param2);
-
+
return 0;
}
else
@@ -3647,7 +3647,7 @@ int lua_Form_setCursorRegion(lua_State* state)
Form* instance = getInstance(state);
instance->setCursorRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3685,7 +3685,7 @@ int lua_Form_setFocusIndex(lua_State* state)
Form* instance = getInstance(state);
instance->setFocusIndex(param1);
-
+
return 0;
}
else
@@ -3723,7 +3723,7 @@ int lua_Form_setFont(lua_State* state)
Form* instance = getInstance(state);
instance->setFont(param1);
-
+
return 0;
}
else
@@ -3747,7 +3747,7 @@ int lua_Form_setFont(lua_State* state)
Form* instance = getInstance(state);
instance->setFont(param1, param2);
-
+
return 0;
}
else
@@ -3785,7 +3785,7 @@ int lua_Form_setFontSize(lua_State* state)
Form* instance = getInstance(state);
instance->setFontSize(param1);
-
+
return 0;
}
else
@@ -3809,7 +3809,7 @@ int lua_Form_setFontSize(lua_State* state)
Form* instance = getInstance(state);
instance->setFontSize(param1, param2);
-
+
return 0;
}
else
@@ -3847,7 +3847,7 @@ int lua_Form_setHeight(lua_State* state)
Form* instance = getInstance(state);
instance->setHeight(param1);
-
+
return 0;
}
else
@@ -3889,7 +3889,7 @@ int lua_Form_setImageColor(lua_State* state)
Form* instance = getInstance(state);
instance->setImageColor(param1, *param2);
-
+
return 0;
}
else
@@ -3917,7 +3917,7 @@ int lua_Form_setImageColor(lua_State* state)
Form* instance = getInstance(state);
instance->setImageColor(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3959,7 +3959,7 @@ int lua_Form_setImageRegion(lua_State* state)
Form* instance = getInstance(state);
instance->setImageRegion(param1, *param2);
-
+
return 0;
}
else
@@ -3987,7 +3987,7 @@ int lua_Form_setImageRegion(lua_State* state)
Form* instance = getInstance(state);
instance->setImageRegion(param1, *param2, param3);
-
+
return 0;
}
else
@@ -4037,7 +4037,7 @@ int lua_Form_setMargin(lua_State* state)
Form* instance = getInstance(state);
instance->setMargin(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -4075,7 +4075,7 @@ int lua_Form_setNode(lua_State* state)
Form* instance = getInstance(state);
instance->setNode(param1);
-
+
return 0;
}
else
@@ -4113,7 +4113,7 @@ int lua_Form_setOpacity(lua_State* state)
Form* instance = getInstance(state);
instance->setOpacity(param1);
-
+
return 0;
}
else
@@ -4137,7 +4137,7 @@ int lua_Form_setOpacity(lua_State* state)
Form* instance = getInstance(state);
instance->setOpacity(param1, param2);
-
+
return 0;
}
else
@@ -4187,7 +4187,7 @@ int lua_Form_setPadding(lua_State* state)
Form* instance = getInstance(state);
instance->setPadding(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -4229,7 +4229,7 @@ int lua_Form_setPosition(lua_State* state)
Form* instance = getInstance(state);
instance->setPosition(param1, param2);
-
+
return 0;
}
else
@@ -4267,7 +4267,7 @@ int lua_Form_setScroll(lua_State* state)
Form* instance = getInstance(state);
instance->setScroll(param1);
-
+
return 0;
}
else
@@ -4305,7 +4305,7 @@ int lua_Form_setScrollBarsAutoHide(lua_State* state)
Form* instance = getInstance(state);
instance->setScrollBarsAutoHide(param1);
-
+
return 0;
}
else
@@ -4347,7 +4347,7 @@ int lua_Form_setSize(lua_State* state)
Form* instance = getInstance(state);
instance->setSize(param1, param2);
-
+
return 0;
}
else
@@ -4385,7 +4385,7 @@ int lua_Form_setSkinColor(lua_State* state)
Form* instance = getInstance(state);
instance->setSkinColor(*param1);
-
+
return 0;
}
else
@@ -4409,7 +4409,7 @@ int lua_Form_setSkinColor(lua_State* state)
Form* instance = getInstance(state);
instance->setSkinColor(*param1, param2);
-
+
return 0;
}
else
@@ -4447,7 +4447,7 @@ int lua_Form_setSkinRegion(lua_State* state)
Form* instance = getInstance(state);
instance->setSkinRegion(*param1);
-
+
return 0;
}
else
@@ -4471,7 +4471,7 @@ int lua_Form_setSkinRegion(lua_State* state)
Form* instance = getInstance(state);
instance->setSkinRegion(*param1, param2);
-
+
return 0;
}
else
@@ -4509,7 +4509,7 @@ int lua_Form_setState(lua_State* state)
Form* instance = getInstance(state);
instance->setState(param1);
-
+
return 0;
}
else
@@ -4547,7 +4547,7 @@ int lua_Form_setStyle(lua_State* state)
Form* instance = getInstance(state);
instance->setStyle(param1);
-
+
return 0;
}
else
@@ -4585,7 +4585,7 @@ int lua_Form_setTextAlignment(lua_State* state)
Form* instance = getInstance(state);
instance->setTextAlignment(param1);
-
+
return 0;
}
else
@@ -4609,7 +4609,7 @@ int lua_Form_setTextAlignment(lua_State* state)
Form* instance = getInstance(state);
instance->setTextAlignment(param1, param2);
-
+
return 0;
}
else
@@ -4647,7 +4647,7 @@ int lua_Form_setTextColor(lua_State* state)
Form* instance = getInstance(state);
instance->setTextColor(*param1);
-
+
return 0;
}
else
@@ -4671,7 +4671,7 @@ int lua_Form_setTextColor(lua_State* state)
Form* instance = getInstance(state);
instance->setTextColor(*param1, param2);
-
+
return 0;
}
else
@@ -4709,7 +4709,7 @@ int lua_Form_setTextRightToLeft(lua_State* state)
Form* instance = getInstance(state);
instance->setTextRightToLeft(param1);
-
+
return 0;
}
else
@@ -4733,7 +4733,7 @@ int lua_Form_setTextRightToLeft(lua_State* state)
Form* instance = getInstance(state);
instance->setTextRightToLeft(param1, param2);
-
+
return 0;
}
else
@@ -4771,7 +4771,7 @@ int lua_Form_setWidth(lua_State* state)
Form* instance = getInstance(state);
instance->setWidth(param1);
-
+
return 0;
}
else
@@ -4809,7 +4809,7 @@ int lua_Form_setZIndex(lua_State* state)
Form* instance = getInstance(state);
instance->setZIndex(param1);
-
+
return 0;
}
else
@@ -5151,7 +5151,7 @@ int lua_Form_update(lua_State* state)
Form* instance = getInstance(state);
instance->update(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_Joint.cpp b/gameplay/src/lua/lua_Joint.cpp
index e1434e2063..bbc6277a1b 100644
--- a/gameplay/src/lua/lua_Joint.cpp
+++ b/gameplay/src/lua/lua_Joint.cpp
@@ -28,7 +28,7 @@ namespace gameplay
void luaRegister_Joint()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addAdvertisedDescendant", lua_Joint_addAdvertisedDescendant},
{"addChild", lua_Joint_addChild},
@@ -149,7 +149,7 @@ void luaRegister_Joint()
{"translateZ", lua_Joint_translateZ},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_ROTATE", lua_Joint_static_ANIMATE_ROTATE},
{"ANIMATE_ROTATE_TRANSLATE", lua_Joint_static_ANIMATE_ROTATE_TRANSLATE},
@@ -202,7 +202,7 @@ int lua_Joint__gc(lua_State* state)
Joint* instance = (Joint*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -240,7 +240,7 @@ int lua_Joint_addAdvertisedDescendant(lua_State* state)
Joint* instance = getInstance(state);
instance->addAdvertisedDescendant(param1);
-
+
return 0;
}
else
@@ -278,7 +278,7 @@ int lua_Joint_addChild(lua_State* state)
Joint* instance = getInstance(state);
instance->addChild(param1);
-
+
return 0;
}
else
@@ -316,7 +316,7 @@ int lua_Joint_addListener(lua_State* state)
Joint* instance = getInstance(state);
instance->addListener(param1);
-
+
return 0;
}
else
@@ -340,7 +340,7 @@ int lua_Joint_addListener(lua_State* state)
Joint* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -374,7 +374,7 @@ int lua_Joint_addRef(lua_State* state)
{
Joint* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -416,7 +416,7 @@ int lua_Joint_addScriptCallback(lua_State* state)
Joint* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -573,7 +573,7 @@ int lua_Joint_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -627,7 +627,7 @@ int lua_Joint_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -829,7 +829,7 @@ int lua_Joint_destroyAnimation(lua_State* state)
{
Joint* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -849,7 +849,7 @@ int lua_Joint_destroyAnimation(lua_State* state)
Joint* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -1324,7 +1324,7 @@ int lua_Joint_getAnimationPropertyValue(lua_State* state)
Joint* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -1436,7 +1436,7 @@ int lua_Joint_getBackVector(lua_State* state)
Joint* instance = getInstance(state);
instance->getBackVector(param1);
-
+
return 0;
}
else
@@ -1677,7 +1677,7 @@ int lua_Joint_getDownVector(lua_State* state)
Joint* instance = getInstance(state);
instance->getDownVector(param1);
-
+
return 0;
}
else
@@ -1835,7 +1835,7 @@ int lua_Joint_getForwardVector(lua_State* state)
Joint* instance = getInstance(state);
instance->getForwardVector(param1);
-
+
return 0;
}
else
@@ -2260,7 +2260,7 @@ int lua_Joint_getLeftVector(lua_State* state)
Joint* instance = getInstance(state);
instance->getLeftVector(param1);
-
+
return 0;
}
else
@@ -2768,7 +2768,7 @@ int lua_Joint_getRightVector(lua_State* state)
Joint* instance = getInstance(state);
instance->getRightVector(param1);
-
+
return 0;
}
else
@@ -2926,7 +2926,7 @@ int lua_Joint_getRotation(lua_State* state)
Joint* instance = getInstance(state);
instance->getRotation(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2937,7 +2937,7 @@ int lua_Joint_getRotation(lua_State* state)
Joint* instance = getInstance(state);
instance->getRotation(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -3017,7 +3017,7 @@ int lua_Joint_getScale(lua_State* state)
Joint* instance = getInstance(state);
instance->getScale(param1);
-
+
return 0;
}
else
@@ -3281,7 +3281,7 @@ int lua_Joint_getTranslation(lua_State* state)
Joint* instance = getInstance(state);
instance->getTranslation(param1);
-
+
return 0;
}
else
@@ -3587,7 +3587,7 @@ int lua_Joint_getUpVector(lua_State* state)
Joint* instance = getInstance(state);
instance->getUpVector(param1);
-
+
return 0;
}
else
@@ -3938,7 +3938,7 @@ int lua_Joint_release(lua_State* state)
{
Joint* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -3972,7 +3972,7 @@ int lua_Joint_removeAllChildren(lua_State* state)
{
Joint* instance = getInstance(state);
instance->removeAllChildren();
-
+
return 0;
}
else
@@ -4010,7 +4010,7 @@ int lua_Joint_removeChild(lua_State* state)
Joint* instance = getInstance(state);
instance->removeChild(param1);
-
+
return 0;
}
else
@@ -4048,7 +4048,7 @@ int lua_Joint_removeListener(lua_State* state)
Joint* instance = getInstance(state);
instance->removeListener(param1);
-
+
return 0;
}
else
@@ -4090,7 +4090,7 @@ int lua_Joint_removeScriptCallback(lua_State* state)
Joint* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -4128,7 +4128,7 @@ int lua_Joint_rotate(lua_State* state)
Joint* instance = getInstance(state);
instance->rotate(*param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4139,7 +4139,7 @@ int lua_Joint_rotate(lua_State* state)
Joint* instance = getInstance(state);
instance->rotate(*param1);
-
+
return 0;
}
else
@@ -4163,7 +4163,7 @@ int lua_Joint_rotate(lua_State* state)
Joint* instance = getInstance(state);
instance->rotate(*param1, param2);
-
+
return 0;
}
else
@@ -4195,7 +4195,7 @@ int lua_Joint_rotate(lua_State* state)
Joint* instance = getInstance(state);
instance->rotate(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -4233,7 +4233,7 @@ int lua_Joint_rotateX(lua_State* state)
Joint* instance = getInstance(state);
instance->rotateX(param1);
-
+
return 0;
}
else
@@ -4271,7 +4271,7 @@ int lua_Joint_rotateY(lua_State* state)
Joint* instance = getInstance(state);
instance->rotateY(param1);
-
+
return 0;
}
else
@@ -4309,7 +4309,7 @@ int lua_Joint_rotateZ(lua_State* state)
Joint* instance = getInstance(state);
instance->rotateZ(param1);
-
+
return 0;
}
else
@@ -4347,7 +4347,7 @@ int lua_Joint_scale(lua_State* state)
Joint* instance = getInstance(state);
instance->scale(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4358,7 +4358,7 @@ int lua_Joint_scale(lua_State* state)
Joint* instance = getInstance(state);
instance->scale(*param1);
-
+
return 0;
}
else
@@ -4386,7 +4386,7 @@ int lua_Joint_scale(lua_State* state)
Joint* instance = getInstance(state);
instance->scale(param1, param2, param3);
-
+
return 0;
}
else
@@ -4424,7 +4424,7 @@ int lua_Joint_scaleX(lua_State* state)
Joint* instance = getInstance(state);
instance->scaleX(param1);
-
+
return 0;
}
else
@@ -4462,7 +4462,7 @@ int lua_Joint_scaleY(lua_State* state)
Joint* instance = getInstance(state);
instance->scaleY(param1);
-
+
return 0;
}
else
@@ -4500,7 +4500,7 @@ int lua_Joint_scaleZ(lua_State* state)
Joint* instance = getInstance(state);
instance->scaleZ(param1);
-
+
return 0;
}
else
@@ -4538,7 +4538,7 @@ int lua_Joint_set(lua_State* state)
Joint* instance = getInstance(state);
instance->set(*param1);
-
+
return 0;
}
else
@@ -4566,7 +4566,7 @@ int lua_Joint_set(lua_State* state)
Joint* instance = getInstance(state);
instance->set(*param1, *param2, *param3);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4585,7 +4585,7 @@ int lua_Joint_set(lua_State* state)
Joint* instance = getInstance(state);
instance->set(*param1, *param2, *param3);
-
+
return 0;
}
else
@@ -4617,7 +4617,7 @@ int lua_Joint_set(lua_State* state)
Joint* instance = getInstance(state);
instance->set(*param1, *param2, param3, *param4);
-
+
return 0;
}
else
@@ -4655,7 +4655,7 @@ int lua_Joint_setAgent(lua_State* state)
Joint* instance = getInstance(state);
instance->setAgent(param1);
-
+
return 0;
}
else
@@ -4697,7 +4697,7 @@ int lua_Joint_setAnimationPropertyValue(lua_State* state)
Joint* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -4725,7 +4725,7 @@ int lua_Joint_setAnimationPropertyValue(lua_State* state)
Joint* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -4763,7 +4763,7 @@ int lua_Joint_setAudioSource(lua_State* state)
Joint* instance = getInstance(state);
instance->setAudioSource(param1);
-
+
return 0;
}
else
@@ -4801,7 +4801,7 @@ int lua_Joint_setCamera(lua_State* state)
Joint* instance = getInstance(state);
instance->setCamera(param1);
-
+
return 0;
}
else
@@ -5011,7 +5011,7 @@ int lua_Joint_setForm(lua_State* state)
Joint* instance = getInstance(state);
instance->setForm(param1);
-
+
return 0;
}
else
@@ -5049,7 +5049,7 @@ int lua_Joint_setId(lua_State* state)
Joint* instance = getInstance(state);
instance->setId(param1);
-
+
return 0;
}
else
@@ -5083,7 +5083,7 @@ int lua_Joint_setIdentity(lua_State* state)
{
Joint* instance = getInstance(state);
instance->setIdentity();
-
+
return 0;
}
else
@@ -5121,7 +5121,7 @@ int lua_Joint_setLight(lua_State* state)
Joint* instance = getInstance(state);
instance->setLight(param1);
-
+
return 0;
}
else
@@ -5159,7 +5159,7 @@ int lua_Joint_setModel(lua_State* state)
Joint* instance = getInstance(state);
instance->setModel(param1);
-
+
return 0;
}
else
@@ -5197,7 +5197,7 @@ int lua_Joint_setParticleEmitter(lua_State* state)
Joint* instance = getInstance(state);
instance->setParticleEmitter(param1);
-
+
return 0;
}
else
@@ -5235,7 +5235,7 @@ int lua_Joint_setRotation(lua_State* state)
Joint* instance = getInstance(state);
instance->setRotation(*param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -5246,7 +5246,7 @@ int lua_Joint_setRotation(lua_State* state)
Joint* instance = getInstance(state);
instance->setRotation(*param1);
-
+
return 0;
}
else
@@ -5270,7 +5270,7 @@ int lua_Joint_setRotation(lua_State* state)
Joint* instance = getInstance(state);
instance->setRotation(*param1, param2);
-
+
return 0;
}
else
@@ -5302,7 +5302,7 @@ int lua_Joint_setRotation(lua_State* state)
Joint* instance = getInstance(state);
instance->setRotation(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -5340,7 +5340,7 @@ int lua_Joint_setScale(lua_State* state)
Joint* instance = getInstance(state);
instance->setScale(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -5351,7 +5351,7 @@ int lua_Joint_setScale(lua_State* state)
Joint* instance = getInstance(state);
instance->setScale(*param1);
-
+
return 0;
}
else
@@ -5379,7 +5379,7 @@ int lua_Joint_setScale(lua_State* state)
Joint* instance = getInstance(state);
instance->setScale(param1, param2, param3);
-
+
return 0;
}
else
@@ -5417,7 +5417,7 @@ int lua_Joint_setScaleX(lua_State* state)
Joint* instance = getInstance(state);
instance->setScaleX(param1);
-
+
return 0;
}
else
@@ -5455,7 +5455,7 @@ int lua_Joint_setScaleY(lua_State* state)
Joint* instance = getInstance(state);
instance->setScaleY(param1);
-
+
return 0;
}
else
@@ -5493,7 +5493,7 @@ int lua_Joint_setScaleZ(lua_State* state)
Joint* instance = getInstance(state);
instance->setScaleZ(param1);
-
+
return 0;
}
else
@@ -5531,7 +5531,7 @@ int lua_Joint_setTag(lua_State* state)
Joint* instance = getInstance(state);
instance->setTag(param1);
-
+
return 0;
}
else
@@ -5555,7 +5555,7 @@ int lua_Joint_setTag(lua_State* state)
Joint* instance = getInstance(state);
instance->setTag(param1, param2);
-
+
return 0;
}
else
@@ -5593,7 +5593,7 @@ int lua_Joint_setTranslation(lua_State* state)
Joint* instance = getInstance(state);
instance->setTranslation(*param1);
-
+
return 0;
}
else
@@ -5621,7 +5621,7 @@ int lua_Joint_setTranslation(lua_State* state)
Joint* instance = getInstance(state);
instance->setTranslation(param1, param2, param3);
-
+
return 0;
}
else
@@ -5659,7 +5659,7 @@ int lua_Joint_setTranslationX(lua_State* state)
Joint* instance = getInstance(state);
instance->setTranslationX(param1);
-
+
return 0;
}
else
@@ -5697,7 +5697,7 @@ int lua_Joint_setTranslationY(lua_State* state)
Joint* instance = getInstance(state);
instance->setTranslationY(param1);
-
+
return 0;
}
else
@@ -5735,7 +5735,7 @@ int lua_Joint_setTranslationZ(lua_State* state)
Joint* instance = getInstance(state);
instance->setTranslationZ(param1);
-
+
return 0;
}
else
@@ -6032,7 +6032,7 @@ int lua_Joint_static_resumeTransformChanged(lua_State* state)
case 0:
{
Joint::resumeTransformChanged();
-
+
return 0;
break;
}
@@ -6057,7 +6057,7 @@ int lua_Joint_static_suspendTransformChanged(lua_State* state)
case 0:
{
Joint::suspendTransformChanged();
-
+
return 0;
break;
}
@@ -6089,7 +6089,7 @@ int lua_Joint_transformPoint(lua_State* state)
Joint* instance = getInstance(state);
instance->transformPoint(param1);
-
+
return 0;
}
else
@@ -6113,7 +6113,7 @@ int lua_Joint_transformPoint(lua_State* state)
Joint* instance = getInstance(state);
instance->transformPoint(*param1, param2);
-
+
return 0;
}
else
@@ -6151,7 +6151,7 @@ int lua_Joint_transformVector(lua_State* state)
Joint* instance = getInstance(state);
instance->transformVector(param1);
-
+
return 0;
}
else
@@ -6175,7 +6175,7 @@ int lua_Joint_transformVector(lua_State* state)
Joint* instance = getInstance(state);
instance->transformVector(*param1, param2);
-
+
return 0;
}
else
@@ -6211,7 +6211,7 @@ int lua_Joint_transformVector(lua_State* state)
Joint* instance = getInstance(state);
instance->transformVector(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -6249,7 +6249,7 @@ int lua_Joint_translate(lua_State* state)
Joint* instance = getInstance(state);
instance->translate(*param1);
-
+
return 0;
}
else
@@ -6277,7 +6277,7 @@ int lua_Joint_translate(lua_State* state)
Joint* instance = getInstance(state);
instance->translate(param1, param2, param3);
-
+
return 0;
}
else
@@ -6315,7 +6315,7 @@ int lua_Joint_translateForward(lua_State* state)
Joint* instance = getInstance(state);
instance->translateForward(param1);
-
+
return 0;
}
else
@@ -6353,7 +6353,7 @@ int lua_Joint_translateLeft(lua_State* state)
Joint* instance = getInstance(state);
instance->translateLeft(param1);
-
+
return 0;
}
else
@@ -6399,7 +6399,7 @@ int lua_Joint_translateSmooth(lua_State* state)
Joint* instance = getInstance(state);
instance->translateSmooth(*param1, param2, param3);
-
+
return 0;
}
else
@@ -6437,7 +6437,7 @@ int lua_Joint_translateUp(lua_State* state)
Joint* instance = getInstance(state);
instance->translateUp(param1);
-
+
return 0;
}
else
@@ -6475,7 +6475,7 @@ int lua_Joint_translateX(lua_State* state)
Joint* instance = getInstance(state);
instance->translateX(param1);
-
+
return 0;
}
else
@@ -6513,7 +6513,7 @@ int lua_Joint_translateY(lua_State* state)
Joint* instance = getInstance(state);
instance->translateY(param1);
-
+
return 0;
}
else
@@ -6551,7 +6551,7 @@ int lua_Joint_translateZ(lua_State* state)
Joint* instance = getInstance(state);
instance->translateZ(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_Joystick.cpp b/gameplay/src/lua/lua_Joystick.cpp
index 6c06b8215c..3ae7a51482 100644
--- a/gameplay/src/lua/lua_Joystick.cpp
+++ b/gameplay/src/lua/lua_Joystick.cpp
@@ -22,7 +22,7 @@ namespace gameplay
void luaRegister_Joystick()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addListener", lua_Joystick_addListener},
{"addRef", lua_Joystick_addRef},
@@ -113,7 +113,7 @@ void luaRegister_Joystick()
{"setZIndex", lua_Joystick_setZIndex},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_OPACITY", lua_Joystick_static_ANIMATE_OPACITY},
{"ANIMATE_POSITION", lua_Joystick_static_ANIMATE_POSITION},
@@ -157,7 +157,7 @@ int lua_Joystick__gc(lua_State* state)
Joystick* instance = (Joystick*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -199,7 +199,7 @@ int lua_Joystick_addListener(lua_State* state)
Joystick* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -233,7 +233,7 @@ int lua_Joystick_addRef(lua_State* state)
{
Joystick* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -275,7 +275,7 @@ int lua_Joystick_addScriptCallback(lua_State* state)
Joystick* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -386,7 +386,7 @@ int lua_Joystick_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -440,7 +440,7 @@ int lua_Joystick_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -642,7 +642,7 @@ int lua_Joystick_destroyAnimation(lua_State* state)
{
Joystick* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -662,7 +662,7 @@ int lua_Joystick_destroyAnimation(lua_State* state)
Joystick* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -696,7 +696,7 @@ int lua_Joystick_disable(lua_State* state)
{
Joystick* instance = getInstance(state);
instance->disable();
-
+
return 0;
}
else
@@ -730,7 +730,7 @@ int lua_Joystick_enable(lua_State* state)
{
Joystick* instance = getInstance(state);
instance->enable();
-
+
return 0;
}
else
@@ -928,7 +928,7 @@ int lua_Joystick_getAnimationPropertyValue(lua_State* state)
Joystick* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2910,7 +2910,7 @@ int lua_Joystick_release(lua_State* state)
{
Joystick* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -2952,7 +2952,7 @@ int lua_Joystick_removeScriptCallback(lua_State* state)
Joystick* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -2990,7 +2990,7 @@ int lua_Joystick_setAlignment(lua_State* state)
Joystick* instance = getInstance(state);
instance->setAlignment(param1);
-
+
return 0;
}
else
@@ -3032,7 +3032,7 @@ int lua_Joystick_setAnimationPropertyValue(lua_State* state)
Joystick* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -3060,7 +3060,7 @@ int lua_Joystick_setAnimationPropertyValue(lua_State* state)
Joystick* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -3098,7 +3098,7 @@ int lua_Joystick_setAutoHeight(lua_State* state)
Joystick* instance = getInstance(state);
instance->setAutoHeight(param1);
-
+
return 0;
}
else
@@ -3136,7 +3136,7 @@ int lua_Joystick_setAutoWidth(lua_State* state)
Joystick* instance = getInstance(state);
instance->setAutoWidth(param1);
-
+
return 0;
}
else
@@ -3186,7 +3186,7 @@ int lua_Joystick_setBorder(lua_State* state)
Joystick* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3222,7 +3222,7 @@ int lua_Joystick_setBorder(lua_State* state)
Joystick* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3260,7 +3260,7 @@ int lua_Joystick_setBounds(lua_State* state)
Joystick* instance = getInstance(state);
instance->setBounds(*param1);
-
+
return 0;
}
else
@@ -3298,7 +3298,7 @@ int lua_Joystick_setConsumeInputEvents(lua_State* state)
Joystick* instance = getInstance(state);
instance->setConsumeInputEvents(param1);
-
+
return 0;
}
else
@@ -3340,7 +3340,7 @@ int lua_Joystick_setCursorColor(lua_State* state)
Joystick* instance = getInstance(state);
instance->setCursorColor(*param1, param2);
-
+
return 0;
}
else
@@ -3382,7 +3382,7 @@ int lua_Joystick_setCursorRegion(lua_State* state)
Joystick* instance = getInstance(state);
instance->setCursorRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3420,7 +3420,7 @@ int lua_Joystick_setFocusIndex(lua_State* state)
Joystick* instance = getInstance(state);
instance->setFocusIndex(param1);
-
+
return 0;
}
else
@@ -3458,7 +3458,7 @@ int lua_Joystick_setFont(lua_State* state)
Joystick* instance = getInstance(state);
instance->setFont(param1);
-
+
return 0;
}
else
@@ -3482,7 +3482,7 @@ int lua_Joystick_setFont(lua_State* state)
Joystick* instance = getInstance(state);
instance->setFont(param1, param2);
-
+
return 0;
}
else
@@ -3520,7 +3520,7 @@ int lua_Joystick_setFontSize(lua_State* state)
Joystick* instance = getInstance(state);
instance->setFontSize(param1);
-
+
return 0;
}
else
@@ -3544,7 +3544,7 @@ int lua_Joystick_setFontSize(lua_State* state)
Joystick* instance = getInstance(state);
instance->setFontSize(param1, param2);
-
+
return 0;
}
else
@@ -3582,7 +3582,7 @@ int lua_Joystick_setHeight(lua_State* state)
Joystick* instance = getInstance(state);
instance->setHeight(param1);
-
+
return 0;
}
else
@@ -3624,7 +3624,7 @@ int lua_Joystick_setImageColor(lua_State* state)
Joystick* instance = getInstance(state);
instance->setImageColor(param1, *param2);
-
+
return 0;
}
else
@@ -3652,7 +3652,7 @@ int lua_Joystick_setImageColor(lua_State* state)
Joystick* instance = getInstance(state);
instance->setImageColor(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3694,7 +3694,7 @@ int lua_Joystick_setImageRegion(lua_State* state)
Joystick* instance = getInstance(state);
instance->setImageRegion(param1, *param2);
-
+
return 0;
}
else
@@ -3722,7 +3722,7 @@ int lua_Joystick_setImageRegion(lua_State* state)
Joystick* instance = getInstance(state);
instance->setImageRegion(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3760,7 +3760,7 @@ int lua_Joystick_setInnerRegionSize(lua_State* state)
Joystick* instance = getInstance(state);
instance->setInnerRegionSize(*param1);
-
+
return 0;
}
else
@@ -3810,7 +3810,7 @@ int lua_Joystick_setMargin(lua_State* state)
Joystick* instance = getInstance(state);
instance->setMargin(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3848,7 +3848,7 @@ int lua_Joystick_setOpacity(lua_State* state)
Joystick* instance = getInstance(state);
instance->setOpacity(param1);
-
+
return 0;
}
else
@@ -3872,7 +3872,7 @@ int lua_Joystick_setOpacity(lua_State* state)
Joystick* instance = getInstance(state);
instance->setOpacity(param1, param2);
-
+
return 0;
}
else
@@ -3910,7 +3910,7 @@ int lua_Joystick_setOuterRegionSize(lua_State* state)
Joystick* instance = getInstance(state);
instance->setOuterRegionSize(*param1);
-
+
return 0;
}
else
@@ -3960,7 +3960,7 @@ int lua_Joystick_setPadding(lua_State* state)
Joystick* instance = getInstance(state);
instance->setPadding(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -4002,7 +4002,7 @@ int lua_Joystick_setPosition(lua_State* state)
Joystick* instance = getInstance(state);
instance->setPosition(param1, param2);
-
+
return 0;
}
else
@@ -4040,7 +4040,7 @@ int lua_Joystick_setRelative(lua_State* state)
Joystick* instance = getInstance(state);
instance->setRelative(param1);
-
+
return 0;
}
else
@@ -4082,7 +4082,7 @@ int lua_Joystick_setSize(lua_State* state)
Joystick* instance = getInstance(state);
instance->setSize(param1, param2);
-
+
return 0;
}
else
@@ -4120,7 +4120,7 @@ int lua_Joystick_setSkinColor(lua_State* state)
Joystick* instance = getInstance(state);
instance->setSkinColor(*param1);
-
+
return 0;
}
else
@@ -4144,7 +4144,7 @@ int lua_Joystick_setSkinColor(lua_State* state)
Joystick* instance = getInstance(state);
instance->setSkinColor(*param1, param2);
-
+
return 0;
}
else
@@ -4182,7 +4182,7 @@ int lua_Joystick_setSkinRegion(lua_State* state)
Joystick* instance = getInstance(state);
instance->setSkinRegion(*param1);
-
+
return 0;
}
else
@@ -4206,7 +4206,7 @@ int lua_Joystick_setSkinRegion(lua_State* state)
Joystick* instance = getInstance(state);
instance->setSkinRegion(*param1, param2);
-
+
return 0;
}
else
@@ -4244,7 +4244,7 @@ int lua_Joystick_setState(lua_State* state)
Joystick* instance = getInstance(state);
instance->setState(param1);
-
+
return 0;
}
else
@@ -4282,7 +4282,7 @@ int lua_Joystick_setStyle(lua_State* state)
Joystick* instance = getInstance(state);
instance->setStyle(param1);
-
+
return 0;
}
else
@@ -4320,7 +4320,7 @@ int lua_Joystick_setTextAlignment(lua_State* state)
Joystick* instance = getInstance(state);
instance->setTextAlignment(param1);
-
+
return 0;
}
else
@@ -4344,7 +4344,7 @@ int lua_Joystick_setTextAlignment(lua_State* state)
Joystick* instance = getInstance(state);
instance->setTextAlignment(param1, param2);
-
+
return 0;
}
else
@@ -4382,7 +4382,7 @@ int lua_Joystick_setTextColor(lua_State* state)
Joystick* instance = getInstance(state);
instance->setTextColor(*param1);
-
+
return 0;
}
else
@@ -4406,7 +4406,7 @@ int lua_Joystick_setTextColor(lua_State* state)
Joystick* instance = getInstance(state);
instance->setTextColor(*param1, param2);
-
+
return 0;
}
else
@@ -4444,7 +4444,7 @@ int lua_Joystick_setTextRightToLeft(lua_State* state)
Joystick* instance = getInstance(state);
instance->setTextRightToLeft(param1);
-
+
return 0;
}
else
@@ -4468,7 +4468,7 @@ int lua_Joystick_setTextRightToLeft(lua_State* state)
Joystick* instance = getInstance(state);
instance->setTextRightToLeft(param1, param2);
-
+
return 0;
}
else
@@ -4506,7 +4506,7 @@ int lua_Joystick_setWidth(lua_State* state)
Joystick* instance = getInstance(state);
instance->setWidth(param1);
-
+
return 0;
}
else
@@ -4544,7 +4544,7 @@ int lua_Joystick_setZIndex(lua_State* state)
Joystick* instance = getInstance(state);
instance->setZIndex(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_Label.cpp b/gameplay/src/lua/lua_Label.cpp
index 204fd15031..12454c451c 100644
--- a/gameplay/src/lua/lua_Label.cpp
+++ b/gameplay/src/lua/lua_Label.cpp
@@ -22,7 +22,7 @@ namespace gameplay
void luaRegister_Label()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addListener", lua_Label_addListener},
{"addRef", lua_Label_addRef},
@@ -108,7 +108,7 @@ void luaRegister_Label()
{"setZIndex", lua_Label_setZIndex},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_OPACITY", lua_Label_static_ANIMATE_OPACITY},
{"ANIMATE_POSITION", lua_Label_static_ANIMATE_POSITION},
@@ -152,7 +152,7 @@ int lua_Label__gc(lua_State* state)
Label* instance = (Label*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -194,7 +194,7 @@ int lua_Label_addListener(lua_State* state)
Label* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -228,7 +228,7 @@ int lua_Label_addRef(lua_State* state)
{
Label* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -270,7 +270,7 @@ int lua_Label_addScriptCallback(lua_State* state)
Label* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -381,7 +381,7 @@ int lua_Label_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -435,7 +435,7 @@ int lua_Label_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -637,7 +637,7 @@ int lua_Label_destroyAnimation(lua_State* state)
{
Label* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -657,7 +657,7 @@ int lua_Label_destroyAnimation(lua_State* state)
Label* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -691,7 +691,7 @@ int lua_Label_disable(lua_State* state)
{
Label* instance = getInstance(state);
instance->disable();
-
+
return 0;
}
else
@@ -725,7 +725,7 @@ int lua_Label_enable(lua_State* state)
{
Label* instance = getInstance(state);
instance->enable();
-
+
return 0;
}
else
@@ -923,7 +923,7 @@ int lua_Label_getAnimationPropertyValue(lua_State* state)
Label* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2767,7 +2767,7 @@ int lua_Label_release(lua_State* state)
{
Label* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -2809,7 +2809,7 @@ int lua_Label_removeScriptCallback(lua_State* state)
Label* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -2847,7 +2847,7 @@ int lua_Label_setAlignment(lua_State* state)
Label* instance = getInstance(state);
instance->setAlignment(param1);
-
+
return 0;
}
else
@@ -2889,7 +2889,7 @@ int lua_Label_setAnimationPropertyValue(lua_State* state)
Label* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2917,7 +2917,7 @@ int lua_Label_setAnimationPropertyValue(lua_State* state)
Label* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -2955,7 +2955,7 @@ int lua_Label_setAutoHeight(lua_State* state)
Label* instance = getInstance(state);
instance->setAutoHeight(param1);
-
+
return 0;
}
else
@@ -2993,7 +2993,7 @@ int lua_Label_setAutoWidth(lua_State* state)
Label* instance = getInstance(state);
instance->setAutoWidth(param1);
-
+
return 0;
}
else
@@ -3043,7 +3043,7 @@ int lua_Label_setBorder(lua_State* state)
Label* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3079,7 +3079,7 @@ int lua_Label_setBorder(lua_State* state)
Label* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3117,7 +3117,7 @@ int lua_Label_setBounds(lua_State* state)
Label* instance = getInstance(state);
instance->setBounds(*param1);
-
+
return 0;
}
else
@@ -3155,7 +3155,7 @@ int lua_Label_setConsumeInputEvents(lua_State* state)
Label* instance = getInstance(state);
instance->setConsumeInputEvents(param1);
-
+
return 0;
}
else
@@ -3197,7 +3197,7 @@ int lua_Label_setCursorColor(lua_State* state)
Label* instance = getInstance(state);
instance->setCursorColor(*param1, param2);
-
+
return 0;
}
else
@@ -3239,7 +3239,7 @@ int lua_Label_setCursorRegion(lua_State* state)
Label* instance = getInstance(state);
instance->setCursorRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3277,7 +3277,7 @@ int lua_Label_setFocusIndex(lua_State* state)
Label* instance = getInstance(state);
instance->setFocusIndex(param1);
-
+
return 0;
}
else
@@ -3315,7 +3315,7 @@ int lua_Label_setFont(lua_State* state)
Label* instance = getInstance(state);
instance->setFont(param1);
-
+
return 0;
}
else
@@ -3339,7 +3339,7 @@ int lua_Label_setFont(lua_State* state)
Label* instance = getInstance(state);
instance->setFont(param1, param2);
-
+
return 0;
}
else
@@ -3377,7 +3377,7 @@ int lua_Label_setFontSize(lua_State* state)
Label* instance = getInstance(state);
instance->setFontSize(param1);
-
+
return 0;
}
else
@@ -3401,7 +3401,7 @@ int lua_Label_setFontSize(lua_State* state)
Label* instance = getInstance(state);
instance->setFontSize(param1, param2);
-
+
return 0;
}
else
@@ -3439,7 +3439,7 @@ int lua_Label_setHeight(lua_State* state)
Label* instance = getInstance(state);
instance->setHeight(param1);
-
+
return 0;
}
else
@@ -3481,7 +3481,7 @@ int lua_Label_setImageColor(lua_State* state)
Label* instance = getInstance(state);
instance->setImageColor(param1, *param2);
-
+
return 0;
}
else
@@ -3509,7 +3509,7 @@ int lua_Label_setImageColor(lua_State* state)
Label* instance = getInstance(state);
instance->setImageColor(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3551,7 +3551,7 @@ int lua_Label_setImageRegion(lua_State* state)
Label* instance = getInstance(state);
instance->setImageRegion(param1, *param2);
-
+
return 0;
}
else
@@ -3579,7 +3579,7 @@ int lua_Label_setImageRegion(lua_State* state)
Label* instance = getInstance(state);
instance->setImageRegion(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3629,7 +3629,7 @@ int lua_Label_setMargin(lua_State* state)
Label* instance = getInstance(state);
instance->setMargin(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3667,7 +3667,7 @@ int lua_Label_setOpacity(lua_State* state)
Label* instance = getInstance(state);
instance->setOpacity(param1);
-
+
return 0;
}
else
@@ -3691,7 +3691,7 @@ int lua_Label_setOpacity(lua_State* state)
Label* instance = getInstance(state);
instance->setOpacity(param1, param2);
-
+
return 0;
}
else
@@ -3741,7 +3741,7 @@ int lua_Label_setPadding(lua_State* state)
Label* instance = getInstance(state);
instance->setPadding(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3783,7 +3783,7 @@ int lua_Label_setPosition(lua_State* state)
Label* instance = getInstance(state);
instance->setPosition(param1, param2);
-
+
return 0;
}
else
@@ -3825,7 +3825,7 @@ int lua_Label_setSize(lua_State* state)
Label* instance = getInstance(state);
instance->setSize(param1, param2);
-
+
return 0;
}
else
@@ -3863,7 +3863,7 @@ int lua_Label_setSkinColor(lua_State* state)
Label* instance = getInstance(state);
instance->setSkinColor(*param1);
-
+
return 0;
}
else
@@ -3887,7 +3887,7 @@ int lua_Label_setSkinColor(lua_State* state)
Label* instance = getInstance(state);
instance->setSkinColor(*param1, param2);
-
+
return 0;
}
else
@@ -3925,7 +3925,7 @@ int lua_Label_setSkinRegion(lua_State* state)
Label* instance = getInstance(state);
instance->setSkinRegion(*param1);
-
+
return 0;
}
else
@@ -3949,7 +3949,7 @@ int lua_Label_setSkinRegion(lua_State* state)
Label* instance = getInstance(state);
instance->setSkinRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3987,7 +3987,7 @@ int lua_Label_setState(lua_State* state)
Label* instance = getInstance(state);
instance->setState(param1);
-
+
return 0;
}
else
@@ -4025,7 +4025,7 @@ int lua_Label_setStyle(lua_State* state)
Label* instance = getInstance(state);
instance->setStyle(param1);
-
+
return 0;
}
else
@@ -4063,7 +4063,7 @@ int lua_Label_setText(lua_State* state)
Label* instance = getInstance(state);
instance->setText(param1);
-
+
return 0;
}
else
@@ -4101,7 +4101,7 @@ int lua_Label_setTextAlignment(lua_State* state)
Label* instance = getInstance(state);
instance->setTextAlignment(param1);
-
+
return 0;
}
else
@@ -4125,7 +4125,7 @@ int lua_Label_setTextAlignment(lua_State* state)
Label* instance = getInstance(state);
instance->setTextAlignment(param1, param2);
-
+
return 0;
}
else
@@ -4163,7 +4163,7 @@ int lua_Label_setTextColor(lua_State* state)
Label* instance = getInstance(state);
instance->setTextColor(*param1);
-
+
return 0;
}
else
@@ -4187,7 +4187,7 @@ int lua_Label_setTextColor(lua_State* state)
Label* instance = getInstance(state);
instance->setTextColor(*param1, param2);
-
+
return 0;
}
else
@@ -4225,7 +4225,7 @@ int lua_Label_setTextRightToLeft(lua_State* state)
Label* instance = getInstance(state);
instance->setTextRightToLeft(param1);
-
+
return 0;
}
else
@@ -4249,7 +4249,7 @@ int lua_Label_setTextRightToLeft(lua_State* state)
Label* instance = getInstance(state);
instance->setTextRightToLeft(param1, param2);
-
+
return 0;
}
else
@@ -4287,7 +4287,7 @@ int lua_Label_setWidth(lua_State* state)
Label* instance = getInstance(state);
instance->setWidth(param1);
-
+
return 0;
}
else
@@ -4325,7 +4325,7 @@ int lua_Label_setZIndex(lua_State* state)
Label* instance = getInstance(state);
instance->setZIndex(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_MaterialParameter.cpp b/gameplay/src/lua/lua_MaterialParameter.cpp
index 430a4f673d..3e09ccdaab 100644
--- a/gameplay/src/lua/lua_MaterialParameter.cpp
+++ b/gameplay/src/lua/lua_MaterialParameter.cpp
@@ -15,7 +15,7 @@ namespace gameplay
void luaRegister_MaterialParameter()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addRef", lua_MaterialParameter_addRef},
{"bindValue", lua_MaterialParameter_bindValue},
@@ -34,7 +34,7 @@ void luaRegister_MaterialParameter()
{"setValue", lua_MaterialParameter_setValue},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_UNIFORM", lua_MaterialParameter_static_ANIMATE_UNIFORM},
{NULL, NULL}
@@ -71,7 +71,7 @@ int lua_MaterialParameter__gc(lua_State* state)
MaterialParameter* instance = (MaterialParameter*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -105,7 +105,7 @@ int lua_MaterialParameter_addRef(lua_State* state)
{
MaterialParameter* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -147,7 +147,7 @@ int lua_MaterialParameter_bindValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->bindValue(param1, param2);
-
+
return 0;
}
else
@@ -258,7 +258,7 @@ int lua_MaterialParameter_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -312,7 +312,7 @@ int lua_MaterialParameter_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -514,7 +514,7 @@ int lua_MaterialParameter_destroyAnimation(lua_State* state)
{
MaterialParameter* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -534,7 +534,7 @@ int lua_MaterialParameter_destroyAnimation(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -695,7 +695,7 @@ int lua_MaterialParameter_getAnimationPropertyValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -849,7 +849,7 @@ int lua_MaterialParameter_release(lua_State* state)
{
MaterialParameter* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -891,7 +891,7 @@ int lua_MaterialParameter_setAnimationPropertyValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -919,7 +919,7 @@ int lua_MaterialParameter_setAnimationPropertyValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -957,7 +957,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -968,7 +968,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -979,7 +979,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -990,7 +990,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1001,7 +1001,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(*param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1012,7 +1012,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1023,7 +1023,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(*param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1034,7 +1034,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1045,7 +1045,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(*param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1056,7 +1056,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1067,7 +1067,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(*param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1078,7 +1078,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1089,7 +1089,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1);
-
+
return 0;
}
else
@@ -1113,7 +1113,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1, param2);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1128,7 +1128,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1, param2);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1143,7 +1143,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1, param2);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1158,7 +1158,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1, param2);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1173,7 +1173,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1, param2);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1188,7 +1188,7 @@ int lua_MaterialParameter_setValue(lua_State* state)
MaterialParameter* instance = getInstance(state);
instance->setValue(param1, param2);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
diff --git a/gameplay/src/lua/lua_Node.cpp b/gameplay/src/lua/lua_Node.cpp
index 8bf231ef69..6798962572 100644
--- a/gameplay/src/lua/lua_Node.cpp
+++ b/gameplay/src/lua/lua_Node.cpp
@@ -27,7 +27,7 @@ namespace gameplay
void luaRegister_Node()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addAdvertisedDescendant", lua_Node_addAdvertisedDescendant},
{"addChild", lua_Node_addChild},
@@ -147,7 +147,7 @@ void luaRegister_Node()
{"translateZ", lua_Node_translateZ},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_ROTATE", lua_Node_static_ANIMATE_ROTATE},
{"ANIMATE_ROTATE_TRANSLATE", lua_Node_static_ANIMATE_ROTATE_TRANSLATE},
@@ -201,7 +201,7 @@ int lua_Node__gc(lua_State* state)
Node* instance = (Node*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -239,7 +239,7 @@ int lua_Node_addAdvertisedDescendant(lua_State* state)
Node* instance = getInstance(state);
instance->addAdvertisedDescendant(param1);
-
+
return 0;
}
else
@@ -277,7 +277,7 @@ int lua_Node_addChild(lua_State* state)
Node* instance = getInstance(state);
instance->addChild(param1);
-
+
return 0;
}
else
@@ -315,7 +315,7 @@ int lua_Node_addListener(lua_State* state)
Node* instance = getInstance(state);
instance->addListener(param1);
-
+
return 0;
}
else
@@ -339,7 +339,7 @@ int lua_Node_addListener(lua_State* state)
Node* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -373,7 +373,7 @@ int lua_Node_addRef(lua_State* state)
{
Node* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -415,7 +415,7 @@ int lua_Node_addScriptCallback(lua_State* state)
Node* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -572,7 +572,7 @@ int lua_Node_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -626,7 +626,7 @@ int lua_Node_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -828,7 +828,7 @@ int lua_Node_destroyAnimation(lua_State* state)
{
Node* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -848,7 +848,7 @@ int lua_Node_destroyAnimation(lua_State* state)
Node* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -1323,7 +1323,7 @@ int lua_Node_getAnimationPropertyValue(lua_State* state)
Node* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -1435,7 +1435,7 @@ int lua_Node_getBackVector(lua_State* state)
Node* instance = getInstance(state);
instance->getBackVector(param1);
-
+
return 0;
}
else
@@ -1676,7 +1676,7 @@ int lua_Node_getDownVector(lua_State* state)
Node* instance = getInstance(state);
instance->getDownVector(param1);
-
+
return 0;
}
else
@@ -1834,7 +1834,7 @@ int lua_Node_getForwardVector(lua_State* state)
Node* instance = getInstance(state);
instance->getForwardVector(param1);
-
+
return 0;
}
else
@@ -2213,7 +2213,7 @@ int lua_Node_getLeftVector(lua_State* state)
Node* instance = getInstance(state);
instance->getLeftVector(param1);
-
+
return 0;
}
else
@@ -2721,7 +2721,7 @@ int lua_Node_getRightVector(lua_State* state)
Node* instance = getInstance(state);
instance->getRightVector(param1);
-
+
return 0;
}
else
@@ -2879,7 +2879,7 @@ int lua_Node_getRotation(lua_State* state)
Node* instance = getInstance(state);
instance->getRotation(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2890,7 +2890,7 @@ int lua_Node_getRotation(lua_State* state)
Node* instance = getInstance(state);
instance->getRotation(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2970,7 +2970,7 @@ int lua_Node_getScale(lua_State* state)
Node* instance = getInstance(state);
instance->getScale(param1);
-
+
return 0;
}
else
@@ -3234,7 +3234,7 @@ int lua_Node_getTranslation(lua_State* state)
Node* instance = getInstance(state);
instance->getTranslation(param1);
-
+
return 0;
}
else
@@ -3540,7 +3540,7 @@ int lua_Node_getUpVector(lua_State* state)
Node* instance = getInstance(state);
instance->getUpVector(param1);
-
+
return 0;
}
else
@@ -3891,7 +3891,7 @@ int lua_Node_release(lua_State* state)
{
Node* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -3925,7 +3925,7 @@ int lua_Node_removeAllChildren(lua_State* state)
{
Node* instance = getInstance(state);
instance->removeAllChildren();
-
+
return 0;
}
else
@@ -3963,7 +3963,7 @@ int lua_Node_removeChild(lua_State* state)
Node* instance = getInstance(state);
instance->removeChild(param1);
-
+
return 0;
}
else
@@ -4001,7 +4001,7 @@ int lua_Node_removeListener(lua_State* state)
Node* instance = getInstance(state);
instance->removeListener(param1);
-
+
return 0;
}
else
@@ -4043,7 +4043,7 @@ int lua_Node_removeScriptCallback(lua_State* state)
Node* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -4081,7 +4081,7 @@ int lua_Node_rotate(lua_State* state)
Node* instance = getInstance(state);
instance->rotate(*param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4092,7 +4092,7 @@ int lua_Node_rotate(lua_State* state)
Node* instance = getInstance(state);
instance->rotate(*param1);
-
+
return 0;
}
else
@@ -4116,7 +4116,7 @@ int lua_Node_rotate(lua_State* state)
Node* instance = getInstance(state);
instance->rotate(*param1, param2);
-
+
return 0;
}
else
@@ -4148,7 +4148,7 @@ int lua_Node_rotate(lua_State* state)
Node* instance = getInstance(state);
instance->rotate(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -4186,7 +4186,7 @@ int lua_Node_rotateX(lua_State* state)
Node* instance = getInstance(state);
instance->rotateX(param1);
-
+
return 0;
}
else
@@ -4224,7 +4224,7 @@ int lua_Node_rotateY(lua_State* state)
Node* instance = getInstance(state);
instance->rotateY(param1);
-
+
return 0;
}
else
@@ -4262,7 +4262,7 @@ int lua_Node_rotateZ(lua_State* state)
Node* instance = getInstance(state);
instance->rotateZ(param1);
-
+
return 0;
}
else
@@ -4300,7 +4300,7 @@ int lua_Node_scale(lua_State* state)
Node* instance = getInstance(state);
instance->scale(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4311,7 +4311,7 @@ int lua_Node_scale(lua_State* state)
Node* instance = getInstance(state);
instance->scale(*param1);
-
+
return 0;
}
else
@@ -4339,7 +4339,7 @@ int lua_Node_scale(lua_State* state)
Node* instance = getInstance(state);
instance->scale(param1, param2, param3);
-
+
return 0;
}
else
@@ -4377,7 +4377,7 @@ int lua_Node_scaleX(lua_State* state)
Node* instance = getInstance(state);
instance->scaleX(param1);
-
+
return 0;
}
else
@@ -4415,7 +4415,7 @@ int lua_Node_scaleY(lua_State* state)
Node* instance = getInstance(state);
instance->scaleY(param1);
-
+
return 0;
}
else
@@ -4453,7 +4453,7 @@ int lua_Node_scaleZ(lua_State* state)
Node* instance = getInstance(state);
instance->scaleZ(param1);
-
+
return 0;
}
else
@@ -4491,7 +4491,7 @@ int lua_Node_set(lua_State* state)
Node* instance = getInstance(state);
instance->set(*param1);
-
+
return 0;
}
else
@@ -4519,7 +4519,7 @@ int lua_Node_set(lua_State* state)
Node* instance = getInstance(state);
instance->set(*param1, *param2, *param3);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -4538,7 +4538,7 @@ int lua_Node_set(lua_State* state)
Node* instance = getInstance(state);
instance->set(*param1, *param2, *param3);
-
+
return 0;
}
else
@@ -4570,7 +4570,7 @@ int lua_Node_set(lua_State* state)
Node* instance = getInstance(state);
instance->set(*param1, *param2, param3, *param4);
-
+
return 0;
}
else
@@ -4608,7 +4608,7 @@ int lua_Node_setAgent(lua_State* state)
Node* instance = getInstance(state);
instance->setAgent(param1);
-
+
return 0;
}
else
@@ -4650,7 +4650,7 @@ int lua_Node_setAnimationPropertyValue(lua_State* state)
Node* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -4678,7 +4678,7 @@ int lua_Node_setAnimationPropertyValue(lua_State* state)
Node* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -4716,7 +4716,7 @@ int lua_Node_setAudioSource(lua_State* state)
Node* instance = getInstance(state);
instance->setAudioSource(param1);
-
+
return 0;
}
else
@@ -4754,7 +4754,7 @@ int lua_Node_setCamera(lua_State* state)
Node* instance = getInstance(state);
instance->setCamera(param1);
-
+
return 0;
}
else
@@ -4964,7 +4964,7 @@ int lua_Node_setForm(lua_State* state)
Node* instance = getInstance(state);
instance->setForm(param1);
-
+
return 0;
}
else
@@ -5002,7 +5002,7 @@ int lua_Node_setId(lua_State* state)
Node* instance = getInstance(state);
instance->setId(param1);
-
+
return 0;
}
else
@@ -5036,7 +5036,7 @@ int lua_Node_setIdentity(lua_State* state)
{
Node* instance = getInstance(state);
instance->setIdentity();
-
+
return 0;
}
else
@@ -5074,7 +5074,7 @@ int lua_Node_setLight(lua_State* state)
Node* instance = getInstance(state);
instance->setLight(param1);
-
+
return 0;
}
else
@@ -5112,7 +5112,7 @@ int lua_Node_setModel(lua_State* state)
Node* instance = getInstance(state);
instance->setModel(param1);
-
+
return 0;
}
else
@@ -5150,7 +5150,7 @@ int lua_Node_setParticleEmitter(lua_State* state)
Node* instance = getInstance(state);
instance->setParticleEmitter(param1);
-
+
return 0;
}
else
@@ -5188,7 +5188,7 @@ int lua_Node_setRotation(lua_State* state)
Node* instance = getInstance(state);
instance->setRotation(*param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -5199,7 +5199,7 @@ int lua_Node_setRotation(lua_State* state)
Node* instance = getInstance(state);
instance->setRotation(*param1);
-
+
return 0;
}
else
@@ -5223,7 +5223,7 @@ int lua_Node_setRotation(lua_State* state)
Node* instance = getInstance(state);
instance->setRotation(*param1, param2);
-
+
return 0;
}
else
@@ -5255,7 +5255,7 @@ int lua_Node_setRotation(lua_State* state)
Node* instance = getInstance(state);
instance->setRotation(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -5293,7 +5293,7 @@ int lua_Node_setScale(lua_State* state)
Node* instance = getInstance(state);
instance->setScale(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -5304,7 +5304,7 @@ int lua_Node_setScale(lua_State* state)
Node* instance = getInstance(state);
instance->setScale(*param1);
-
+
return 0;
}
else
@@ -5332,7 +5332,7 @@ int lua_Node_setScale(lua_State* state)
Node* instance = getInstance(state);
instance->setScale(param1, param2, param3);
-
+
return 0;
}
else
@@ -5370,7 +5370,7 @@ int lua_Node_setScaleX(lua_State* state)
Node* instance = getInstance(state);
instance->setScaleX(param1);
-
+
return 0;
}
else
@@ -5408,7 +5408,7 @@ int lua_Node_setScaleY(lua_State* state)
Node* instance = getInstance(state);
instance->setScaleY(param1);
-
+
return 0;
}
else
@@ -5446,7 +5446,7 @@ int lua_Node_setScaleZ(lua_State* state)
Node* instance = getInstance(state);
instance->setScaleZ(param1);
-
+
return 0;
}
else
@@ -5484,7 +5484,7 @@ int lua_Node_setTag(lua_State* state)
Node* instance = getInstance(state);
instance->setTag(param1);
-
+
return 0;
}
else
@@ -5508,7 +5508,7 @@ int lua_Node_setTag(lua_State* state)
Node* instance = getInstance(state);
instance->setTag(param1, param2);
-
+
return 0;
}
else
@@ -5546,7 +5546,7 @@ int lua_Node_setTranslation(lua_State* state)
Node* instance = getInstance(state);
instance->setTranslation(*param1);
-
+
return 0;
}
else
@@ -5574,7 +5574,7 @@ int lua_Node_setTranslation(lua_State* state)
Node* instance = getInstance(state);
instance->setTranslation(param1, param2, param3);
-
+
return 0;
}
else
@@ -5612,7 +5612,7 @@ int lua_Node_setTranslationX(lua_State* state)
Node* instance = getInstance(state);
instance->setTranslationX(param1);
-
+
return 0;
}
else
@@ -5650,7 +5650,7 @@ int lua_Node_setTranslationY(lua_State* state)
Node* instance = getInstance(state);
instance->setTranslationY(param1);
-
+
return 0;
}
else
@@ -5688,7 +5688,7 @@ int lua_Node_setTranslationZ(lua_State* state)
Node* instance = getInstance(state);
instance->setTranslationZ(param1);
-
+
return 0;
}
else
@@ -6052,7 +6052,7 @@ int lua_Node_static_resumeTransformChanged(lua_State* state)
case 0:
{
Node::resumeTransformChanged();
-
+
return 0;
break;
}
@@ -6077,7 +6077,7 @@ int lua_Node_static_suspendTransformChanged(lua_State* state)
case 0:
{
Node::suspendTransformChanged();
-
+
return 0;
break;
}
@@ -6109,7 +6109,7 @@ int lua_Node_transformPoint(lua_State* state)
Node* instance = getInstance(state);
instance->transformPoint(param1);
-
+
return 0;
}
else
@@ -6133,7 +6133,7 @@ int lua_Node_transformPoint(lua_State* state)
Node* instance = getInstance(state);
instance->transformPoint(*param1, param2);
-
+
return 0;
}
else
@@ -6171,7 +6171,7 @@ int lua_Node_transformVector(lua_State* state)
Node* instance = getInstance(state);
instance->transformVector(param1);
-
+
return 0;
}
else
@@ -6195,7 +6195,7 @@ int lua_Node_transformVector(lua_State* state)
Node* instance = getInstance(state);
instance->transformVector(*param1, param2);
-
+
return 0;
}
else
@@ -6231,7 +6231,7 @@ int lua_Node_transformVector(lua_State* state)
Node* instance = getInstance(state);
instance->transformVector(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -6269,7 +6269,7 @@ int lua_Node_translate(lua_State* state)
Node* instance = getInstance(state);
instance->translate(*param1);
-
+
return 0;
}
else
@@ -6297,7 +6297,7 @@ int lua_Node_translate(lua_State* state)
Node* instance = getInstance(state);
instance->translate(param1, param2, param3);
-
+
return 0;
}
else
@@ -6335,7 +6335,7 @@ int lua_Node_translateForward(lua_State* state)
Node* instance = getInstance(state);
instance->translateForward(param1);
-
+
return 0;
}
else
@@ -6373,7 +6373,7 @@ int lua_Node_translateLeft(lua_State* state)
Node* instance = getInstance(state);
instance->translateLeft(param1);
-
+
return 0;
}
else
@@ -6419,7 +6419,7 @@ int lua_Node_translateSmooth(lua_State* state)
Node* instance = getInstance(state);
instance->translateSmooth(*param1, param2, param3);
-
+
return 0;
}
else
@@ -6457,7 +6457,7 @@ int lua_Node_translateUp(lua_State* state)
Node* instance = getInstance(state);
instance->translateUp(param1);
-
+
return 0;
}
else
@@ -6495,7 +6495,7 @@ int lua_Node_translateX(lua_State* state)
Node* instance = getInstance(state);
instance->translateX(param1);
-
+
return 0;
}
else
@@ -6533,7 +6533,7 @@ int lua_Node_translateY(lua_State* state)
Node* instance = getInstance(state);
instance->translateY(param1);
-
+
return 0;
}
else
@@ -6571,7 +6571,7 @@ int lua_Node_translateZ(lua_State* state)
Node* instance = getInstance(state);
instance->translateZ(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_RadioButton.cpp b/gameplay/src/lua/lua_RadioButton.cpp
index 5ed6706ba7..f86ba61474 100644
--- a/gameplay/src/lua/lua_RadioButton.cpp
+++ b/gameplay/src/lua/lua_RadioButton.cpp
@@ -24,7 +24,7 @@ namespace gameplay
void luaRegister_RadioButton()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addListener", lua_RadioButton_addListener},
{"addRef", lua_RadioButton_addRef},
@@ -116,7 +116,7 @@ void luaRegister_RadioButton()
{"setZIndex", lua_RadioButton_setZIndex},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_OPACITY", lua_RadioButton_static_ANIMATE_OPACITY},
{"ANIMATE_POSITION", lua_RadioButton_static_ANIMATE_POSITION},
@@ -160,7 +160,7 @@ int lua_RadioButton__gc(lua_State* state)
RadioButton* instance = (RadioButton*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -202,7 +202,7 @@ int lua_RadioButton_addListener(lua_State* state)
RadioButton* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -236,7 +236,7 @@ int lua_RadioButton_addRef(lua_State* state)
{
RadioButton* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -278,7 +278,7 @@ int lua_RadioButton_addScriptCallback(lua_State* state)
RadioButton* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -389,7 +389,7 @@ int lua_RadioButton_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -443,7 +443,7 @@ int lua_RadioButton_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -645,7 +645,7 @@ int lua_RadioButton_destroyAnimation(lua_State* state)
{
RadioButton* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -665,7 +665,7 @@ int lua_RadioButton_destroyAnimation(lua_State* state)
RadioButton* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -699,7 +699,7 @@ int lua_RadioButton_disable(lua_State* state)
{
RadioButton* instance = getInstance(state);
instance->disable();
-
+
return 0;
}
else
@@ -733,7 +733,7 @@ int lua_RadioButton_enable(lua_State* state)
{
RadioButton* instance = getInstance(state);
instance->enable();
-
+
return 0;
}
else
@@ -931,7 +931,7 @@ int lua_RadioButton_getAnimationPropertyValue(lua_State* state)
RadioButton* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2895,7 +2895,7 @@ int lua_RadioButton_release(lua_State* state)
{
RadioButton* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -2937,7 +2937,7 @@ int lua_RadioButton_removeScriptCallback(lua_State* state)
RadioButton* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -2975,7 +2975,7 @@ int lua_RadioButton_setAlignment(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setAlignment(param1);
-
+
return 0;
}
else
@@ -3017,7 +3017,7 @@ int lua_RadioButton_setAnimationPropertyValue(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -3045,7 +3045,7 @@ int lua_RadioButton_setAnimationPropertyValue(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -3083,7 +3083,7 @@ int lua_RadioButton_setAutoHeight(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setAutoHeight(param1);
-
+
return 0;
}
else
@@ -3121,7 +3121,7 @@ int lua_RadioButton_setAutoWidth(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setAutoWidth(param1);
-
+
return 0;
}
else
@@ -3171,7 +3171,7 @@ int lua_RadioButton_setBorder(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3207,7 +3207,7 @@ int lua_RadioButton_setBorder(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3245,7 +3245,7 @@ int lua_RadioButton_setBounds(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setBounds(*param1);
-
+
return 0;
}
else
@@ -3283,7 +3283,7 @@ int lua_RadioButton_setConsumeInputEvents(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setConsumeInputEvents(param1);
-
+
return 0;
}
else
@@ -3325,7 +3325,7 @@ int lua_RadioButton_setCursorColor(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setCursorColor(*param1, param2);
-
+
return 0;
}
else
@@ -3367,7 +3367,7 @@ int lua_RadioButton_setCursorRegion(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setCursorRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3405,7 +3405,7 @@ int lua_RadioButton_setFocusIndex(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setFocusIndex(param1);
-
+
return 0;
}
else
@@ -3443,7 +3443,7 @@ int lua_RadioButton_setFont(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setFont(param1);
-
+
return 0;
}
else
@@ -3467,7 +3467,7 @@ int lua_RadioButton_setFont(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setFont(param1, param2);
-
+
return 0;
}
else
@@ -3505,7 +3505,7 @@ int lua_RadioButton_setFontSize(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setFontSize(param1);
-
+
return 0;
}
else
@@ -3529,7 +3529,7 @@ int lua_RadioButton_setFontSize(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setFontSize(param1, param2);
-
+
return 0;
}
else
@@ -3567,7 +3567,7 @@ int lua_RadioButton_setGroupId(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setGroupId(param1);
-
+
return 0;
}
else
@@ -3605,7 +3605,7 @@ int lua_RadioButton_setHeight(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setHeight(param1);
-
+
return 0;
}
else
@@ -3647,7 +3647,7 @@ int lua_RadioButton_setImageColor(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setImageColor(param1, *param2);
-
+
return 0;
}
else
@@ -3675,7 +3675,7 @@ int lua_RadioButton_setImageColor(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setImageColor(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3717,7 +3717,7 @@ int lua_RadioButton_setImageRegion(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setImageRegion(param1, *param2);
-
+
return 0;
}
else
@@ -3745,7 +3745,7 @@ int lua_RadioButton_setImageRegion(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setImageRegion(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3787,7 +3787,7 @@ int lua_RadioButton_setImageSize(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setImageSize(param1, param2);
-
+
return 0;
}
else
@@ -3837,7 +3837,7 @@ int lua_RadioButton_setMargin(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setMargin(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3875,7 +3875,7 @@ int lua_RadioButton_setOpacity(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setOpacity(param1);
-
+
return 0;
}
else
@@ -3899,7 +3899,7 @@ int lua_RadioButton_setOpacity(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setOpacity(param1, param2);
-
+
return 0;
}
else
@@ -3949,7 +3949,7 @@ int lua_RadioButton_setPadding(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setPadding(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3991,7 +3991,7 @@ int lua_RadioButton_setPosition(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setPosition(param1, param2);
-
+
return 0;
}
else
@@ -4029,7 +4029,7 @@ int lua_RadioButton_setSelected(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setSelected(param1);
-
+
return 0;
}
else
@@ -4071,7 +4071,7 @@ int lua_RadioButton_setSize(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setSize(param1, param2);
-
+
return 0;
}
else
@@ -4109,7 +4109,7 @@ int lua_RadioButton_setSkinColor(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setSkinColor(*param1);
-
+
return 0;
}
else
@@ -4133,7 +4133,7 @@ int lua_RadioButton_setSkinColor(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setSkinColor(*param1, param2);
-
+
return 0;
}
else
@@ -4171,7 +4171,7 @@ int lua_RadioButton_setSkinRegion(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setSkinRegion(*param1);
-
+
return 0;
}
else
@@ -4195,7 +4195,7 @@ int lua_RadioButton_setSkinRegion(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setSkinRegion(*param1, param2);
-
+
return 0;
}
else
@@ -4233,7 +4233,7 @@ int lua_RadioButton_setState(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setState(param1);
-
+
return 0;
}
else
@@ -4271,7 +4271,7 @@ int lua_RadioButton_setStyle(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setStyle(param1);
-
+
return 0;
}
else
@@ -4309,7 +4309,7 @@ int lua_RadioButton_setText(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setText(param1);
-
+
return 0;
}
else
@@ -4347,7 +4347,7 @@ int lua_RadioButton_setTextAlignment(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setTextAlignment(param1);
-
+
return 0;
}
else
@@ -4371,7 +4371,7 @@ int lua_RadioButton_setTextAlignment(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setTextAlignment(param1, param2);
-
+
return 0;
}
else
@@ -4409,7 +4409,7 @@ int lua_RadioButton_setTextColor(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setTextColor(*param1);
-
+
return 0;
}
else
@@ -4433,7 +4433,7 @@ int lua_RadioButton_setTextColor(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setTextColor(*param1, param2);
-
+
return 0;
}
else
@@ -4471,7 +4471,7 @@ int lua_RadioButton_setTextRightToLeft(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setTextRightToLeft(param1);
-
+
return 0;
}
else
@@ -4495,7 +4495,7 @@ int lua_RadioButton_setTextRightToLeft(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setTextRightToLeft(param1, param2);
-
+
return 0;
}
else
@@ -4533,7 +4533,7 @@ int lua_RadioButton_setWidth(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setWidth(param1);
-
+
return 0;
}
else
@@ -4571,7 +4571,7 @@ int lua_RadioButton_setZIndex(lua_State* state)
RadioButton* instance = getInstance(state);
instance->setZIndex(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_Slider.cpp b/gameplay/src/lua/lua_Slider.cpp
index c34c632b7d..8d6fe258f9 100644
--- a/gameplay/src/lua/lua_Slider.cpp
+++ b/gameplay/src/lua/lua_Slider.cpp
@@ -23,7 +23,7 @@ namespace gameplay
void luaRegister_Slider()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addListener", lua_Slider_addListener},
{"addRef", lua_Slider_addRef},
@@ -117,7 +117,7 @@ void luaRegister_Slider()
{"setZIndex", lua_Slider_setZIndex},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_OPACITY", lua_Slider_static_ANIMATE_OPACITY},
{"ANIMATE_POSITION", lua_Slider_static_ANIMATE_POSITION},
@@ -161,7 +161,7 @@ int lua_Slider__gc(lua_State* state)
Slider* instance = (Slider*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -203,7 +203,7 @@ int lua_Slider_addListener(lua_State* state)
Slider* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -237,7 +237,7 @@ int lua_Slider_addRef(lua_State* state)
{
Slider* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -279,7 +279,7 @@ int lua_Slider_addScriptCallback(lua_State* state)
Slider* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -390,7 +390,7 @@ int lua_Slider_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -444,7 +444,7 @@ int lua_Slider_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -646,7 +646,7 @@ int lua_Slider_destroyAnimation(lua_State* state)
{
Slider* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -666,7 +666,7 @@ int lua_Slider_destroyAnimation(lua_State* state)
Slider* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -700,7 +700,7 @@ int lua_Slider_disable(lua_State* state)
{
Slider* instance = getInstance(state);
instance->disable();
-
+
return 0;
}
else
@@ -734,7 +734,7 @@ int lua_Slider_enable(lua_State* state)
{
Slider* instance = getInstance(state);
instance->enable();
-
+
return 0;
}
else
@@ -932,7 +932,7 @@ int lua_Slider_getAnimationPropertyValue(lua_State* state)
Slider* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2924,7 +2924,7 @@ int lua_Slider_release(lua_State* state)
{
Slider* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -2966,7 +2966,7 @@ int lua_Slider_removeScriptCallback(lua_State* state)
Slider* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -3004,7 +3004,7 @@ int lua_Slider_setAlignment(lua_State* state)
Slider* instance = getInstance(state);
instance->setAlignment(param1);
-
+
return 0;
}
else
@@ -3046,7 +3046,7 @@ int lua_Slider_setAnimationPropertyValue(lua_State* state)
Slider* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -3074,7 +3074,7 @@ int lua_Slider_setAnimationPropertyValue(lua_State* state)
Slider* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -3112,7 +3112,7 @@ int lua_Slider_setAutoHeight(lua_State* state)
Slider* instance = getInstance(state);
instance->setAutoHeight(param1);
-
+
return 0;
}
else
@@ -3150,7 +3150,7 @@ int lua_Slider_setAutoWidth(lua_State* state)
Slider* instance = getInstance(state);
instance->setAutoWidth(param1);
-
+
return 0;
}
else
@@ -3200,7 +3200,7 @@ int lua_Slider_setBorder(lua_State* state)
Slider* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3236,7 +3236,7 @@ int lua_Slider_setBorder(lua_State* state)
Slider* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3274,7 +3274,7 @@ int lua_Slider_setBounds(lua_State* state)
Slider* instance = getInstance(state);
instance->setBounds(*param1);
-
+
return 0;
}
else
@@ -3312,7 +3312,7 @@ int lua_Slider_setConsumeInputEvents(lua_State* state)
Slider* instance = getInstance(state);
instance->setConsumeInputEvents(param1);
-
+
return 0;
}
else
@@ -3354,7 +3354,7 @@ int lua_Slider_setCursorColor(lua_State* state)
Slider* instance = getInstance(state);
instance->setCursorColor(*param1, param2);
-
+
return 0;
}
else
@@ -3396,7 +3396,7 @@ int lua_Slider_setCursorRegion(lua_State* state)
Slider* instance = getInstance(state);
instance->setCursorRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3434,7 +3434,7 @@ int lua_Slider_setFocusIndex(lua_State* state)
Slider* instance = getInstance(state);
instance->setFocusIndex(param1);
-
+
return 0;
}
else
@@ -3472,7 +3472,7 @@ int lua_Slider_setFont(lua_State* state)
Slider* instance = getInstance(state);
instance->setFont(param1);
-
+
return 0;
}
else
@@ -3496,7 +3496,7 @@ int lua_Slider_setFont(lua_State* state)
Slider* instance = getInstance(state);
instance->setFont(param1, param2);
-
+
return 0;
}
else
@@ -3534,7 +3534,7 @@ int lua_Slider_setFontSize(lua_State* state)
Slider* instance = getInstance(state);
instance->setFontSize(param1);
-
+
return 0;
}
else
@@ -3558,7 +3558,7 @@ int lua_Slider_setFontSize(lua_State* state)
Slider* instance = getInstance(state);
instance->setFontSize(param1, param2);
-
+
return 0;
}
else
@@ -3596,7 +3596,7 @@ int lua_Slider_setHeight(lua_State* state)
Slider* instance = getInstance(state);
instance->setHeight(param1);
-
+
return 0;
}
else
@@ -3638,7 +3638,7 @@ int lua_Slider_setImageColor(lua_State* state)
Slider* instance = getInstance(state);
instance->setImageColor(param1, *param2);
-
+
return 0;
}
else
@@ -3666,7 +3666,7 @@ int lua_Slider_setImageColor(lua_State* state)
Slider* instance = getInstance(state);
instance->setImageColor(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3708,7 +3708,7 @@ int lua_Slider_setImageRegion(lua_State* state)
Slider* instance = getInstance(state);
instance->setImageRegion(param1, *param2);
-
+
return 0;
}
else
@@ -3736,7 +3736,7 @@ int lua_Slider_setImageRegion(lua_State* state)
Slider* instance = getInstance(state);
instance->setImageRegion(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3786,7 +3786,7 @@ int lua_Slider_setMargin(lua_State* state)
Slider* instance = getInstance(state);
instance->setMargin(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3824,7 +3824,7 @@ int lua_Slider_setMax(lua_State* state)
Slider* instance = getInstance(state);
instance->setMax(param1);
-
+
return 0;
}
else
@@ -3862,7 +3862,7 @@ int lua_Slider_setMin(lua_State* state)
Slider* instance = getInstance(state);
instance->setMin(param1);
-
+
return 0;
}
else
@@ -3900,7 +3900,7 @@ int lua_Slider_setOpacity(lua_State* state)
Slider* instance = getInstance(state);
instance->setOpacity(param1);
-
+
return 0;
}
else
@@ -3924,7 +3924,7 @@ int lua_Slider_setOpacity(lua_State* state)
Slider* instance = getInstance(state);
instance->setOpacity(param1, param2);
-
+
return 0;
}
else
@@ -3974,7 +3974,7 @@ int lua_Slider_setPadding(lua_State* state)
Slider* instance = getInstance(state);
instance->setPadding(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -4016,7 +4016,7 @@ int lua_Slider_setPosition(lua_State* state)
Slider* instance = getInstance(state);
instance->setPosition(param1, param2);
-
+
return 0;
}
else
@@ -4058,7 +4058,7 @@ int lua_Slider_setSize(lua_State* state)
Slider* instance = getInstance(state);
instance->setSize(param1, param2);
-
+
return 0;
}
else
@@ -4096,7 +4096,7 @@ int lua_Slider_setSkinColor(lua_State* state)
Slider* instance = getInstance(state);
instance->setSkinColor(*param1);
-
+
return 0;
}
else
@@ -4120,7 +4120,7 @@ int lua_Slider_setSkinColor(lua_State* state)
Slider* instance = getInstance(state);
instance->setSkinColor(*param1, param2);
-
+
return 0;
}
else
@@ -4158,7 +4158,7 @@ int lua_Slider_setSkinRegion(lua_State* state)
Slider* instance = getInstance(state);
instance->setSkinRegion(*param1);
-
+
return 0;
}
else
@@ -4182,7 +4182,7 @@ int lua_Slider_setSkinRegion(lua_State* state)
Slider* instance = getInstance(state);
instance->setSkinRegion(*param1, param2);
-
+
return 0;
}
else
@@ -4220,7 +4220,7 @@ int lua_Slider_setState(lua_State* state)
Slider* instance = getInstance(state);
instance->setState(param1);
-
+
return 0;
}
else
@@ -4258,7 +4258,7 @@ int lua_Slider_setStep(lua_State* state)
Slider* instance = getInstance(state);
instance->setStep(param1);
-
+
return 0;
}
else
@@ -4296,7 +4296,7 @@ int lua_Slider_setStyle(lua_State* state)
Slider* instance = getInstance(state);
instance->setStyle(param1);
-
+
return 0;
}
else
@@ -4334,7 +4334,7 @@ int lua_Slider_setText(lua_State* state)
Slider* instance = getInstance(state);
instance->setText(param1);
-
+
return 0;
}
else
@@ -4372,7 +4372,7 @@ int lua_Slider_setTextAlignment(lua_State* state)
Slider* instance = getInstance(state);
instance->setTextAlignment(param1);
-
+
return 0;
}
else
@@ -4396,7 +4396,7 @@ int lua_Slider_setTextAlignment(lua_State* state)
Slider* instance = getInstance(state);
instance->setTextAlignment(param1, param2);
-
+
return 0;
}
else
@@ -4434,7 +4434,7 @@ int lua_Slider_setTextColor(lua_State* state)
Slider* instance = getInstance(state);
instance->setTextColor(*param1);
-
+
return 0;
}
else
@@ -4458,7 +4458,7 @@ int lua_Slider_setTextColor(lua_State* state)
Slider* instance = getInstance(state);
instance->setTextColor(*param1, param2);
-
+
return 0;
}
else
@@ -4496,7 +4496,7 @@ int lua_Slider_setTextRightToLeft(lua_State* state)
Slider* instance = getInstance(state);
instance->setTextRightToLeft(param1);
-
+
return 0;
}
else
@@ -4520,7 +4520,7 @@ int lua_Slider_setTextRightToLeft(lua_State* state)
Slider* instance = getInstance(state);
instance->setTextRightToLeft(param1, param2);
-
+
return 0;
}
else
@@ -4558,7 +4558,7 @@ int lua_Slider_setValue(lua_State* state)
Slider* instance = getInstance(state);
instance->setValue(param1);
-
+
return 0;
}
else
@@ -4596,7 +4596,7 @@ int lua_Slider_setWidth(lua_State* state)
Slider* instance = getInstance(state);
instance->setWidth(param1);
-
+
return 0;
}
else
@@ -4634,7 +4634,7 @@ int lua_Slider_setZIndex(lua_State* state)
Slider* instance = getInstance(state);
instance->setZIndex(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_TextBox.cpp b/gameplay/src/lua/lua_TextBox.cpp
index ddee1bf614..8a6dcab102 100644
--- a/gameplay/src/lua/lua_TextBox.cpp
+++ b/gameplay/src/lua/lua_TextBox.cpp
@@ -23,7 +23,7 @@ namespace gameplay
void luaRegister_TextBox()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addListener", lua_TextBox_addListener},
{"addRef", lua_TextBox_addRef},
@@ -110,7 +110,7 @@ void luaRegister_TextBox()
{"setZIndex", lua_TextBox_setZIndex},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_OPACITY", lua_TextBox_static_ANIMATE_OPACITY},
{"ANIMATE_POSITION", lua_TextBox_static_ANIMATE_POSITION},
@@ -154,7 +154,7 @@ int lua_TextBox__gc(lua_State* state)
TextBox* instance = (TextBox*)object->instance;
SAFE_RELEASE(instance);
}
-
+
return 0;
}
else
@@ -196,7 +196,7 @@ int lua_TextBox_addListener(lua_State* state)
TextBox* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -230,7 +230,7 @@ int lua_TextBox_addRef(lua_State* state)
{
TextBox* instance = getInstance(state);
instance->addRef();
-
+
return 0;
}
else
@@ -272,7 +272,7 @@ int lua_TextBox_addScriptCallback(lua_State* state)
TextBox* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -383,7 +383,7 @@ int lua_TextBox_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -437,7 +437,7 @@ int lua_TextBox_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -639,7 +639,7 @@ int lua_TextBox_destroyAnimation(lua_State* state)
{
TextBox* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -659,7 +659,7 @@ int lua_TextBox_destroyAnimation(lua_State* state)
TextBox* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -693,7 +693,7 @@ int lua_TextBox_disable(lua_State* state)
{
TextBox* instance = getInstance(state);
instance->disable();
-
+
return 0;
}
else
@@ -727,7 +727,7 @@ int lua_TextBox_enable(lua_State* state)
{
TextBox* instance = getInstance(state);
instance->enable();
-
+
return 0;
}
else
@@ -925,7 +925,7 @@ int lua_TextBox_getAnimationPropertyValue(lua_State* state)
TextBox* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2806,7 +2806,7 @@ int lua_TextBox_release(lua_State* state)
{
TextBox* instance = getInstance(state);
instance->release();
-
+
return 0;
}
else
@@ -2848,7 +2848,7 @@ int lua_TextBox_removeScriptCallback(lua_State* state)
TextBox* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -2886,7 +2886,7 @@ int lua_TextBox_setAlignment(lua_State* state)
TextBox* instance = getInstance(state);
instance->setAlignment(param1);
-
+
return 0;
}
else
@@ -2928,7 +2928,7 @@ int lua_TextBox_setAnimationPropertyValue(lua_State* state)
TextBox* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2956,7 +2956,7 @@ int lua_TextBox_setAnimationPropertyValue(lua_State* state)
TextBox* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -2994,7 +2994,7 @@ int lua_TextBox_setAutoHeight(lua_State* state)
TextBox* instance = getInstance(state);
instance->setAutoHeight(param1);
-
+
return 0;
}
else
@@ -3032,7 +3032,7 @@ int lua_TextBox_setAutoWidth(lua_State* state)
TextBox* instance = getInstance(state);
instance->setAutoWidth(param1);
-
+
return 0;
}
else
@@ -3082,7 +3082,7 @@ int lua_TextBox_setBorder(lua_State* state)
TextBox* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3118,7 +3118,7 @@ int lua_TextBox_setBorder(lua_State* state)
TextBox* instance = getInstance(state);
instance->setBorder(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3156,7 +3156,7 @@ int lua_TextBox_setBounds(lua_State* state)
TextBox* instance = getInstance(state);
instance->setBounds(*param1);
-
+
return 0;
}
else
@@ -3194,7 +3194,7 @@ int lua_TextBox_setConsumeInputEvents(lua_State* state)
TextBox* instance = getInstance(state);
instance->setConsumeInputEvents(param1);
-
+
return 0;
}
else
@@ -3236,7 +3236,7 @@ int lua_TextBox_setCursorColor(lua_State* state)
TextBox* instance = getInstance(state);
instance->setCursorColor(*param1, param2);
-
+
return 0;
}
else
@@ -3278,7 +3278,7 @@ int lua_TextBox_setCursorRegion(lua_State* state)
TextBox* instance = getInstance(state);
instance->setCursorRegion(*param1, param2);
-
+
return 0;
}
else
@@ -3316,7 +3316,7 @@ int lua_TextBox_setFocusIndex(lua_State* state)
TextBox* instance = getInstance(state);
instance->setFocusIndex(param1);
-
+
return 0;
}
else
@@ -3354,7 +3354,7 @@ int lua_TextBox_setFont(lua_State* state)
TextBox* instance = getInstance(state);
instance->setFont(param1);
-
+
return 0;
}
else
@@ -3378,7 +3378,7 @@ int lua_TextBox_setFont(lua_State* state)
TextBox* instance = getInstance(state);
instance->setFont(param1, param2);
-
+
return 0;
}
else
@@ -3416,7 +3416,7 @@ int lua_TextBox_setFontSize(lua_State* state)
TextBox* instance = getInstance(state);
instance->setFontSize(param1);
-
+
return 0;
}
else
@@ -3440,7 +3440,7 @@ int lua_TextBox_setFontSize(lua_State* state)
TextBox* instance = getInstance(state);
instance->setFontSize(param1, param2);
-
+
return 0;
}
else
@@ -3478,7 +3478,7 @@ int lua_TextBox_setHeight(lua_State* state)
TextBox* instance = getInstance(state);
instance->setHeight(param1);
-
+
return 0;
}
else
@@ -3520,7 +3520,7 @@ int lua_TextBox_setImageColor(lua_State* state)
TextBox* instance = getInstance(state);
instance->setImageColor(param1, *param2);
-
+
return 0;
}
else
@@ -3548,7 +3548,7 @@ int lua_TextBox_setImageColor(lua_State* state)
TextBox* instance = getInstance(state);
instance->setImageColor(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3590,7 +3590,7 @@ int lua_TextBox_setImageRegion(lua_State* state)
TextBox* instance = getInstance(state);
instance->setImageRegion(param1, *param2);
-
+
return 0;
}
else
@@ -3618,7 +3618,7 @@ int lua_TextBox_setImageRegion(lua_State* state)
TextBox* instance = getInstance(state);
instance->setImageRegion(param1, *param2, param3);
-
+
return 0;
}
else
@@ -3668,7 +3668,7 @@ int lua_TextBox_setMargin(lua_State* state)
TextBox* instance = getInstance(state);
instance->setMargin(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3706,7 +3706,7 @@ int lua_TextBox_setOpacity(lua_State* state)
TextBox* instance = getInstance(state);
instance->setOpacity(param1);
-
+
return 0;
}
else
@@ -3730,7 +3730,7 @@ int lua_TextBox_setOpacity(lua_State* state)
TextBox* instance = getInstance(state);
instance->setOpacity(param1, param2);
-
+
return 0;
}
else
@@ -3780,7 +3780,7 @@ int lua_TextBox_setPadding(lua_State* state)
TextBox* instance = getInstance(state);
instance->setPadding(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -3822,7 +3822,7 @@ int lua_TextBox_setPosition(lua_State* state)
TextBox* instance = getInstance(state);
instance->setPosition(param1, param2);
-
+
return 0;
}
else
@@ -3864,7 +3864,7 @@ int lua_TextBox_setSize(lua_State* state)
TextBox* instance = getInstance(state);
instance->setSize(param1, param2);
-
+
return 0;
}
else
@@ -3902,7 +3902,7 @@ int lua_TextBox_setSkinColor(lua_State* state)
TextBox* instance = getInstance(state);
instance->setSkinColor(*param1);
-
+
return 0;
}
else
@@ -3926,7 +3926,7 @@ int lua_TextBox_setSkinColor(lua_State* state)
TextBox* instance = getInstance(state);
instance->setSkinColor(*param1, param2);
-
+
return 0;
}
else
@@ -3964,7 +3964,7 @@ int lua_TextBox_setSkinRegion(lua_State* state)
TextBox* instance = getInstance(state);
instance->setSkinRegion(*param1);
-
+
return 0;
}
else
@@ -3988,7 +3988,7 @@ int lua_TextBox_setSkinRegion(lua_State* state)
TextBox* instance = getInstance(state);
instance->setSkinRegion(*param1, param2);
-
+
return 0;
}
else
@@ -4026,7 +4026,7 @@ int lua_TextBox_setState(lua_State* state)
TextBox* instance = getInstance(state);
instance->setState(param1);
-
+
return 0;
}
else
@@ -4064,7 +4064,7 @@ int lua_TextBox_setStyle(lua_State* state)
TextBox* instance = getInstance(state);
instance->setStyle(param1);
-
+
return 0;
}
else
@@ -4102,7 +4102,7 @@ int lua_TextBox_setText(lua_State* state)
TextBox* instance = getInstance(state);
instance->setText(param1);
-
+
return 0;
}
else
@@ -4140,7 +4140,7 @@ int lua_TextBox_setTextAlignment(lua_State* state)
TextBox* instance = getInstance(state);
instance->setTextAlignment(param1);
-
+
return 0;
}
else
@@ -4164,7 +4164,7 @@ int lua_TextBox_setTextAlignment(lua_State* state)
TextBox* instance = getInstance(state);
instance->setTextAlignment(param1, param2);
-
+
return 0;
}
else
@@ -4202,7 +4202,7 @@ int lua_TextBox_setTextColor(lua_State* state)
TextBox* instance = getInstance(state);
instance->setTextColor(*param1);
-
+
return 0;
}
else
@@ -4226,7 +4226,7 @@ int lua_TextBox_setTextColor(lua_State* state)
TextBox* instance = getInstance(state);
instance->setTextColor(*param1, param2);
-
+
return 0;
}
else
@@ -4264,7 +4264,7 @@ int lua_TextBox_setTextRightToLeft(lua_State* state)
TextBox* instance = getInstance(state);
instance->setTextRightToLeft(param1);
-
+
return 0;
}
else
@@ -4288,7 +4288,7 @@ int lua_TextBox_setTextRightToLeft(lua_State* state)
TextBox* instance = getInstance(state);
instance->setTextRightToLeft(param1, param2);
-
+
return 0;
}
else
@@ -4326,7 +4326,7 @@ int lua_TextBox_setWidth(lua_State* state)
TextBox* instance = getInstance(state);
instance->setWidth(param1);
-
+
return 0;
}
else
@@ -4364,7 +4364,7 @@ int lua_TextBox_setZIndex(lua_State* state)
TextBox* instance = getInstance(state);
instance->setZIndex(param1);
-
+
return 0;
}
else
diff --git a/gameplay/src/lua/lua_Transform.cpp b/gameplay/src/lua/lua_Transform.cpp
index 99730f7195..8fb6e581b5 100644
--- a/gameplay/src/lua/lua_Transform.cpp
+++ b/gameplay/src/lua/lua_Transform.cpp
@@ -16,7 +16,7 @@ namespace gameplay
void luaRegister_Transform()
{
- const luaL_Reg lua_members[] =
+ const luaL_Reg lua_members[] =
{
{"addListener", lua_Transform_addListener},
{"addScriptCallback", lua_Transform_addScriptCallback},
@@ -77,7 +77,7 @@ void luaRegister_Transform()
{"translateZ", lua_Transform_translateZ},
{NULL, NULL}
};
- const luaL_Reg lua_statics[] =
+ const luaL_Reg lua_statics[] =
{
{"ANIMATE_ROTATE", lua_Transform_static_ANIMATE_ROTATE},
{"ANIMATE_ROTATE_TRANSLATE", lua_Transform_static_ANIMATE_ROTATE_TRANSLATE},
@@ -130,7 +130,7 @@ int lua_Transform__gc(lua_State* state)
Transform* instance = (Transform*)object->instance;
SAFE_DELETE(instance);
}
-
+
return 0;
}
else
@@ -302,7 +302,7 @@ int lua_Transform_addListener(lua_State* state)
Transform* instance = getInstance(state);
instance->addListener(param1);
-
+
return 0;
}
else
@@ -326,7 +326,7 @@ int lua_Transform_addListener(lua_State* state)
Transform* instance = getInstance(state);
instance->addListener(param1, param2);
-
+
return 0;
}
else
@@ -368,7 +368,7 @@ int lua_Transform_addScriptCallback(lua_State* state)
Transform* instance = getInstance(state);
instance->addScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -479,7 +479,7 @@ int lua_Transform_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -533,7 +533,7 @@ int lua_Transform_createAnimation(lua_State* state)
unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 4);
// Get parameter 4 off the stack.
- ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedLongPointer(5);
+ ScriptUtil::LuaArray param4 = ScriptUtil::getUnsignedIntPointer(5);
// Get parameter 5 off the stack.
ScriptUtil::LuaArray param5 = ScriptUtil::getFloatPointer(6);
@@ -735,7 +735,7 @@ int lua_Transform_destroyAnimation(lua_State* state)
{
Transform* instance = getInstance(state);
instance->destroyAnimation();
-
+
return 0;
}
else
@@ -755,7 +755,7 @@ int lua_Transform_destroyAnimation(lua_State* state)
Transform* instance = getInstance(state);
instance->destroyAnimation(param1);
-
+
return 0;
}
else
@@ -916,7 +916,7 @@ int lua_Transform_getAnimationPropertyValue(lua_State* state)
Transform* instance = getInstance(state);
instance->getAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -982,7 +982,7 @@ int lua_Transform_getBackVector(lua_State* state)
Transform* instance = getInstance(state);
instance->getBackVector(param1);
-
+
return 0;
}
else
@@ -1048,7 +1048,7 @@ int lua_Transform_getDownVector(lua_State* state)
Transform* instance = getInstance(state);
instance->getDownVector(param1);
-
+
return 0;
}
else
@@ -1114,7 +1114,7 @@ int lua_Transform_getForwardVector(lua_State* state)
Transform* instance = getInstance(state);
instance->getForwardVector(param1);
-
+
return 0;
}
else
@@ -1180,7 +1180,7 @@ int lua_Transform_getLeftVector(lua_State* state)
Transform* instance = getInstance(state);
instance->getLeftVector(param1);
-
+
return 0;
}
else
@@ -1292,7 +1292,7 @@ int lua_Transform_getRightVector(lua_State* state)
Transform* instance = getInstance(state);
instance->getRightVector(param1);
-
+
return 0;
}
else
@@ -1358,7 +1358,7 @@ int lua_Transform_getRotation(lua_State* state)
Transform* instance = getInstance(state);
instance->getRotation(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1369,7 +1369,7 @@ int lua_Transform_getRotation(lua_State* state)
Transform* instance = getInstance(state);
instance->getRotation(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1449,7 +1449,7 @@ int lua_Transform_getScale(lua_State* state)
Transform* instance = getInstance(state);
instance->getScale(param1);
-
+
return 0;
}
else
@@ -1626,7 +1626,7 @@ int lua_Transform_getTranslation(lua_State* state)
Transform* instance = getInstance(state);
instance->getTranslation(param1);
-
+
return 0;
}
else
@@ -1803,7 +1803,7 @@ int lua_Transform_getUpVector(lua_State* state)
Transform* instance = getInstance(state);
instance->getUpVector(param1);
-
+
return 0;
}
else
@@ -1841,7 +1841,7 @@ int lua_Transform_removeListener(lua_State* state)
Transform* instance = getInstance(state);
instance->removeListener(param1);
-
+
return 0;
}
else
@@ -1883,7 +1883,7 @@ int lua_Transform_removeScriptCallback(lua_State* state)
Transform* instance = getInstance(state);
instance->removeScriptCallback(param1, param2);
-
+
return 0;
}
else
@@ -1921,7 +1921,7 @@ int lua_Transform_rotate(lua_State* state)
Transform* instance = getInstance(state);
instance->rotate(*param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -1932,7 +1932,7 @@ int lua_Transform_rotate(lua_State* state)
Transform* instance = getInstance(state);
instance->rotate(*param1);
-
+
return 0;
}
else
@@ -1956,7 +1956,7 @@ int lua_Transform_rotate(lua_State* state)
Transform* instance = getInstance(state);
instance->rotate(*param1, param2);
-
+
return 0;
}
else
@@ -1988,7 +1988,7 @@ int lua_Transform_rotate(lua_State* state)
Transform* instance = getInstance(state);
instance->rotate(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -2026,7 +2026,7 @@ int lua_Transform_rotateX(lua_State* state)
Transform* instance = getInstance(state);
instance->rotateX(param1);
-
+
return 0;
}
else
@@ -2064,7 +2064,7 @@ int lua_Transform_rotateY(lua_State* state)
Transform* instance = getInstance(state);
instance->rotateY(param1);
-
+
return 0;
}
else
@@ -2102,7 +2102,7 @@ int lua_Transform_rotateZ(lua_State* state)
Transform* instance = getInstance(state);
instance->rotateZ(param1);
-
+
return 0;
}
else
@@ -2140,7 +2140,7 @@ int lua_Transform_scale(lua_State* state)
Transform* instance = getInstance(state);
instance->scale(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2151,7 +2151,7 @@ int lua_Transform_scale(lua_State* state)
Transform* instance = getInstance(state);
instance->scale(*param1);
-
+
return 0;
}
else
@@ -2179,7 +2179,7 @@ int lua_Transform_scale(lua_State* state)
Transform* instance = getInstance(state);
instance->scale(param1, param2, param3);
-
+
return 0;
}
else
@@ -2217,7 +2217,7 @@ int lua_Transform_scaleX(lua_State* state)
Transform* instance = getInstance(state);
instance->scaleX(param1);
-
+
return 0;
}
else
@@ -2255,7 +2255,7 @@ int lua_Transform_scaleY(lua_State* state)
Transform* instance = getInstance(state);
instance->scaleY(param1);
-
+
return 0;
}
else
@@ -2293,7 +2293,7 @@ int lua_Transform_scaleZ(lua_State* state)
Transform* instance = getInstance(state);
instance->scaleZ(param1);
-
+
return 0;
}
else
@@ -2331,7 +2331,7 @@ int lua_Transform_set(lua_State* state)
Transform* instance = getInstance(state);
instance->set(*param1);
-
+
return 0;
}
else
@@ -2359,7 +2359,7 @@ int lua_Transform_set(lua_State* state)
Transform* instance = getInstance(state);
instance->set(*param1, *param2, *param3);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2378,7 +2378,7 @@ int lua_Transform_set(lua_State* state)
Transform* instance = getInstance(state);
instance->set(*param1, *param2, *param3);
-
+
return 0;
}
else
@@ -2410,7 +2410,7 @@ int lua_Transform_set(lua_State* state)
Transform* instance = getInstance(state);
instance->set(*param1, *param2, param3, *param4);
-
+
return 0;
}
else
@@ -2452,7 +2452,7 @@ int lua_Transform_setAnimationPropertyValue(lua_State* state)
Transform* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2);
-
+
return 0;
}
else
@@ -2480,7 +2480,7 @@ int lua_Transform_setAnimationPropertyValue(lua_State* state)
Transform* instance = getInstance(state);
instance->setAnimationPropertyValue(param1, param2, param3);
-
+
return 0;
}
else
@@ -2514,7 +2514,7 @@ int lua_Transform_setIdentity(lua_State* state)
{
Transform* instance = getInstance(state);
instance->setIdentity();
-
+
return 0;
}
else
@@ -2552,7 +2552,7 @@ int lua_Transform_setRotation(lua_State* state)
Transform* instance = getInstance(state);
instance->setRotation(*param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2563,7 +2563,7 @@ int lua_Transform_setRotation(lua_State* state)
Transform* instance = getInstance(state);
instance->setRotation(*param1);
-
+
return 0;
}
else
@@ -2587,7 +2587,7 @@ int lua_Transform_setRotation(lua_State* state)
Transform* instance = getInstance(state);
instance->setRotation(*param1, param2);
-
+
return 0;
}
else
@@ -2619,7 +2619,7 @@ int lua_Transform_setRotation(lua_State* state)
Transform* instance = getInstance(state);
instance->setRotation(param1, param2, param3, param4);
-
+
return 0;
}
else
@@ -2657,7 +2657,7 @@ int lua_Transform_setScale(lua_State* state)
Transform* instance = getInstance(state);
instance->setScale(param1);
-
+
return 0;
}
else if ((lua_type(state, 1) == LUA_TUSERDATA) &&
@@ -2668,7 +2668,7 @@ int lua_Transform_setScale(lua_State* state)
Transform* instance = getInstance(state);
instance->setScale(*param1);
-
+
return 0;
}
else
@@ -2696,7 +2696,7 @@ int lua_Transform_setScale(lua_State* state)
Transform* instance = getInstance(state);
instance->setScale(param1, param2, param3);
-
+
return 0;
}
else
@@ -2734,7 +2734,7 @@ int lua_Transform_setScaleX(lua_State* state)
Transform* instance = getInstance(state);
instance->setScaleX(param1);
-
+
return 0;
}
else
@@ -2772,7 +2772,7 @@ int lua_Transform_setScaleY(lua_State* state)
Transform* instance = getInstance(state);
instance->setScaleY(param1);
-
+
return 0;
}
else
@@ -2810,7 +2810,7 @@ int lua_Transform_setScaleZ(lua_State* state)
Transform* instance = getInstance(state);
instance->setScaleZ(param1);
-
+
return 0;
}
else
@@ -2848,7 +2848,7 @@ int lua_Transform_setTranslation(lua_State* state)
Transform* instance = getInstance(state);
instance->setTranslation(*param1);
-
+
return 0;
}
else
@@ -2876,7 +2876,7 @@ int lua_Transform_setTranslation(lua_State* state)
Transform* instance = getInstance(state);
instance->setTranslation(param1, param2, param3);
-
+
return 0;
}
else
@@ -2914,7 +2914,7 @@ int lua_Transform_setTranslationX(lua_State* state)
Transform* instance = getInstance(state);
instance->setTranslationX(param1);
-
+
return 0;
}
else
@@ -2952,7 +2952,7 @@ int lua_Transform_setTranslationY(lua_State* state)
Transform* instance = getInstance(state);
instance->setTranslationY(param1);
-
+
return 0;
}
else
@@ -2990,7 +2990,7 @@ int lua_Transform_setTranslationZ(lua_State* state)
Transform* instance = getInstance(state);
instance->setTranslationZ(param1);
-
+
return 0;
}
else
@@ -3287,7 +3287,7 @@ int lua_Transform_static_resumeTransformChanged(lua_State* state)
case 0:
{
Transform::resumeTransformChanged();
-
+
return 0;
break;
}
@@ -3312,7 +3312,7 @@ int lua_Transform_static_suspendTransformChanged(lua_State* state)
case 0:
{
Transform::suspendTransformChanged();
-
+
return 0;
break;
}
@@ -3344,7 +3344,7 @@ int lua_Transform_transformPoint(lua_State* state)
Transform* instance = getInstance(state);
instance->transformPoint(param1);
-
+
return 0;
}
else
@@ -3368,7 +3368,7 @@ int lua_Transform_transformPoint(lua_State* state)
Transform* instance = getInstance(state);
instance->transformPoint(*param1, param2);
-
+
return 0;
}
else
@@ -3406,7 +3406,7 @@ int lua_Transform_transformVector(lua_State* state)
Transform* instance = getInstance(state);
instance->transformVector(param1);
-
+
return 0;
}
else
@@ -3430,7 +3430,7 @@ int lua_Transform_transformVector(lua_State* state)
Transform* instance = getInstance(state);
instance->transformVector(*param1, param2);
-
+
return 0;
}
else
@@ -3466,7 +3466,7 @@ int lua_Transform_transformVector(lua_State* state)
Transform* instance = getInstance(state);
instance->transformVector(param1, param2, param3, param4, param5);
-
+
return 0;
}
else
@@ -3504,7 +3504,7 @@ int lua_Transform_translate(lua_State* state)
Transform* instance = getInstance(state);
instance->translate(*param1);
-
+
return 0;
}
else
@@ -3532,7 +3532,7 @@ int lua_Transform_translate(lua_State* state)
Transform* instance = getInstance(state);
instance->translate(param1, param2, param3);
-
+
return 0;
}
else
@@ -3570,7 +3570,7 @@ int lua_Transform_translateForward(lua_State* state)
Transform* instance = getInstance(state);
instance->translateForward(param1);
-
+
return 0;
}
else
@@ -3608,7 +3608,7 @@ int lua_Transform_translateLeft(lua_State* state)
Transform* instance = getInstance(state);
instance->translateLeft(param1);
-
+
return 0;
}
else
@@ -3654,7 +3654,7 @@ int lua_Transform_translateSmooth(lua_State* state)
Transform* instance = getInstance(state);
instance->translateSmooth(*param1, param2, param3);
-
+
return 0;
}
else
@@ -3692,7 +3692,7 @@ int lua_Transform_translateUp(lua_State* state)
Transform* instance = getInstance(state);
instance->translateUp(param1);
-
+
return 0;
}
else
@@ -3730,7 +3730,7 @@ int lua_Transform_translateX(lua_State* state)
Transform* instance = getInstance(state);
instance->translateX(param1);
-
+
return 0;
}
else
@@ -3768,7 +3768,7 @@ int lua_Transform_translateY(lua_State* state)
Transform* instance = getInstance(state);
instance->translateY(param1);
-
+
return 0;
}
else
@@ -3806,7 +3806,7 @@ int lua_Transform_translateZ(lua_State* state)
Transform* instance = getInstance(state);
instance->translateZ(param1);
-
+
return 0;
}
else