PhysX 3.4 / APEX 1.4 release candidate @21506124

4 files changed, 16 insertions, 22 deletions

diff --git a/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjectNames.h b/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjectNames.h
index 45022743..148a81d8 100644
--- a/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjectNames.h
+++ b/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjectNames.h
@@ -85,7 +85,6 @@ PxRigidBody_MaxDepenetrationVelocity,
 PxRigidBody_MaxContactImpulse,
 PxRigidBody_PropertiesStop,
 PxRigidDynamic_PropertiesStart,
-PxRigidDynamic_KinematicTarget,
 PxRigidDynamic_LinearDamping,
 PxRigidDynamic_AngularDamping,
 PxRigidDynamic_MaxAngularVelocity,
diff --git a/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjects.h b/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjects.h
index 4dbcf1a4..3fa86f93 100644
--- a/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjects.h
+++ b/PhysX_3.4/Source/PhysXMetaData/core/include/PxAutoGeneratedMetaDataObjects.h
@@ -531,7 +531,6 @@ template<> struct PxEnumTraits< physx::PxRigidDynamicLockFlag::Enum > { PxEnumTr
 		: PxRigidBodyGeneratedInfo
 	{
 		static const char* getClassName() { return "PxRigidDynamic"; }
-		PxWriteOnlyPropertyInfo<PX_PROPERTY_INFO_NAME::PxRigidDynamic_KinematicTarget, PxRigidDynamic, const PxTransform & > KinematicTarget;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxRigidDynamic_LinearDamping, PxRigidDynamic, PxReal, PxReal > LinearDamping;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxRigidDynamic_AngularDamping, PxRigidDynamic, PxReal, PxReal > AngularDamping;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxRigidDynamic_MaxAngularVelocity, PxRigidDynamic, PxReal, PxReal > MaxAngularVelocity;
@@ -565,7 +564,7 @@ template<> struct PxEnumTraits< physx::PxRigidDynamicLockFlag::Enum > { PxEnumTr
 			inStartIndex = PxRigidBodyGeneratedInfo::visitInstanceProperties( inOperator, inStartIndex );
 			return inStartIndex;
 		}
-		static PxU32 instancePropertyCount() { return 12; }
+		static PxU32 instancePropertyCount() { return 11; }
 		static PxU32 totalPropertyCount() { return instancePropertyCount()
 				+ PxRigidBodyGeneratedInfo::totalPropertyCount(); }
 		template<typename TOperator>
@@ -573,19 +572,18 @@ template<> struct PxEnumTraits< physx::PxRigidDynamicLockFlag::Enum > { PxEnumTr
 		{
 			PX_UNUSED(inOperator);
 			PX_UNUSED(inStartIndex);
-			inOperator( KinematicTarget, inStartIndex + 0 );; 
-			inOperator( LinearDamping, inStartIndex + 1 );; 
-			inOperator( AngularDamping, inStartIndex + 2 );; 
-			inOperator( MaxAngularVelocity, inStartIndex + 3 );; 
-			inOperator( IsSleeping, inStartIndex + 4 );; 
-			inOperator( SleepThreshold, inStartIndex + 5 );; 
-			inOperator( StabilizationThreshold, inStartIndex + 6 );; 
-			inOperator( RigidDynamicLockFlags, inStartIndex + 7 );; 
-			inOperator( WakeCounter, inStartIndex + 8 );; 
-			inOperator( SolverIterationCounts, inStartIndex + 9 );; 
-			inOperator( ContactReportThreshold, inStartIndex + 10 );; 
-			inOperator( ConcreteTypeName, inStartIndex + 11 );; 
-			return 12 + inStartIndex;
+			inOperator( LinearDamping, inStartIndex + 0 );; 
+			inOperator( AngularDamping, inStartIndex + 1 );; 
+			inOperator( MaxAngularVelocity, inStartIndex + 2 );; 
+			inOperator( IsSleeping, inStartIndex + 3 );; 
+			inOperator( SleepThreshold, inStartIndex + 4 );; 
+			inOperator( StabilizationThreshold, inStartIndex + 5 );; 
+			inOperator( RigidDynamicLockFlags, inStartIndex + 6 );; 
+			inOperator( WakeCounter, inStartIndex + 7 );; 
+			inOperator( SolverIterationCounts, inStartIndex + 8 );; 
+			inOperator( ContactReportThreshold, inStartIndex + 9 );; 
+			inOperator( ConcreteTypeName, inStartIndex + 10 );; 
+			return 11 + inStartIndex;
 		}
 	};
 	template<> struct PxClassInfoTraits<PxRigidDynamic>
@@ -2612,7 +2610,7 @@ template<> struct PxEnumTraits< physx::PxBroadPhaseType::Enum > { PxEnumTraits()
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_CCDMaxPasses, PxScene, PxU32, PxU32 > CCDMaxPasses;
 		PxReadOnlyPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_FrictionOffsetThreshold, PxScene, PxReal > FrictionOffsetThreshold;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_FrictionType, PxScene, PxFrictionType::Enum, PxFrictionType::Enum > FrictionType;
-		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_VisualizationCullingBox, PxScene, const PxBounds3 &, const PxBounds3 & > VisualizationCullingBox;
+		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_VisualizationCullingBox, PxScene, const PxBounds3 &, PxBounds3 > VisualizationCullingBox;
 		PxReadOnlyPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_StaticStructure, PxScene, PxPruningStructureType::Enum > StaticStructure;
 		PxReadOnlyPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_DynamicStructure, PxScene, PxPruningStructureType::Enum > DynamicStructure;
 		PxPropertyInfo<PX_PROPERTY_INFO_NAME::PxScene_DynamicTreeRebuildRateHint, PxScene, PxU32, PxU32 > DynamicTreeRebuildRateHint;
diff --git a/PhysX_3.4/Source/PhysXMetaData/core/include/PxMetaDataCompare.h b/PhysX_3.4/Source/PhysXMetaData/core/include/PxMetaDataCompare.h
index 8ada141b..39a09018 100644
--- a/PhysX_3.4/Source/PhysXMetaData/core/include/PxMetaDataCompare.h
+++ b/PhysX_3.4/Source/PhysXMetaData/core/include/PxMetaDataCompare.h
@@ -96,7 +96,6 @@ struct EqualityOp
 	void operator()( const PxReadOnlyCollectionPropertyInfo<PxPropertyInfoName::PxArticulationLink_Children, PxArticulationLink, PxArticulationLink* >& inProp, PxU32 ) {}
 	void operator()( const PxReadOnlyCollectionPropertyInfo<PxPropertyInfoName::PxRigidActor_Constraints, PxRigidActor, PxConstraint* >& inProp, PxU32 ){}
 	void operator()( const PxReadOnlyCollectionPropertyInfo<PxPropertyInfoName::PxAggregate_Actors, PxAggregate, PxActor* >& inProp, PxU32 ) {}
-    void operator()( const PxWriteOnlyPropertyInfo<PxPropertyInfoName::PxRigidDynamic_KinematicTarget, PxRigidDynamic, const PxTransform &  >& inProp, PxU32 ) {}
     void operator()( const PxWriteOnlyPropertyInfo<PxPropertyInfoName::PxCloth_TargetPose, PxCloth, const PxTransform &  >& inProp, PxU32 ) {}
 	void operator()( const PxWriteOnlyPropertyInfo<PxPropertyInfoName::PxCloth_InertiaScale, PxCloth, PxReal >& inProp, PxU32 ) {}
 	void operator()( const PxWriteOnlyPropertyInfo<PxPropertyInfoName::PxCloth_DragCoefficient, PxCloth, PxReal >& inProp, PxU32 ) {}
diff --git a/PhysX_3.4/Source/PhysXMetaData/core/src/PxAutoGeneratedMetaDataObjects.cpp b/PhysX_3.4/Source/PhysXMetaData/core/src/PxAutoGeneratedMetaDataObjects.cpp
index 92b7d886..71d7e996 100644
--- a/PhysX_3.4/Source/PhysXMetaData/core/src/PxAutoGeneratedMetaDataObjects.cpp
+++ b/PhysX_3.4/Source/PhysXMetaData/core/src/PxAutoGeneratedMetaDataObjects.cpp
@@ -213,7 +213,6 @@ PX_PHYSX_CORE_API PxRigidBodyGeneratedValues::PxRigidBodyGeneratedValues( const
 {
 	PX_UNUSED(inSource);
 }
-void setPxRigidDynamic_KinematicTarget( PxRigidDynamic* inObj, const PxTransform & inArg){ inObj->setKinematicTarget( inArg ); }
 void setPxRigidDynamic_LinearDamping( PxRigidDynamic* inObj, PxReal inArg){ inObj->setLinearDamping( inArg ); }
 PxReal getPxRigidDynamic_LinearDamping( const PxRigidDynamic* inObj ) { return inObj->getLinearDamping(); }
 void setPxRigidDynamic_AngularDamping( PxRigidDynamic* inObj, PxReal inArg){ inObj->setAngularDamping( inArg ); }
@@ -235,8 +234,7 @@ void setPxRigidDynamic_ContactReportThreshold( PxRigidDynamic* inObj, PxReal inA
 PxReal getPxRigidDynamic_ContactReportThreshold( const PxRigidDynamic* inObj ) { return inObj->getContactReportThreshold(); }
 const char * getPxRigidDynamic_ConcreteTypeName( const PxRigidDynamic* inObj ) { return inObj->getConcreteTypeName(); }
 PX_PHYSX_CORE_API PxRigidDynamicGeneratedInfo::PxRigidDynamicGeneratedInfo()
-	: KinematicTarget( "KinematicTarget", setPxRigidDynamic_KinematicTarget)
-	, LinearDamping( "LinearDamping", setPxRigidDynamic_LinearDamping, getPxRigidDynamic_LinearDamping)
+	: LinearDamping( "LinearDamping", setPxRigidDynamic_LinearDamping, getPxRigidDynamic_LinearDamping)
 	, AngularDamping( "AngularDamping", setPxRigidDynamic_AngularDamping, getPxRigidDynamic_AngularDamping)
 	, MaxAngularVelocity( "MaxAngularVelocity", setPxRigidDynamic_MaxAngularVelocity, getPxRigidDynamic_MaxAngularVelocity)
 	, IsSleeping( "IsSleeping", getPxRigidDynamic_IsSleeping)
@@ -1020,7 +1018,7 @@ PxReal getPxScene_FrictionOffsetThreshold( const PxScene* inObj ) { return inObj
 void setPxScene_FrictionType( PxScene* inObj, PxFrictionType::Enum inArg){ inObj->setFrictionType( inArg ); }
 PxFrictionType::Enum getPxScene_FrictionType( const PxScene* inObj ) { return inObj->getFrictionType(); }
 void setPxScene_VisualizationCullingBox( PxScene* inObj, const PxBounds3 & inArg){ inObj->setVisualizationCullingBox( inArg ); }
-const PxBounds3 & getPxScene_VisualizationCullingBox( const PxScene* inObj ) { return inObj->getVisualizationCullingBox(); }
+PxBounds3 getPxScene_VisualizationCullingBox( const PxScene* inObj ) { return inObj->getVisualizationCullingBox(); }
 PxPruningStructureType::Enum getPxScene_StaticStructure( const PxScene* inObj ) { return inObj->getStaticStructure(); }
 PxPruningStructureType::Enum getPxScene_DynamicStructure( const PxScene* inObj ) { return inObj->getDynamicStructure(); }
 void setPxScene_DynamicTreeRebuildRateHint( PxScene* inObj, PxU32 inArg){ inObj->setDynamicTreeRebuildRateHint( inArg ); }