Remove InstanceNode. No need it anymore

include/anki/Scene.h

@@ -17,7 +17,6 @@
 #include "anki/scene/Camera.h"
 #include "anki/scene/Light.h"
 #include "anki/scene/Path.h"
-#include "anki/scene/InstanceNode.h"
 #include "anki/scene/StaticCollisionNode.h"
 #include "anki/scene/BodyNode.h"
 

include/anki/scene/InstanceNode.h

@@ -1,55 +0,0 @@
-// Copyright (C) 2009-2015, Panagiotis Christopoulos Charitos.
-// All rights reserved.
-// Code licensed under the BSD License.
-// http://www.anki3d.org/LICENSE
-
-#ifndef ANKI_SCENE_INSTANCE_NODE_H
-#define ANKI_SCENE_INSTANCE_NODE_H
-
-#include "anki/scene/SceneNode.h"
-
-namespace anki {
-
-/// @addtogroup scene
-/// @{
-
-/// Instance component. Dummy used only for idendification
-class InstanceComponent: public SceneComponent
-{
-public:
-	static Bool classof(const SceneComponent& c)
-	{
-		return c.getType() == Type::INSTANCE;
-	}
-
-	InstanceComponent(SceneNode* node)
-	:	SceneComponent(Type::INSTANCE, node)
-	{}
-};
-
-/// Instance scene node
-class InstanceNode: public SceneNode,  public MoveComponent, 
-	public InstanceComponent
-{
-public:
-	InstanceNode(SceneGraph* scene)
-	:	SceneNode(scene), 
-		MoveComponent(this, MoveComponent::Flag::IGNORE_PARENT_TRANSFORM),
-		InstanceComponent(this)
-	{}
-
-	ANKI_USE_RESULT Error create(const CString& name)
-	{
-		ANKI_CHECK(SceneNode::create(name));
-		addComponent(static_cast<MoveComponent*>(this));
-		addComponent(static_cast<InstanceComponent*>(this));
-
-		return ErrorCode::NONE;
-	}
-};
-/// @}
-
-} // end namespace anki
-
-#endif
-

src/scene/ModelNode.cpp

@@ -5,7 +5,6 @@
 
 #include "anki/scene/ModelNode.h"
 #include "anki/scene/SceneGraph.h"
-#include "anki/scene/InstanceNode.h"
 #include "anki/scene/BodyComponent.h"
 #include "anki/scene/Misc.h"
 #include "anki/resource/Model.h"

src/scene/ParticleEmitter.cpp

@@ -5,7 +5,6 @@
 
 #include "anki/scene/ParticleEmitter.h"
 #include "anki/scene/SceneGraph.h"
-#include "anki/scene/InstanceNode.h"
 #include "anki/scene/Misc.h"
 #include "anki/resource/Model.h"
 #include "anki/resource/ResourceManager.h"

src/scene/SceneGraph.cpp

@@ -6,7 +6,6 @@
 #include "anki/scene/SceneGraph.h"
 #include "anki/scene/Camera.h"
 #include "anki/scene/ModelNode.h"
-#include "anki/scene/InstanceNode.h"
 #include "anki/scene/Sector.h"
 #include "anki/core/Counters.h"
 #include "anki/physics/PhysicsWorld.h"

src/script/Scene.cpp

@@ -1353,73 +1353,6 @@ static inline void wrapModelNode(lua_State* l)
 	lua_settop(l, 0);
 }
 
-//==============================================================================
-// InstanceNode                                                                =
-//==============================================================================
-
-//==============================================================================
-static const char* classnameInstanceNode = "InstanceNode";
-
-template<>
-I64 LuaBinder::getWrappedTypeSignature<InstanceNode>()
-{
-	return -2063375830923741403;
-}
-
-template<>
-const char* LuaBinder::getWrappedTypeName<InstanceNode>()
-{
-	return classnameInstanceNode;
-}
-
-//==============================================================================
-/// Pre-wrap method InstanceNode::getSceneNodeBase.
-static inline int pwrapInstanceNodegetSceneNodeBase(lua_State* l)
-{
-	UserData* ud;
-	(void)ud;
-	void* voidp;
-	(void)voidp;
-	PtrSize size;
-	(void)size;
-	
-	LuaBinder::checkArgsCount(l, 1);
-	
-	// Get "this" as "self"
-	if(LuaBinder::checkUserData(l, 1, classnameInstanceNode, -2063375830923741403, ud)) return -1;
-	InstanceNode* self = ud->getData<InstanceNode>();
-	
-	// Call the method
-	SceneNode& ret = *self;
-	
-	// Push return value
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
-	luaL_setmetatable(l, "SceneNode");
-	ud->initPointed(-2220074417980276571, const_cast<SceneNode*>(&ret));
-	
-	return 1;
-}
-
-//==============================================================================
-/// Wrap method InstanceNode::getSceneNodeBase.
-static int wrapInstanceNodegetSceneNodeBase(lua_State* l)
-{
-	int res = pwrapInstanceNodegetSceneNodeBase(l);
-	if(res >= 0) return res;
-	lua_error(l);
-	return 0;
-}
-
-//==============================================================================
-/// Wrap class InstanceNode.
-static inline void wrapInstanceNode(lua_State* l)
-{
-	LuaBinder::createClass(l, classnameInstanceNode);
-	LuaBinder::pushLuaCFuncMethod(l, "getSceneNodeBase", wrapInstanceNodegetSceneNodeBase);
-	lua_settop(l, 0);
-}
-
 //==============================================================================
 // PointLight                                                                  =
 //==============================================================================
@@ -1940,55 +1873,6 @@ static int wrapSceneGraphnewModelNode(lua_State* l)
 	return 0;
 }
 
-//==============================================================================
-/// Pre-wrap method SceneGraph::newInstanceNode.
-static inline int pwrapSceneGraphnewInstanceNode(lua_State* l)
-{
-	UserData* ud;
-	(void)ud;
-	void* voidp;
-	(void)voidp;
-	PtrSize size;
-	(void)size;
-	
-	LuaBinder::checkArgsCount(l, 2);
-	
-	// Get "this" as "self"
-	if(LuaBinder::checkUserData(l, 1, classnameSceneGraph, -7754439619132389154, ud)) return -1;
-	SceneGraph* self = ud->getData<SceneGraph>();
-	
-	// Pop arguments
-	const char* arg0;
-	if(LuaBinder::checkString(l, 2, arg0)) return -1;
-	
-	// Call the method
-	InstanceNode* ret = newSceneNode<InstanceNode>(self, arg0);
-	
-	// Push return value
-	if(ANKI_UNLIKELY(ret == nullptr))
-	{
-		lua_pushstring(l, "Glue code returned nullptr");
-		return -1;
-	}
-	
-	voidp = lua_newuserdata(l, sizeof(UserData));
-	ud = static_cast<UserData*>(voidp);
-	luaL_setmetatable(l, "InstanceNode");
-	ud->initPointed(-2063375830923741403, const_cast<InstanceNode*>(ret));
-	
-	return 1;
-}
-
-//==============================================================================
-/// Wrap method SceneGraph::newInstanceNode.
-static int wrapSceneGraphnewInstanceNode(lua_State* l)
-{
-	int res = pwrapSceneGraphnewInstanceNode(l);
-	if(res >= 0) return res;
-	lua_error(l);
-	return 0;
-}
-
 //==============================================================================
 /// Pre-wrap method SceneGraph::newPointLight.
 static inline int pwrapSceneGraphnewPointLight(lua_State* l)
@@ -2305,7 +2189,6 @@ static inline void wrapSceneGraph(lua_State* l)
 {
 	LuaBinder::createClass(l, classnameSceneGraph);
 	LuaBinder::pushLuaCFuncMethod(l, "newModelNode", wrapSceneGraphnewModelNode);
-	LuaBinder::pushLuaCFuncMethod(l, "newInstanceNode", wrapSceneGraphnewInstanceNode);
 	LuaBinder::pushLuaCFuncMethod(l, "newPointLight", wrapSceneGraphnewPointLight);
 	LuaBinder::pushLuaCFuncMethod(l, "newSpotLight", wrapSceneGraphnewSpotLight);
 	LuaBinder::pushLuaCFuncMethod(l, "newStaticCollisionNode", wrapSceneGraphnewStaticCollisionNode);
@@ -2365,7 +2248,6 @@ void wrapModuleScene(lua_State* l)
 	wrapLensFlareComponent(l);
 	wrapSceneNode(l);
 	wrapModelNode(l);
-	wrapInstanceNode(l);
 	wrapPointLight(l);
 	wrapSpotLight(l);
 	wrapStaticCollisionNode(l);

src/script/Scene.xml

@@ -182,14 +182,6 @@ static SceneGraph* getSceneGraph(lua_State* l)
 				</method>
 			</methods>
 		</class>
-		<class name="InstanceNode">
-			<methods>
-				<method name="getSceneNodeBase">
-					<overrideCall>SceneNode&amp; ret = *self;</overrideCall>
-					<return>SceneNode&amp;</return>
-				</method>
-			</methods>
-		</class>
 		<class name="PointLight">
 			<methods>
 				<method name="getSceneNodeBase">
@@ -254,13 +246,6 @@ static SceneGraph* getSceneGraph(lua_State* l)
 					</args>
 					<return>ModelNode*</return>
 				</method>
-				<method name="newInstanceNode">
-					<overrideCall><![CDATA[InstanceNode* ret = newSceneNode<InstanceNode>(self, arg0);]]></overrideCall>
-					<args>
-						<arg>const CString&amp;</arg>
-					</args>
-					<return>InstanceNode*</return>
-				</method>
 				<method name="newPointLight">
 					<overrideCall><![CDATA[PointLight* ret = newSceneNode<PointLight>(self, arg0);]]></overrideCall>
 					<args>