Merging pepper to trunk at revision 39791.

Important note: I used rsync to do the local merge, as "svn merge --reintegrate ^/branches/soc-2011-pepper" doesn't work with our svn server right now!

1 files changed, 54 insertions, 33 deletions

diff --git a/source/gameengine/Converter/BL_ShapeDeformer.cpp b/source/gameengine/Converter/BL_ShapeDeformer.cpp
index 8d8f149bb6c..befe0f6e784 100644
--- a/source/gameengine/Converter/BL_ShapeDeformer.cpp
+++ b/source/gameengine/Converter/BL_ShapeDeformer.cpp
@@ -44,13 +44,12 @@
 #include "RAS_MeshObject.h"
 
 //#include "BL_ArmatureController.h"
+#include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_action_types.h"
 #include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_ipo_types.h"
-#include "DNA_curve_types.h"
 #include "BKE_armature.h"
 #include "BKE_action.h"
 #include "BKE_key.h"
@@ -59,6 +58,7 @@
 
 extern "C"{
 	#include "BKE_lattice.h"
+	#include "BKE_animsys.h"
 }
  
 
@@ -68,9 +68,42 @@ extern "C"{
 #define __NLA_DEFNORMALS
 //#undef __NLA_DEFNORMALS
 
+BL_ShapeDeformer::BL_ShapeDeformer(BL_DeformableGameObject *gameobj,
+                    Object *bmeshobj,
+                    RAS_MeshObject *mesh)
+				:	
+					BL_SkinDeformer(gameobj,bmeshobj, mesh),
+					m_useShapeDrivers(false),
+					m_lastShapeUpdate(-1)
+{
+	m_key = m_bmesh->key;
+	m_bmesh->key = copy_key(m_key);
+};
+
+/* this second constructor is needed for making a mesh deformable on the fly. */
+BL_ShapeDeformer::BL_ShapeDeformer(BL_DeformableGameObject *gameobj,
+				Object *bmeshobj_old,
+				Object *bmeshobj_new,
+				RAS_MeshObject *mesh,
+				bool release_object,
+				bool recalc_normal,
+				BL_ArmatureObject* arma)
+				:
+					BL_SkinDeformer(gameobj, bmeshobj_old, bmeshobj_new, mesh, release_object, recalc_normal, arma),
+					m_useShapeDrivers(false),
+					m_lastShapeUpdate(-1)
+{
+	m_key = m_bmesh->key;
+	m_bmesh->key = copy_key(m_key);
+};
 
 BL_ShapeDeformer::~BL_ShapeDeformer()
 {
+	if (m_key && m_bmesh->key)
+	{
+		free_key(m_bmesh->key);
+		m_bmesh->key = m_key;
+	}
 };
 
 RAS_Deformer *BL_ShapeDeformer::GetReplica()
@@ -90,45 +123,23 @@ void BL_ShapeDeformer::ProcessReplica()
 
 bool BL_ShapeDeformer::LoadShapeDrivers(Object* arma)
 {
-	IpoCurve *icu;
-
-	m_shapeDrivers.clear();
-	// check if this mesh has armature driven shape keys
-	if (m_bmesh->key && m_bmesh->key->ipo) {
-		for(icu= (IpoCurve*)m_bmesh->key->ipo->curve.first; icu; icu= (IpoCurve*)icu->next) {
-			if(icu->driver && 
-				(icu->flag & IPO_MUTE) == 0 &&
-				icu->driver->type == IPO_DRIVER_TYPE_NORMAL &&
-				icu->driver->ob == arma &&
-				icu->driver->blocktype == ID_AR) {
-				// this shape key ipo curve has a driver on the parent armature
-				// record this curve in the shape deformer so that the corresponding
-				m_shapeDrivers.push_back(icu);
-			}
-		}
-	}
-	return !m_shapeDrivers.empty();
+	// This used to check if we had drivers from this armature,
+	// now we just assume we want to use shape drivers
+	// and let the animsys handle things.
+	m_useShapeDrivers = true;
+
+	return true;
 }
 
 bool BL_ShapeDeformer::ExecuteShapeDrivers(void)
 {
-	if (!m_shapeDrivers.empty() && PoseUpdated()) {
-		vector<IpoCurve*>::iterator it;
-//		void *poin;
-//		int type;
-
+	if (m_useShapeDrivers && PoseUpdated()) {
 		// the shape drivers use the bone matrix as input. Must 
 		// update the matrix now
 		m_armobj->ApplyPose();
 
-		for (it=m_shapeDrivers.begin(); it!=m_shapeDrivers.end(); it++) {
-			// no need to set a specific time: this curve has a driver
-			// XXX IpoCurve *icu = *it;
-			//calc_icu(icu, 1.0f);
-			//poin = get_ipo_poin((ID*)m_bmesh->key, icu, &type);
-			//if (poin) 
-			//	write_ipo_poin(poin, type, icu->curval);
-		}
+		// We don't need an actual time, just use 0
+		BKE_animsys_evaluate_animdata(NULL, &GetKey()->id, GetKey()->adt, 0.f, ADT_RECALC_DRIVERS);
 
 		ForceUpdate();
 		m_armobj->RestorePose();
@@ -190,3 +201,13 @@ bool BL_ShapeDeformer::Update(void)
 	}
 	return bSkinUpdate;
 }
+
+Key *BL_ShapeDeformer::GetKey()
+{
+	return m_bmesh->key;
+}
+
+void BL_ShapeDeformer::SetKey(Key *key)
+{
+	m_bmesh->key = key;
+}