From ef6937e69e8ee3f409cf9d460d5ad300a65d5924 Mon Sep 17 00:00:00 2001 From: sschirm Date: Fri, 23 Dec 2016 14:20:36 +0100 Subject: PhysX 3.4 / APEX 1.4 release candidate @21506124 --- .../module/basicfs/include/AttractorFSCommon.h | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 APEX_1.4/module/basicfs/include/AttractorFSCommon.h (limited to 'APEX_1.4/module/basicfs/include/AttractorFSCommon.h') diff --git a/APEX_1.4/module/basicfs/include/AttractorFSCommon.h b/APEX_1.4/module/basicfs/include/AttractorFSCommon.h deleted file mode 100644 index 8f673f5f..00000000 --- a/APEX_1.4/module/basicfs/include/AttractorFSCommon.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2015, NVIDIA CORPORATION. All rights reserved. - * - * NVIDIA CORPORATION and its licensors retain all intellectual property - * and proprietary rights in and to this software, related documentation - * and any modifications thereto. Any use, reproduction, disclosure or - * distribution of this software and related documentation without an express - * license agreement from NVIDIA CORPORATION is strictly prohibited. - */ - - -#ifndef __ATTRACTOR_FS_COMMON_SRC_H__ -#define __ATTRACTOR_FS_COMMON_SRC_H__ - -#include "../../fieldsampler/include/FieldSamplerCommon.h" - -namespace nvidia -{ -namespace basicfs -{ - -//struct AttractorFSParams -#define INPLACE_TYPE_STRUCT_NAME AttractorFSParams -#define INPLACE_TYPE_STRUCT_FIELDS \ - INPLACE_TYPE_FIELD(PxVec3, origin) \ - INPLACE_TYPE_FIELD(float, radius) \ - INPLACE_TYPE_FIELD(float, constFieldStrength) \ - INPLACE_TYPE_FIELD(float, variableFieldStrength) -#include INPLACE_TYPE_BUILD() - - -PX_CUDA_CALLABLE PX_INLINE PxVec3 commonAttractorFSKernel(const AttractorFSParams& params, const PxVec3& pos) -{ - PxVec3 dir = params.origin - pos; - PX_ASSERT(params.radius); - float dist = dir.magnitude() / params.radius; - - float result = params.constFieldStrength; - if (dist >= 0.4) - { - result += params.variableFieldStrength / dist; - } - - return result * dir.getNormalized(); -} - -PX_CUDA_CALLABLE PX_INLINE PxVec3 executeAttractorFS(const AttractorFSParams& params, const PxVec3& pos/*, uint32_t totalElapsedMS*/) -{ - PxVec3 dir = params.origin - pos; - PX_ASSERT(params.radius); - float dist = dir.magnitude() / params.radius; - - float result = params.constFieldStrength; - if (dist >= 0.4) - { - result += params.variableFieldStrength / dist; - } - - return result * dir.getNormalized(); -} - -} -} // namespace nvidia - -#endif -- cgit v1.2.3