Add the physics playground

.gitignore

@@ -11,5 +11,7 @@
 !*.md
 !*.txt
 !*.glslp
+!*.anki*
+!*.blend
 !CMakeLists.txt
 build*/*

samples/CMakeLists.txt

@@ -1,3 +1,4 @@
 add_definitions(-UANKI_BUILD)
 add_subdirectory(simple_scene)
 add_subdirectory(sponza)
+add_subdirectory(physics_playground)

samples/common/Framework.cpp

@@ -89,10 +89,6 @@ Error SampleApp::userMainLoop(Bool& quit)
 	{
 		// renderer.getDbg().flipFlags(DbgFlag::SPATIAL_COMPONENT);
 	}
-	if(in.getKey(KeyCode::F6) == 1)
-	{
-		renderer.getDbg().switchDepthTestEnabled();
-	}
 
 	if(in.getKey(KeyCode::UP))
 	{
@@ -124,14 +120,14 @@ Error SampleApp::userMainLoop(Bool& quit)
 		mover->moveLocalX(MOVE_DISTANCE);
 	}
 
-	if(in.getKey(KeyCode::Z))
+	if(in.getKey(KeyCode::C))
 	{
-		mover->moveLocalY(MOVE_DISTANCE);
+		mover->moveLocalY(-MOVE_DISTANCE);
 	}
 
 	if(in.getKey(KeyCode::SPACE))
 	{
-		mover->moveLocalY(-MOVE_DISTANCE);
+		mover->moveLocalY(MOVE_DISTANCE);
 	}
 
 	if(in.getKey(KeyCode::W))

samples/physics_playground/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_executable(physics_playground Main.cpp ../common/Framework.cpp)
+target_link_libraries(physics_playground anki)
+
+installExecutable(physics_playground)

samples/physics_playground/Main.cpp

@@ -0,0 +1,77 @@
+// Copyright (C) 2009-2018, Panagiotis Christopoulos Charitos and contributors.
+// All rights reserved.
+// Code licensed under the BSD License.
+// http://www.anki3d.org/LICENSE
+
+#include <cstdio>
+#include "../common/Framework.h"
+
+using namespace anki;
+
+class MyApp : public SampleApp
+{
+public:
+	Error sampleExtraInit() override
+	{
+		ScriptResourcePtr script;
+		ANKI_CHECK(getResourceManager().loadResource("assets/scene.lua", script));
+		ANKI_CHECK(getScriptManager().evalString(script->getSource()));
+		return Error::NONE;
+	}
+
+	Error userMainLoop(Bool& quit) override;
+};
+
+Error MyApp::userMainLoop(Bool& quit)
+{
+	ANKI_CHECK(SampleApp::userMainLoop(quit));
+
+	if(getInput().getMouseButton(MouseButton::LEFT) == 1)
+	{
+		ANKI_LOGI("Firing a monkey");
+
+		static U instance = 0;
+
+		Transform camTrf = getSceneGraph().getActiveCameraNode().getComponent<MoveComponent>().getWorldTransform();
+
+		ModelNode* monkey;
+		ANKI_CHECK(getSceneGraph().newSceneNode<ModelNode>(
+			StringAuto(getAllocator()).sprintf("monkey%u", instance++).toCString(),
+			monkey,
+			"assets/SuzanneMaterial-material.ankimdl"));
+		// monkey->getComponent<MoveComponent>().setLocalTransform(camTrf);
+
+		BodyNode* body;
+		ANKI_CHECK(getSceneGraph().newSceneNode<BodyNode>(
+			StringAuto(getAllocator()).sprintf("bmonkey%u", instance++).toCString(), body, "assets/Suzanne.ankicl"));
+		body->getComponent<BodyComponent>().setTransform(camTrf);
+
+		body->addChild(monkey);
+	}
+
+	return Error::NONE;
+}
+
+int main(int argc, char* argv[])
+{
+	Error err = Error::NONE;
+
+	MyApp* app = new MyApp;
+	err = app->init(argc, argv, argv[0]);
+	if(!err)
+	{
+		err = app->mainLoop();
+	}
+
+	if(err)
+	{
+		ANKI_LOGE("Error reported. Bye!");
+	}
+	else
+	{
+		delete app;
+		ANKI_LOGI("Bye!!");
+	}
+
+	return 0;
+}

samples/physics_playground/assets/Material-material.ankimtl

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This file is auto generated by ExporterMaterial.cpp -->
+<material shaderProgram="shaders/GBufferGeneric.glslp">
+	
+	<mutators>
+		<mutator name="DIFFUSE_TEX" value="0"/>
+		<mutator name="SPECULAR_TEX" value="0"/>
+		<mutator name="ROUGHNESS_TEX" value="0"/>
+		<mutator name="METAL_TEX" value="0"/>
+		<mutator name="NORMAL_TEX" value="0"/>
+		<mutator name="PARALLAX" value="0"/>
+		<mutator name="EMISSIVE_TEX" value="0"/>
+	</mutators>
+	
+	<inputs>
+		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
+		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
+		
+	
+		<input shaderInput="diffColor" value="0.548460 0.640000 0.063144"/>
+		<input shaderInput="specColor" value="0.500000 0.500000 0.500000"/>
+		<input shaderInput="roughness" value="0.097847" />
+		<input shaderInput="metallic" value="0.000000"/>
+		
+		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderInput="subsurface" value="0.000000"/>
+		
+	</inputs>
+</material>

samples/physics_playground/assets/Material_001-material.ankimtl

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This file is auto generated by ExporterMaterial.cpp -->
+<material shaderProgram="shaders/GBufferGeneric.glslp">
+	
+	<mutators>
+		<mutator name="DIFFUSE_TEX" value="0"/>
+		<mutator name="SPECULAR_TEX" value="0"/>
+		<mutator name="ROUGHNESS_TEX" value="0"/>
+		<mutator name="METAL_TEX" value="0"/>
+		<mutator name="NORMAL_TEX" value="0"/>
+		<mutator name="PARALLAX" value="0"/>
+		<mutator name="EMISSIVE_TEX" value="0"/>
+	</mutators>
+	
+	<inputs>
+		<input shaderInput="mvp" builtin="MODEL_VIEW_PROJECTION_MATRIX"/>
+		<input shaderInput="rotationMat" builtin="ROTATION_MATRIX"/>
+		
+	
+		<input shaderInput="diffColor" value="0.012172 0.367335 0.640000"/>
+		<input shaderInput="specColor" value="0.500000 0.500000 0.500000"/>
+		<input shaderInput="roughness" value="0.097847" />
+		<input shaderInput="metallic" value="0.000000"/>
+		
+		<input shaderInput="emission" value="0.000000 0.000000 0.000000"/>
+		<input shaderInput="subsurface" value="0.000000"/>
+		
+	</inputs>
+</material>

samples/physics_playground/assets/Suzanne.ankicl

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<collisionShape>
+	<type>staticMesh</type>
+	<value>assets/Suzanne.ankimesh</value>
+</collisionShape>

samples/physics_playground/assets/SuzanneMaterial-material.ankimdl

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<model>
+	<modelPatches>
+		<modelPatch>
+			<mesh>assets/Suzanne.ankimesh</mesh>
+			<material>assets/Material-material.ankimtl</material>
+		</modelPatch>
+	</modelPatches>
+</model>

samples/physics_playground/assets/floor.ankicl

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<collisionShape>
+	<type>staticMesh</type>
+	<value>assets/floor.ankimesh</value>
+</collisionShape>

samples/physics_playground/assets/floorMaterial-material.ankimdl

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<model>
+	<modelPatches>
+		<modelPatch>
+			<mesh>assets/floor.ankimesh</mesh>
+			<material>assets/Material-material.ankimtl</material>
+		</modelPatch>
+	</modelPatches>
+</model>

samples/physics_playground/assets/walls.ankicl

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<collisionShape>
+	<type>staticMesh</type>
+	<value>assets/walls.ankimesh</value>
+</collisionShape>

samples/physics_playground/assets/wallsMaterial_001-material.ankimdl

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<model>
+	<modelPatches>
+		<modelPatch>
+			<mesh>assets/walls.ankimesh</mesh>
+			<material>assets/Material_001-material.ankimtl</material>
+		</modelPatch>
+	</modelPatches>
+</model>

src/anki/Scene.h

@@ -20,6 +20,7 @@
 #include <anki/scene/OccluderNode.h>
 #include <anki/scene/DecalNode.h>
 #include <anki/scene/Octree.h>
+#include <anki/scene/PhysicsDebugNode.h>
 
 #include <anki/scene/components/MoveComponent.h>
 #include <anki/scene/components/RenderComponent.h>

src/anki/physics/PhysicsBody.cpp

@@ -30,19 +30,16 @@ public:
 PhysicsBody::PhysicsBody(PhysicsWorld* world, const PhysicsBodyInitInfo& init)
 	: PhysicsObject(PhysicsObjectType::BODY, world)
 {
-	if(init.m_static)
-	{
-		ANKI_ASSERT(init.m_mass > 0.0f);
-	}
+	const Bool dynamic = init.m_mass > 0.0f;
 
 	// Create motion state
 	m_motionState = getAllocator().newInstance<MotionState>();
 	m_motionState->m_body = this;
 
 	// Compute inertia
-	btCollisionShape* shape = init.m_shape->getBtShape(!init.m_static);
+	btCollisionShape* shape = init.m_shape->getBtShape(dynamic);
 	btVector3 localInertia(0, 0, 0);
-	if(!init.m_static)
+	if(dynamic)
 	{
 		shape->calculateLocalInertia(init.m_mass, localInertia);
 	}

src/anki/physics/PhysicsBody.h

@@ -18,11 +18,10 @@ class PhysicsBodyInitInfo
 {
 public:
 	PhysicsCollisionShapePtr m_shape;
-	F32 m_mass = 0.0;
+	F32 m_mass = 0.0f;
 	Transform m_startTrf = Transform::getIdentity();
 	Bool m_kinematic = false;
 	Bool m_gravity = true;
-	Bool m_static = false;
 };
 
 /// Rigid body.

src/anki/physics/PhysicsCollisionShape.cpp

@@ -54,6 +54,7 @@ PhysicsTriangleSoup::~PhysicsTriangleSoup()
 {
 	getAllocator().deleteInstance(m_staticShape);
 	getAllocator().deleteInstance(m_shape);
+	m_shape = nullptr;
 	getAllocator().deleteInstance(m_mesh);
 }
 

src/anki/scene/Forward.h

@@ -14,6 +14,7 @@ class FrustumComponent;
 class InstanceComponent;
 class MoveComponent;
 class RenderComponent;
+class MaterialRenderComponent;
 class SpatialComponent;
 class DecalComponent;
 class PortalComponent;

src/anki/scene/Misc.h

@@ -1,30 +0,0 @@
-// Copyright (C) 2009-2018, Panagiotis Christopoulos Charitos and contributors.
-// All rights reserved.
-// Code licensed under the BSD License.
-// http://www.anki3d.org/LICENSE
-
-#pragma once
-
-#include <anki/scene/components/SpatialComponent.h>
-
-namespace anki
-{
-
-/// @addtogroup scene
-/// @{
-
-/// A class that holds spatial information and implements the SpatialComponent virtuals. You just need to update the
-/// OBB manually
-class ObbSpatialComponent : public SpatialComponent
-{
-public:
-	Obb m_obb;
-
-	ObbSpatialComponent(SceneNode* node)
-		: SpatialComponent(node, &m_obb)
-	{
-	}
-};
-/// @}
-
-} // end namespace anki

src/anki/scene/ModelNode.cpp

@@ -7,7 +7,7 @@
 #include <anki/scene/SceneGraph.h>
 #include <anki/scene/components/BodyComponent.h>
 #include <anki/scene/components/SkinComponent.h>
-#include <anki/scene/Misc.h>
+#include <anki/scene/components/RenderComponent.h>
 #include <anki/resource/ModelResource.h>
 #include <anki/resource/ResourceManager.h>
 #include <anki/resource/SkeletonResource.h>
@@ -17,7 +17,7 @@ namespace anki
 {
 
 /// Render component implementation.
-class ModelPatchNode::MRenderComponent : public RenderComponent
+class ModelPatchNode::MRenderComponent : public MaterialRenderComponent
 {
 public:
 	const ModelPatchNode& getNode() const
@@ -26,7 +26,7 @@ public:
 	}
 
 	MRenderComponent(ModelPatchNode* node)
-		: RenderComponent(node, node->m_modelPatch->getMaterial())
+		: MaterialRenderComponent(node, node->m_modelPatch->getMaterial())
 	{
 	}
 
@@ -111,11 +111,11 @@ void ModelPatchNode::drawCallback(RenderQueueDrawContext& ctx, ConstWeakArray<vo
 		trfs[i] = Mat4(self2.getParent()->getComponentAt<MoveComponent>(0).getWorldTransform());
 	}
 
-	self.getComponentAt<RenderComponent>(1).allocateAndSetupUniforms(
-		self.m_modelPatch->getMaterial()->getDescriptorSetIndex(),
-		ctx,
-		ConstWeakArray<Mat4>(&trfs[0], userData.getSize()),
-		*ctx.m_stagingGpuAllocator);
+	static_cast<const MaterialRenderComponent&>(self.getComponentAt<RenderComponent>(1))
+		.allocateAndSetupUniforms(self.m_modelPatch->getMaterial()->getDescriptorSetIndex(),
+			ctx,
+			ConstWeakArray<Mat4>(&trfs[0], userData.getSize()),
+			*ctx.m_stagingGpuAllocator);
 
 	// Draw
 	cmdb->drawElements(PrimitiveTopology::TRIANGLES,
@@ -150,11 +150,11 @@ public:
 	}
 };
 
-class ModelNode::MRenderComponent : public RenderComponent
+class ModelNode::MRenderComponent : public MaterialRenderComponent
 {
 public:
 	MRenderComponent(ModelNode* node)
-		: RenderComponent(node, node->m_model->getModelPatches()[0]->getMaterial())
+		: MaterialRenderComponent(node, node->m_model->getModelPatches()[0]->getMaterial())
 	{
 	}
 
@@ -300,10 +300,11 @@ void ModelNode::drawCallback(RenderQueueDrawContext& ctx, ConstWeakArray<void*>
 			trfs[i] = Mat4(self2.getComponent<MoveComponent>().getWorldTransform());
 		}
 
-		self.getComponent<RenderComponent>().allocateAndSetupUniforms(patch->getMaterial()->getDescriptorSetIndex(),
-			ctx,
-			ConstWeakArray<Mat4>(&trfs[0], userData.getSize()),
-			*ctx.m_stagingGpuAllocator);
+		static_cast<const MaterialRenderComponent&>(self.getComponent<RenderComponent>())
+			.allocateAndSetupUniforms(patch->getMaterial()->getDescriptorSetIndex(),
+				ctx,
+				ConstWeakArray<Mat4>(&trfs[0], userData.getSize()),
+				*ctx.m_stagingGpuAllocator);
 
 		// Bones storage
 		if(self.m_model->getSkeleton())

src/anki/scene/ModelNode.h

@@ -6,11 +6,11 @@
 #pragma once
 
 #include <anki/scene/SceneNode.h>
-#include <anki/scene/components/RenderComponent.h>
 #include <anki/scene/components/MoveComponent.h>
 #include <anki/scene/components/SpatialComponent.h>
 #include <anki/resource/ModelResource.h>
 #include <anki/collision/Obb.h>
+#include <anki/renderer/RenderQueue.h>
 
 namespace anki
 {

src/anki/scene/ParticleEmitterNode.cpp

@@ -5,7 +5,9 @@
 
 #include <anki/scene/ParticleEmitterNode.h>
 #include <anki/scene/SceneGraph.h>
-#include <anki/scene/Misc.h>
+#include <anki/scene/components/MoveComponent.h>
+#include <anki/scene/components/SpatialComponent.h>
+#include <anki/scene/components/RenderComponent.h>
 #include <anki/resource/ModelResource.h>
 #include <anki/resource/ResourceManager.h>
 #include <anki/util/Functions.h>
@@ -162,7 +164,7 @@ void Particle::revive(const ParticleEmitterNode& pe,
 #endif
 
 /// The derived render component for particle emitters.
-class ParticleEmitterRenderComponent : public RenderComponent
+class ParticleEmitterRenderComponent : public MaterialRenderComponent
 {
 public:
 	const ParticleEmitterNode& getNode() const
@@ -171,7 +173,7 @@ public:
 	}
 
 	ParticleEmitterRenderComponent(ParticleEmitterNode* node)
-		: RenderComponent(node, node->m_particleEmitterResource->getMaterial())
+		: MaterialRenderComponent(node, node->m_particleEmitterResource->getMaterial())
 	{
 	}
 
@@ -304,11 +306,11 @@ void ParticleEmitterNode::drawCallback(RenderQueueDrawContext& ctx, ConstWeakArr
 
 		// Uniforms
 		Array<Mat4, 1> trf = {{Mat4::getIdentity()}};
-		self.getComponent<RenderComponent>().allocateAndSetupUniforms(
-			self.m_particleEmitterResource->getMaterial()->getDescriptorSetIndex(),
-			ctx,
-			trf,
-			*ctx.m_stagingGpuAllocator);
+		static_cast<const MaterialRenderComponent&>(self.getComponent<RenderComponent>())
+			.allocateAndSetupUniforms(self.m_particleEmitterResource->getMaterial()->getDescriptorSetIndex(),
+				ctx,
+				trf,
+				*ctx.m_stagingGpuAllocator);
 
 		// Draw
 		cmdb->drawArrays(PrimitiveTopology::TRIANGLE_STRIP, 4, self.m_aliveParticlesCount, 0, 0);

src/anki/scene/ParticleEmitterNode.h

@@ -6,10 +6,9 @@
 #pragma once
 
 #include <anki/scene/SceneNode.h>
-#include <anki/scene/components/MoveComponent.h>
-#include <anki/scene/components/SpatialComponent.h>
-#include <anki/scene/components/RenderComponent.h>
 #include <anki/resource/ParticleEmitterResource.h>
+#include <anki/renderer/RenderQueue.h>
+#include <anki/collision/Obb.h>
 
 namespace anki
 {

src/anki/scene/PhysicsDebugNode.cpp

@@ -0,0 +1,48 @@
+// Copyright (C) 2009-2018, Panagiotis Christopoulos Charitos and contributors.
+// All rights reserved.
+// Code licensed under the BSD License.
+// http://www.anki3d.org/LICENSE
+
+#include <anki/scene/PhysicsDebugNode.h>
+#include <anki/resource/ResourceManager.h>
+#include <anki/scene/components/RenderComponent.h>
+#include <anki/scene/components/SpatialComponent.h>
+#include <anki/scene/SceneGraph.h>
+
+namespace anki
+{
+
+/// Render component implementation.
+class PhysicsDebugNode::MyRenderComponent : public RenderComponent
+{
+public:
+	ShaderProgramResourcePtr m_prog;
+
+	MyRenderComponent(SceneNode* node)
+		: RenderComponent(node)
+	{
+		m_castsShadow = false;
+		m_isForwardShading = false;
+	}
+
+	void setupRenderableQueueElement(RenderableQueueElement& el) const override
+	{
+		// TODO
+	}
+};
+
+Error PhysicsDebugNode::init()
+{
+	MyRenderComponent* rcomp = newComponent<MyRenderComponent>(this);
+	ANKI_CHECK(getResourceManager().loadResource("shaders/SceneDebug.glslp", rcomp->m_prog));
+
+	ObbSpatialComponent* scomp = newComponent<ObbSpatialComponent>(this);
+	Vec3 center = (getSceneGraph().getSceneMax() + getSceneGraph().getSceneMin()) / 2.0f;
+	scomp->m_obb.setCenter(center.xyz0());
+	scomp->m_obb.setExtend((getSceneGraph().getSceneMax() - center).xyz0());
+	scomp->m_obb.setRotation(Mat3x4::getIdentity());
+
+	return Error::NONE;
+}
+
+} // end namespace anki

src/anki/scene/PhysicsDebugNode.h

@@ -0,0 +1,27 @@
+// Copyright (C) 2009-2018, Panagiotis Christopoulos Charitos and contributors.
+// All rights reserved.
+// Code licensed under the BSD License.
+// http://www.anki3d.org/LICENSE
+
+#pragma once
+
+#include <anki/scene/SceneNode.h>
+
+namespace anki
+{
+
+/// An always visible node that debug draws primitives of the physics world.
+class PhysicsDebugNode : public SceneNode
+{
+public:
+	PhysicsDebugNode(SceneGraph* scene, CString name);
+
+	~PhysicsDebugNode();
+
+	ANKI_USE_RESULT Error init();
+
+private:
+	class MyRenderComponent;
+};
+
+} // end namespace anki

src/anki/scene/SceneGraph.cpp

@@ -101,7 +101,7 @@ Error SceneGraph::init(AllocAlignedCallback allocCb,
 	m_maxReflectionProxyDistance = config.getNumber("scene.imageReflectionMaxDistance");
 
 	m_octree = m_alloc.newInstance<Octree>(m_alloc);
-	m_octree->init(Vec3(-1000.0f), Vec3(1000.0f), 5); // TODO
+	m_octree->init(m_sceneMin, m_sceneMax, 5); // TODO
 
 	// Init the default main camera
 	ANKI_CHECK(newSceneNode<PerspectiveCameraNode>("mainCamera", m_defaultMainCam));

src/anki/scene/SceneGraph.h

@@ -167,6 +167,16 @@ public:
 		return m_stats;
 	}
 
+	const Vec3& getSceneMin() const
+	{
+		return m_sceneMin;
+	}
+
+	const Vec3& getSceneMax() const
+	{
+		return m_sceneMax;
+	}
+
 anki_internal:
 	ResourceManager& getResourceManager()
 	{
@@ -262,6 +272,9 @@ private:
 
 	Octree* m_octree = nullptr;
 
+	Vec3 m_sceneMin = {-1000.0f, -200.0f, -1000.0f};
+	Vec3 m_sceneMax = {1000.0f, 200.0f, 1000.0f};
+
 	Atomic<U32> m_objectsMarkedForDeletionCount;
 
 	F32 m_maxReflectionProxyDistance = 0.0;

src/anki/scene/StaticCollisionNode.cpp

@@ -30,7 +30,7 @@ Error StaticCollisionNode::init(const CString& resourceFname, const Transform& t
 	// Create body
 	PhysicsBodyInitInfo init;
 	init.m_shape = m_rsrc->getShape();
-	init.m_static = true;
+	init.m_mass = 0.0f;
 	init.m_startTrf = transform;
 
 	m_body = getSceneGraph().getPhysicsWorld().newInstance<PhysicsBody>(init);

src/anki/scene/StaticGeometryNode.cpp

@@ -12,13 +12,13 @@ namespace anki
 {
 
 /// The implementation of static geometry node renderable component.
-class StaticGeometryRenderComponent : public RenderComponent
+class StaticGeometryRenderComponent : public MaterialRenderComponent
 {
 public:
 	StaticGeometryPatchNode* m_node;
 
 	StaticGeometryRenderComponent(StaticGeometryPatchNode* node)
-		: RenderComponent(node, node->m_modelPatch->getMaterial())
+		: MaterialRenderComponent(node, node->m_modelPatch->getMaterial())
 		, m_node(node)
 	{
 	}

src/anki/scene/Visibility.cpp

@@ -350,7 +350,7 @@ void VisibilityTestTask::test(ThreadHive& hive, U32 taskId)
 			if(wantsRenderComponents || (wantsShadowCasters && rc->getCastsShadow()))
 			{
 				RenderableQueueElement* el;
-				if(rc->getMaterial().isForwardShading())
+				if(rc->isForwardShading())
 				{
 					el = result.m_forwardShadingRenderables.newElement(alloc);
 				}
@@ -366,7 +366,7 @@ void VisibilityTestTask::test(ThreadHive& hive, U32 taskId)
 				el->m_distanceFromCamera = max(0.0f, sps[0].m_sp->getAabb().testPlane(nearPlane));
 
 				if(wantsEarlyZ && el->m_distanceFromCamera < m_frcCtx->m_visCtx->m_earlyZDist
-					&& !rc->getMaterial().isForwardShading())
+					&& !rc->isForwardShading())
 				{
 					RenderableQueueElement* el2 = result.m_earlyZRenderables.newElement(alloc);
 					*el2 = *el;

src/anki/scene/components/RenderComponent.cpp

@@ -12,8 +12,8 @@
 namespace anki
 {
 
-RenderComponent::RenderComponent(SceneNode* node, MaterialResourcePtr mtl)
-	: SceneComponent(SceneComponentType::RENDER, node)
+MaterialRenderComponent::MaterialRenderComponent(SceneNode* node, MaterialResourcePtr mtl)
+	: RenderComponent(node)
 	, m_mtl(mtl)
 {
 	// Create the material variables
@@ -23,14 +23,17 @@ RenderComponent::RenderComponent(SceneNode* node, MaterialResourcePtr mtl)
 	{
 		m_vars[count++].m_mvar = &mv;
 	}
+
+	m_isForwardShading = mtl->isForwardShading();
+	m_castsShadow = mtl->castsShadow();
 }
 
-RenderComponent::~RenderComponent()
+MaterialRenderComponent::~MaterialRenderComponent()
 {
 	m_vars.destroy(getAllocator());
 }
 
-void RenderComponent::allocateAndSetupUniforms(
+void MaterialRenderComponent::allocateAndSetupUniforms(
 	U set, const RenderQueueDrawContext& ctx, ConstWeakArray<Mat4> transforms, StagingGpuMemoryManager& alloc) const
 {
 	ANKI_ASSERT(transforms.getSize() <= MAX_INSTANCES);
@@ -62,7 +65,7 @@ void RenderComponent::allocateAndSetupUniforms(
 	// Iterate variables
 	for(auto it = m_vars.getBegin(); it != m_vars.getEnd(); ++it)
 	{
-		const RenderComponentVariable& var = *it;
+		const MaterialRenderComponentVariable& var = *it;
 		const MaterialVariable& mvar = var.getMaterialVariable();
 		const ShaderProgramResourceInputVariable& progvar = mvar.getShaderProgramResourceInputVariable();
 

src/anki/scene/components/RenderComponent.h

@@ -17,14 +17,42 @@ namespace anki
 /// @addtogroup scene
 /// @{
 
+/// Render component interface. Implemented by renderable scene nodes
+class RenderComponent : public SceneComponent
+{
+public:
+	static const SceneComponentType CLASS_TYPE = SceneComponentType::RENDER;
+
+	RenderComponent(SceneNode* node)
+		: SceneComponent(CLASS_TYPE, node)
+	{
+	}
+
+	Bool getCastsShadow() const
+	{
+		return m_castsShadow;
+	}
+
+	Bool isForwardShading() const
+	{
+		return m_isForwardShading;
+	}
+
+	virtual void setupRenderableQueueElement(RenderableQueueElement& el) const = 0;
+
+protected:
+	Bool8 m_castsShadow = false;
+	Bool8 m_isForwardShading = false;
+};
+
 /// A wrapper on top of MaterialVariable
-class RenderComponentVariable
+class MaterialRenderComponentVariable
 {
-	friend class RenderComponent;
+	friend class MaterialRenderComponent;
 
 public:
-	RenderComponentVariable() = default;
-	~RenderComponentVariable() = default;
+	MaterialRenderComponentVariable() = default;
+	~MaterialRenderComponentVariable() = default;
 
 	template<typename T>
 	const T& getValue() const
@@ -41,17 +69,15 @@ private:
 	const MaterialVariable* m_mvar = nullptr;
 };
 
-/// RenderComponent interface. Implemented by renderable scene nodes
-class RenderComponent : public SceneComponent
+/// Material render component interface.
+class MaterialRenderComponent : public RenderComponent
 {
 public:
-	static const SceneComponentType CLASS_TYPE = SceneComponentType::RENDER;
+	using Variables = DynamicArray<MaterialRenderComponentVariable>;
 
-	using Variables = DynamicArray<RenderComponentVariable>;
+	MaterialRenderComponent(SceneNode* node, MaterialResourcePtr mtl);
 
-	RenderComponent(SceneNode* node, MaterialResourcePtr mtl);
-
-	~RenderComponent();
+	~MaterialRenderComponent();
 
 	Variables::Iterator getVariablesBegin()
 	{
@@ -80,12 +106,6 @@ public:
 		return *m_mtl;
 	}
 
-	Bool getCastsShadow() const
-	{
-		const MaterialResource& mtl = getMaterial();
-		return mtl.castsShadow();
-	}
-
 	/// Iterate variables using a lambda
 	template<typename Func>
 	ANKI_USE_RESULT Error iterateVariables(Func func)
@@ -105,8 +125,6 @@ public:
 		ConstWeakArray<Mat4> transforms,
 		StagingGpuMemoryManager& alloc) const;
 
-	virtual void setupRenderableQueueElement(RenderableQueueElement& el) const = 0;
-
 private:
 	Variables m_vars;
 	MaterialResourcePtr m_mtl;

src/anki/scene/components/SpatialComponent.h

@@ -104,6 +104,19 @@ private:
 
 	OctreePlaceable m_octreeInfo;
 };
+
+/// A class that holds spatial information and implements the SpatialComponent virtuals. You just need to update the
+/// OBB manually
+class ObbSpatialComponent : public SpatialComponent
+{
+public:
+	Obb m_obb;
+
+	ObbSpatialComponent(SceneNode* node)
+		: SpatialComponent(node, &m_obb)
+	{
+	}
+};
 /// @}
 
 } // end namespace anki

tools/scene/Exporter.cpp

@@ -1146,22 +1146,28 @@ void Exporter::exportAll()
 		// Write the collision node
 		if(!node.m_collisionMesh.empty())
 		{
-			bool found = false;
 			unsigned i = 0;
-			for(; i < m_scene->mNumMeshes; i++)
+			if(node.m_collisionMesh == "self")
 			{
-				if(m_scene->mMeshes[i]->mName.C_Str() == node.m_collisionMesh)
+				i = model.m_meshIndex;
+			}
+			else
+			{
+				for(; i < m_scene->mNumMeshes; i++)
 				{
-					found = true;
-					break;
+					if(m_scene->mMeshes[i]->mName.C_Str() == node.m_collisionMesh)
+					{
+						break;
+					}
 				}
 			}
 
+			const bool found = i < m_scene->mNumMeshes;
 			if(found)
 			{
 				exportCollisionMesh(i);
 
-				std::string fname = m_rpath + node.m_collisionMesh + ".ankicl";
+				std::string fname = m_rpath + getMeshName(getMeshAt(i)) + ".ankicl";
 				file << "node = scene:newStaticCollisionNode(\"" << nodeName << "_cl\", \"" << fname << "\", trf)\n";
 			}
 			else

tools/scene/ExporterMaterial.cpp

@@ -8,7 +8,7 @@
 
 const char* MATERIAL_TEMPLATE = R"(<?xml version="1.0" encoding="UTF-8" ?>
 <!-- This file is auto generated by ExporterMaterial.cpp -->
-<material shaderProgram="shaders/GBufferGeneric.ankiprog">
+<material shaderProgram="shaders/GBufferGeneric.glslp">
 	
 	<mutators>
 		<mutator name="DIFFUSE_TEX" value="%diffTexMutator%"/>