Merge remote-tracking branch 'public/release_candidate' into release

Author: Cry-Build

Code/CryEngine/Cry3DEngine/3dEngine.h

@@ -1032,7 +1032,7 @@ class C3DEngine : public I3DEngine, public Cry3DEngineBase
 	IStatObj*                        CreateStatObj();
 	virtual IStatObj*                CreateStatObjOptionalIndexedMesh(bool createIndexedMesh);
 
-	IStatObj*                        UpdateDeformableStatObj(IGeometry* pPhysGeom, bop_meshupdate* pLastUpdate = 0, IFoliage* pSrcFoliage = 0);
+	IStatObj*                        UpdateDeformableStatObj(IGeometry* pPhysGeom, bop_meshupdate* pLastUpdate = 0, IFoliage* pSrcFoliage = 0, IMaterial* pMtlOverride = nullptr);
 
 	// Creates a new indexed mesh.
 	IIndexedMesh*                 CreateIndexedMesh();

Code/CryEngine/Cry3DEngine/StatObjPhys.cpp

@@ -461,9 +461,9 @@ static int InjectVertices(CMesh* pMesh, int nNewVtx, SMeshBoneMapping_uint8*& pB
 	return nVtx0;
 }
 
-IStatObj* C3DEngine::UpdateDeformableStatObj(IGeometry* pPhysGeom, bop_meshupdate* pLastUpdate, IFoliage* pSrcFoliage)
+IStatObj* C3DEngine::UpdateDeformableStatObj(IGeometry* pPhysGeom, bop_meshupdate* pLastUpdate, IFoliage* pSrcFoliage, IMaterial* pMtlOverride)
 {
-	int i, j, j1, itri, iop, itriOrg, ivtx, ivtxNew, nTris0, nVtx0, iSubsetB = 0, nNewVtx, nNewPhysVtx, ivtxRef, bEmptyObj, ibox;
+	int i, j, j1, itri, iop, itriOrg, ivtx, ivtxNew, nTris0, nVtx0, iSubsetB = 0, nNewVtx, nNewPhysVtx, ivtxRef, bEmptyObj, ibox, bSubtract = 1;
 	int* pIdx2iTri, * piTri2Idx, * pSubsets, * pSubsets0, * pVtxWeld;
 	int bHasColors[2] = { 0, 0 };
 	vtx_idx* pIdx0, * pIdx;
@@ -522,6 +522,7 @@ IStatObj* C3DEngine::UpdateDeformableStatObj(IGeometry* pPhysGeom, bop_meshupdat
 		(pStatObj[0] = CreateStatObj());//->AddRef();
 		pStatObj[0]->SetFlags(STATIC_OBJECT_CLONE | STATIC_OBJECT_GENERATED);
 		((CStatObj*)pStatObj[0])->m_bTmpIndexedMesh = true;
+		bSubtract = 0;
 	}
 	else if (!(pStatObj[0]->GetFlags() & STATIC_OBJECT_CLONE))
 	{
@@ -613,7 +614,7 @@ IStatObj* C3DEngine::UpdateDeformableStatObj(IGeometry* pPhysGeom, bop_meshupdat
 	for (i = 0; i < (int)pMesh[0]->m_subsets.size(); i++)
 		for (j = pMesh[0]->m_subsets[i].nFirstIndexId / 3; j*3 < pMesh[0]->m_subsets[i].nFirstIndexId + pMesh[0]->m_subsets[i].nNumIndices; j++)
 			pSubsets[j] = i + (0x1000 & ~-iszero(pMesh[0]->m_subsets[i].nPhysicalizeType - PHYS_GEOM_TYPE_DEFAULT));
-	pMaterial[0] = pStatObj[0]->GetMaterial();
+	pMaterial[0] = pMtlOverride ? pMtlOverride : pStatObj[0]->GetMaterial();
 
 	for (pmu = pmu0; pmu; pmu = pmu->next)
 	{
@@ -876,7 +877,7 @@ IStatObj* C3DEngine::UpdateDeformableStatObj(IGeometry* pPhysGeom, bop_meshupdat
 							pmu->pNewVtx[ivtxNew].idxTri[iop] = -(ivtx + 1);
 
 						Quat qrot = Quat(IDENTITY) * (1.0f - iop) + pmu->relRot * (float)iop;
-						int flip = 1 - (iop & isneg(-pmu->relScale)) * 2;
+						int flip = 1 - (iop & bSubtract & isneg(-pmu->relScale)) * 2;
 
 						pTexCoord[0][ivtx] = SMeshTexCoord(Coord);
 						pTangents[0][ivtx] = SMeshTangents(qrot * Tangent, qrot * Bitangent, NormalFlip * (int16)flip);
@@ -1460,7 +1461,7 @@ static inline float qmax(float op1, float op2) { return (op1 + op2 + fabsf(op1 -
 
 static int __s_pvtx_map_dummy = 0;
 
-void SyncToRenderMesh(SSyncToRenderMeshContext* ctx, volatile int* updateState)
+void SyncToRenderMesh(SSyncToRenderMeshContext* ctx)
 {
 	IGeometry* pPhysGeom = ctx->pObj->GetPhysGeom() ? ctx->pObj->GetPhysGeom()->pGeom : 0;
 	if (pPhysGeom)
@@ -1469,14 +1470,7 @@ void SyncToRenderMesh(SSyncToRenderMeshContext* ctx, volatile int* updateState)
 		IStatObj* pObjSrc = (IStatObj*)pPhysGeom->GetForeignData(0);
 		if (pPhysGeom->GetForeignData(DATA_MESHUPDATE) || !ctx->pObj->m_hasClothTangentsData || pObjSrc != ctx->pObj && pObjSrc != ctx->pObj->GetCloneSourceObject())
 		{
-			// skip all updates if the mesh was altered
-			if (updateState)
-				CryInterlockedDecrement(updateState);
 			pPhysGeom->Unlock(0);
-
-			if (ctx->pObj->m_hasClothTangentsData && ctx->pObj->m_pClothTangentsData)
-				ctx->mesh->UnlockStream(VSF_TANGENTS);
-			ctx->mesh->UnlockStream(VSF_GENERAL);
 			return;
 		}
 	}
@@ -1487,9 +1481,13 @@ void SyncToRenderMesh(SSyncToRenderMeshContext* ctx, volatile int* updateState)
 	strided_pointer<Vec3> pVtx = ctx->pVtx;
 	int* pVtxMap = (mask == ~0) ? &__s_pvtx_map_dummy : ctx->pVtxMap;
 	float rscale = ctx->rscale;
+	ctx->mesh->LockForThreadAccess();
 	SClothTangentVtx* ctd = ctx->ctd;
-	strided_pointer<Vec3> pMeshVtx = ctx->pMeshVtx;
-	strided_pointer<SPipTangents> pTangents = ctx->pTangents;
+	strided_pointer<Vec3> pMeshVtx;
+	pMeshVtx.data = (Vec3*)ctx->mesh->GetPosPtr(pMeshVtx.iStride, FSL_SYSTEM_UPDATE);
+	strided_pointer<SPipTangents> pTangents;
+	if (ctx->pObj->m_hasClothTangentsData && ctx->pObj->m_pClothTangentsData)
+		pTangents.data = (SPipTangents*)ctx->mesh->GetTangentPtr(pTangents.iStride, FSL_SYSTEM_UPDATE);
 	strided_pointer<Vec3> pNormals = ctx->pNormals;
 
 	AABB bbox;
@@ -1532,24 +1530,23 @@ void SyncToRenderMesh(SSyncToRenderMeshContext* ctx, volatile int* updateState)
 		}
 	}
 
-	if (updateState)
-		CryInterlockedDecrement(updateState);
 	if (pPhysGeom)
 		pPhysGeom->Unlock(0);
 
 	if (ctx->pObj->m_hasClothTangentsData && ctx->pObj->m_pClothTangentsData)
 		ctx->mesh->UnlockStream(VSF_TANGENTS);
 	ctx->mesh->UnlockStream(VSF_GENERAL);
+	ctx->mesh->UnLockForThreadAccess();
 }
 
 DECLARE_JOB(
   "StatObj_SyncToRenderMesh"
   , TStatObj_SyncToRenderMesh
   , SyncToRenderMesh);
 
-void SkinVertices(SSyncToRenderMeshContext* ctx, volatile int* ready)
+void SkinVertices(SSyncToRenderMeshContext* ctx)
 {
-	ctx->pObj->SkinVertices(ctx->pVtx, Matrix34(IDENTITY), ready);
+	ctx->pObj->SkinVertices(ctx->pVtx, Matrix34(IDENTITY));
 }
 
 DECLARE_JOB(
@@ -1562,8 +1559,6 @@ IStatObj* CStatObj::UpdateVertices(strided_pointer<Vec3> pVtx, strided_pointer<V
 	CStatObj* pObj = this;
 	if (m_pRenderMesh)
 	{
-		strided_pointer<Vec3> pMeshVtx;
-		strided_pointer<SPipTangents> pTangents;
 		int i, j, mask = 0, dummy = 0, nVtxFull;
 		if (!pVtxMap)
 			pVtxMap = &dummy, mask = ~0;
@@ -1580,6 +1575,7 @@ IStatObj* CStatObj::UpdateVertices(strided_pointer<Vec3> pVtx, strided_pointer<V
 			memset(m_pClothTangentsData, 0, sizeof(SClothTangentVtx) * nVtxFull);
 			mesh_data* pmd = (mesh_data*)GetPhysGeom()->pGeom->GetData();
 			m_pRenderMesh->LockForThreadAccess();
+			strided_pointer<SPipTangents> pTangents;
 			pTangents.data = (SPipTangents*)m_pRenderMesh->GetTangentPtr(pTangents.iStride, FSL_READ);
 			for (i = 0; i < pmd->nTris; i++)
 				for (j = 0; j < 3; j++)
@@ -1665,11 +1661,9 @@ IStatObj* CStatObj::UpdateVertices(strided_pointer<Vec3> pVtx, strided_pointer<V
 			{
 				if (GetCVars()->e_RenderMeshUpdateAsync)
 				{
-					IRenderMesh* mesh = pObj->m_pRenderMesh;
-					mesh->LockForThreadAccess();
 					m_pAsyncUpdateContext->pObj = pObj;
 					m_pAsyncUpdateContext->pVtx = pVtx;
-					TStatObj_SkinVertices job(m_pAsyncUpdateContext, mesh->SetAsyncUpdateState());
+					TStatObj_SkinVertices job(m_pAsyncUpdateContext);
 					job.RegisterJobState(&m_pAsyncUpdateContext->jobState);
 					job.Run();
 				}
@@ -1684,29 +1678,19 @@ IStatObj* CStatObj::UpdateVertices(strided_pointer<Vec3> pVtx, strided_pointer<V
 		if (!pVtx)
 			return pObj;
 
-		IRenderMesh* mesh = pObj->m_pRenderMesh;
-		mesh->LockForThreadAccess();
-		pMeshVtx.data = (Vec3*)((mesh = pObj->m_pRenderMesh)->GetPosPtr(pMeshVtx.iStride, FSL_SYSTEM_UPDATE));
-		if (m_hasClothTangentsData && m_pClothTangentsData)
-		{
-			pTangents.data = (SPipTangents*)mesh->GetTangentPtr(pTangents.iStride, FSL_SYSTEM_UPDATE);
-		}
-
 		m_pAsyncUpdateContext->Set(&pObj->m_AABB.min, &pObj->m_AABB.max, iVtx0, nVtx, pVtx, pVtxMap, mask, rscale
-		                           , m_pClothTangentsData, pMeshVtx, pTangents, pNormals, pObj, mesh);
+		                           , m_pClothTangentsData, nullptr, nullptr, pNormals, pObj, pObj->m_pRenderMesh);
 
 		if (GetCVars()->e_RenderMeshUpdateAsync)
 		{
-			TStatObj_SyncToRenderMesh job(m_pAsyncUpdateContext, mesh->SetAsyncUpdateState());
+			TStatObj_SyncToRenderMesh job(m_pAsyncUpdateContext);
 			job.RegisterJobState(&m_pAsyncUpdateContext->jobState);
 			job.Run();
 		}
 		else
 		{
-			SyncToRenderMesh(m_pAsyncUpdateContext, NULL);
+			SyncToRenderMesh(m_pAsyncUpdateContext);
 		}
-
-		mesh->UnLockForThreadAccess();
 	}
 	return pObj;
 }

Code/CryEngine/CryAction/ILevelSystem.h

@@ -89,7 +89,7 @@ struct ILevelInfo
 {
 	virtual ~ILevelInfo(){}
 
-	typedef struct
+	struct SGameTypeInfo
 	{
 		string name;
 		string xmlFile;
@@ -99,7 +99,7 @@ struct ILevelInfo
 			pSizer->AddObject(name);
 			pSizer->AddObject(xmlFile);
 		}
-	} TGameTypeInfo;
+	};
 
 	struct SMinimapInfo
 	{
@@ -129,9 +129,9 @@ struct ILevelInfo
 	virtual const uint32                     GetLevelTag() const = 0;
 
 	virtual int                              GetGameTypeCount() const = 0;
-	virtual const ILevelInfo::TGameTypeInfo* GetGameType(int gameType) const = 0;
+	virtual const ILevelInfo::SGameTypeInfo* GetGameType(int gameType) const = 0;
 	virtual bool                             SupportsGameType(const char* gameTypeName) const = 0;
-	virtual const ILevelInfo::TGameTypeInfo* GetDefaultGameType() const = 0;
+	virtual const ILevelInfo::SGameTypeInfo* GetDefaultGameType() const = 0;
 	virtual size_t                           GetGameRulesCount() const = 0;
 	virtual size_t                           GetGameRules(const char** pszGameRules, size_t numGameRules) const = 0;
 	virtual bool                             HasGameRules() const = 0;

Code/CryEngine/CryAction/LevelSystem.cpp

@@ -721,7 +721,7 @@ bool CLevelInfo::ReadInfo()
 
 						if (gameTypeName)
 						{
-							ILevelInfo::TGameTypeInfo info;
+							ILevelInfo::SGameTypeInfo info;
 
 							info.cgfCount = 0;
 							gameTypeNode->getAttr("CGFCount", info.cgfCount);
@@ -855,7 +855,7 @@ void CLevelInfo::ReadMetaData()
 }
 
 //------------------------------------------------------------------------
-const ILevelInfo::TGameTypeInfo* CLevelInfo::GetDefaultGameType() const
+const ILevelInfo::SGameTypeInfo* CLevelInfo::GetDefaultGameType() const
 {
 	if (!m_gameTypes.empty())
 	{

Code/CryEngine/CryAction/LevelSystem.h

@@ -48,9 +48,9 @@ class CLevelInfo :
 	virtual const bool                       MetadataLoaded() const override          { return m_bMetaDataRead; }
 
 	virtual int                              GetGameTypeCount() const override        { return m_gameTypes.size(); };
-	virtual const ILevelInfo::TGameTypeInfo* GetGameType(int gameType) const override { return &m_gameTypes[gameType]; };
+	virtual const ILevelInfo::SGameTypeInfo* GetGameType(int gameType) const override { return &m_gameTypes[gameType]; };
 	virtual bool                             SupportsGameType(const char* gameTypeName) const override;
-	virtual const ILevelInfo::TGameTypeInfo* GetDefaultGameType() const override;
+	virtual const ILevelInfo::SGameTypeInfo* GetDefaultGameType() const override;
 	virtual bool                             HasGameRules() const override            { return !m_gamerules.empty(); }
 
 	virtual const ILevelInfo::SMinimapInfo&  GetMinimapInfo() const override          { return m_minimapInfo; }
@@ -87,7 +87,7 @@ class CLevelInfo :
 	uint32                                 m_scanTag;
 	uint32                                 m_levelTag;
 	bool                                   m_bMetaDataRead;
-	std::vector<ILevelInfo::TGameTypeInfo> m_gameTypes;
+	std::vector<ILevelInfo::SGameTypeInfo> m_gameTypes;
 	bool                                   m_isModLevel;
 	SMinimapInfo                           m_minimapInfo;
 	typedef std::map<string, TFlowInputData, stl::less_stricmp<string>> TAttributeList;

Code/CryEngine/CryAction/Network/CET_EntitySystem.cpp

@@ -108,7 +108,7 @@ class CCET_RandomSystemReset final : public CCET_Base
 				// if we're about to load a new level and throw this data away
 				if (!m_loadingNewLevel)
 				{
-					const ILevelInfo::TGameTypeInfo* pGameTypeInfo = pLevel->GetDefaultGameType();
+					const ILevelInfo::SGameTypeInfo* pGameTypeInfo = pLevel->GetDefaultGameType();
 					const char* const szGameTypeName = pGameTypeInfo ? pGameTypeInfo->name.c_str() : "";
 					gEnv->pAISystem->LoadLevelData(pLevel->GetPath(), szGameTypeName);
 				}

Code/CryEngine/CryAction/Serialization/GameSerialize.cpp

@@ -807,7 +807,7 @@ ELoadGameResult CGameSerialize::LoadGame(CCryAction* pCryAction, const char* met
 		CRY_ASSERT(CCryAction::GetCryAction()->StartedGameContext() == false || (pLevelInfo != 0), "Can't find level info: This might break AI");
 		if (pLevelInfo)
 		{
-			const ILevelInfo::TGameTypeInfo* pGameTypeInfo = pLevelInfo->GetDefaultGameType();
+			const ILevelInfo::SGameTypeInfo* pGameTypeInfo = pLevelInfo->GetDefaultGameType();
 			const char* const szGameTypeName = pGameTypeInfo ? pGameTypeInfo->name.c_str() : "";
 			if (gEnv->pAISystem)
 			{
@@ -1530,7 +1530,7 @@ bool CGameSerialize::LoadLevel(SLoadEnvironment& loadEnv, SGameStartParams& star
 	CRY_ASSERT(CCryAction::GetCryAction()->StartedGameContext() == false || (pLevelInfo != 0), "Can't find level info: This might break AI");
 	if (pLevelInfo)
 	{
-		const ILevelInfo::TGameTypeInfo* pGameTypeInfo = pLevelInfo->GetDefaultGameType();
+		const ILevelInfo::SGameTypeInfo* pGameTypeInfo = pLevelInfo->GetDefaultGameType();
 		const char* const szGameTypeName = pGameTypeInfo ? pGameTypeInfo->name.c_str() : "";
 		if (gEnv->pAISystem)
 		{

Code/CryEngine/CryAudioSystem/implementations/CryAudioImplFmod/Impl.cpp

@@ -518,7 +518,39 @@ void CImpl::UnregisterInMemoryFile(SFileInfo* const pFileInfo)
 
 		if (pFileData != nullptr)
 		{
-			CRY_VERIFY(pFileData->pBank->unload() == FMOD_OK);
+			// Stop all playing events before unloading.
+			int eventCount = 0;
+			CRY_VERIFY(pFileData->pBank->getEventCount(&eventCount) == FMOD_OK, "Failed to retrieve event count during %s", __FUNCTION__);
+			std::vector<::FMOD::Studio::EventDescription*> eventDescriptions(eventCount);
+
+			if (!eventDescriptions.empty())
+			{
+				CRY_VERIFY(pFileData->pBank->getEventList(&eventDescriptions[0], eventCount, &eventCount) == FMOD_OK, "Failed to retrieve event list during %s", __FUNCTION__);
+
+				for (::FMOD::Studio::EventDescription* pEventDescription : eventDescriptions)
+				{
+					int instanceCount = 0;
+					CRY_VERIFY(pEventDescription->getInstanceCount(&instanceCount) == FMOD_OK, "Failed to retrieve instance count during %s", __FUNCTION__);
+					std::vector<::FMOD::Studio::EventInstance*> eventInstances(instanceCount);
+
+					if (!eventInstances.empty())
+					{
+						CRY_VERIFY(pEventDescription->getInstanceList(&eventInstances[0], instanceCount, &instanceCount) == FMOD_OK, "Failed to retrieve instance list during %s", __FUNCTION__);
+
+						for (::FMOD::Studio::EventInstance* pEventInstance : eventInstances)
+						{
+							void* pUserData = nullptr;
+							CRY_VERIFY(pEventInstance->getUserData(&pUserData) == FMOD_OK, "Failed to retrieve CEventInstance during %s", __FUNCTION__);
+							CEventInstance* pCEventInstance = reinterpret_cast<CEventInstance*>(pUserData);
+							pCEventInstance->SetToBeRemoved();
+						}
+
+						CRY_VERIFY(pEventDescription->releaseAllInstances() == FMOD_OK, "Failed to release playing instances during %s", __FUNCTION__);
+					}
+				}
+			}
+
+			CRY_VERIFY(pFileData->pBank->unload() == FMOD_OK, "Failed to unload bank \"%s\" during %s", pFileInfo->filePath, __FUNCTION__);
 
 			FMOD_STUDIO_LOADING_STATE loadingState;
 

Code/CryEngine/CryCommon/Cry3DEngine/I3DEngine.h

@@ -2011,7 +2011,7 @@ struct I3DEngine : public IProcess
 
 	//! Updates rendering mesh in the stat obj associated with pPhysGeom.
 	//! \note Creates or clones the object if necessary.
-	virtual IStatObj* UpdateDeformableStatObj(IGeometry* pPhysGeom, bop_meshupdate* pLastUpdate = 0, IFoliage* pSrcFoliage = 0) = 0;
+	virtual IStatObj* UpdateDeformableStatObj(IGeometry* pPhysGeom, bop_meshupdate* pLastUpdate = 0, IFoliage* pSrcFoliage = 0, IMaterial* pMtlOverride = nullptr) = 0;
 
 	//! Saves/loads state of engine objects.
 	virtual void SerializeState(TSerialize ser) = 0;

Code/CryEngine/CryCommon/CryPhysics/physinterface.h

@@ -1044,7 +1044,7 @@ struct pe_params_car : pe_params
 	float  kDynFriction;            //!< friction modifier for sliping wheels
 	float  steerTrackNeutralTurn;   //!< for tracked vehicles, steering angle that causes equal but opposite forces on tracks
 	float  pullTilt;                //!< for tracked vehicles, tilt angle of pulling force towards ground
-	float  maxTilt;                 //!< maximum wheel contact normal tilt (left or right) after which it acts as a locked part of the hull; it's a cosine of the angle
+	float  maxTilt;                 //!< maximum wheel contact normal tilt (left or right) after which it acts as a locked part of the hull
 	int    bKeepTractionWhenTilted; //!< keeps wheel traction in tilted mode
 	float  wheelMassScale;          //!< scales wheels' masses for inertia computations (default 0)
 };
@@ -2448,8 +2448,8 @@ struct IGeometry
 	{
 		SProxifyParams() : ncells(50), islandMap(-1l), maxLineDot(0.88f), maxLineDist(2.0f), minLineCells(8), minSurfCells(50), surfPrimIters(1.0f), surfMinNormLen(0.5f), surfMergeDist(4.0f),
 			surfNormRefineThresh(0.94f), primVoxInflate(1.5f), primRefillThresh(0.6f), primVfillSurf(0.85f), primVfillLine(0.6f), primSurfOutside(0.4f), capsHRratio(4.0f), maxGeoms(128),
-			skipPrimMask(0), surfMeshMinCells(80), surfMeshIters(7), lenVtxNorm(1.0f), inflatePrims(0), inflateMeshes(0), nVoxPatches(0), mergeIslands(1), convexHull(0), closeHoles(0), forceBBox(0),
-			findPrimSurfaces(1), findPrimLines(1), findMeshes(1), surfMaxAndMinNorms(0), surfRefineWithMesh(1), storeVox(0), reuseVox(0), flipCurCell(0)
+			skipPrimMask(0), surfMeshMinCells(80), surfMeshIters(5), lenVtxNorm(1.0f), inflatePrims(0), inflateMeshes(0), nVoxPatches(0), mergeIslands(1), convexHull(0), closeHoles(0), forceBBox(0),
+			findPrimSurfaces(0), findPrimLines(0), findMeshes(1), surfMaxAndMinNorms(0), surfRefineWithMesh(0), storeVox(0), reuseVox(0), flipCurCell(0)
 		{ MARK_UNUSED qForced, pVoxPatches; }
 		int          ncells;
 		uint64       islandMap;
@@ -2824,7 +2824,8 @@ enum rwi_flags
 	rwi_queue                    = 0x800,        //!< queues the RWI request, when done it'll generate EventPhysRWIResult
 	rwi_force_pierceable_noncoll = 0x1000,       //!< non-colliding geometries will be treated as pierceable regardless of the actual material
 	rwi_update_last_hit          = 0x4000,       //!< update phitLast with the current hit results (should be set if the last hit should be reused for a "warm" start)
-	rwi_any_hit                  = 0x8000        //!< returns the first found hit for meshes, not necessarily the closets
+	rwi_any_hit                  = 0x8000,       //!< returns the first found hit for meshes, not necessarily the closets
+	rwi_auto_grid_start          = 0x10000,			 //!< automatically detect the starting local grid based on the ray's origin
 };
 #define rwi_pierceability(pty)      (pty)
 #define rwi_colltype_all(colltypes) ((colltypes) << rwi_colltype_bit)
@@ -3549,7 +3550,7 @@ struct IPhysicalWorld
 
 	//! DeformPhysicalEntity - applies boolean breaking for entity parts that have >=0 breakability index
 	//! r is used to scale the corresponding explosion (boolean) shape
-	virtual int   DeformPhysicalEntity(IPhysicalEntity* pent, const Vec3& ptHit, const Vec3& dirHit, float r, int flags = 0) = 0;
+	virtual int   DeformPhysicalEntity(IPhysicalEntity* pent, const Vec3& ptHit, const Vec3& dirHit, float r, int flags = 0, const Vec3& dirUp = Vec3(ZERO)) = 0;
 	//! UpdateDeformingEntities - normally this happens automatically during TimeStep; can be called manually for ex. during loading
 	virtual void  UpdateDeformingEntities(float time_interval = 0.01f) = 0; //!< normally this happens during TimeStep
 	//! CalculateExplosionExposure - uses occlusion grid from the last SimulateExplosion to calculate exposure