Working on physics

include/anki/resource/Model.h

@@ -193,6 +193,11 @@ public:
 	{
 		return visibilityShape;
 	}
+
+	const btCollisionShape* getCollisionShape() const
+	{
+		return collShape.get();
+	}
 	/// @}
 
 	void load(const char* filename);

src/physics/MotionState.cpp

@@ -38,6 +38,9 @@ void MotionState::setWorldTransform(const btTransform& worldTrans)
 {
 	worldTransform = worldTrans;
 	needsUpdate = true;
+
+	/// XXX
+	sync();
 }
 
 //==============================================================================

src/renderer/Dbg.cpp

@@ -92,7 +92,7 @@ void Dbg::run()
 	}
 
 	// XXX
-	if(1)
+	if(0)
 	{
 		Vec3 tri[3] = {
 			Vec3{10.0 , 7.0, -2.0}, 

src/resource/Model.cpp

@@ -4,6 +4,7 @@
 #include "anki/resource/MeshLoader.h"
 #include "anki/resource/ShaderProgramResource.h"
 #include "anki/misc/Xml.h"
+#include "anki/physics/Converters.h"
 #include <btBulletCollisionCommon.h>
 
 namespace anki {
@@ -260,7 +261,7 @@ void Model::load(const char* filename)
 		XmlElement rootEl = doc.getChildElement("model");
 
 		// <collisionShape>
-		XmlElement collEl = doc.getChildElement("collisionShape");
+		XmlElement collEl = rootEl.getChildElementOptional("collisionShape");
 		if(collEl)
 		{
 			std::string type = collEl.getChildElement("type").getText();
@@ -272,6 +273,8 @@ void Model::load(const char* filename)
 			}
 			else if(type == "box")
 			{
+				Vec3 extend = valEl.getVec3();
+				collShape.reset(new btBoxShape(toBt(extend)));
 			}
 			else if(type == "mesh")
 			{

src/scene/ModelNode.cpp

@@ -2,6 +2,8 @@
 #include "anki/scene/SceneGraph.h"
 #include "anki/resource/Model.h"
 #include "anki/resource/Skeleton.h"
+#include "anki/physics/RigidBody.h"
+#include "anki/physics/PhysicsWorld.h"
 
 namespace anki {
 
@@ -192,6 +194,23 @@ ModelNode::ModelNode(
 		patches.push_back(mpn);
 		++i;
 	}
+
+	// Load rigid body
+	if(model->getCollisionShape() != nullptr)
+	{
+		RigidBody::Initializer init;
+		init.mass = 1.0;
+		init.shape = const_cast<btCollisionShape*>(model->getCollisionShape());
+		init.startTrf.getOrigin().y() = 20.0;
+		init.movable = this;
+
+		RigidBody* body;
+		
+		getSceneGraph().getPhysics().newPhysicsObject<RigidBody>(
+			body, init);
+
+		sceneNodeProtected.rigidBodyC = body;
+	}
 }
 
 //==============================================================================
@@ -201,6 +220,12 @@ ModelNode::~ModelNode()
 	{
 		getSceneGraph().deleteSceneNode(patch);
 	}
+
+	if(sceneNodeProtected.rigidBodyC)
+	{
+		getSceneGraph().getPhysics().deletePhysicsObject(
+			sceneNodeProtected.rigidBodyC);
+	}
 }
 
 //==============================================================================

testapp/Main.cpp

@@ -42,10 +42,6 @@ void initPhysics()
 {
 	SceneGraph& scene = SceneGraphSingleton::get();
 
-	scene.getPhysics().setDebugDrawer(
-		new PhysicsDebugDrawer(
-			&MainRendererSingleton::get().getDbg().getDebugDrawer()));
-
 	btCollisionShape* groundShape = new btBoxShape(
 	    btVector3(btScalar(50.), btScalar(50.), btScalar(50.)));
 
@@ -243,6 +239,11 @@ void init()
 	horse->setLocalTransform(Transform(Vec3(-2, 0, 0), Mat3::getIdentity(),
 		0.7));
 
+
+	scene.newSceneNode(horse, "crate", "models/crate0/crate0.ankimdl");
+	horse->setLocalTransform(Transform(Vec3(2, 10.0, 0), Mat3::getIdentity(),
+		1.0));
+
 	// barrel
 	/*ModelNode* redBarrel = new ModelNode(
 		"red_barrel", &scene, nullptr, MoveComponent::MF_NONE, 
@@ -261,7 +262,12 @@ void init()
 #endif
 	scene.load("maps/sponza/master.ankiscene");
 
-	//initPhysics();
+	// Physics debug
+	scene.getPhysics().setDebugDrawer(
+		new PhysicsDebugDrawer(
+			&MainRendererSingleton::get().getDbg().getDebugDrawer()));
+
+	initPhysics();
 
 	// Sectors
 #if 0

tools/texture/ankitexture.py

@@ -226,9 +226,9 @@ def identify_image(in_file):
 	stdout_str = proc.stdout.read()
 
 	# Make sure the colorspace is what we want
-	reg = re.search(r"Colorspace: (.*)", stdout_str)
+	"""reg = re.search(r"Colorspace: (.*)", stdout_str)
 	if not reg or reg.group(1) != "RGB":
-		raise Exception("Something is wrong with the colorspace")
+		raise Exception("Something is wrong with the colorspace")"""
 
 	# Get the size of the iamge
 	reg = re.search(r"Geometry: ([0-9]*)x([0-9]*)\+", stdout_str)