Generated new lua bindings.

gameplay/src/Node.cpp

@@ -449,7 +449,7 @@ void Node::update(float elapsedTime)
 {
     for (Node* node = _firstChild; node != NULL; node = node->_nextSibling)
     {
-        if (node->isActive())
+        if (node->isEnabled())
             node->update(elapsedTime);
     }
 

gameplay/src/Scene.cpp

@@ -388,7 +388,7 @@ void Scene::update(float elapsedTime)
 {
     for (Node* node = _firstNode; node != NULL; node = node->_nextSibling)
     {
-        if (node->isActive())
+        if (node->isEnabled())
             node->update(elapsedTime);
     }
 }

gameplay/src/lua/lua_FileSystem.cpp

@@ -21,6 +21,7 @@ void luaRegister_FileSystem()
     {
         {"createFileFromAsset", lua_FileSystem_static_createFileFromAsset},
         {"fileExists", lua_FileSystem_static_fileExists},
+        {"getAssetPath", lua_FileSystem_static_getAssetPath},
         {"getDirectoryName", lua_FileSystem_static_getDirectoryName},
         {"getExtension", lua_FileSystem_static_getExtension},
         {"getResourcePath", lua_FileSystem_static_getResourcePath},
@@ -28,6 +29,7 @@ void luaRegister_FileSystem()
         {"loadResourceAliases", lua_FileSystem_static_loadResourceAliases},
         {"readAll", lua_FileSystem_static_readAll},
         {"resolvePath", lua_FileSystem_static_resolvePath},
+        {"setAssetPath", lua_FileSystem_static_setAssetPath},
         {"setResourcePath", lua_FileSystem_static_setResourcePath},
         {NULL, NULL}
     };
@@ -152,6 +154,34 @@ int lua_FileSystem_static_fileExists(lua_State* state)
     return 0;
 }
 
+int lua_FileSystem_static_getAssetPath(lua_State* state)
+{
+    // Get the number of parameters.
+    int paramCount = lua_gettop(state);
+
+    // Attempt to match the parameters to a valid binding.
+    switch (paramCount)
+    {
+        case 0:
+        {
+            const char* result = FileSystem::getAssetPath();
+
+            // Push the return value onto the stack.
+            lua_pushstring(state, result);
+
+            return 1;
+            break;
+        }
+        default:
+        {
+            lua_pushstring(state, "Invalid number of parameters (expected 0).");
+            lua_error(state);
+            break;
+        }
+    }
+    return 0;
+}
+
 int lua_FileSystem_static_getDirectoryName(lua_State* state)
 {
     // Get the number of parameters.
@@ -441,6 +471,40 @@ int lua_FileSystem_static_resolvePath(lua_State* state)
     return 0;
 }
 
+int lua_FileSystem_static_setAssetPath(lua_State* state)
+{
+    // Get the number of parameters.
+    int paramCount = lua_gettop(state);
+
+    // Attempt to match the parameters to a valid binding.
+    switch (paramCount)
+    {
+        case 1:
+        {
+            if ((lua_type(state, 1) == LUA_TSTRING || lua_type(state, 1) == LUA_TNIL))
+            {
+                // Get parameter 1 off the stack.
+                const char* param1 = gameplay::ScriptUtil::getString(1, false);
+
+                FileSystem::setAssetPath(param1);
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_FileSystem_static_setAssetPath - Failed to match the given parameters to a valid function signature.");
+            lua_error(state);
+            break;
+        }
+        default:
+        {
+            lua_pushstring(state, "Invalid number of parameters (expected 1).");
+            lua_error(state);
+            break;
+        }
+    }
+    return 0;
+}
+
 int lua_FileSystem_static_setResourcePath(lua_State* state)
 {
     // Get the number of parameters.

gameplay/src/lua/lua_FileSystem.h

@@ -9,6 +9,7 @@ namespace gameplay
 int lua_FileSystem__gc(lua_State* state);
 int lua_FileSystem_static_createFileFromAsset(lua_State* state);
 int lua_FileSystem_static_fileExists(lua_State* state);
+int lua_FileSystem_static_getAssetPath(lua_State* state);
 int lua_FileSystem_static_getDirectoryName(lua_State* state);
 int lua_FileSystem_static_getExtension(lua_State* state);
 int lua_FileSystem_static_getResourcePath(lua_State* state);
@@ -16,6 +17,7 @@ int lua_FileSystem_static_isAbsolutePath(lua_State* state);
 int lua_FileSystem_static_loadResourceAliases(lua_State* state);
 int lua_FileSystem_static_readAll(lua_State* state);
 int lua_FileSystem_static_resolvePath(lua_State* state);
+int lua_FileSystem_static_setAssetPath(lua_State* state);
 int lua_FileSystem_static_setResourcePath(lua_State* state);
 
 void luaRegister_FileSystem();

gameplay/src/lua/lua_Global.cpp

@@ -713,17 +713,10 @@ void luaRegister_lua_Global()
     {
         std::vector<std::string> scopePath;
         scopePath.push_back("ParticleEmitter");
-<<<<<<< HEAD
-        gameplay::ScriptUtil::registerEnumValue(ParticleEmitter::BLEND_OPAQUE, "BLEND_OPAQUE", scopePath);
-        gameplay::ScriptUtil::registerEnumValue(ParticleEmitter::BLEND_TRANSPARENT, "BLEND_TRANSPARENT", scopePath);
+        gameplay::ScriptUtil::registerEnumValue(ParticleEmitter::BLEND_NONE, "BLEND_NONE", scopePath);
+        gameplay::ScriptUtil::registerEnumValue(ParticleEmitter::BLEND_ALPHA, "BLEND_ALPHA", scopePath);
         gameplay::ScriptUtil::registerEnumValue(ParticleEmitter::BLEND_ADDITIVE, "BLEND_ADDITIVE", scopePath);
         gameplay::ScriptUtil::registerEnumValue(ParticleEmitter::BLEND_MULTIPLIED, "BLEND_MULTIPLIED", scopePath);
-=======
-        gameplay::ScriptUtil::registerConstantString("BLEND_NONE", "BLEND_NONE", scopePath);
-        gameplay::ScriptUtil::registerConstantString("BLEND_ALPHA", "BLEND_ALPHA", scopePath);
-        gameplay::ScriptUtil::registerConstantString("BLEND_ADDITIVE", "BLEND_ADDITIVE", scopePath);
-        gameplay::ScriptUtil::registerConstantString("BLEND_MULTIPLIED", "BLEND_MULTIPLIED", scopePath);
->>>>>>> 56056e69d8e0dfc651a52a1888c65c01d0f1f51d
     }
 
     // Register enumeration PhysicsCollisionObject::CollisionListener::EventType.
@@ -1025,120 +1018,4 @@ int lua__strcmpnocase(lua_State* state)
     return 0;
 }
 
-<<<<<<< HEAD
-=======
-static const char* enumStringEmpty = "";
-
-const char* lua_stringFromEnumGlobal(std::string& enumname, unsigned int value)
-{
-    if (enumname == "AIMessage::ParameterType")
-        return lua_stringFromEnum_AIMessageParameterType((AIMessage::ParameterType)value);
-    if (enumname == "AnimationClip::Listener::EventType")
-        return lua_stringFromEnum_AnimationClipListenerEventType((AnimationClip::Listener::EventType)value);
-    if (enumname == "AudioSource::State")
-        return lua_stringFromEnum_AudioSourceState((AudioSource::State)value);
-    if (enumname == "Camera::Type")
-        return lua_stringFromEnum_CameraType((Camera::Type)value);
-    if (enumname == "Container::Direction")
-        return lua_stringFromEnum_ContainerDirection((Container::Direction)value);
-    if (enumname == "Container::Scroll")
-        return lua_stringFromEnum_ContainerScroll((Container::Scroll)value);
-    if (enumname == "Control::Alignment")
-        return lua_stringFromEnum_ControlAlignment((Control::Alignment)value);
-    if (enumname == "Control::AutoSize")
-        return lua_stringFromEnum_ControlAutoSize((Control::AutoSize)value);
-    if (enumname == "Control::Listener::EventType")
-        return lua_stringFromEnum_ControlListenerEventType((Control::Listener::EventType)value);
-    if (enumname == "Control::State")
-        return lua_stringFromEnum_ControlState((Control::State)value);
-    if (enumname == "Curve::InterpolationType")
-        return lua_stringFromEnum_CurveInterpolationType((Curve::InterpolationType)value);
-    if (enumname == "DepthStencilTarget::Format")
-        return lua_stringFromEnum_DepthStencilTargetFormat((DepthStencilTarget::Format)value);
-    if (enumname == "Font::Format")
-        return lua_stringFromEnum_FontFormat((Font::Format)value);
-    if (enumname == "Font::Justify")
-        return lua_stringFromEnum_FontJustify((Font::Justify)value);
-    if (enumname == "Font::Style")
-        return lua_stringFromEnum_FontStyle((Font::Style)value);
-    if (enumname == "Game::ClearFlags")
-        return lua_stringFromEnum_GameClearFlags((Game::ClearFlags)value);
-    if (enumname == "Game::State")
-        return lua_stringFromEnum_GameState((Game::State)value);
-    if (enumname == "Gamepad::ButtonMapping")
-        return lua_stringFromEnum_GamepadButtonMapping((Gamepad::ButtonMapping)value);
-    if (enumname == "Gamepad::GamepadEvent")
-        return lua_stringFromEnum_GamepadGamepadEvent((Gamepad::GamepadEvent)value);
-    if (enumname == "Gesture::GestureEvent")
-        return lua_stringFromEnum_GestureGestureEvent((Gesture::GestureEvent)value);
-    if (enumname == "Image::Format")
-        return lua_stringFromEnum_ImageFormat((Image::Format)value);
-    if (enumname == "Keyboard::Key")
-        return lua_stringFromEnum_KeyboardKey((Keyboard::Key)value);
-    if (enumname == "Keyboard::KeyEvent")
-        return lua_stringFromEnum_KeyboardKeyEvent((Keyboard::KeyEvent)value);
-    if (enumname == "Layout::Type")
-        return lua_stringFromEnum_LayoutType((Layout::Type)value);
-    if (enumname == "Light::Type")
-        return lua_stringFromEnum_LightType((Light::Type)value);
-    if (enumname == "Logger::Level")
-        return lua_stringFromEnum_LoggerLevel((Logger::Level)value);
-    if (enumname == "Mesh::IndexFormat")
-        return lua_stringFromEnum_MeshIndexFormat((Mesh::IndexFormat)value);
-    if (enumname == "Mesh::PrimitiveType")
-        return lua_stringFromEnum_MeshPrimitiveType((Mesh::PrimitiveType)value);
-    if (enumname == "Mouse::MouseEvent")
-        return lua_stringFromEnum_MouseMouseEvent((Mouse::MouseEvent)value);
-    if (enumname == "Node::Type")
-        return lua_stringFromEnum_NodeType((Node::Type)value);
-    if (enumname == "ParticleEmitter::BlendMode")
-        return lua_stringFromEnum_ParticleEmitterBlendMode((ParticleEmitter::BlendMode)value);
-    if (enumname == "PhysicsCollisionObject::CollisionListener::EventType")
-        return lua_stringFromEnum_PhysicsCollisionObjectCollisionListenerEventType((PhysicsCollisionObject::CollisionListener::EventType)value);
-    if (enumname == "PhysicsCollisionObject::Type")
-        return lua_stringFromEnum_PhysicsCollisionObjectType((PhysicsCollisionObject::Type)value);
-    if (enumname == "PhysicsCollisionShape::Type")
-        return lua_stringFromEnum_PhysicsCollisionShapeType((PhysicsCollisionShape::Type)value);
-    if (enumname == "PhysicsController::Listener::EventType")
-        return lua_stringFromEnum_PhysicsControllerListenerEventType((PhysicsController::Listener::EventType)value);
-    if (enumname == "Properties::Type")
-        return lua_stringFromEnum_PropertiesType((Properties::Type)value);
-    if (enumname == "RenderState::AutoBinding")
-        return lua_stringFromEnum_RenderStateAutoBinding((RenderState::AutoBinding)value);
-    if (enumname == "RenderState::Blend")
-        return lua_stringFromEnum_RenderStateBlend((RenderState::Blend)value);
-    if (enumname == "RenderState::CullFaceSide")
-        return lua_stringFromEnum_RenderStateCullFaceSide((RenderState::CullFaceSide)value);
-    if (enumname == "RenderState::DepthFunction")
-        return lua_stringFromEnum_RenderStateDepthFunction((RenderState::DepthFunction)value);
-    if (enumname == "RenderState::FrontFace")
-        return lua_stringFromEnum_RenderStateFrontFace((RenderState::FrontFace)value);
-    if (enumname == "RenderState::StencilFunction")
-        return lua_stringFromEnum_RenderStateStencilFunction((RenderState::StencilFunction)value);
-    if (enumname == "RenderState::StencilOperation")
-        return lua_stringFromEnum_RenderStateStencilOperation((RenderState::StencilOperation)value);
-    if (enumname == "Terrain::Flags")
-        return lua_stringFromEnum_TerrainFlags((Terrain::Flags)value);
-    if (enumname == "TextBox::InputMode")
-        return lua_stringFromEnum_TextBoxInputMode((TextBox::InputMode)value);
-    if (enumname == "Texture::CubeFace")
-        return lua_stringFromEnum_TextureCubeFace((Texture::CubeFace)value);
-    if (enumname == "Texture::Filter")
-        return lua_stringFromEnum_TextureFilter((Texture::Filter)value);
-    if (enumname == "Texture::Format")
-        return lua_stringFromEnum_TextureFormat((Texture::Format)value);
-    if (enumname == "Texture::Type")
-        return lua_stringFromEnum_TextureType((Texture::Type)value);
-    if (enumname == "Texture::Wrap")
-        return lua_stringFromEnum_TextureWrap((Texture::Wrap)value);
-    if (enumname == "Touch::TouchEvent")
-        return lua_stringFromEnum_TouchTouchEvent((Touch::TouchEvent)value);
-    if (enumname == "VertexFormat::Usage")
-        return lua_stringFromEnum_VertexFormatUsage((VertexFormat::Usage)value);
-
-    GP_ERROR("Unrecognized enumeration type '%s'.", enumname.c_str());
-    return enumStringEmpty;
-}
-
->>>>>>> 56056e69d8e0dfc651a52a1888c65c01d0f1f51d
 }

gameplay/src/lua/lua_Global.h

@@ -2,62 +2,6 @@
 #ifndef LUA_GLOBAL_H_
 #define LUA_GLOBAL_H_
 
-<<<<<<< HEAD
-=======
-#include "lua_AIMessageParameterType.h"
-#include "lua_AnimationClipListenerEventType.h"
-#include "lua_AudioSourceState.h"
-#include "lua_CameraType.h"
-#include "lua_ContainerDirection.h"
-#include "lua_ContainerScroll.h"
-#include "lua_ControlAlignment.h"
-#include "lua_ControlAutoSize.h"
-#include "lua_ControlListenerEventType.h"
-#include "lua_ControlState.h"
-#include "lua_CurveInterpolationType.h"
-#include "lua_DepthStencilTargetFormat.h"
-#include "lua_FontFormat.h"
-#include "lua_FontJustify.h"
-#include "lua_FontStyle.h"
-#include "lua_GameClearFlags.h"
-#include "lua_GameState.h"
-#include "lua_GamepadButtonMapping.h"
-#include "lua_GamepadGamepadEvent.h"
-#include "lua_GestureGestureEvent.h"
-#include "lua_ImageFormat.h"
-#include "lua_KeyboardKey.h"
-#include "lua_KeyboardKeyEvent.h"
-#include "lua_LayoutType.h"
-#include "lua_LightType.h"
-#include "lua_LoggerLevel.h"
-#include "lua_MeshIndexFormat.h"
-#include "lua_MeshPrimitiveType.h"
-#include "lua_MouseMouseEvent.h"
-#include "lua_NodeType.h"
-#include "lua_ParticleEmitterBlendMode.h"
-#include "lua_PhysicsCollisionObjectCollisionListenerEventType.h"
-#include "lua_PhysicsCollisionObjectType.h"
-#include "lua_PhysicsCollisionShapeType.h"
-#include "lua_PhysicsControllerListenerEventType.h"
-#include "lua_PropertiesType.h"
-#include "lua_RenderStateAutoBinding.h"
-#include "lua_RenderStateBlend.h"
-#include "lua_RenderStateCullFaceSide.h"
-#include "lua_RenderStateDepthFunction.h"
-#include "lua_RenderStateFrontFace.h"
-#include "lua_RenderStateStencilFunction.h"
-#include "lua_RenderStateStencilOperation.h"
-#include "lua_TerrainFlags.h"
-#include "lua_TextBoxInputMode.h"
-#include "lua_TextureCubeFace.h"
-#include "lua_TextureFilter.h"
-#include "lua_TextureFormat.h"
-#include "lua_TextureType.h"
-#include "lua_TextureWrap.h"
-#include "lua_TouchTouchEvent.h"
-#include "lua_VertexFormatUsage.h"
-
->>>>>>> 56056e69d8e0dfc651a52a1888c65c01d0f1f51d
 namespace gameplay
 {
 

gameplay/src/lua/lua_ParticleEmitter.cpp

@@ -10,10 +10,6 @@
 #include "Quaternion.h"
 #include "Ref.h"
 #include "Scene.h"
-<<<<<<< HEAD
-=======
-#include "lua_ParticleEmitterBlendMode.h"
->>>>>>> 56056e69d8e0dfc651a52a1888c65c01d0f1f51d
 
 namespace gameplay
 {
@@ -28,6 +24,7 @@ void luaRegister_ParticleEmitter()
         {"emitOnce", lua_ParticleEmitter_emitOnce},
         {"getAcceleration", lua_ParticleEmitter_getAcceleration},
         {"getAccelerationVariance", lua_ParticleEmitter_getAccelerationVariance},
+        {"getBlendMode", lua_ParticleEmitter_getBlendMode},
         {"getColorEnd", lua_ParticleEmitter_getColorEnd},
         {"getColorEndVariance", lua_ParticleEmitter_getColorEndVariance},
         {"getColorStart", lua_ParticleEmitter_getColorStart},
@@ -60,7 +57,6 @@ void luaRegister_ParticleEmitter()
         {"getSpriteHeight", lua_ParticleEmitter_getSpriteHeight},
         {"getSpriteWidth", lua_ParticleEmitter_getSpriteWidth},
         {"getTexture", lua_ParticleEmitter_getTexture},
-        {"getBlendMode", lua_ParticleEmitter_getBlendMode},
         {"getVelocity", lua_ParticleEmitter_getVelocity},
         {"getVelocityVariance", lua_ParticleEmitter_getVelocityVariance},
         {"isActive", lua_ParticleEmitter_isActive},
@@ -70,6 +66,7 @@ void luaRegister_ParticleEmitter()
         {"isStarted", lua_ParticleEmitter_isStarted},
         {"release", lua_ParticleEmitter_release},
         {"setAcceleration", lua_ParticleEmitter_setAcceleration},
+        {"setBlendMode", lua_ParticleEmitter_setBlendMode},
         {"setColor", lua_ParticleEmitter_setColor},
         {"setEllipsoid", lua_ParticleEmitter_setEllipsoid},
         {"setEmissionRate", lua_ParticleEmitter_setEmissionRate},
@@ -87,7 +84,6 @@ void luaRegister_ParticleEmitter()
         {"setSpriteLooped", lua_ParticleEmitter_setSpriteLooped},
         {"setSpriteTexCoords", lua_ParticleEmitter_setSpriteTexCoords},
         {"setTexture", lua_ParticleEmitter_setTexture},
-        {"setBlendMode", lua_ParticleEmitter_setBlendMode},
         {"setVelocity", lua_ParticleEmitter_setVelocity},
         {"start", lua_ParticleEmitter_start},
         {"stop", lua_ParticleEmitter_stop},
@@ -385,6 +381,41 @@ int lua_ParticleEmitter_getAccelerationVariance(lua_State* state)
     return 0;
 }
 
+int lua_ParticleEmitter_getBlendMode(lua_State* state)
+{
+    // Get the number of parameters.
+    int paramCount = lua_gettop(state);
+
+    // Attempt to match the parameters to a valid binding.
+    switch (paramCount)
+    {
+        case 1:
+        {
+            if ((lua_type(state, 1) == LUA_TUSERDATA))
+            {
+                ParticleEmitter* instance = getInstance(state);
+                ParticleEmitter::BlendMode result = instance->getBlendMode();
+
+                // Push the return value onto the stack.
+                lua_pushnumber(state, (int)result);
+
+                return 1;
+            }
+
+            lua_pushstring(state, "lua_ParticleEmitter_getBlendMode - Failed to match the given parameters to a valid function signature.");
+            lua_error(state);
+            break;
+        }
+        default:
+        {
+            lua_pushstring(state, "Invalid number of parameters (expected 1).");
+            lua_error(state);
+            break;
+        }
+    }
+    return 0;
+}
+
 int lua_ParticleEmitter_getColorEnd(lua_State* state)
 {
     // Get the number of parameters.
@@ -1595,45 +1626,6 @@ int lua_ParticleEmitter_getTexture(lua_State* state)
     return 0;
 }
 
-int lua_ParticleEmitter_getBlendMode(lua_State* state)
-{
-    // Get the number of parameters.
-    int paramCount = lua_gettop(state);
-
-    // Attempt to match the parameters to a valid binding.
-    switch (paramCount)
-    {
-        case 1:
-        {
-            if ((lua_type(state, 1) == LUA_TUSERDATA))
-            {
-                ParticleEmitter* instance = getInstance(state);
-                ParticleEmitter::BlendMode result = instance->getBlendMode();
-
-                // Push the return value onto the stack.
-<<<<<<< HEAD
-                lua_pushnumber(state, (int)result);
-=======
-                lua_pushstring(state, lua_stringFromEnum_ParticleEmitterBlendMode(result));
->>>>>>> 56056e69d8e0dfc651a52a1888c65c01d0f1f51d
-
-                return 1;
-            }
-
-            lua_pushstring(state, "lua_ParticleEmitter_getBlendMode - Failed to match the given parameters to a valid function signature.");
-            lua_error(state);
-            break;
-        }
-        default:
-        {
-            lua_pushstring(state, "Invalid number of parameters (expected 1).");
-            lua_error(state);
-            break;
-        }
-    }
-    return 0;
-}
-
 int lua_ParticleEmitter_getVelocity(lua_State* state)
 {
     // Get the number of parameters.
@@ -1981,6 +1973,42 @@ int lua_ParticleEmitter_setAcceleration(lua_State* state)
     return 0;
 }
 
+int lua_ParticleEmitter_setBlendMode(lua_State* state)
+{
+    // Get the number of parameters.
+    int paramCount = lua_gettop(state);
+
+    // Attempt to match the parameters to a valid binding.
+    switch (paramCount)
+    {
+        case 2:
+        {
+            if ((lua_type(state, 1) == LUA_TUSERDATA) &&
+                lua_type(state, 2) == LUA_TNUMBER)
+            {
+                // Get parameter 1 off the stack.
+                ParticleEmitter::BlendMode param1 = (ParticleEmitter::BlendMode)luaL_checkint(state, 2);
+
+                ParticleEmitter* instance = getInstance(state);
+                instance->setBlendMode(param1);
+                
+                return 0;
+            }
+
+            lua_pushstring(state, "lua_ParticleEmitter_setBlendMode - Failed to match the given parameters to a valid function signature.");
+            lua_error(state);
+            break;
+        }
+        default:
+        {
+            lua_pushstring(state, "Invalid number of parameters (expected 2).");
+            lua_error(state);
+            break;
+        }
+    }
+    return 0;
+}
+
 int lua_ParticleEmitter_setColor(lua_State* state)
 {
     // Get the number of parameters.
@@ -2724,11 +2752,7 @@ int lua_ParticleEmitter_setTexture(lua_State* state)
                     const char* param1 = gameplay::ScriptUtil::getString(2, false);
 
                     // Get parameter 2 off the stack.
-<<<<<<< HEAD
-                    ParticleEmitter::TextureBlending param2 = (ParticleEmitter::TextureBlending)luaL_checkint(state, 3);
-=======
-                    ParticleEmitter::BlendMode param2 = (ParticleEmitter::BlendMode)lua_enumFromString_ParticleEmitterBlendMode(luaL_checkstring(state, 3));
->>>>>>> 56056e69d8e0dfc651a52a1888c65c01d0f1f51d
+                    ParticleEmitter::BlendMode param2 = (ParticleEmitter::BlendMode)luaL_checkint(state, 3);
 
                     ParticleEmitter* instance = getInstance(state);
                     instance->setTexture(param1, param2);
@@ -2750,11 +2774,7 @@ int lua_ParticleEmitter_setTexture(lua_State* state)
                         break;
 
                     // Get parameter 2 off the stack.
-<<<<<<< HEAD
-                    ParticleEmitter::TextureBlending param2 = (ParticleEmitter::TextureBlending)luaL_checkint(state, 3);
-=======
-                    ParticleEmitter::BlendMode param2 = (ParticleEmitter::BlendMode)lua_enumFromString_ParticleEmitterBlendMode(luaL_checkstring(state, 3));
->>>>>>> 56056e69d8e0dfc651a52a1888c65c01d0f1f51d
+                    ParticleEmitter::BlendMode param2 = (ParticleEmitter::BlendMode)luaL_checkint(state, 3);
 
                     ParticleEmitter* instance = getInstance(state);
                     instance->setTexture(param1, param2);
@@ -2777,46 +2797,6 @@ int lua_ParticleEmitter_setTexture(lua_State* state)
     return 0;
 }
 
-int lua_ParticleEmitter_setBlendMode(lua_State* state)
-{
-    // Get the number of parameters.
-    int paramCount = lua_gettop(state);
-
-    // Attempt to match the parameters to a valid binding.
-    switch (paramCount)
-    {
-        case 2:
-        {
-            if ((lua_type(state, 1) == LUA_TUSERDATA) &&
-                lua_type(state, 2) == LUA_TNUMBER)
-            {
-                // Get parameter 1 off the stack.
-<<<<<<< HEAD
-                ParticleEmitter::TextureBlending param1 = (ParticleEmitter::TextureBlending)luaL_checkint(state, 2);
-=======
-                ParticleEmitter::BlendMode param1 = (ParticleEmitter::BlendMode)lua_enumFromString_ParticleEmitterBlendMode(luaL_checkstring(state, 2));
->>>>>>> 56056e69d8e0dfc651a52a1888c65c01d0f1f51d
-
-                ParticleEmitter* instance = getInstance(state);
-                instance->setBlendMode(param1);
-                
-                return 0;
-            }
-
-            lua_pushstring(state, "lua_ParticleEmitter_setBlendMode - Failed to match the given parameters to a valid function signature.");
-            lua_error(state);
-            break;
-        }
-        default:
-        {
-            lua_pushstring(state, "Invalid number of parameters (expected 2).");
-            lua_error(state);
-            break;
-        }
-    }
-    return 0;
-}
-
 int lua_ParticleEmitter_setVelocity(lua_State* state)
 {
     // Get the number of parameters.
@@ -2980,11 +2960,7 @@ int lua_ParticleEmitter_static_create(lua_State* state)
                     const char* param1 = gameplay::ScriptUtil::getString(1, false);
 
                     // Get parameter 2 off the stack.
-<<<<<<< HEAD
-                    ParticleEmitter::TextureBlending param2 = (ParticleEmitter::TextureBlending)luaL_checkint(state, 2);
-=======
-                    ParticleEmitter::BlendMode param2 = (ParticleEmitter::BlendMode)lua_enumFromString_ParticleEmitterBlendMode(luaL_checkstring(state, 2));
->>>>>>> 56056e69d8e0dfc651a52a1888c65c01d0f1f51d
+                    ParticleEmitter::BlendMode param2 = (ParticleEmitter::BlendMode)luaL_checkint(state, 2);
 
                     // Get parameter 3 off the stack.
                     unsigned int param3 = (unsigned int)luaL_checkunsigned(state, 3);
@@ -3039,11 +3015,7 @@ int lua_ParticleEmitter_static_getBlendModeFromString(lua_State* state)
                 ParticleEmitter::BlendMode result = ParticleEmitter::getBlendModeFromString(param1);
 
                 // Push the return value onto the stack.
-<<<<<<< HEAD
                 lua_pushnumber(state, (int)result);
-=======
-                lua_pushstring(state, lua_stringFromEnum_ParticleEmitterBlendMode(result));
->>>>>>> 56056e69d8e0dfc651a52a1888c65c01d0f1f51d
 
                 return 1;
             }

gameplay/src/lua/lua_ParticleEmitter.h

@@ -13,6 +13,7 @@ int lua_ParticleEmitter_draw(lua_State* state);
 int lua_ParticleEmitter_emitOnce(lua_State* state);
 int lua_ParticleEmitter_getAcceleration(lua_State* state);
 int lua_ParticleEmitter_getAccelerationVariance(lua_State* state);
+int lua_ParticleEmitter_getBlendMode(lua_State* state);
 int lua_ParticleEmitter_getColorEnd(lua_State* state);
 int lua_ParticleEmitter_getColorEndVariance(lua_State* state);
 int lua_ParticleEmitter_getColorStart(lua_State* state);
@@ -45,7 +46,6 @@ int lua_ParticleEmitter_getSpriteFrameRandomOffset(lua_State* state);
 int lua_ParticleEmitter_getSpriteHeight(lua_State* state);
 int lua_ParticleEmitter_getSpriteWidth(lua_State* state);
 int lua_ParticleEmitter_getTexture(lua_State* state);
-int lua_ParticleEmitter_getBlendMode(lua_State* state);
 int lua_ParticleEmitter_getVelocity(lua_State* state);
 int lua_ParticleEmitter_getVelocityVariance(lua_State* state);
 int lua_ParticleEmitter_isActive(lua_State* state);
@@ -55,6 +55,7 @@ int lua_ParticleEmitter_isSpriteLooped(lua_State* state);
 int lua_ParticleEmitter_isStarted(lua_State* state);
 int lua_ParticleEmitter_release(lua_State* state);
 int lua_ParticleEmitter_setAcceleration(lua_State* state);
+int lua_ParticleEmitter_setBlendMode(lua_State* state);
 int lua_ParticleEmitter_setColor(lua_State* state);
 int lua_ParticleEmitter_setEllipsoid(lua_State* state);
 int lua_ParticleEmitter_setEmissionRate(lua_State* state);
@@ -72,7 +73,6 @@ int lua_ParticleEmitter_setSpriteFrameRandomOffset(lua_State* state);
 int lua_ParticleEmitter_setSpriteLooped(lua_State* state);
 int lua_ParticleEmitter_setSpriteTexCoords(lua_State* state);
 int lua_ParticleEmitter_setTexture(lua_State* state);
-int lua_ParticleEmitter_setBlendMode(lua_State* state);
 int lua_ParticleEmitter_setVelocity(lua_State* state);
 int lua_ParticleEmitter_start(lua_State* state);
 int lua_ParticleEmitter_static_create(lua_State* state);

gameplay/src/lua/lua_ParticleEmitterBlendMode.cpp

@@ -1,41 +0,0 @@
-#include "Base.h"
-#include "lua_ParticleEmitterBlendMode.h"
-
-namespace gameplay
-{
-
-static const char* enumStringEmpty = "";
-
-static const char* luaEnumString_ParticleEmitterBlendMode_BLEND_NONE = "BLEND_NONE";
-static const char* luaEnumString_ParticleEmitterBlendMode_BLEND_ALPHA = "BLEND_ALPHA";
-static const char* luaEnumString_ParticleEmitterBlendMode_BLEND_ADDITIVE = "BLEND_ADDITIVE";
-static const char* luaEnumString_ParticleEmitterBlendMode_BLEND_MULTIPLIED = "BLEND_MULTIPLIED";
-
-ParticleEmitter::BlendMode lua_enumFromString_ParticleEmitterBlendMode(const char* s)
-{
-    if (strcmp(s, luaEnumString_ParticleEmitterBlendMode_BLEND_NONE) == 0)
-        return ParticleEmitter::BLEND_NONE;
-    if (strcmp(s, luaEnumString_ParticleEmitterBlendMode_BLEND_ALPHA) == 0)
-        return ParticleEmitter::BLEND_ALPHA;
-    if (strcmp(s, luaEnumString_ParticleEmitterBlendMode_BLEND_ADDITIVE) == 0)
-        return ParticleEmitter::BLEND_ADDITIVE;
-    if (strcmp(s, luaEnumString_ParticleEmitterBlendMode_BLEND_MULTIPLIED) == 0)
-        return ParticleEmitter::BLEND_MULTIPLIED;
-    return ParticleEmitter::BLEND_NONE;
-}
-
-const char* lua_stringFromEnum_ParticleEmitterBlendMode(ParticleEmitter::BlendMode e)
-{
-    if (e == ParticleEmitter::BLEND_NONE)
-        return luaEnumString_ParticleEmitterBlendMode_BLEND_NONE;
-    if (e == ParticleEmitter::BLEND_ALPHA)
-        return luaEnumString_ParticleEmitterBlendMode_BLEND_ALPHA;
-    if (e == ParticleEmitter::BLEND_ADDITIVE)
-        return luaEnumString_ParticleEmitterBlendMode_BLEND_ADDITIVE;
-    if (e == ParticleEmitter::BLEND_MULTIPLIED)
-        return luaEnumString_ParticleEmitterBlendMode_BLEND_MULTIPLIED;
-    return enumStringEmpty;
-}
-
-}
-

gameplay/src/lua/lua_ParticleEmitterBlendMode.h

@@ -1,15 +0,0 @@
-#ifndef LUA_PARTICLEEMITTERBLENDMODE_H_
-#define LUA_PARTICLEEMITTERBLENDMODE_H_
-
-#include "ParticleEmitter.h"
-
-namespace gameplay
-{
-
-// Lua bindings for enum conversion functions for ParticleEmitter::BlendMode.
-ParticleEmitter::BlendMode lua_enumFromString_ParticleEmitterBlendMode(const char* s);
-const char* lua_stringFromEnum_ParticleEmitterBlendMode(ParticleEmitter::BlendMode e);
-
-}
-
-#endif