Browse Source

Removed Node::update and Scene::update

seanpaultaylor 11 years ago
parent
commit
13676fb93b

+ 1 - 1
gameplay/android/.cproject

@@ -20,7 +20,7 @@
 					<folderInfo id="com.android.toolchain.gcc.1762611861.1006586964" name="/" resourcePath="">
 						<toolChain id="com.android.toolchain.gcc.104843543" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.849260442" isAbstract="false" superClass="com.android.targetPlatform"/>
-							<builder arguments="NDK_DEBUG=1" command="ndk-build" id="com.android.builder.584998984" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
+							<builder arguments="NDK_DEBUG=1 -j4" command="ndk-build" id="com.android.builder.584998984" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
 								<outputEntries>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>

+ 0 - 9
gameplay/src/Node.cpp

@@ -438,15 +438,6 @@ Node* Node::getRootNode() const
     return n;
 }
 
-void Node::update(float elapsedTime)
-{
-    for (Node* node = _firstChild; node != NULL; node = node->_nextSibling)
-    {
-        if (node->isActive())
-            node->update(elapsedTime);
-    }
-}
-
 bool Node::isStatic() const
 {
     return (_collisionObject && _collisionObject->isStatic());

+ 0 - 5
gameplay/src/Node.h

@@ -256,11 +256,6 @@ public:
      */
     Node* getRootNode() const;
 
-    /**
-     * Updates this node and any active children.
-     */
-    void update(float elapsedTime);
-
     /**
      * Returns whether the transformation of this node is static.
      *

+ 0 - 9
gameplay/src/Scene.cpp

@@ -384,15 +384,6 @@ void Scene::setAmbientColor(float red, float green, float blue)
     _ambientColor.set(red, green, blue);
 }
 
-void Scene::update(float elapsedTime)
-{
-    for (Node* node = _firstNode; node != NULL; node = node->_nextSibling)
-    {
-        if (node->isActive())
-            node->update(elapsedTime);
-    }
-}
-
 void Scene::reset()
 {
     _nextItr = NULL;

+ 0 - 5
gameplay/src/Scene.h

@@ -234,11 +234,6 @@ public:
      */
     inline void visit(const char* visitMethod);
 
-    /**
-     * Updates all the active nodes in the scene.
-     */
-    void update(float elapsedTime);
-
     /**
      * @see VisibleSet#getNext
      */

+ 0 - 37
gameplay/src/lua/lua_Joint.cpp

@@ -151,7 +151,6 @@ void luaRegister_Joint()
         {"translateX", lua_Joint_translateX},
         {"translateY", lua_Joint_translateY},
         {"translateZ", lua_Joint_translateZ},
-        {"update", lua_Joint_update},
         {NULL, NULL}
     };
     const luaL_Reg lua_statics[] = 
@@ -6891,40 +6890,4 @@ int lua_Joint_translateZ(lua_State* state)
     return 0;
 }
 
-int lua_Joint_update(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.
-                float param1 = (float)luaL_checknumber(state, 2);
-
-                Joint* instance = getInstance(state);
-                instance->update(param1);
-                
-                return 0;
-            }
-
-            lua_pushstring(state, "lua_Joint_update - 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;
-}
-
 }

+ 0 - 1
gameplay/src/lua/lua_Joint.h

@@ -143,7 +143,6 @@ int lua_Joint_translateUp(lua_State* state);
 int lua_Joint_translateX(lua_State* state);
 int lua_Joint_translateY(lua_State* state);
 int lua_Joint_translateZ(lua_State* state);
-int lua_Joint_update(lua_State* state);
 
 void luaRegister_Joint();
 

+ 0 - 37
gameplay/src/lua/lua_Node.cpp

@@ -149,7 +149,6 @@ void luaRegister_Node()
         {"translateX", lua_Node_translateX},
         {"translateY", lua_Node_translateY},
         {"translateZ", lua_Node_translateZ},
-        {"update", lua_Node_update},
         {NULL, NULL}
     };
     const luaL_Reg lua_statics[] = 
@@ -6911,40 +6910,4 @@ int lua_Node_translateZ(lua_State* state)
     return 0;
 }
 
-int lua_Node_update(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.
-                float param1 = (float)luaL_checknumber(state, 2);
-
-                Node* instance = getInstance(state);
-                instance->update(param1);
-                
-                return 0;
-            }
-
-            lua_pushstring(state, "lua_Node_update - 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;
-}
-
 }

+ 0 - 1
gameplay/src/lua/lua_Node.h

@@ -143,7 +143,6 @@ int lua_Node_translateUp(lua_State* state);
 int lua_Node_translateX(lua_State* state);
 int lua_Node_translateY(lua_State* state);
 int lua_Node_translateZ(lua_State* state);
-int lua_Node_update(lua_State* state);
 
 void luaRegister_Node();
 

+ 0 - 37
gameplay/src/lua/lua_Scene.cpp

@@ -37,7 +37,6 @@ void luaRegister_Scene()
         {"setActiveCamera", lua_Scene_setActiveCamera},
         {"setAmbientColor", lua_Scene_setAmbientColor},
         {"setId", lua_Scene_setId},
-        {"update", lua_Scene_update},
         {"visit", lua_Scene_visit},
         {NULL, NULL}
     };
@@ -1101,42 +1100,6 @@ int lua_Scene_static_load(lua_State* state)
     return 0;
 }
 
-int lua_Scene_update(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.
-                float param1 = (float)luaL_checknumber(state, 2);
-
-                Scene* instance = getInstance(state);
-                instance->update(param1);
-                
-                return 0;
-            }
-
-            lua_pushstring(state, "lua_Scene_update - 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_Scene_visit(lua_State* state)
 {
     // Get the number of parameters.

+ 0 - 1
gameplay/src/lua/lua_Scene.h

@@ -27,7 +27,6 @@ int lua_Scene_setId(lua_State* state);
 int lua_Scene_static_create(lua_State* state);
 int lua_Scene_static_getScene(lua_State* state);
 int lua_Scene_static_load(lua_State* state);
-int lua_Scene_update(lua_State* state);
 int lua_Scene_visit(lua_State* state);
 
 void luaRegister_Scene();

+ 1 - 1
samples/browser/android/.cproject

@@ -20,7 +20,7 @@
 					<folderInfo id="com.android.toolchain.gcc.1762611861.1006586964" name="/" resourcePath="">
 						<toolChain id="com.android.toolchain.gcc.104843543" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.849260442" isAbstract="false" superClass="com.android.targetPlatform"/>
-							<builder arguments="NDK_DEBUG=1" command="ndk-build" id="com.android.builder.584998984" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
+							<builder arguments="NDK_DEBUG=1 -j4" command="ndk-build" id="com.android.builder.584998984" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
 								<outputEntries>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>

+ 1 - 1
samples/character/android/.cproject

@@ -20,7 +20,7 @@
 					<folderInfo id="com.android.toolchain.gcc.1984509596.1192826538" name="/" resourcePath="">
 						<toolChain id="com.android.toolchain.gcc.1065237560" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.199183964" isAbstract="false" superClass="com.android.targetPlatform"/>
-							<builder arguments="NDK_DEBUG=1" command="ndk-build" id="com.android.builder.1987684105" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
+							<builder arguments="NDK_DEBUG=1 -j4" command="ndk-build" id="com.android.builder.1987684105" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
 								<outputEntries>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>

+ 1 - 1
samples/lua/android/.cproject

@@ -20,7 +20,7 @@
 					<folderInfo id="com.android.toolchain.gcc.135762196.412640941" name="/" resourcePath="">
 						<toolChain id="com.android.toolchain.gcc.1331449750" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.1635460037" isAbstract="false" superClass="com.android.targetPlatform"/>
-							<builder arguments="NDK_DEBUG=1" command="ndk-build" id="com.android.builder.141968149" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
+							<builder arguments="NDK_DEBUG=1 -j4" command="ndk-build" id="com.android.builder.141968149" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
 								<outputEntries>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>

+ 1 - 1
samples/mesh/android/.cproject

@@ -20,7 +20,7 @@
 					<folderInfo id="com.android.toolchain.gcc.1723047999.1769297596" name="/" resourcePath="">
 						<toolChain id="com.android.toolchain.gcc.698600898" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.42683489" isAbstract="false" superClass="com.android.targetPlatform"/>
-							<builder arguments="NDK_DEBUG=1" command="ndk-build" id="com.android.builder.863968597" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
+							<builder arguments="NDK_DEBUG=1 -j4" command="ndk-build" id="com.android.builder.863968597" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
 								<outputEntries>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>

+ 1 - 1
samples/particles/android/.cproject

@@ -20,7 +20,7 @@
 					<folderInfo id="com.android.toolchain.gcc.458321517.1863810971" name="/" resourcePath="">
 						<toolChain id="com.android.toolchain.gcc.1279533886" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.1699146026" isAbstract="false" superClass="com.android.targetPlatform"/>
-							<builder arguments="NDK_DEBUG=1" command="ndk-build" id="com.android.builder.1245750685" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
+							<builder arguments="NDK_DEBUG=1 -j4" command="ndk-build" id="com.android.builder.1245750685" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
 								<outputEntries>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>

+ 1 - 1
samples/racer/android/.cproject

@@ -20,7 +20,7 @@
 					<folderInfo id="com.android.toolchain.gcc.1993863788.1400239721" name="/" resourcePath="">
 						<toolChain id="com.android.toolchain.gcc.727751013" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.1396424189" isAbstract="false" superClass="com.android.targetPlatform"/>
-							<builder arguments="NDK_DEBUG=1" command="ndk-build" id="com.android.builder.1075919749" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
+							<builder arguments="NDK_DEBUG=1 -j4" command="ndk-build" id="com.android.builder.1075919749" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
 								<outputEntries>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>

+ 1 - 1
samples/spaceship/android/.cproject

@@ -20,7 +20,7 @@
 					<folderInfo id="com.android.toolchain.gcc.912461605.1188049453" name="/" resourcePath="">
 						<toolChain id="com.android.toolchain.gcc.1555939867" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.1534880518" isAbstract="false" superClass="com.android.targetPlatform"/>
-							<builder arguments="NDK_DEBUG=1" command="ndk-build" id="com.android.builder.1728122731" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
+							<builder arguments="NDK_DEBUG=1 -j4" command="ndk-build" id="com.android.builder.1728122731" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Android Builder" superClass="com.android.builder">
 								<outputEntries>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="obj"/>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>