Exposed morph shapes to C#

Source/BansheeCore/Include/BsAnimation.h

@@ -238,6 +238,20 @@ namespace BansheeEngine
 		 */
 		void setSkeleton(const SPtr<Skeleton>& skeleton);
 
+		/** 
+		 * Sets morph shapes that can be used for per-vertex blending animation. After they're set call 
+		 * setMorphShapeWeight() to apply morph shapes. 
+		 */
+		void setMorphShapes(const SPtr<MorphShapes>& morphShapes);
+
+		/**
+		 * Changes a weight of a single morph shape, determining how much of it to apply on top of the base mesh.
+		 *
+		 * @param idx		Index of the morph shape to modify. This must match the shapes provided to setMorphShapes().
+		 * @param weight	Weight that determines how much of the shape to apply to the mesh, in range [0, 1]. 	
+		 */
+		void setMorphShapeWeight(UINT32 idx, float weight);
+
 		/** 
 		 * Sets a mask that allows certain bones from the skeleton to be disabled. Caller must ensure that the mask matches
 		 * the skeleton assigned to the animation.

Source/BansheeCore/Include/BsMesh.h

@@ -130,6 +130,9 @@ namespace BansheeEngine
 		/** Gets the skeleton required for animation of this mesh, if any is available. */
 		SPtr<Skeleton> getSkeleton() const { return mSkeleton; }
 
+		/** Returns an object containing all shapes used for morph animation, if any are available. */
+		SPtr<MorphShapes> getMorphShapes() const { return mMorphShapes; }
+
 		/** Retrieves a core implementation of a mesh usable only from the core thread. */
 		SPtr<MeshCore> getCore() const;
 

Source/BansheeCore/Source/BsAnimation.cpp

@@ -571,6 +571,18 @@ namespace BansheeEngine
 		mDirty |= AnimDirtyStateFlag::Skeleton;
 	}
 
+	void Animation::setMorphShapes(const SPtr<MorphShapes>& morphShapes)
+	{
+		BS_EXCEPT(NotImplementedException, "TODO");
+		// TODO
+	}
+
+	void Animation::setMorphShapeWeight(UINT32 idx, float weight)
+	{
+		BS_EXCEPT(NotImplementedException, "TODO");
+		// TODO
+	}
+
 	void Animation::setMask(const SkeletonMask& mask)
 	{
 		mSkeletonMask = mask;

Source/BansheeEngine/Include/BsCAnimation.h

@@ -77,6 +77,9 @@ namespace BansheeEngine
 		/** @copydoc Animation::setState */
 		void setState(const HAnimationClip& clip, AnimationClipState state);
 
+		/** @copydoc Animation::setMorphShapeWeight */
+		void setMorphShapeWeight(UINT32 idx, float weight);
+
 		/** Sets bounds that will be used for animation and mesh culling. Only relevant if setUseBounds() is set to true. */
 		void setBounds(const AABox& bounds);
 

Source/BansheeEngine/Source/BsCAnimation.cpp

@@ -118,6 +118,12 @@ namespace BansheeEngine
 			return mInternal->setState(clip, state);
 	}
 
+	void CAnimation::setMorphShapeWeight(UINT32 idx, float weight)
+	{
+		if (mInternal != nullptr)
+			return mInternal->setMorphShapeWeight(idx, weight);
+	}
+
 	void CAnimation::setBounds(const AABox& bounds)
 	{
 		mBounds = bounds;

Source/BansheeEngine/Source/BsRenderable.cpp

@@ -261,7 +261,10 @@ namespace BansheeEngine
 		mAnimation = animation;
 
 		if (mAnimation != nullptr && mMesh.isLoaded(false))
+		{
 			mAnimation->setSkeleton(mMesh->getSkeleton());
+			mAnimation->setMorphShapes(mMesh->getMorphShapes());
+		}
 
 		_markCoreDirty();
 	}
@@ -315,9 +318,15 @@ namespace BansheeEngine
 		if(mAnimation != nullptr)
 		{
 			if (mMesh.isLoaded(false))
+			{
 				mAnimation->setSkeleton(mMesh->getSkeleton());
+				mAnimation->setMorphShapes(mMesh->getMorphShapes());
+			}
 			else
+			{
 				mAnimation->setSkeleton(nullptr);
+				mAnimation->setMorphShapes(nullptr);
+			}
 		}
 	}
 

Source/MBansheeEngine/Animation/Animation.cs

@@ -376,6 +376,41 @@ namespace BansheeEngine
             }
         }
 
+        /// <summary>
+        /// Changes a weight of a single morph shape, determining how much of it to apply on top of the base mesh.
+        /// </summary>
+        /// <param name="name">Name of the morph shape to modify the weight for. This depends on the mesh the animation
+        ///                    is currently animating.</param>
+        /// <param name="weight">Weight that determines how much of the shape to apply to the mesh, in range[0, 1].</param>
+        public void SetMorphShapeWeight(string name, float weight)
+        {
+            switch (state)
+            {
+                case State.Active:
+                    if (animatedRenderable == null)
+                        return;
+
+                    Mesh mesh = animatedRenderable.Mesh;
+                    if (mesh == null)
+                        return;
+
+                    MorphShapes morphShapes = mesh.MorphShapes;
+                    if (morphShapes == null)
+                        return;
+
+                    string[] shapeNames = morphShapes.Shapes;
+                    for (int i = 0; i < shapeNames.Length; i++)
+                    {
+                        if (shapeNames[i] == name)
+                        {
+                            _native.SetMorphShapeWeight(i, weight);
+                            break;
+                        }
+                    }
+                    break;
+            }
+        }
+
         /// <summary>
         /// Allows the caller to play an animation clip during edit mode. This form of animation playback is limited as
         /// you have no control over clip properties, and features like blending, cross fade or animation events are not

Source/MBansheeEngine/Animation/Interop/NativeAnimation.cs

@@ -130,6 +130,11 @@ namespace BansheeEngine
             Internal_SetState(mCachedPtr, clipPtr, ref state);
         }
 
+        public void SetMorphShapeWeight(int idx, float weight)
+        {
+            Internal_SetMorphShapeWeight(mCachedPtr, idx, weight);
+        }
+
         public bool GetGenericCurveValue(int curveIdx, out float value)
         {
             return Internal_GetGenericCurveValue(mCachedPtr, curveIdx, out value);
@@ -212,6 +217,9 @@ namespace BansheeEngine
         [MethodImpl(MethodImplOptions.InternalCall)]
         private static extern void Internal_SetState(IntPtr thisPtr, IntPtr clipPtr, ref AnimationClipState state);
 
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern void Internal_SetMorphShapeWeight(IntPtr thisPtr, int idx, float weight);
+
         [MethodImpl(MethodImplOptions.InternalCall)]
         private static extern int Internal_GetNumClips(IntPtr thisPtr);
 

Source/MBansheeEngine/Animation/MorphShapes.cs

@@ -0,0 +1,37 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
+using System;
+using System.Runtime.CompilerServices;
+
+namespace BansheeEngine
+{
+    /** @addtogroup Animation
+     *  @{
+     */
+
+    /// <summary>
+    /// Contains a set of morph shapes, used for morph target animation. Each morph shape contains a single possible shape
+    /// that can be added on top of the base shape in order to create the animation.
+    /// </summary>
+    public class MorphShapes : ScriptObject
+    {
+        /// <summary>
+        /// Constructor for internal runtime use only.
+        /// </summary>
+        private MorphShapes()
+        { }
+
+        /// <summary>
+        /// Returns a list of names of all available morph shapes.
+        /// </summary>
+        public string[] Shapes
+        {
+            get { return Internal_GetShapes(mCachedPtr); }
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern string[] Internal_GetShapes(IntPtr instance);
+    }
+
+    /** @} */
+}

Source/MBansheeEngine/MBansheeEngine.csproj

@@ -49,6 +49,7 @@
     <Compile Include="Animation\AnimationCurves.cs" />
     <Compile Include="Animation\Bone.cs" />
     <Compile Include="Animation\Interop\NativeAnimation.cs" />
+    <Compile Include="Animation\MorphShapes.cs" />
     <Compile Include="Animation\Skeleton.cs" />
     <Compile Include="Audio\Audio.cs" />
     <Compile Include="Audio\AudioClip.cs" />

Source/MBansheeEngine/Rendering/Mesh.cs

@@ -160,6 +160,14 @@ namespace BansheeEngine
             get { return Internal_GetSkeleton(mCachedPtr); }
         }
 
+        /// <summary>
+        /// Returns an object containing all shapes used for morph animation, if any are available.
+        /// </summary>
+        public MorphShapes MorphShapes
+        {
+            get { return Internal_GetMorphShapes(mCachedPtr); }
+        }
+
         [MethodImpl(MethodImplOptions.InternalCall)]
         private static extern void Internal_CreateInstance(Mesh instance, int numVertices,
             int numIndices, SubMesh[] subMeshes, MeshUsage usage, VertexType vertex, IndexType index);
@@ -177,6 +185,9 @@ namespace BansheeEngine
         [MethodImpl(MethodImplOptions.InternalCall)]
         private static extern Skeleton Internal_GetSkeleton(IntPtr thisPtr);
 
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern MorphShapes Internal_GetMorphShapes(IntPtr thisPtr);
+
         [MethodImpl(MethodImplOptions.InternalCall)]
         private static extern void Internal_GetBounds(IntPtr thisPtr, out AABox box, out Sphere sphere);
 

Source/MBansheeEngine/Rendering/Renderable.cs

@@ -164,7 +164,8 @@ namespace BansheeEngine
         /// <param name="animation">Component that was added</param>
         internal void RegisterAnimation(Animation animation)
         {
-            bool isMeshAnimated = serializableData.mesh != null && serializableData.mesh.Skeleton != null; // TODO - Also check for blend shapes here
+            bool isMeshAnimated = serializableData.mesh != null && 
+                (serializableData.mesh.Skeleton != null || serializableData.mesh.MorphShapes != null);
 
             if (!isMeshAnimated)
                 return;

Source/SBansheeEngine/CMakeSources.cmake

@@ -146,6 +146,7 @@ set(BS_SBANSHEEENGINE_INC_WRAPPERS
 	"Include/BsScriptAnimationCurve.h"
 	"Include/BsScriptAnimationCurves.h"
 	"Include/BsScriptSkeleton.h"
+	"Include/BsScriptMorphShapes.h"
 )
 
 set(BS_SBANSHEEENGINE_INC_WRAPPERS_GUI
@@ -282,6 +283,7 @@ set(BS_SBANSHEEENGINE_SRC_WRAPPERS
 	"Source/BsScriptAnimationCurve.cpp"
 	"Source/BsScriptAnimationCurves.cpp"
 	"Source/BsScriptSkeleton.cpp"
+	"Source/BsScriptMorphShapes.cpp"
 )
 
 set(BS_SBANSHEEENGINE_INC_SERIALIZATION

Source/SBansheeEngine/Include/BsScriptAnimation.h

@@ -55,6 +55,8 @@ namespace BansheeEngine
 		static bool internal_GetState(ScriptAnimation* thisPtr, ScriptAnimationClip* clip, AnimationClipState* state);
 		static void internal_SetState(ScriptAnimation* thisPtr, ScriptAnimationClip* clip, AnimationClipState* state);
 
+		static void internal_SetMorphShapeWeight(ScriptAnimation* thisPtr, UINT32 idx, float weight);
+
 		static UINT32 internal_GetNumClips(ScriptAnimation* thisPtr);
 		static MonoObject* internal_GetClip(ScriptAnimation* thisPtr, UINT32 idx);
 

Source/SBansheeEngine/Include/BsScriptMesh.h

@@ -85,6 +85,7 @@ namespace BansheeEngine
 		static MonoArray* internal_GetSubMeshes(ScriptMesh* thisPtr);
 		static UINT32 internal_GetSubMeshCount(ScriptMesh* thisPtr);
 		static MonoObject* internal_GetSkeleton(ScriptMesh* thisPtr);
+		static MonoObject* internal_GetMorphShapes(ScriptMesh* thisPtr);
 		static void internal_GetBounds(ScriptMesh* thisPtr, AABox* box, Sphere* sphere);
 		static MonoObject* internal_GetMeshData(ScriptMesh* thisPtr);
 		static void internal_SetMeshData(ScriptMesh* thisPtr, ScriptMeshData* value);

Source/SBansheeEngine/Include/BsScriptMorphShapes.h

@@ -0,0 +1,41 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
+#pragma once
+
+#include "BsScriptEnginePrerequisites.h"
+#include "BsScriptObject.h"
+#include "BsAnimation.h"
+
+namespace BansheeEngine
+{
+	class ScriptAnimationClip;
+
+	/** @addtogroup ScriptInteropEngine
+	 *  @{
+	 */
+
+	/**	Interop class between C++ & CLR for MorphShapes. */
+	class BS_SCR_BE_EXPORT ScriptMorphShapes : public ScriptObject <ScriptMorphShapes>
+	{
+	public:
+		SCRIPT_OBJ(ENGINE_ASSEMBLY, "BansheeEngine", "MorphShapes")
+
+		/**	Returns the native wrapped object. */
+		SPtr<MorphShapes> getInternal() const { return mMorphShapes; }
+
+		/** Creates a managed object from the native morph shapes object. */
+		static MonoObject* create(const SPtr<MorphShapes>& morphShapes);
+
+	private:
+		ScriptMorphShapes(MonoObject* managedInstance, const SPtr<MorphShapes>& morphShapes);
+
+		SPtr<MorphShapes> mMorphShapes;
+
+		/************************************************************************/
+		/* 								CLR HOOKS						   		*/
+		/************************************************************************/
+		static MonoArray* internal_GetShapes(ScriptMorphShapes* thisPtr);
+	};
+
+	/** @} */
+}

Source/SBansheeEngine/Source/BsScriptAnimation.cpp

@@ -49,6 +49,8 @@ namespace BansheeEngine
 		metaData.scriptClass->addInternalCall("Internal_GetState", &ScriptAnimation::internal_GetState);
 		metaData.scriptClass->addInternalCall("Internal_SetState", &ScriptAnimation::internal_SetState);
 
+		metaData.scriptClass->addInternalCall("Internal_SetMorphShapeWeight", &ScriptAnimation::internal_SetMorphShapeWeight);
+
 		metaData.scriptClass->addInternalCall("Internal_GetNumClips", &ScriptAnimation::internal_GetNumClips);
 		metaData.scriptClass->addInternalCall("Internal_GetClip", &ScriptAnimation::internal_GetClip);
 
@@ -192,6 +194,11 @@ namespace BansheeEngine
 		thisPtr->getInternal()->setState(nativeClip, *state);
 	}
 
+	void ScriptAnimation::internal_SetMorphShapeWeight(ScriptAnimation* thisPtr, UINT32 idx, float weight)
+	{
+		thisPtr->getInternal()->setMorphShapeWeight(idx, weight);
+	}
+
 	bool ScriptAnimation::internal_GetGenericCurveValue(ScriptAnimation* thisPtr, UINT32 curveIdx, float* value)
 	{
 		return thisPtr->getInternal()->getGenericCurveValue(curveIdx, *value);

Source/SBansheeEngine/Source/BsScriptMesh.cpp

@@ -9,6 +9,7 @@
 #include "BsMonoManager.h"
 #include "BsCoreThread.h"
 #include "BsScriptSkeleton.h"
+#include "BsScriptMorphShapes.h"
 
 namespace BansheeEngine
 {
@@ -43,6 +44,7 @@ namespace BansheeEngine
 		metaData.scriptClass->addInternalCall("Internal_GetSubMeshes", &ScriptMesh::internal_GetSubMeshes);
 		metaData.scriptClass->addInternalCall("Internal_GetSubMeshCount", &ScriptMesh::internal_GetSubMeshCount);
 		metaData.scriptClass->addInternalCall("Internal_GetSkeleton", &ScriptMesh::internal_GetSkeleton);
+		metaData.scriptClass->addInternalCall("Internal_GetMorphShapes", &ScriptMesh::internal_GetMorphShapes);
 		metaData.scriptClass->addInternalCall("Internal_GetBounds", &ScriptMesh::internal_GetBounds);
 		metaData.scriptClass->addInternalCall("Internal_GetMeshData", &ScriptMesh::internal_GetMeshData);
 		metaData.scriptClass->addInternalCall("Internal_SetMeshData", &ScriptMesh::internal_SetMeshData);
@@ -126,6 +128,17 @@ namespace BansheeEngine
 		return ScriptSkeleton::create(skeleton);
 	}
 
+	MonoObject* ScriptMesh::internal_GetMorphShapes(ScriptMesh* thisPtr)
+	{
+		HMesh mesh = thisPtr->getHandle();
+
+		SPtr<MorphShapes> morphShapes = mesh->getMorphShapes();
+		if (morphShapes == nullptr)
+			return nullptr;
+
+		return ScriptMorphShapes::create(morphShapes);
+	}
+
 	void ScriptMesh::internal_GetBounds(ScriptMesh* thisPtr, AABox* box, Sphere* sphere)
 	{
 		HMesh mesh = thisPtr->getHandle();

Source/SBansheeEngine/Source/BsScriptMorphShapes.cpp

@@ -0,0 +1,48 @@
+//********************************** Banshee Engine (www.banshee3d.com) **************************************************//
+//**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
+#include "BsScriptMorphShapes.h"
+#include "BsScriptMeta.h"
+#include "BsMonoField.h"
+#include "BsMonoMethod.h"
+#include "BsMonoClass.h"
+#include "BsMonoManager.h"
+#include "BsMonoUtil.h"
+#include "BsMorphShapes.h"
+
+using namespace std::placeholders;
+
+namespace BansheeEngine
+{
+	ScriptMorphShapes::ScriptMorphShapes(MonoObject* managedInstance, const SPtr<MorphShapes>& morphShapes)
+		:ScriptObject(managedInstance), mMorphShapes(morphShapes)
+	{ }
+
+	void ScriptMorphShapes::initRuntimeData()
+	{
+		metaData.scriptClass->addInternalCall("Internal_GetShapes", &ScriptMorphShapes::internal_GetShapes);
+	}
+
+	MonoObject* ScriptMorphShapes::create(const SPtr<MorphShapes>& morphShapes)
+	{
+		MonoObject* instance = metaData.scriptClass->createInstance();
+
+		new (bs_alloc<ScriptMorphShapes>()) ScriptMorphShapes(instance, morphShapes);
+		return instance;
+	}
+
+	MonoArray* ScriptMorphShapes::internal_GetShapes(ScriptMorphShapes* thisPtr)
+	{
+		SPtr<MorphShapes> morphShapes = thisPtr->getInternal();
+
+		UINT32 numShapes = morphShapes->getNumShapes();
+		ScriptArray scriptArray(MonoUtil::getStringClass(), numShapes);
+
+		for (UINT32 i = 0; i < numShapes; i++)
+		{
+			MonoString* monoString = MonoUtil::stringToMono(morphShapes->getShape(i)->getName());
+			scriptArray.set(i, monoString);
+		}
+
+		return scriptArray.getInternal();
+	}
+}