Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 16 insertions, 62 deletions

diff --git a/sdk/compiler/cmake/NvBlastExtSerialization.cmake b/sdk/compiler/cmake/NvBlastExtSerialization.cmake
index 440ad43..e6cd597 100644
--- a/sdk/compiler/cmake/NvBlastExtSerialization.cmake
+++ b/sdk/compiler/cmake/NvBlastExtSerialization.cmake
@@ -6,11 +6,6 @@ SET(COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/common)
 
 SET(SERIAL_EXT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/extensions/serialization/source)
 SET(SERIAL_EXT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/serialization/include)
-SET(TK_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/toolkit/include)
-SET(PHYSX_EXT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/physx/include)
-SET(PHYSX_EXT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/extensions/physx/source)
-SET(EXT_COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/extensions/common/source)
-SET(EXT_COMMON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/common/include)
 
 SET(DTO_SOURCE_DIR ${SERIAL_EXT_SOURCE_DIR}/DTO)
 
@@ -18,7 +13,6 @@ SET(SOLVER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/lowlevel/source)
 
 SET(SERIAL_GENERATED_SOURCE_DIR ${SERIAL_EXT_SOURCE_DIR}/generated)
 
-FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)
 FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
 FIND_PACKAGE(CapnProtoSDK $ENV{PM_CapnProto_VERSION} REQUIRED)
 
@@ -31,7 +25,7 @@ INCLUDE(CapnProtoGenerate)
 
 SET(CAPNPC_OUTPUT_DIR ${SERIAL_GENERATED_SOURCE_DIR})
 SET(CAPNPC_SRC_PREFIX ${SERIAL_EXT_SOURCE_DIR})
-CAPNP_GENERATE_CPP(CAPNP_SRCS CAPNP_HDRS ${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerializationLL.capn ${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerialization.capn)
+CAPNP_GENERATE_CPP(CAPNP_SRCS CAPNP_HDRS ${SERIAL_EXT_SOURCE_DIR}/NvBlastExtLlSerialization.capn)
 
 SET(COMMON_FILES
 	${BLASTEXTSERIALIZATION_PLATFORM_COMMON_FILES}
@@ -46,7 +40,6 @@ SET(COMMON_FILES
 	${COMMON_SOURCE_DIR}/NvBlastFixedBoolArray.h
 	${COMMON_SOURCE_DIR}/NvBlastFixedPriorityQueue.h
 	${COMMON_SOURCE_DIR}/NvBlastGeometry.h
-#	${COMMON_SOURCE_DIR}/NvBlastIndexFns.cpp
 	${COMMON_SOURCE_DIR}/NvBlastIndexFns.h
 	${COMMON_SOURCE_DIR}/NvBlastIteratorBase.h
 	${COMMON_SOURCE_DIR}/NvBlastMath.h
@@ -59,66 +52,37 @@ SET(COMMON_FILES
   
 
 SET(EXT_SERIALIZATION_FILES
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerializationLL.capn
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerialization.capn
+	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtLlSerialization.capn
 
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerialization.h
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerializationImpl.h
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerializationLLImpl.h
+	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerialization.cpp
+	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtLlSerialization.cpp
 
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerializationLLInterface.cpp
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerializationInterface.cpp
+	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerializationCAPN.h
+
+	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtSerializationInternal.h
+	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtLlSerializerCAPN.h
 	
 	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtOutputStream.h
 	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtOutputStream.cpp
 	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtInputStream.h
 	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtInputStream.cpp
-	
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtKJPxInputStream.h
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtKJPxInputStream.cpp
-	
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtKJPxOutputStream.h
-	${SERIAL_EXT_SOURCE_DIR}/NvBlastExtKJPxOutputStream.cpp
 )
 
 SET(DTO_SOURCE_FILES
 	${DTO_SOURCE_DIR}/DTOMacros.h
 	${DTO_SOURCE_DIR}/AssetDTO.h
 	${DTO_SOURCE_DIR}/AssetDTO.cpp
-	${DTO_SOURCE_DIR}/TkAssetDTO.h
-	${DTO_SOURCE_DIR}/TkAssetDTO.cpp
-	${DTO_SOURCE_DIR}/ExtPxAssetDTO.h
-	${DTO_SOURCE_DIR}/ExtPxAssetDTO.cpp
-	${DTO_SOURCE_DIR}/PxVec3DTO.h
-	${DTO_SOURCE_DIR}/PxVec3DTO.cpp
 	${DTO_SOURCE_DIR}/NvBlastChunkDTO.h
 	${DTO_SOURCE_DIR}/NvBlastChunkDTO.cpp
 	${DTO_SOURCE_DIR}/NvBlastBondDTO.h
 	${DTO_SOURCE_DIR}/NvBlastBondDTO.cpp
 	${DTO_SOURCE_DIR}/NvBlastIDDTO.h
 	${DTO_SOURCE_DIR}/NvBlastIDDTO.cpp
-	${DTO_SOURCE_DIR}/TkAssetJointDescDTO.h
-	${DTO_SOURCE_DIR}/TkAssetJointDescDTO.cpp
-	${DTO_SOURCE_DIR}/ExtPxChunkDTO.h
-	${DTO_SOURCE_DIR}/ExtPxChunkDTO.cpp
-	${DTO_SOURCE_DIR}/ExtPxSubchunkDTO.h
-	${DTO_SOURCE_DIR}/ExtPxSubchunkDTO.cpp
-	${DTO_SOURCE_DIR}/PxQuatDTO.h
-	${DTO_SOURCE_DIR}/PxQuatDTO.cpp
-	${DTO_SOURCE_DIR}/PxTransformDTO.h
-	${DTO_SOURCE_DIR}/PxTransformDTO.cpp
-	${DTO_SOURCE_DIR}/PxMeshScaleDTO.h
-	${DTO_SOURCE_DIR}/PxMeshScaleDTO.cpp
-	${DTO_SOURCE_DIR}/PxConvexMeshGeometryDTO.h
-	${DTO_SOURCE_DIR}/PxConvexMeshGeometryDTO.cpp
-	
-	
-	
 )
 
 SET(EXT_SERIALIZATION_INCLUDES
-	${SERIAL_EXT_INCLUDE_DIR}/NvBlastExtSerializationLLInterface.h
-	${SERIAL_EXT_INCLUDE_DIR}/NvBlastExtSerializationInterface.h
+	${SERIAL_EXT_INCLUDE_DIR}/NvBlastExtSerialization.h
+	${SERIAL_EXT_INCLUDE_DIR}/NvBlastExtLlSerialization.h
 )
 
 ADD_LIBRARY(NvBlastExtSerialization ${BLASTEXTSERIALIZATION_LIB_TYPE} 
@@ -133,6 +97,8 @@ ADD_LIBRARY(NvBlastExtSerialization ${BLASTEXTSERIALIZATION_LIB_TYPE}
 	${CAPNP_HDRS}
 	
 	${MD5_FILES}
+
+	${CAPNPROTOSDK_SOURCE_FILES}
 )
 
 SOURCE_GROUP("common" FILES ${COMMON_FILES})
@@ -141,7 +107,7 @@ SOURCE_GROUP("include" FILES ${EXT_SERIALIZATION_INCLUDES})
 SOURCE_GROUP("src\\serialization" FILES ${EXT_SERIALIZATION_FILES})
 SOURCE_GROUP("src\\serialization\\DTO" FILES ${DTO_SOURCE_FILES})
 SOURCE_GROUP("src\\serialization\\generated" FILES ${CAPNP_SRCS} ${CAPNP_HDRS})
-
+SOURCE_GROUP("src\\serialization\\CapnProtoSDK" FILES ${CAPNPROTOSDK_SOURCE_FILES})
 
 # Target specific compile options
 
@@ -158,22 +124,15 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtSerialization
 	PUBLIC ${SERIAL_EXT_SOURCE_DIR}
 	PUBLIC ${DTO_SOURCE_DIR}
 	
-	PRIVATE ${PHYSX_EXT_INCLUDE_DIR}
-	PRIVATE ${PHYSX_EXT_SOURCE_DIR}
-
-	PRIVATE ${EXT_COMMON_SOURCE_DIR}
-	PRIVATE ${EXT_COMMON_INCLUDE_DIR}
-	
 	PUBLIC ${CAPNPROTOSDK_INCLUDE_DIRS}
 	
 	PRIVATE ${COMMON_SOURCE_DIR}
-	
-	PUBLIC ${PHYSXSDK_INCLUDE_DIRS}
+
 	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
 )
 
 TARGET_COMPILE_DEFINITIONS(NvBlastExtSerialization
-	PUBLIC CAPNP_LITE=1
+	PUBLIC CAPNP_LITE=1;BLAST_LL_ALLOC=1
 	PRIVATE ${BLASTEXTSERIALIZATION_COMPILE_DEFS}
 )
 
@@ -191,10 +150,5 @@ SET_TARGET_PROPERTIES(NvBlastExtSerialization PROPERTIES
 
 # Do final direct sets after the target has been defined
 TARGET_LINK_LIBRARIES(NvBlastExtSerialization 
-	PRIVATE NvBlast NvBlastExtPhysX NvBlastTk ${CAPNPROTOSDK_LIBRARIES}
-	PUBLIC $<$<CONFIG:debug>:${PHYSX3_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSX3COOKING_LIB_DEBUG}>
-	PUBLIC $<$<CONFIG:checked>:${PHYSX3_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSX3COOKING_LIB_CHECKED}>
-	PUBLIC $<$<CONFIG:profile>:${PHYSX3_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSX3COOKING_LIB_PROFILE}>
-	PUBLIC $<$<CONFIG:release>:${PHYSX3_LIB}> $<$<CONFIG:release>:${PHYSX3COOKING_LIB}>
-	
+	PRIVATE NvBlast NvBlastGlobals ${CAPNPROTOSDK_LIBRARIES}
 )