PhysX 3.4 / APEX 1.4 release candidate @21506124

60 files changed, 0 insertions, 15574 deletions

diff --git a/APEX_1.4/module/iofx/include/ARLSort.h b/APEX_1.4/module/iofx/include/ARLSort.h
deleted file mode 100644
index 265fe1b2..00000000
--- a/APEX_1.4/module/iofx/include/ARLSort.h
+++ /dev/null
@@ -1,254 +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 __ARL_SORT_H__
-#define __ARL_SORT_H__
-
-namespace nvidia
-{
-namespace iofx
-{
-
-template <typename TKey, typename TValue>
-class ARLSort
-{
-	static const int MAX_NUM_BIT = 8;  // largest bit num in sorting digit(might bast be tuned between 6 and 12)
-	static const int MIN_NUM_BIT = 4;
-	static const int INSERT_MAX  = 64; // any value below this, use Insertion sort
-
-public:
-
-	static void sort(TKey* keys, TValue* values, int numElems)
-	{
-		if (numElems >= INSERT_MAX)
-		{
-			TKey max = keys[0];
-			for (int i = 1; i < numElems; ++i)
-			{
-				TKey key = keys[i];
-				if (key > max)
-				{
-					max = key;
-				}
-			}
-			if (max > 0)
-			{
-				max >>= 1;
-				int leftBitNo = 0;
-				// find highest bit set
-				while (max > 0)
-				{
-					max >>= 1;
-					leftBitNo++;
-				}
-				sortARLwithBorders(keys, values, 0, numElems - 1, leftBitNo);
-			}
-		}
-		else
-		{
-			insertSort(keys, values, 0, numElems - 1);
-		}
-	}
-
-
-private:
-	static void insertSort(TKey* keys, TValue* values, int left, int right)
-	{
-		for (int k = left; k < right; ++k)
-		{
-			if (keys[k] > keys[k + 1])
-			{
-				TKey tmpKey = keys[k + 1];
-				TValue tmpValue = values[k + 1];
-				int i = k;
-				do
-				{
-					keys[i + 1] = keys[i];
-					values[i + 1] = values[i];
-					--i;
-				}
-				while (i >= left && keys[i] > tmpKey);
-				keys[i + 1] = tmpKey;
-				values[i + 1] = tmpValue;
-			}
-		}
-	}
-
-	/**
-	*  ARL sort with border array, The 2002 version Adaptive Left Radix with Insert-sort as a subalgorithm.
-	*          Sorts positive integers from a[start] 'up to and including'  a[end]
-	*           on bits: leftBitNo, leftBitNo-1,..,leftBitNo -numBit+1 (31..0)
-	*          Uses only internal moves by shifting along permutation cycles <br>
-	*           UNSTABLE
-	*
-	*   @Author: Arne Maus, Dept.of Informatics,Univ. of Oslo,  2002-2009
-	Copyright (c) 2000,2009, Arne Maus, Dept. of Informatics, Univ. of Oslo, Norway.
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-	    * Redistributions of source code must retain the above copyright
-	      notice, this list of conditions and the following disclaimer.
-	    * Redistributions in binary form must reproduce the above copyright
-	      notice, this list of conditions and the following disclaimer in the
-	      documentation and/or other materials provided with the distribution.
-	    * Neither the name of the <organization> nor the
-	      names of its contributors may be used to endorse or promote products
-	      derived from this software without specific prior written permission.
-
-	THIS SOFTWARE IS PROVIDED BY ARNE MAUS, DEPT. OF INFORMATICS, UNIV. OF OSLO, NORWAY ''AS
-	 IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-	 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-	 EVENT SHALL ARNE MAUS, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	 OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-	 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-	 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-	 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-	 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
-	static void sortARLwithBorders(TKey* keys, TValue* values, int start, int end, int leftBitNo)
-	{
-		int num = end - start + 1;
-
-		int point[(1 << MAX_NUM_BIT) + 1];
-		int border[(1 << MAX_NUM_BIT) + 1];
-
-		// adaptive part - adjust numBit : number of bits to sort on in this pass
-		// a) adapts to bits left to sort to sort AND cache-size level 1 (8-32KB)
-		int numBit = leftBitNo + 1;
-		if (numBit > MAX_NUM_BIT)
-		{
-			numBit = MAX_NUM_BIT;
-		}
-		// b) adapts to 'sparse' distribution
-		while ((1 << (numBit - 1)) > num && numBit > MIN_NUM_BIT)
-		{
-			--numBit;
-		}
-		if (numBit == leftBitNo)
-		{
-			++numBit;    // eventually, do the last bit
-		}
-
-		// sort on leftmost 'numBits' starting at bit no: leftBitNo
-		// setting constants
-		int rBitNo = leftBitNo - numBit + 1;
-		int lim = 1 << numBit;
-		TKey mask =  TKey(lim - 1) << rBitNo;
-
-		// sort on  'numBit' bits, from: leftBitNo'to 'rBitNo+1' in a[start..end]
-
-		// c) count-scan 'numBit' bits
-		memset(point, 0, sizeof(point));
-		for (int i = start; i <= end ; i++)
-		{
-			point[(keys[i] & mask) >> rBitNo ]++;
-		}
-
-		int t1, t2 = point[0];
-		point[0] = start;
-
-		for (int i = 1; i <= lim; i++)
-		{
-			// d)  point [i] points to where bundle 'i' starts, stopvalue in borders[lim-1]
-			t1 = t2;
-			t2 = point[i];
-			border[i - 1] = point[i] = point[i - 1] + t1;
-		}
-
-		border[lim - 1] = point[lim];
-		border[lim] = end + 1;
-
-		int currentBox = 0, pos = start;
-
-		//  find next element to move in  permtation cycles
-		// skip cycles of length =1
-
-		while (point[currentBox] == border[currentBox])
-		{
-			currentBox++;
-		}
-
-		while (currentBox < lim)
-		{
-			// find next cycle, skip (most)cycles of length =1
-			pos = point[currentBox];
-			TKey key = keys[pos];
-			TValue value = values[pos];
-
-			// start of new permutation cycle
-			int adr2 = point[(key & mask) >> rBitNo]++;
-
-			if (adr2 > pos)
-			{
-				// permuttion cycle longer than 1 element
-				do
-				{
-					TKey key2 = keys[adr2];
-					TValue value2 = values[adr2];
-					// central loop
-					keys[adr2] = key;
-					values[adr2] = value;
-
-					adr2 = point[(key2 & mask) >> rBitNo]++;
-
-					key = key2;
-					value = value2;
-				}
-				while (adr2 > pos);
-
-				keys[pos] = key;
-				values[pos] = value;
-			}// end perm cycle
-
-			// find box where to find start of new  permutation cycle
-			while (currentBox < lim && point[currentBox] == border[currentBox])
-			{
-				currentBox++;
-			}
-
-		} // end more to sort
-
-		leftBitNo = leftBitNo - numBit;
-
-		if (leftBitNo >= 0)
-		{
-			//  more to sort - recursively
-			t2 = start;
-			for (int i = 0; i < lim; i++)
-			{
-				t1 = t2;
-				t2 = point[i];
-				int newNum = t2 - t1;
-
-				// call each cell if more than one number
-				if (newNum > 1)
-				{
-					if (newNum <= INSERT_MAX)
-					{
-						insertSort(keys, values, t1, t2 - 1);
-					}
-					else
-					{
-						sortARLwithBorders(keys, values, t1, t2 - 1, leftBitNo);
-					}
-				} // if newNum > 1
-			} // end for
-		} // end if leftBitNo
-
-	}// end sortARLwithBorders
-
-};
-
-}
-} // namespace nvidia
-
-#endif // __ARL_SORT_H__
diff --git a/APEX_1.4/module/iofx/include/IofxActorCPU.h b/APEX_1.4/module/iofx/include/IofxActorCPU.h
deleted file mode 100644
index b83f5afc..00000000
--- a/APEX_1.4/module/iofx/include/IofxActorCPU.h
+++ /dev/null
@@ -1,267 +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 __IOFX_ACTOR_CPU_H__
-#define __IOFX_ACTOR_CPU_H__
-
-#include "Apex.h"
-#include "IofxActor.h"
-#include "InstancedObjectSimulationIntl.h"
-#include "ResourceProviderIntl.h"
-#include "ApexActor.h"
-#include "IofxActorImpl.h"
-#include "IofxSceneCPU.h"
-
-#include "ModifierData.h"
-
-namespace nvidia
-{
-namespace iofx
-{
-
-class Modifier;
-class IofxAssetImpl;
-class IofxManager;
-class IofxActorCPU;
-class IosObjectCpuData;
-
-class TaskModifiers : public PxLightCpuTask
-{
-public:
-	TaskModifiers(IofxActorCPU& owner) : mOwner(owner) {}
-	const char* getName() const
-	{
-		return "IofxActorCPU::Modifiers";
-	}
-	void run();
-
-protected:
-	IofxActorCPU& mOwner;
-
-private:
-	TaskModifiers& operator=(const TaskModifiers&);
-};
-
-class IofxActorCPU : public IofxActorImpl
-{
-public:
-	IofxActorCPU(ResID, IofxScene*, IofxManager& );
-	~IofxActorCPU() {}
-
-	void updateBounds();
-
-	void runModifiers();
-
-
-	template <typename Input, typename PublicState, typename PrivateState, typename OutputLayout>
-	void updateParticles(const IosObjectCpuData& objData, const OutputLayout& outputLayout, const uint8_t* ptr);
-
-
-	TaskModifiers	            mModifierTask;
-
-	PxBounds3                   mWorkingBounds;
-	ObjectRange					mWorkingRange;
-	uint32_t						mWorkingVisibleCount;
-};
-
-template <typename T>
-void FromSlices(IofxSlice** slices, uint32_t idx, T& val)
-{
-	size_t i = 0;
-	IofxSlice* data = (IofxSlice*)&val;
-	for (; i != sizeof(T) / sizeof(IofxSlice); ++i, ++data)
-	{
-		*data = slices[i][idx];
-	}
-
-	uint32_t tail = sizeof(T) % sizeof(IofxSlice);
-	if (!tail)
-	{
-		return;
-	}
-
-	uint32_t* u32s = (uint32_t*)data;
-
-	if (4 == tail)
-	{
-		u32s[0] = slices[i][idx].x;
-	}
-	else if (8 == tail)
-	{
-		u32s[0] = slices[i][idx].x;
-		u32s[1] = slices[i][idx].y;
-	}
-	else if (12 == tail)
-	{
-		u32s[0] = slices[i][idx].x;
-		u32s[1] = slices[i][idx].y;
-		u32s[2] = slices[i][idx].z;
-	}
-	else
-	{
-		PX_ALWAYS_ASSERT();
-	}
-}
-
-template <typename T>
-void ToSlices(IofxSlice** slices, uint32_t idx, const T& val)
-{
-	size_t i = 0;
-	const IofxSlice* data = (const IofxSlice*)&val;
-	for (; i != sizeof(T) / sizeof(IofxSlice); ++i, ++data)
-	{
-		slices[i][idx] = *data;
-	}
-
-	uint32_t tail = sizeof(T) % sizeof(IofxSlice);
-	if (!tail)
-	{
-		return;
-	}
-
-	const uint32_t* u32s = (const uint32_t*)data;
-
-	if (4 == tail)
-	{
-		slices[i][idx].x = u32s[0];
-	}
-	else if (8 == tail)
-	{
-		slices[i][idx].x = u32s[0];
-		slices[i][idx].y = u32s[1];
-	}
-	else if (12 == tail)
-	{
-		slices[i][idx].x = u32s[0];
-		slices[i][idx].y = u32s[1];
-		slices[i][idx].z = u32s[2];
-	}
-	else
-	{
-		PX_ALWAYS_ASSERT();
-	}
-}
-
-template <typename Input, typename PublicState, typename PrivateState, typename OutputLayout>
-void IofxActorCPU::updateParticles(const IosObjectCpuData& objData, const OutputLayout& outputLayout, const uint8_t* ptr)
-{
-	IofxSlice** inPubState = objData.inPubState;
-	IofxSlice** inPrivState = objData.inPrivState;
-	IofxSlice** outPubState = objData.outPubState;
-	IofxSlice** outPrivState = objData.outPrivState;
-
-	ModifierCommonParams common = objData.getCommonParams();
-
-	RandState randState(mIofxScene->mApexScene->getSeed());
-
-	for (uint32_t id = 0; id < mWorkingRange.objectCount; id++)
-	{
-		uint32_t outputID = mWorkingRange.startIndex + id;
-		uint32_t stateID = objData.outputToState[ outputID ];
-		PX_ASSERT(stateID != IosBufferDescIntl::NOT_A_PARTICLE);
-		PX_ASSERT(stateID < objData.maxStateID);
-		uint32_t inputID = objData.pmaInStateToInput->get(stateID);
-
-		bool newParticle = false;
-		if (inputID & IosBufferDescIntl::NEW_PARTICLE_FLAG)
-		{
-			newParticle = true;
-			inputID &= ~IosBufferDescIntl::NEW_PARTICLE_FLAG;
-		}
-
-		const IofxActorIDIntl actorId = objData.pmaActorIdentifiers->get(inputID);
-		const uint16_t actorClassId = actorId.getActorClassID();
-		PX_ASSERT(actorClassId < mMgr.mActorClassTable.size());
-
-		IofxManagerClient* iofxClient = mMgr.mActorClassTable[ actorClassId ].client;
-		PX_ASSERT(iofxClient != NULL);
-		IofxAssetSceneInstCPU* iofxAssetSceneInst = static_cast<IofxAssetSceneInstCPU*>(iofxClient->getAssetSceneInst());
-		PX_ASSERT(iofxAssetSceneInst != NULL);
-
-		Input input;
-		input.load(objData, inputID);
-
-		PublicState pubState;
-		PrivateState privState;
-
-		if (newParticle)
-		{
-			PublicState::initDefault(pubState, iofxClient->getParams().objectScale);
-			PrivateState::initDefault(privState);
-
-			for (uint32_t j = 0; j < iofxAssetSceneInst->mSpawnModifiersList.size(); j++)
-			{
-				const void* params = &iofxAssetSceneInst->mModifiersParamsBuffer[ iofxAssetSceneInst->mSpawnModifiersList[j].paramsOffset ];
-				iofxAssetSceneInst->mSpawnModifiersList[j].updateFunc(params, input, pubState, privState, common, randState);
-			}
-		}
-		else
-		{
-			PX_ASSERT(stateID < objData.maxObjectCount);
-
-			FromSlices(inPubState, stateID, pubState);
-			FromSlices(inPrivState, stateID, privState);
-		}
-
-		ToSlices(outPubState, outputID, pubState);
-
-		for (uint32_t j = 0; j < iofxAssetSceneInst->mContinuousModifiersList.size(); j++)
-		{
-			const void* params = &iofxAssetSceneInst->mModifiersParamsBuffer[ iofxAssetSceneInst->mContinuousModifiersList[j].paramsOffset ];
-			iofxAssetSceneInst->mContinuousModifiersList[j].updateFunc(params, input, pubState, privState, common, randState);
-		}
-
-		objData.pmaOutStateToInput->get(outputID) = inputID;
-		ToSlices(outPrivState, outputID, privState);
-
-		outputLayout.write(outputID, input, pubState, ptr);
-	}
-}
-
-class ModifierParamsMapperCPUimpl;
-
-class IofxAssetSceneInstCPU : public IofxAssetSceneInst
-{
-public:
-	IofxAssetSceneInstCPU(IofxAssetImpl* asset, uint32_t semantics, IofxScene* scene);
-	virtual ~IofxAssetSceneInstCPU() {}
-
-	struct ModifierInfo
-	{
-		union
-		{
-			ModifierImpl::updateSpriteFunc updateSpriteFunc;
-			ModifierImpl::updateMeshFunc updateMeshFunc;
-		};
-		void updateFunc(const void* params, const SpriteInput& input, SpritePublicState& pubState, SpritePrivateState& privState, const ModifierCommonParams& common, RandState& randState)
-		{
-			updateSpriteFunc(params, input, pubState, privState, common, randState);
-		}
-		void updateFunc(const void* params, const MeshInput& input, MeshPublicState& pubState, MeshPrivateState& privState, const ModifierCommonParams& common, RandState& randState)
-		{
-			updateMeshFunc(params, input, pubState, privState, common, randState);
-		}
-
-		uint32_t paramsOffset;
-	};
-
-	uint32_t introspectModifiers(ModifierParamsMapperCPUimpl& introspector, ModifierInfo* list, const ModifierStack& stack, ModifierStage stage, uint32_t usageClass);
-
-	physx::Array<ModifierInfo>	mSpawnModifiersList;
-	physx::Array<ModifierInfo>	mContinuousModifiersList;
-	physx::Array<uint8_t>			mModifiersParamsBuffer;
-};
-
-
-}
-} // namespace nvidia
-
-#endif // __IOFX_ACTOR_CPU_H__
diff --git a/APEX_1.4/module/iofx/include/IofxActorGPU.h b/APEX_1.4/module/iofx/include/IofxActorGPU.h
deleted file mode 100644
index 07165d8e..00000000
--- a/APEX_1.4/module/iofx/include/IofxActorGPU.h
+++ /dev/null
@@ -1,53 +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 __IOFX_ACTOR_GPU_H__
-#define __IOFX_ACTOR_GPU_H__
-
-#include "Apex.h"
-#include "IofxActor.h"
-#include "ApexActor.h"
-#include "IofxActorImpl.h"
-
-namespace nvidia
-{
-namespace apex
-{
-class SceneIntl;
-}
-namespace iofx
-{
-
-
-class Modifier;
-class IofxAssetImpl;
-class IofxScene;
-class IofxManager;
-
-class IofxActorGPU : public IofxActorImpl
-{
-public:
-	APEX_RW_LOCKABLE_BOILERPLATE
-
-	IofxActorGPU(ResID renderResID, IofxScene* iscene, IofxManager& mgr)
-		: IofxActorImpl(renderResID, iscene, mgr)
-	{
-	}
-	~IofxActorGPU()
-	{
-	}
-};
-
-
-}
-} // namespace nvidia
-
-#endif // __IOFX_ACTOR_GPU_H__
diff --git a/APEX_1.4/module/iofx/include/IofxActorImpl.h b/APEX_1.4/module/iofx/include/IofxActorImpl.h
deleted file mode 100644
index 818a51a9..00000000
--- a/APEX_1.4/module/iofx/include/IofxActorImpl.h
+++ /dev/null
@@ -1,161 +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 __IOFX_ACTOR_IMPL_H__
-#define __IOFX_ACTOR_IMPL_H__
-
-#include "Apex.h"
-#include "IofxActor.h"
-#include "InstancedObjectSimulationIntl.h"
-#include "ResourceProviderIntl.h"
-#include "ApexActor.h"
-#include "IofxAssetImpl.h"
-#include "IofxManagerIntl.h"
-#include "IofxManager.h"
-#include "ModifierImpl.h"
-#include "ApexRWLockable.h"
-
-namespace nvidia
-{
-namespace apex
-{
-class SceneIntl;
-class Modifier;
-}
-namespace iofx
-{
-
-class IofxScene;
-class RenderVolumeImpl;
-
-struct ObjectRange
-{
-	ObjectRange() : startIndex(0), objectCount(0) {}
-
-	uint32_t			startIndex;	    //!< start index for this IOFX actor
-	uint32_t			objectCount;	//!< count of object instances this frame
-};
-
-
-class IofxRenderableImpl;
-
-class IofxActorImpl :
-	public IofxActor,
-	public ApexResourceInterface,
-	public ApexActor,
-	public ApexResource,
-	public ApexRWLockable
-{
-public:
-	APEX_RW_LOCKABLE_BOILERPLATE
-
-	IofxActorImpl(ResID, IofxScene*, IofxManager&);
-	~IofxActorImpl();
-
-	// Actor methods
-	void				setPhysXScene(PxScene*)	{ }
-	PxScene* 			getPhysXScene() const
-	{
-		return NULL;
-	}
-	Asset* getOwner() const
-	{
-		READ_ZONE();
-		return NULL;
-	}
-	Actor*        getActor()
-	{
-		return this;
-	}
-	const char* 		getIosAssetName() const
-	{
-		READ_ZONE();
-		return mMgr.mIosAssetName.c_str();
-	}
-	IofxRenderable*	acquireRenderableReference();
-
-	void				getLodRange(float& min, float& max, bool& intOnly) const;
-	float		getActiveLod() const;
-	void				forceLod(float lod);
-	/**
-	\brief Selectively enables/disables debug visualization of a specific APEX actor.  Default value it true.
-	*/
-	virtual void setEnableDebugVisualization(bool state)
-	{
-		WRITE_ZONE();
-		ApexActor::setEnableDebugVisualization(state);
-	}
-
-	// ApexResourceInterface methods
-	void				release();
-	void			    destroy();
-
-	uint32_t	    getListIndex() const
-	{
-		return m_listIndex;
-	}
-	void	            setListIndex(ResourceList& list, uint32_t index)
-	{
-		m_listIndex = index;
-		m_list = &list;
-	}
-
-	virtual float		getObjectRadius() const
-	{
-		READ_ZONE();
-		return mMgr.getObjectRadius();
-	}
-	virtual uint32_t		getObjectCount() const
-	{
-		READ_ZONE();
-		return mResultRange.objectCount;
-	}
-	virtual uint32_t		getVisibleCount() const
-	{
-		READ_ZONE();
-		return mResultVisibleCount;
-	}
-	virtual physx::PxBounds3 getBounds() const
-	{
-		READ_ZONE();
-		return mResultBounds;
-	}
-
-	bool						prepareRenderables(IosObjectBaseData* obj);
-
-
-	ResID						mRenderResID;
-	IofxScene*					mIofxScene;
-	IofxManager&                mMgr;
-	RenderVolumeImpl*           mRenderVolume;
-
-	/* Set by IOFX Manager at creation time, immutable */
-	uint32_t					mActorID;
-
-	PxBounds3                   mResultBounds;
-	ObjectRange					mResultRange;
-	uint32_t					mResultVisibleCount;
-
-	physx::Array<IofxRenderableImpl*> mRenderableArray;
-
-	uint32_t					mSemantics;
-	IofxRenderableImpl*		mActiveRenderable;
-
-	bool						mDistanceSortingEnabled;
-
-	friend class IofxManager;
-	friend class IofxManagerGPU;
-};
-
-}
-} // namespace nvidia
-
-#endif // __IOFX_ACTOR_IMPL_H__
diff --git a/APEX_1.4/module/iofx/include/IofxAssetImpl.h b/APEX_1.4/module/iofx/include/IofxAssetImpl.h
deleted file mode 100644
index 00abc577..00000000
--- a/APEX_1.4/module/iofx/include/IofxAssetImpl.h
+++ /dev/null
@@ -1,504 +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 IOFX_ASSET_IMPL_H
-#define IOFX_ASSET_IMPL_H
-
-#include "Apex.h"
-#include "ApexUsingNamespace.h"
-#include "ApexSDKHelpers.h"
-#include "ApexAssetAuthoring.h"
-#include "ApexAssetTracker.h"
-#include "ApexContext.h"
-#include "IofxAsset.h"
-#include "Modifier.h"
-#include "ApexString.h"
-#include "ResourceProviderIntl.h"
-#include "ApexAuthorableObject.h"
-#include "IofxAssetParameters.h"
-#include "MeshIofxParameters.h"
-#include "SpriteIofxParameters.h"
-#include "ParamArray.h"
-#include "ModifierImpl.h"
-#include "ApexRWLockable.h"
-#include "ReadCheck.h"
-#include "WriteCheck.h"
-#include "ApexAuthorableObject.h"
-
-// instead of having an initial color modifier, just drop
-// in 4 color vs life modifiers instead
-#define IOFX_SLOW_COMPOSITE_MODIFIERS 1
-
-namespace nvidia
-{
-namespace iofx
-{
-
-typedef physx::Array<Modifier*> ModifierStack;
-
-class ModuleIofxImpl;
-
-class IofxAssetImpl : public IofxAsset,
-	public ResourceList,
-	public ApexResourceInterface,
-	public ApexResource,
-	public NvParameterized::SerializationCallback,
-	public ApexContext,
-	public ApexRWLockable
-{
-	friend class IofxAssetDummyAuthoring;
-protected:
-	IofxAssetImpl(ModuleIofxImpl* module, ResourceList& list, const char* name);
-	IofxAssetImpl(ModuleIofxImpl* module,
-	          ResourceList& list,
-	          NvParameterized::Interface* params,
-	          const char* name);
-
-public:
-	APEX_RW_LOCKABLE_BOILERPLATE
-
-	~IofxAssetImpl();
-
-	// Asset
-	virtual void								release();
-	virtual const char* 						getName(void) const
-	{
-		READ_ZONE();
-		return mName.c_str();
-	}
-	virtual AuthObjTypeID						getObjTypeID() const
-	{
-		READ_ZONE();
-		return mAssetTypeID;
-	}
-	virtual const char* 						getObjTypeName() const
-	{
-		READ_ZONE();
-		return getClassName();
-	}
-	virtual uint32_t						forceLoadAssets();
-	// ApexResourceInterface
-	virtual void								setListIndex(ResourceList& list, uint32_t index)
-	{
-		m_listIndex = index;
-		m_list = &list;
-	}
-	virtual uint32_t						getListIndex() const
-	{
-		return m_listIndex;
-	}
-
-	// Context
-	virtual void								removeAllActors();
-	RenderableIterator*					createRenderableIterator()
-	{
-		return ApexContext::createRenderableIterator();
-	}
-	void										releaseRenderableIterator(RenderableIterator& iter)
-	{
-		ApexContext::releaseRenderableIterator(iter);
-	}
-
-	void										addDependentActor(ApexActor* actor);
-
-	bool isOpaqueMesh(uint32_t index) const;
-
-	virtual uint32_t						getMeshAssetCount() const
-	{
-		READ_ZONE();
-		return mRenderMeshList ? mRenderMeshList->size() : 0;
-	}
-	virtual const char*							getMeshAssetName(uint32_t index) const;
-	virtual uint32_t   						getMeshAssetWeight(uint32_t index) const;
-	virtual const char*							getSpriteMaterialName() const;
-	virtual uint32_t						getContinuousModifierCount() const
-	{
-		return mContinuousModifierStack.size();
-	}
-	virtual const Modifier*					getSpawnModifiers(uint32_t& outCount) const
-	{
-		READ_ZONE();
-		outCount = mSpawnModifierStack.size();
-		return mSpawnModifierStack.front();
-	}
-	virtual const Modifier*					getContinuousModifiers(uint32_t& outCount) const
-	{
-		READ_ZONE();
-		outCount = mContinuousModifierStack.size();
-		return mContinuousModifierStack.front();
-	}
-
-	template<class ModifierType>
-	PX_INLINE float								getMaxYFromCurveModifier(Modifier* modifier) const
-	{
-		float maxScale = 0.0f;
-		ModifierType* m = DYNAMIC_CAST(ModifierType*)(modifier);
-		const nvidia::apex::Curve* curve = m->getFunction();
-		uint32_t numControlPoints = 0;
-		const Vec2R* controlPoints = curve->getControlPoints(numControlPoints);
-		for (uint32_t j = 0; j < numControlPoints; ++j)
-		{
-			maxScale = PxMax(maxScale, controlPoints->y);
-			++controlPoints;
-		}
-		return maxScale;
-	}
-
-	virtual float						getScaleUpperBound(float maxVelocity) const
-	{
-		// check all modifiers and return the biggest scale they can produce
-		READ_ZONE();
-		float scale = 1.0f;
-
-		for (uint32_t i = 0; i < mSpawnModifierStack.size(); ++i)
-		{
-			Modifier* modifier = mSpawnModifierStack[i];
-
-			switch (modifier->getModifierType())
-			{
-			case ModifierType_SimpleScale:
-			{
-				SimpleScaleModifierImpl* m = DYNAMIC_CAST(SimpleScaleModifierImpl*)(modifier);
-				scale *= m->getScaleFactor().maxElement();
-				break;
-			}
-			case ModifierType_RandomScale:
-			{
-				RandomScaleModifierImpl* m = DYNAMIC_CAST(RandomScaleModifierImpl*)(modifier);
-				scale *= m->getScaleFactor().maximum;
-				break;
-			}
-			default:
-				break;
-			}
-
-		}
-		for (uint32_t i = 0; i < mContinuousModifierStack.size(); ++i)
-		{
-			Modifier* modifier = mContinuousModifierStack[i];
-			switch (mContinuousModifierStack[i]->getModifierType())
-			{
-			case ModifierType_ScaleAlongVelocity:
-			{
-				ScaleAlongVelocityModifierImpl* m = DYNAMIC_CAST(ScaleAlongVelocityModifierImpl*)(modifier);
-				scale *= m->getScaleFactor() * maxVelocity;
-				break;
-			}
-			case ModifierType_ScaleVsLife:
-			{
-				float maxScale = getMaxYFromCurveModifier<ScaleVsLifeModifierImpl>(modifier);
-				if (maxScale != 0.0f)
-				{
-					scale *= maxScale;
-				}
-				break;
-			}
-			case ModifierType_ScaleVsDensity:
-			{
-				float maxScale = getMaxYFromCurveModifier<ScaleVsDensityModifierImpl>(modifier);
-				if (maxScale != 0.0f)
-				{
-					scale *= maxScale;
-				}
-				break;
-			}
-			case ModifierType_ScaleVsCameraDistance:
-			{
-				float maxScale = getMaxYFromCurveModifier<ScaleVsCameraDistanceModifierImpl>(modifier);
-				if (maxScale != 0.0f)
-				{
-					scale *= maxScale;
-				}
-				break;
-			}
-			case ModifierType_OrientScaleAlongScreenVelocity:
-			{
-				OrientScaleAlongScreenVelocityModifierImpl* m = DYNAMIC_CAST(OrientScaleAlongScreenVelocityModifierImpl*)(modifier);
-				scale *= m->getScalePerVelocity() * maxVelocity;
-				break;
-			}
-			default:
-				break;
-			}
-		}
-
-		return scale;
-	}
-
-	uint32_t								getSpriteSemanticsBitmap() const
-	{
-		return mSpriteSemanticBitmap;
-	}
-	PX_INLINE bool								isSpriteSemanticUsed(IofxRenderSemantic::Enum semantic)
-	{
-		return (((1 << semantic) & mSpriteSemanticBitmap) ? true : false);
-	}
-	void										setSpriteSemanticsUsed(uint32_t spriteSemanticsBitmap);
-
-	uint32_t								getMeshSemanticsBitmap() const
-	{
-		return mMeshSemanticBitmap;
-	}
-	PX_INLINE bool								isMeshSemanticUsed(IofxRenderSemantic::Enum semantic)
-	{
-		return (((1 << semantic) & mMeshSemanticBitmap) ? true : false);
-	}
-	void										setMeshSemanticsUsed(uint32_t meshSemanticsBitmap);
-
-	/* objects that assist in force loading and proper "assets own assets" behavior */
-	ApexAssetTracker							mRenderMeshAssetTracker;
-	ApexAssetTracker							mSpriteMaterialAssetTracker;
-
-	const NvParameterized::Interface* getAssetNvParameterized() const
-	{
-		return mParams;
-	}
-	/**
-	 * \brief Releases the ApexAsset but returns the NvParameterized::Interface and *ownership* to the caller.
-	 */
-	virtual NvParameterized::Interface* releaseAndReturnNvParameterizedInterface(void)
-	{
-		NvParameterized::Interface* ret = mParams;
-		mParams = NULL;
-		release();
-		return ret;
-	}
-	NvParameterized::Interface* getDefaultActorDesc()
-	{
-		READ_ZONE();
-		APEX_INVALID_OPERATION("Not yet implemented!");
-		return NULL;
-	};
-
-	NvParameterized::Interface* getDefaultAssetPreviewDesc()
-	{
-		READ_ZONE();
-		APEX_INVALID_OPERATION("Not yet implemented!");
-		return NULL;
-	}
-
-	virtual Actor* createApexActor(const NvParameterized::Interface& /*parms*/, Scene& /*apexScene*/)
-	{
-		READ_ZONE();
-		APEX_INVALID_OPERATION("Not yet implemented!");
-		return NULL;
-	}
-
-	virtual AssetPreview* createApexAssetPreview(const NvParameterized::Interface& /*params*/, AssetPreviewScene* /*previewScene*/)
-	{
-		READ_ZONE();
-		APEX_INVALID_OPERATION("Not yet implemented!");
-		return NULL;
-	}
-
-	virtual bool isValidForActorCreation(const ::NvParameterized::Interface& /*parms*/, Scene& /*apexScene*/) const
-	{
-		READ_ZONE();
-		return true; // todo, implement!
-	}
-
-	virtual bool isDirty() const
-	{
-		READ_ZONE();
-		return false;
-	}
-
-	void										destroy();
-	static const char* 							getClassName()
-	{
-		return IOFX_AUTHORING_TYPE_NAME;
-	}
-	static AuthObjTypeID						mAssetTypeID;
-
-	struct RenderMesh
-	{
-		uint32_t        mWeight;
-		ApexSimpleString	mMeshAssetName;
-	};
-
-	// authorable data
-	IofxAssetParameters*					   	mParams;
-	physx::Array<RenderMesh>					mRenderMeshes;
-	ModifierStack								mSpawnModifierStack;
-	ModifierStack								mContinuousModifierStack;
-	ParamArray<MeshIofxParametersNS::meshProperties_Type> *mRenderMeshList;
-	SpriteIofxParameters*				   		mSpriteParams;
-
-	// runtime data
-	ModuleIofxImpl*							        mModule;
-	ApexSimpleString							mName;
-	uint32_t								mSpriteSemanticBitmap;
-	uint32_t								mMeshSemanticBitmap;
-
-#if IOFX_SLOW_COMPOSITE_MODIFIERS
-	physx::Array<NvParameterized::Interface*>	mCompositeParams;
-#endif
-
-	PX_INLINE ModifierStack&					getModifierStack(uint32_t modStage)
-	{
-		switch (modStage)
-		{
-		case ModifierStage_Spawn:
-			return mSpawnModifierStack;
-		case ModifierStage_Continuous:
-			return mContinuousModifierStack;
-		default:
-			PX_ALWAYS_ASSERT();
-		};
-		return mSpawnModifierStack; // should never get here.
-	}
-
-	PX_INLINE const ModifierStack&				getModifierStack(uint32_t modStage) const
-	{
-		switch (modStage)
-		{
-		case ModifierStage_Spawn:
-			return mSpawnModifierStack;
-		case ModifierStage_Continuous:
-			return mContinuousModifierStack;
-		default:
-			PX_ALWAYS_ASSERT();
-		};
-		return mSpawnModifierStack; // should never get here.
-	}
-
-	PX_INLINE NvParameterized::ErrorType getModifierStack(uint32_t modStage, NvParameterized::Handle& h)
-	{
-		switch (modStage)
-		{
-		case ModifierStage_Spawn:
-			return mParams->getParameterHandle("spawnModifierList", h);
-		case ModifierStage_Continuous:
-			return mParams->getParameterHandle("continuousModifierList", h);
-		default:
-			PX_ALWAYS_ASSERT();
-		};
-		return NvParameterized::ERROR_INDEX_OUT_OF_RANGE; // should never get here.
-	}
-
-	PX_INLINE NvParameterized::ErrorType getModifierStack(uint32_t modStage, NvParameterized::Handle& h) const
-	{
-		switch (modStage)
-		{
-		case ModifierStage_Spawn:
-			return mParams->getParameterHandle("spawnModifierList", h);
-		case ModifierStage_Continuous:
-			return mParams->getParameterHandle("continuousModifierList", h);
-		default:
-			PX_ALWAYS_ASSERT();
-		};
-		return NvParameterized::ERROR_INDEX_OUT_OF_RANGE; // should never get here.
-	}
-
-	bool isSortingEnabled() const;
-
-	/* NvParameterized Serialization callbacks */
-	void						preSerialize(void* userData_ = NULL);
-	void						postDeserialize(void* userData_ = NULL);
-
-	// initialize a table of assets and resource IDs for resource tracking
-	void						initializeAssetNameTable();
-
-	uint32_t						getPubStateSize() const;
-	uint32_t						getPrivStateSize() const;
-
-	friend class ModuleIofxImpl;
-	template <class T_Module, class T_Asset, class T_AssetAuthoring> friend class nvidia::apex::ApexAuthorableObject;
-};
-
-#ifndef WITHOUT_APEX_AUTHORING
-class IofxAssetAuthoringImpl : public IofxAssetAuthoring, public IofxAssetImpl, public ApexAssetAuthoring
-{
-public:
-	APEX_RW_LOCKABLE_BOILERPLATE
-
-	IofxAssetAuthoringImpl(ModuleIofxImpl* module, ResourceList& list) :
-		IofxAssetImpl(module, list, "IofxAssetAuthoringImpl") {}
-
-	IofxAssetAuthoringImpl(ModuleIofxImpl* module, ResourceList& list, const char* name) :
-		IofxAssetImpl(module, list, name) {}
-
-	IofxAssetAuthoringImpl(ModuleIofxImpl* module, ResourceList& list, NvParameterized::Interface* params, const char* name) :
-		IofxAssetImpl(module, list, params, name) {}
-
-	virtual void	        release();
-
-	virtual const char* 			getName(void) const
-	{
-		READ_ZONE();
-		return IofxAssetImpl::getName();
-	}
-	virtual const char* 			getObjTypeName() const;
-	virtual bool					prepareForPlatform(nvidia::apex::PlatformTag)
-	{
-		APEX_INVALID_OPERATION("Not Implemented.");
-		return false;
-	}
-
-	void setToolString(const char* toolName, const char* toolVersion, uint32_t toolChangelist)
-	{
-		ApexAssetAuthoring::setToolString(toolName, toolVersion, toolChangelist);
-	}
-
-#if IOFX_AUTHORING_API_ENABLED
-	virtual void	        setMeshAssetName(const char* meshAssetName, uint32_t meshIndex = 0);
-	virtual void	        setMeshAssetWeight(const uint32_t weight, uint32_t meshIndex = 0);
-	virtual void            setSpriteMaterialName(const char* spriteMaterialName);
-
-	virtual uint32_t	getMeshAssetCount()	const
-	{
-		return IofxAssetImpl::getMeshAssetCount();
-	}
-	virtual const char*		getMeshAssetName(uint32_t index) const
-	{
-		return IofxAssetImpl::getMeshAssetName(index);
-	}
-	virtual uint32_t   	getMeshAssetWeight(uint32_t index) const
-	{
-		return IofxAssetImpl::getMeshAssetWeight(index);
-	}
-	virtual const char*		getSpriteMaterialName() const
-	{
-		return IofxAssetImpl::getSpriteMaterialName();
-	}
-
-	virtual Modifier*		createModifier(uint32_t modStage, uint32_t modType);
-
-	virtual void			removeModifier(uint32_t modStage, uint32_t position);
-	virtual uint32_t	findModifier(uint32_t modStage, Modifier* modifier);
-	virtual Modifier* 	getModifier(uint32_t modStage, uint32_t position) const;
-	virtual uint32_t	getModifierCount(uint32_t modStage) const;
-#endif
-
-	NvParameterized::Interface* getNvParameterized() const
-	{
-		READ_ZONE();
-		return (NvParameterized::Interface*)getAssetNvParameterized();
-	}
-	/**
-	 * \brief Releases the ApexAsset but returns the NvParameterized::Interface and *ownership* to the caller.
-	 */
-	virtual NvParameterized::Interface* releaseAndReturnNvParameterizedInterface(void)
-	{
-		READ_ZONE();
-		NvParameterized::Interface* ret = mParams;
-		mParams = NULL;
-		release();
-		return ret;
-	}
-	uint32_t			getAssetTarget() const;
-};
-#endif
-
-}
-} // namespace nvidia
-
-#endif // IOFX_ASSET_IMPL_H
diff --git a/APEX_1.4/module/iofx/include/IofxManager.h b/APEX_1.4/module/iofx/include/IofxManager.h
deleted file mode 100644
index 8a0043b9..00000000
--- a/APEX_1.4/module/iofx/include/IofxManager.h
+++ /dev/null
@@ -1,400 +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 __IOFX_MANAGER_H__
-#define __IOFX_MANAGER_H__
-
-#include "PsArray.h"
-#include "PsHashMap.h"
-#include "SceneIntl.h"
-#include "IofxManagerIntl.h"
-#include "ApexActor.h"
-
-#include "ModifierData.h"
-
-#include "PxTask.h"
-#include "ApexMirroredArray.h"
-
-namespace nvidia
-{
-namespace iofx
-{
-
-class IofxScene;
-class IofxManager;
-class IosObjectBaseData;
-class IofxAssetImpl;
-class IofxActorImpl;
-class RenderVolumeImpl;
-class IofxSharedRenderData;
-
-class TaskUpdateEffects : public PxTask
-{
-public:
-	TaskUpdateEffects(IofxManager& owner) : mOwner(owner) {}
-	const char* getName() const
-	{
-		return "IofxManager::UpdateEffects";
-	}
-	void run();
-protected:
-	IofxManager& mOwner;
-
-private:
-	TaskUpdateEffects& operator=(const TaskUpdateEffects&);
-};
-
-class IofxAssetImpl;
-
-class IofxSceneInst : public UserAllocated
-{
-public:
-	virtual ~IofxSceneInst() {}
-
-	uint32_t getRefCount() const
-	{
-		return _refCount;
-	}
-	void addRef()
-	{
-		++_refCount;
-	}
-	bool removeRef()
-	{
-		PX_ASSERT(_refCount > 0);
-		return (--_refCount == 0);
-	}
-
-protected:
-	IofxSceneInst() : _refCount(0) {}
-
-private:
-	uint32_t		_refCount;
-};
-
-class IofxAssetSceneInst : public IofxSceneInst
-{
-public:
-	IofxAssetSceneInst(IofxAssetImpl* asset, uint32_t semantics)
-		: _asset(asset), _semantics(semantics)
-	{
-	}
-	virtual ~IofxAssetSceneInst()
-	{
-	}
-
-	PX_INLINE IofxAssetImpl* getAsset() const
-	{
-		return _asset;
-	}
-	PX_INLINE uint32_t getSemantics() const
-	{
-		return _semantics;
-	}
-
-protected:
-	IofxAssetImpl*	_asset;
-	uint32_t		_semantics;
-};
-
-class IofxManagerClient : public IofxManagerClientIntl, public UserAllocated
-{
-public:
-	IofxManagerClient(IofxAssetSceneInst* assetSceneInst, uint32_t actorClassID, const IofxManagerClientIntl::Params& params)
-		: _assetSceneInst(assetSceneInst), _actorClassID(actorClassID), _params(params)
-	{
-	}
-	virtual ~IofxManagerClient()
-	{
-	}
-
-	PX_INLINE IofxAssetSceneInst* getAssetSceneInst() const
-	{
-		PX_ASSERT(_assetSceneInst != NULL);
-		return _assetSceneInst;
-	}
-
-	PX_INLINE uint32_t getActorClassID() const
-	{
-		return _actorClassID;
-	}
-
-	PX_INLINE const IofxManagerClientIntl::Params& getParams() const
-	{
-		return _params;
-	}
-
-	// IofxManagerClientIntl interface
-	virtual void getParams(IofxManagerClientIntl::Params& params) const
-	{
-		params = _params;
-	}
-	virtual void setParams(const IofxManagerClientIntl::Params& params)
-	{
-		_params = params;
-	}
-
-protected:
-	IofxAssetSceneInst*			_assetSceneInst;
-	uint32_t						_actorClassID;
-	IofxManagerClientIntl::Params	_params;
-};
-
-class IofxActorSceneInst : public IofxSceneInst
-{
-public:
-	IofxActorSceneInst(ResID renderResID)
-		: _renderResID(renderResID)
-	{
-	}
-	virtual ~IofxActorSceneInst()
-	{
-	}
-
-	PX_INLINE ResID getRenderResID() const
-	{
-		return _renderResID;
-	}
-
-	void addAssetSceneInst(IofxAssetSceneInst* value)
-	{
-		_assetSceneInstArray.pushBack(value);
-	}
-	bool removeAssetSceneInst(IofxAssetSceneInst* value)
-	{
-		return _assetSceneInstArray.findAndReplaceWithLast(value);
-	}
-	const physx::Array<IofxAssetSceneInst*>& getAssetSceneInstArray() const
-	{
-		return _assetSceneInstArray;
-	}
-
-protected:
-	ResID _renderResID;
-	physx::Array<IofxAssetSceneInst*> _assetSceneInstArray;
-};
-
-class CudaPipeline
-{
-public:
-	virtual ~CudaPipeline() {}
-	virtual void release() = 0;
-	virtual void fetchResults() = 0;
-	virtual void submitTasks() = 0;
-
-	virtual PxTaskID launchGpuTasks() = 0;
-	virtual void launchPrep() = 0;
-
-	virtual IofxManagerClient* createClient(IofxAssetSceneInst* assetSceneInst, uint32_t actorClassID, const IofxManagerClientIntl::Params& params) = 0;
-	virtual IofxAssetSceneInst* createAssetSceneInst(IofxAssetImpl* asset, uint32_t semantics) = 0;
-};
-
-
-class IofxManager : public IofxManagerIntl, public ApexResourceInterface, public ApexResource, public ApexContext
-{
-public:
-	IofxManager(IofxScene& scene, const IofxManagerDescIntl& desc, bool isMesh);
-	~IofxManager();
-
-	void destroy();
-
-	/* Over-ride this ApexContext method to capture IofxActorImpl deletion events */
-	void removeActorAtIndex(uint32_t index);
-
-	void createSimulationBuffers(IosBufferDescIntl& outDesc);
-	void setSimulationParameters(float radius, const PxVec3& up, float gravity, float restDensity);
-	void updateEffectsData(float deltaTime, uint32_t numObjects, uint32_t maxInputID, uint32_t maxStateID, void* extraData);
-	virtual void submitTasks();
-	virtual void fetchResults();
-	void release();
-	void outputHostToDevice(PxGpuCopyDescQueue& copyQueue);
-	PxTaskID getUpdateEffectsTaskID(PxTaskID);
-	void cpuModifiers();
-	PxBounds3 getBounds() const;
-	void swapStates();
-
-	uint32_t getActorID(IofxAssetSceneInst* assetSceneInst, uint16_t meshID);
-	void releaseActorID(IofxAssetSceneInst* assetSceneInst, uint32_t actorID);
-
-	uint16_t getActorClassID(IofxManagerClientIntl* client, uint16_t meshID);
-
-	IofxManagerClientIntl* createClient(nvidia::apex::IofxAsset* asset, const IofxManagerClientIntl::Params& params);
-	void releaseClient(IofxManagerClientIntl* client);
-
-	uint16_t	getVolumeID(RenderVolume* vol);
-	PX_INLINE uint32_t	getSimulatedParticlesCount() const
-	{
-		return mLastNumObjects;
-	}
-
-	PX_INLINE void setOnStartCallback(IofxManagerCallbackIntl* callback)
-	{
-		if (mOnStartCallback) 
-		{
-			PX_DELETE(mOnStartCallback);
-		}
-		mOnStartCallback = callback;
-	}
-	PX_INLINE void setOnFinishCallback(IofxManagerCallbackIntl* callback)
-	{
-		if (mOnFinishCallback) 
-		{
-			PX_DELETE(mOnFinishCallback);
-		}
-		mOnFinishCallback = callback;
-	}
-
-	PX_INLINE bool isMesh()
-	{
-		return mIsMesh;
-	}
-
-	uint32_t	    getListIndex() const
-	{
-		return m_listIndex;
-	}
-	void	            setListIndex(ResourceList& list, uint32_t index)
-	{
-		m_listIndex = index;
-		m_list = &list;
-	}
-
-	float	getObjectRadius() const;
-
-	IofxAssetSceneInst* 	createAssetSceneInst(IofxAsset* asset);
-
-	void initIofxActor(IofxActorImpl* iofxActor, uint32_t mActorID, RenderVolumeImpl* renderVolume);
-
-
-	typedef HashMap<IofxAssetImpl*, IofxAssetSceneInst*> AssetHashMap_t;
-	AssetHashMap_t				mAssetHashMap;
-
-	physx::Array<IofxActorSceneInst*> mActorTable;
-
-	struct ActorClassData
-	{
-		IofxManagerClient*		client;  // NULL for empty rows
-		uint16_t				meshid;
-		uint16_t				count;
-		uint32_t				actorID;
-	};
-	physx::Array<ActorClassData>	mActorClassTable;
-
-	struct VolumeData
-	{
-		RenderVolumeImpl*			vol; // NULL for empty rows
-		PxBounds3					mBounds;
-		uint32_t					mPri;
-		uint32_t					mFlags;
-		physx::Array<IofxActorImpl*>	mActors; // Indexed by actorClassID
-	};
-	physx::Array<VolumeData>			mVolumeTable;
-	physx::Array<uint32_t>				mCountPerActor;
-	physx::Array<uint32_t>				mStartPerActor;
-	physx::Array<uint32_t>				mBuildPerActor;
-	physx::Array<uint32_t>				mOutputToState;
-	PxTaskID						mPostUpdateTaskID;
-
-	physx::Array<uint32_t>				mSortingKeys;
-
-	physx::Array<uint32_t>				mVolumeActorClassBitmap;
-
-	IofxScene*                          mIofxScene;
-	physx::Array<IosObjectBaseData*>	mObjData;
-	IosBufferDescIntl						mSimBuffers;
-	ApexSimpleString					mIosAssetName;
-
-	// reference pointers for IOFX actors, so they know which buffer
-	// in in which mode.
-	IosObjectBaseData* 					mWorkingIosData;
-	IosObjectBaseData* 					mResultIosData;
-	IosObjectBaseData*					mStagingIosData;
-
-	enum RenderState
-	{
-		RENDER_WAIT_FOR_DATA_ALLOC = 0,
-		RENDER_WAIT_FOR_FETCH_RESULT,
-		RENDER_WAIT_FOR_NEW,
-		RENDER_READY
-	};
-	RenderState							mRenderState;
-
-	RenderInteropFlags::Enum			mInteropFlags;
-
-	volatile uint32_t					mTargetSemantics;
-
-	// Simulation storage, for CPU/GPU IOS
-	ApexMirroredArray<PxVec4>			positionMass;
-	ApexMirroredArray<PxVec4>			velocityLife;
-	ApexMirroredArray<PxVec4>			collisionNormalFlags;
-	ApexMirroredArray<float>			density;
-	ApexMirroredArray<IofxActorIDIntl>	actorIdentifiers;
-	ApexMirroredArray<uint32_t>			inStateToInput;
-	ApexMirroredArray<uint32_t>			outStateToInput;
-
-	ApexMirroredArray<uint32_t>			userData;
-
-	IofxManagerCallbackIntl*				mOnStartCallback;
-	IofxManagerCallbackIntl*				mOnFinishCallback;
-
-	// Assets that were added on this frame (prior to simulate)
-	physx::Array<const IofxAssetImpl*>		addedAssets;
-
-	// Max size of public/private states over active (simulated) assets
-	uint32_t							pubStateSize, privStateSize;
-
-	// State data (CPU only)
-
-	typedef ApexMirroredArray<IofxSlice> SliceArray;
-
-	struct State
-	{
-		physx::Array<SliceArray*> slices; // Slices
-		physx::Array<IofxSlice*> a, b; // Pointers to slices' halves
-	};
-
-	State								pubState;
-	State								privState;
-
-	uint32_t							mInStateOffset;
-	uint32_t							mOutStateOffset;
-	bool								mStateSwap;
-
-	float                               mTotalElapsedTime;
-	bool                                mIsMesh;
-	bool                                mDistanceSortingEnabled;
-	bool                                mCudaIos;
-	bool                                mCudaModifiers;
-
-	void								prepareRenderables();
-
-	void								fillMapUnmapArraysForInterop(physx::Array<CUgraphicsResource> &, physx::Array<CUgraphicsResource> &);
-	void								mapBufferResultsForInterop(bool, bool);
-
-	CudaPipeline*                       mCudaPipeline;
-	TaskUpdateEffects					mSimulateTask;
-
-	PxBounds3							mBounds;
-
-#if APEX_CUDA_SUPPORT
-	PxGpuCopyDescQueue					mCopyQueue;
-#endif
-
-	uint32_t							mLastNumObjects;
-	uint32_t							mLastMaxInputID;
-};
-
-#define DEFERRED_IOFX_ACTOR ((IofxActorImpl*)(1))
-
-}
-} // end namespace nvidia::apex
-
-#endif // __IOFX_MANAGER_H__
diff --git a/APEX_1.4/module/iofx/include/IofxManagerGPU.h b/APEX_1.4/module/iofx/include/IofxManagerGPU.h
deleted file mode 100644
index f624c242..00000000
--- a/APEX_1.4/module/iofx/include/IofxManagerGPU.h
+++ /dev/null
@@ -1,182 +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 __IOFX_MANAGER_GPU_H__
-#define __IOFX_MANAGER_GPU_H__
-
-#include "Apex.h"
-#include "IofxManager.h"
-#include "IofxSceneGPU.h"
-
-#if APEX_CUDA_SUPPORT
-#include "ApexCudaWrapper.h"
-#include "PxCudaContextManager.h"
-#endif
-
-#include "ModifierData.h"
-#include "IosObjectData.h"
-
-namespace nvidia
-{
-namespace apex
-{
-class SceneIntl;
-class Modifier;
-}
-namespace iofx
-{
-
-class IofxAssetImpl;
-class IofxScene;
-class ModifierParamsMapperGPU;
-
-/* Class which manages a per-IOS CUDA IOFX pipeline */
-class IofxManagerGPU : public CudaPipeline, public UserAllocated
-{
-public:
-	IofxManagerGPU(SceneIntl& scene, const IofxManagerDescIntl& desc, IofxManager&, const ApexMirroredPlace::Enum defaultPlace = ApexMirroredPlace::GPU);
-	~IofxManagerGPU();
-
-	void release();
-	virtual void submitTasks();
-	virtual void fetchResults();
-	PxTaskID IofxManagerGPU::launchGpuTasks();
-	void launchPrep();
-
-	IofxManagerClient* createClient(IofxAssetSceneInst* assetSceneInst, uint32_t actorClassID, const IofxManagerClientIntl::Params& params);
-	IofxAssetSceneInst* createAssetSceneInst(IofxAssetImpl* asset, uint32_t semantics);
-
-
-	IofxManager&        mManager;
-	IofxScene&          mIofxScene;
-
-	bool				cudaLaunch(CUstream stream, int kernelIndex);
-	void				cudaLaunchRadixSort(CUstream stream, unsigned int numElements, unsigned int keyBits, unsigned int startBit, bool useSyncKernels);
-
-	uint32_t				mCurSeed;
-	uint32_t*				mTargetBufDevPtr;
-	uint32_t               mCountActorIDs;
-	uint32_t               mNumberVolumes;
-	uint32_t				mNumberActorClasses;
-	uint32_t				mOutputDWords;
-	bool                mEmptySimulation;
-	PxTask*		mTaskLaunch;
-
-#if APEX_CUDA_SUPPORT
-	ApexCudaConstMemGroup					mVolumeConstMemGroup;
-	InplaceHandle<VolumeParamsArray>		mVolumeParamsArrayHandle;
-	InplaceHandle<ActorClassIDBitmapArray>	mActorClassIDBitmapArrayHandle;
-
-	ApexCudaConstMemGroup					mRemapConstMemGroup;
-	InplaceHandle<ActorIDRemapArray>		mActorIDRemapArrayHandle;
-
-	ApexCudaConstMemGroup					mModifierConstMemGroup;
-	InplaceHandle<ClientParamsHandleArray>	mClientParamsHandleArrayHandle;
-	InplaceHandle<SpriteOutputLayout>		mSpriteOutputLayoutHandle;
-	InplaceHandle<MeshOutputLayout>			mMeshOutputLayoutHandle;
-
-	PxGpuCopyDescQueue mCopyQueue;
-#endif
-
-	const ApexMirroredPlace::Enum mDefaultPlace;
-
-	ApexMirroredArray<float>	mCuSpawnScale;
-	ApexMirroredArray<uint32_t>	mCuSpawnSeed;
-
-	ApexMirroredArray<LCG_PRNG>		mCuBlockPRNGs;
-
-	// sprite sorting, then actor ID sorting
-	ApexMirroredArray<uint32_t>	mCuSortedActorIDs;
-	ApexMirroredArray<uint32_t>	mCuSortedStateIDs;
-	ApexMirroredArray<uint32_t>	mCuSortTempKeys;
-	ApexMirroredArray<uint32_t>	mCuSortTempValues;
-	ApexMirroredArray<uint32_t>	mCuSortTemp;
-
-	ApexMirroredArray<uint32_t>	mCuActorStart;
-	ApexMirroredArray<uint32_t>	mCuActorEnd;
-	ApexMirroredArray<uint32_t>	mCuActorVisibleEnd;
-
-	ApexMirroredArray<PxVec4>		mCuMinBounds;
-	ApexMirroredArray<PxVec4>		mCuMaxBounds;
-	ApexMirroredArray<PxVec4>		mCuTempMinBounds;
-	ApexMirroredArray<PxVec4>		mCuTempMaxBounds;
-	ApexMirroredArray<uint32_t>		mCuTempActorIDs;
-	LCG_PRNG						mRandThreadLeap;
-	LCG_PRNG						mRandGridLeap;
-
-
-	class OutputBuffer
-	{
-		PxCudaBuffer* mGpuBuffer;
-
-	public:
-		OutputBuffer()
-		{
-			mGpuBuffer = 0;
-		}
-		~OutputBuffer()
-		{
-			release();
-		}
-
-		PX_INLINE bool isValid() const
-		{
-			return (mGpuBuffer != 0);
-		}
-
-		PX_INLINE void* getGpuPtr() const
-		{
-			return (mGpuBuffer != 0) ? reinterpret_cast<void*>(mGpuBuffer->getPtr()) : 0;
-		}
-
-		void release()
-		{
-			if (mGpuBuffer != 0)
-			{
-				mGpuBuffer->free();
-				mGpuBuffer = 0;
-			}
-		}
-
-		void realloc(size_t capacity, PxCudaContextManager* ctx)
-		{
-			if (mGpuBuffer != 0 && mGpuBuffer->getSize() >= capacity) 
-			{
-				return;
-			}
-			if (capacity > 0)
-			{
-				release();
-				mGpuBuffer = ctx->getMemoryManager()->alloc(
-								PxCudaBufferType(PxCudaBufferMemorySpace::T_GPU, PxCudaBufferFlags::F_READ_WRITE),
-								capacity);
-				PX_ASSERT(mGpuBuffer != 0);
-			}
-		}
-
-		void copyToHost(CUstream stream, void* hostPtr, size_t size)
-		{
-			if (isValid())
-			{
-				CUT_SAFE_CALL(cuMemcpyDtoHAsync(hostPtr, CUdeviceptr(mGpuBuffer->getPtr()), size, stream));
-			}
-		}
-	};
-
-	OutputBuffer				mTargetOutputBuffer;
-	uint32_t					mTargetTextureCount;
-	ApexCudaArray				mTargetCudaArrayList[IofxSpriteRenderLayout::MAX_SURFACE_COUNT];
-};
-
-}
-} // namespace nvidia
-
-#endif // __IOFX_ACTOR_GPU_H__
diff --git a/APEX_1.4/module/iofx/include/IofxRenderData.h b/APEX_1.4/module/iofx/include/IofxRenderData.h
deleted file mode 100644
index fde64366..00000000
--- a/APEX_1.4/module/iofx/include/IofxRenderData.h
+++ /dev/null
@@ -1,711 +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 __IOFX_RENDER_DATA_H__
-#define __IOFX_RENDER_DATA_H__
-
-#include "ApexUsingNamespace.h"
-#include "PsUserAllocated.h"
-#include "IofxRenderable.h"
-#include "IofxRenderCallback.h"
-#include "UserRenderCallback.h"
-#include "ApexRenderMeshAsset.h"
-#include "UserOpaqueMesh.h"
-#include "RenderAPIIntl.h"
-
-#if APEX_CUDA_SUPPORT
-#include "ApexCuda.h"
-#endif
-
-namespace nvidia
-{
-using namespace apex;
-
-namespace iofx
-{
-
-class IofxActorImpl;
-class IofxScene;
-
-
-class IofxSharedRenderDataBase : public RenderEntityIntl
-{
-public:
-	virtual ~IofxSharedRenderDataBase() {}
-
-	virtual void updateSemantics(IofxScene& scene, uint32_t semantics, uint32_t maxObjectCount, uint32_t activeObjectCount) = 0;
-
-	virtual size_t getRenderBufferSize() const = 0;
-
-#if APEX_CUDA_SUPPORT
-	virtual CUdeviceptr getBufferMappedCudaPtr() const = 0;
-#endif
-	virtual void* getBufferMappedPtr() const = 0;
-
-	PX_INLINE bool checkSemantics(uint32_t semantics) const
-	{
-		return (semantics & mSemantics) == semantics;
-	}
-
-	PX_INLINE uint32_t getSemantics() const
-	{
-		return mSemantics;
-	}
-
-	PX_INLINE uint32_t getInstanceID() const
-	{
-		return mInstanceID;
-	}
-
-	PX_INLINE IofxSharedRenderDataBase* incrementReferenceCount()
-	{
-		return static_cast<IofxSharedRenderDataBase*>(RenderEntityIntl::incrementReferenceCount());
-	}
-
-protected:
-	IofxSharedRenderDataBase()
-		: mInstanceID(uint32_t(-1))
-		, mSemantics(0)
-	{
-	}
-
-	uint32_t	mInstanceID;
-	uint32_t	mSemantics;
-
-private:
-	IofxSharedRenderDataBase& operator=(const IofxSharedRenderDataBase&);
-};
-
-template <typename Impl, typename SRDT>
-class IofxSharedRenderDataImpl : public RenderEntityIntlImpl<Impl, IofxSharedRenderDataBase>
-{
-public:
-	virtual void updateSemantics(IofxScene& iofxScene, uint32_t newSemantics, uint32_t maxObjectCount, uint32_t activeObjectCount)
-	{
-		mSharedRenderData.maxObjectCount = maxObjectCount;
-		mSharedRenderData.activeObjectCount = activeObjectCount;
-
-		if (newSemantics == mSemantics)
-		{
-			return;
-		}
-
-		Impl::RenderLayout_t newRenderLayout;
-		bool bIsUserDefinedLayout = false;
-		if (newSemantics != 0)
-		{
-			bIsUserDefinedLayout = getImpl()->createRenderLayout(iofxScene, newSemantics, maxObjectCount, newRenderLayout);
-			if (getImpl()->getRenderLayout().isTheSameAs(newRenderLayout))
-			{
-				mSemantics = newSemantics;
-				return;
-			}
-		}
-
-		IofxSharedRenderDataImpl::free();
-
-		if (newSemantics != 0)
-		{
-			bool result = false;
-			if (bIsUserDefinedLayout)
-			{
-				//only create render buffer through UserRenderCallback if layout was user defined through IofxRenderCallback!
-				IofxRenderCallback* iofxRenderCallback = iofxScene.getIofxRenderCallback();
-				if (iofxRenderCallback != NULL)
-				{
-					result = getImpl()->allocAllRenderStorage(newRenderLayout, iofxRenderCallback);
-				}
-			}
-			if (!result)
-			{
-				IofxRenderCallbackImpl internalIofxRenderCallback;
-				result = getImpl()->allocAllRenderStorage(newRenderLayout, &internalIofxRenderCallback);
-			}
-			if (result)
-			{
-				getImpl()->getRenderLayout() = newRenderLayout;
-				mSemantics = newSemantics;
-			}
-		}
-	}
-
-	virtual void free()
-	{
-		RenderEntityIntlImpl<Impl, IofxSharedRenderDataBase>::free();
-
-		mSemantics = 0;
-		getImpl()->getRenderLayout().setDefaults();
-	}
-
-	virtual void* getBufferMappedPtr() const
-	{
-		return getImpl()->getRenderBufferState().getMappedPtr();
-	}
-#if APEX_CUDA_SUPPORT
-	virtual CUdeviceptr getBufferMappedCudaPtr() const
-	{
-		return getImpl()->getRenderBufferState().getMappedCudaPtr();
-	}
-#endif
-
-	virtual size_t getRenderBufferSize() const
-	{
-		return getImpl()->getRenderBufferDesc().size;
-	}
-
-	typedef SRDT SharedRenderData_t;
-
-	PX_INLINE const SharedRenderData_t& getSharedRenderData() const
-	{
-		return mSharedRenderData;
-	}
-
-protected:
-	IofxSharedRenderDataImpl(uint32_t instance, RenderInteropFlags::Enum interopFlags)
-		: RenderEntityIntlImpl<Impl, IofxSharedRenderDataBase>(interopFlags)
-	{
-		mInstanceID = instance;
-		mSharedRenderData.maxObjectCount = 0;
-		mSharedRenderData.activeObjectCount = 0;
-	}
-
-	SharedRenderData_t	mSharedRenderData;
-};
-
-class IofxSharedRenderDataMeshImpl : public IofxSharedRenderDataImpl<IofxSharedRenderDataMeshImpl, IofxMeshSharedRenderData>
-{
-public:
-	typedef IofxMeshRenderLayout RenderLayout_t;
-
-	IofxSharedRenderDataMeshImpl(uint32_t instance, RenderInteropFlags::Enum interopFlags)
-		: IofxSharedRenderDataImpl<IofxSharedRenderDataMeshImpl, IofxMeshSharedRenderData>(instance, interopFlags)
-	{
-		mSharedRenderData.meshRenderBuffer = NULL;
-	}
-
-	PX_INLINE const UserRenderBufferDesc& getRenderBufferDesc() const
-	{
-		return mSharedRenderData.meshRenderLayout.bufferDesc;
-	}
-	PX_INLINE const RenderBufferStateIntl& getRenderBufferState() const
-	{
-		return mMeshBufferState;
-	}
-	PX_INLINE RenderLayout_t& getRenderLayout()
-	{
-		return mSharedRenderData.meshRenderLayout;
-	}
-	PX_INLINE const RenderLayout_t& getRenderLayout() const
-	{
-		return mSharedRenderData.meshRenderLayout;
-	}
-	//
-	PX_INLINE uint32_t getRenderStorageCount() const
-	{
-		return (mSharedRenderData.meshRenderBuffer != NULL) ? 1u : 0u;
-	}
-	PX_INLINE RenderStorageStateIntl& getRenderStorage(uint32_t index, UserRenderStorage* &renderStorage, RenderInteropFlags::Enum &interopFlags)
-	{
-		PX_UNUSED(index);
-		PX_ASSERT(index == 0);
-		renderStorage = mSharedRenderData.meshRenderBuffer;
-		interopFlags = mSharedRenderData.meshRenderLayout.bufferDesc.interopFlags;
-		return mMeshBufferState;
-	}
-	PX_INLINE void onMapRenderStorage(uint32_t index)
-	{
-		PX_UNUSED(index);
-		PX_ASSERT(index == 0);
-		mMeshBufferState.setMapRange(0, mSharedRenderData.activeObjectCount * mSharedRenderData.meshRenderLayout.stride);
-	}
-	//
-
-	bool createRenderLayout(IofxScene& iofxScene, uint32_t semantics, uint32_t maxObjectCount, RenderLayout_t& newRenderLayout);
-	bool allocAllRenderStorage(const RenderLayout_t& newRenderLayout, IofxRenderCallback* callback);
-	void freeAllRenderStorage();
-
-private:
-	IofxSharedRenderDataMeshImpl& operator=(const IofxSharedRenderDataMeshImpl&);
-
-	RenderBufferStateIntl mMeshBufferState;
-};
-
-class IofxSharedRenderDataSpriteImpl : public IofxSharedRenderDataImpl<IofxSharedRenderDataSpriteImpl, IofxSpriteSharedRenderData>
-{
-public:
-	typedef IofxSpriteRenderLayout RenderLayout_t;
-
-	IofxSharedRenderDataSpriteImpl(uint32_t instance, RenderInteropFlags::Enum interopFlags)
-		: IofxSharedRenderDataImpl<IofxSharedRenderDataSpriteImpl, IofxSpriteSharedRenderData>(instance, interopFlags)
-	{
-		mSharedRenderData.spriteRenderBuffer = NULL;
-		for (uint32_t i = 0; i < IofxSpriteRenderLayout::MAX_SURFACE_COUNT; ++i)
-		{
-			mSharedRenderData.spriteRenderSurfaces[i] = NULL;
-		}		
-	}
-
-	PX_INLINE const UserRenderBufferDesc& getRenderBufferDesc() const
-	{
-		return mSharedRenderData.spriteRenderLayout.bufferDesc;
-	}
-	PX_INLINE const RenderBufferStateIntl& getRenderBufferState() const
-	{
-		return mSpriteBufferState;
-	}
-	PX_INLINE RenderLayout_t& getRenderLayout()
-	{
-		return mSharedRenderData.spriteRenderLayout;
-	}
-	PX_INLINE const RenderLayout_t& getRenderLayout() const
-	{
-		return mSharedRenderData.spriteRenderLayout;
-	}
-
-	//
-	PX_INLINE uint32_t getRenderStorageCount() const
-	{
-		if (mSharedRenderData.spriteRenderLayout.surfaceCount > 0)
-		{
-			return mSharedRenderData.spriteRenderLayout.surfaceCount;
-		}
-		else
-		{
-			return (mSharedRenderData.spriteRenderBuffer != NULL) ? 1u : 0u;
-		}
-	}
-	PX_INLINE RenderStorageStateIntl& getRenderStorage(uint32_t index, UserRenderStorage* &renderStorage, RenderInteropFlags::Enum &interopFlags)
-	{
-		if (mSharedRenderData.spriteRenderLayout.surfaceCount > 0)
-		{
-			PX_ASSERT(index < mSharedRenderData.spriteRenderLayout.surfaceCount);
-			renderStorage = mSharedRenderData.spriteRenderSurfaces[index];
-			interopFlags = mSharedRenderData.spriteRenderLayout.surfaceDescs[index].interopFlags;
-			return mSpriteSurfaceStateArray[index];
-		}
-		else
-		{
-			PX_ASSERT(index == 0);
-			renderStorage = mSharedRenderData.spriteRenderBuffer;
-			interopFlags = mSharedRenderData.spriteRenderLayout.bufferDesc.interopFlags;
-			return mSpriteBufferState;
-		}
-	}
-	PX_INLINE void onMapRenderStorage(uint32_t index)
-	{
-		if (mSharedRenderData.spriteRenderLayout.surfaceCount == 0)
-		{
-			PX_UNUSED(index);
-			PX_ASSERT(index == 0);
-			mSpriteBufferState.setMapRange(0, mSharedRenderData.activeObjectCount * mSharedRenderData.spriteRenderLayout.stride);
-		}
-	}
-	//
-
-	bool createRenderLayout(IofxScene& iofxScene, uint32_t semantics, uint32_t maxObjectCount, RenderLayout_t& newRenderLayout);
-	bool allocAllRenderStorage(const RenderLayout_t& newRenderLayout, IofxRenderCallback* callback);
-	void freeAllRenderStorage();
-
-#if APEX_CUDA_SUPPORT
-
-	PX_INLINE CUarray getSurfaceMappedCudaArray(uint32_t index) const
-	{
-		PX_ASSERT(index < IofxSpriteRenderLayout::MAX_SURFACE_COUNT);
-		return mSpriteSurfaceStateArray[index].getMappedCudaArray();
-	}
-#endif
-
-	PX_INLINE bool getSurfaceMappedInfo(uint32_t index, UserRenderSurface::MappedInfo& mappedInfo) const
-	{
-		PX_ASSERT(index < IofxSpriteRenderLayout::MAX_SURFACE_COUNT);
-		mappedInfo = mSpriteSurfaceStateArray[index].getMappedInfo();
-		return mSpriteSurfaceStateArray[index].isMapped();
-	}
-
-private:
-	IofxSharedRenderDataSpriteImpl& operator=(const IofxSharedRenderDataSpriteImpl&);
-
-	RenderBufferStateIntl		mSpriteBufferState;
-	RenderSurfaceStateIntl	mSpriteSurfaceStateArray[IofxSpriteRenderLayout::MAX_SURFACE_COUNT];
-};
-
-
-class IofxRenderableImpl : public IofxRenderable, public UserAllocated, public ApexRWLockable
-{
-public:
-	// IofxRenderable methods
-	virtual const physx::PxBounds3& getBounds() const
-	{
-		return mRenderBounds;
-	}
-
-	virtual void				update(IofxSharedRenderDataBase* sharedRenderData, const physx::PxBounds3& bounds, uint32_t startIndex, uint32_t objectCount, uint32_t visibleCount) = 0;
-
-	virtual void				release()
-	{
-		bool triggerDelete = false;
-		mRefCountLock.lock();
-		if (mRefCount > 0)
-		{
-			triggerDelete = !(--mRefCount);
-		}
-		mRefCountLock.unlock();
-		if (triggerDelete)
-		{
-			if (mRenderCallback != NULL)
-			{
-				mRenderCallback->onReleasingIofxRenderable(*this);
-			}
-			delete this;
-		}
-	}
-
-	// Returns this if successful, NULL otherwise
-	IofxRenderable*			incrementReferenceCount()
-	{
-		IofxRenderable* returnValue = NULL;
-		mRefCountLock.lock();
-		if (mRefCount > 0)
-		{
-			++mRefCount;
-			returnValue = this;
-		}
-		mRefCountLock.unlock();
-		return returnValue;
-	}
-
-	PX_INLINE int32_t			getReferenceCount() const
-	{
-		return mRefCount;
-	}
-
-	virtual ~IofxRenderableImpl()
-	{
-		WRITE_ZONE();
-
-		PX_ASSERT(mRefCount == 0);
-		if (mSharedRenderData != NULL)
-		{
-			mSharedRenderData->release();
-		}
-		if (mRenderResID != INVALID_RESOURCE_ID)
-		{
-			//this call decrements resource refCount
-			GetInternalApexSDK()->getInternalResourceProvider()->releaseResource(mRenderResID);
-		}
-	}
-
-protected:
-	IofxRenderableImpl(IofxScene* iofxScene)
-		: mRefCount(1)	// Ref count initialized to 1, assuming that whoever calls this constructor will store a reference
-		, mRenderCallback(iofxScene->getIofxRenderCallback())
-		, mSharedRenderData(NULL)
-		, mRenderResID(INVALID_RESOURCE_ID)
-	{
-		mRenderBounds.setEmpty();
-	}
-
-	void initRenderResource(ResID renderResID, IofxCommonRenderData& renderData)
-	{
-		mRenderResID = renderResID;
-		if (mRenderResID != INVALID_RESOURCE_ID)
-		{
-			ResourceProviderIntl* nrp = GetInternalApexSDK()->getInternalResourceProvider();
-			renderData.renderResourceNameSpace = nrp->getResourceNameSpace(mRenderResID);
-			renderData.renderResourceName = nrp->getResourceName(mRenderResID);
-			renderData.renderResource = nrp->getResource(mRenderResID);
-			//this call increments resource refCount
-			nrp->setResource(renderData.renderResourceNameSpace, renderData.renderResourceName, renderData.renderResource, true, true);
-		}
-		else
-		{
-			renderData.renderResourceNameSpace = renderData.renderResourceName = "";
-			renderData.renderResource = NULL;
-		}
-	}
-
-	void update(IofxSharedRenderDataBase* sharedRenderData, const physx::PxBounds3& bounds)
-	{
-		if (mSharedRenderData != sharedRenderData)
-		{
-			if (mSharedRenderData != NULL)
-			{
-				mSharedRenderData->release();
-			}
-			mSharedRenderData = sharedRenderData->incrementReferenceCount();
-		}
-		mRenderBounds = bounds;
-		if (mRenderCallback != NULL)
-		{
-			mRenderCallback->onUpdatedIofxRenderable(*this);
-		}
-	}
-
-	volatile int32_t		mRefCount;
-	AtomicLock				mRefCountLock;
-
-	IofxRenderCallback*	mRenderCallback;
-	IofxSharedRenderDataBase*	mSharedRenderData;
-
-	physx::PxBounds3		mRenderBounds;
-
-	ResID					mRenderResID;
-
-	friend class IofxActorImpl;
-};
-
-class IofxMeshRenderable : public IofxRenderableImpl
-{
-public:
-	APEX_RW_LOCKABLE_BOILERPLATE
-
-	IofxMeshRenderable(IofxScene* iofxScene, ResID renderResID)
-		: IofxRenderableImpl(iofxScene)
-	{
-		mMeshRenderData.startIndex = mMeshRenderData.objectCount = 0;
-		mMeshRenderData.sharedRenderData = NULL;
-
-		initRenderResource(renderResID, mMeshRenderData);
-		ApexRenderMeshAsset* rma = static_cast<ApexRenderMeshAsset*>(static_cast<Asset*>(mMeshRenderData.renderResource));
-		if (rma != NULL)
-		{
-			UserOpaqueMesh* opaqueMesh = rma->getOpaqueMesh();
-			if (opaqueMesh != NULL)
-			{
-				//this call increments resource refCount
-				GetInternalApexSDK()->getInternalResourceProvider()->setResource(APEX_OPAQUE_MESH_NAME_SPACE, rma->getName(), opaqueMesh, true, true);
-			}
-		}
-
-		if (mRenderCallback != NULL)
-		{
-			mRenderCallback->onCreatedIofxRenderable(*this);
-		}
-	}
-
-	virtual ~IofxMeshRenderable()
-	{
-		ApexRenderMeshAsset* rma = static_cast<ApexRenderMeshAsset*>(static_cast<Asset*>(mMeshRenderData.renderResource));
-		if (rma != NULL)
-		{
-			UserOpaqueMesh* opaqueMesh = rma->getOpaqueMesh();
-			if (opaqueMesh != NULL)
-			{
-				//this call decrements resource refCount
-				GetInternalApexSDK()->getNamedResourceProvider()->releaseResource(APEX_OPAQUE_MESH_NAME_SPACE, rma->getName());
-			}
-		}
-	}
-
-	// IofxRenderableImpl methods
-	virtual void				update(IofxSharedRenderDataBase* sharedRenderData, const physx::PxBounds3& bounds, uint32_t startIndex, uint32_t objectCount, uint32_t visibleCount)
-	{
-		mMeshRenderData.startIndex = startIndex;
-		mMeshRenderData.objectCount = objectCount;
-		PX_UNUSED(visibleCount);
-		mMeshRenderData.sharedRenderData = &(static_cast<IofxSharedRenderDataMeshImpl*>(sharedRenderData)->getSharedRenderData());
-		IofxRenderableImpl::update(sharedRenderData, bounds);
-	}
-
-	virtual Type							getType() const
-	{
-		return IofxRenderable::MESH;
-	}
-
-	virtual const IofxSpriteRenderData*	getSpriteRenderData() const
-	{
-		return NULL;
-	}
-
-	virtual const IofxMeshRenderData*		getMeshRenderData() const
-	{
-		return &mMeshRenderData;
-	}
-
-private:
-	IofxMeshRenderData		mMeshRenderData;
-};
-
-class IofxSpriteRenderable : public IofxRenderableImpl
-{
-public:
-	APEX_RW_LOCKABLE_BOILERPLATE
-
-	IofxSpriteRenderable(IofxScene* iofxScene, ResID renderResID)
-		: IofxRenderableImpl(iofxScene)
-	{
-		mSpriteRenderData.startIndex = mSpriteRenderData.objectCount = 0;
-		mSpriteRenderData.visibleCount = 0;
-		mSpriteRenderData.sharedRenderData = NULL;
-
-		initRenderResource(renderResID, mSpriteRenderData);
-
-		if (mRenderCallback != NULL)
-		{
-			mRenderCallback->onCreatedIofxRenderable(*this);
-		}
-	}
-
-	virtual void				update(IofxSharedRenderDataBase* sharedRenderData, const physx::PxBounds3& bounds, uint32_t startIndex, uint32_t objectCount, uint32_t visibleCount)
-	{
-		mSpriteRenderData.startIndex = startIndex;
-		mSpriteRenderData.objectCount = objectCount;
-		mSpriteRenderData.visibleCount = visibleCount;
-		mSpriteRenderData.sharedRenderData = &(static_cast<IofxSharedRenderDataSpriteImpl*>(sharedRenderData)->getSharedRenderData());
-		IofxRenderableImpl::update(sharedRenderData, bounds);
-	}
-
-	virtual Type							getType() const
-	{
-		return IofxRenderable::SPRITE;
-	}
-
-	virtual const IofxSpriteRenderData*	getSpriteRenderData() const
-	{
-		return &mSpriteRenderData;
-	}
-
-	virtual const IofxMeshRenderData*		getMeshRenderData() const
-	{
-		return NULL;
-	}
-
-private:
-	IofxSpriteRenderData		mSpriteRenderData;
-};
-
-
-class IofxRenderBuffer : public UserRenderBuffer,  public UserAllocated
-{
-public:
-	IofxRenderBuffer(const UserRenderBufferDesc& desc)
-	{
-		mData = shdfnd::getAllocator().allocate(desc.size, "", __FILE__, __LINE__);
-		if (mData == NULL)
-		{
-			PX_ASSERT(!"IofxRenderBuffer: failed to allocate CPU memory!");
-		}
-	}
-
-	virtual ~IofxRenderBuffer()
-	{
-		if (mData)
-		{
-			shdfnd::getAllocator().deallocate(mData);
-			mData = NULL;
-		}
-	}
-
-	virtual void release()
-	{
-		PX_DELETE(this);
-	}
-
-	//CPU access
-	virtual void* map(RenderMapType::Enum mapType, size_t offset, size_t size)
-	{
-		PX_UNUSED(mapType);
-		PX_UNUSED(size);
-		return mData ? static_cast<uint8_t*>(mData) + offset : NULL;
-	}
-	virtual void unmap()
-	{
-		//do nothing!
-	}
-
-	//GPU access
-	virtual bool getCUDAgraphicsResource(CUgraphicsResource &ret)
-	{
-		PX_UNUSED(ret);
-		return false;
-	}
-
-private:
-	void*	mData;
-};
-
-
-class IofxRenderSurface : public UserRenderSurface,  public UserAllocated
-{
-public:
-	IofxRenderSurface(const UserRenderSurfaceDesc& desc)
-	{
-		mPitch = uint32_t(desc.width) * RenderDataFormat::getFormatDataSize(desc.format);
-		mData = shdfnd::getAllocator().allocate(mPitch * desc.height, "", __FILE__, __LINE__);
-		if (mData == 0)
-		{
-			PX_ASSERT(!"IofxRenderSurface: failed to allocate CPU memory!");
-		}
-	}
-
-	virtual ~IofxRenderSurface()
-	{
-		if (mData)
-		{
-			shdfnd::getAllocator().deallocate(mData);
-			mData = 0;
-		}
-	}
-
-	virtual void release()
-	{
-		PX_DELETE(this);
-	}
-
-	//CPU access
-	virtual bool map(RenderMapType::Enum mapType, MappedInfo& info)
-	{
-		PX_UNUSED(mapType);
-		PX_ASSERT(mapType == RenderMapType::MAP_READ);
-		if (mData)
-		{
-			info.pData= mData;
-			info.rowPitch = mPitch;
-			info.depthPitch = 0;
-			return true;
-		}
-		return false;
-	}
-	virtual void unmap()
-	{
-		//do nothing!
-	}
-
-	//GPU access
-	virtual bool getCUDAgraphicsResource(CUgraphicsResource &ret)
-	{
-		PX_UNUSED(ret);
-		return false;
-	}
-
-private:
-	void*		mData;
-	uint32_t	mPitch;
-};
-
-class IofxRenderCallbackImpl : public IofxRenderCallback
-{
-public:
-	virtual UserRenderBuffer* createRenderBuffer(const UserRenderBufferDesc& desc)
-	{
-		return PX_NEW(IofxRenderBuffer)(desc);
-	}
-	virtual UserRenderSurface* createRenderSurface(const UserRenderSurfaceDesc& desc)
-	{
-		return PX_NEW(IofxRenderSurface)(desc);
-	}
-};
-
-
-}
-} // namespace nvidia
-
-#endif /* __IOFX_RENDER_DATA_H__ */
diff --git a/APEX_1.4/module/iofx/include/IofxScene.h b/APEX_1.4/module/iofx/include/IofxScene.h
deleted file mode 100644
index d16edb02..00000000
--- a/APEX_1.4/module/iofx/include/IofxScene.h
+++ /dev/null
@@ -1,203 +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 __IOFX_SCENE_H__
-#define __IOFX_SCENE_H__
-
-#include "Apex.h"
-#include "ModuleIofx.h"
-
-#include "ApexSDKIntl.h"
-#include "ModuleIntl.h"
-#include "ApexContext.h"
-#include "ApexSDKHelpers.h"
-#include "RenderVolumeImpl.h"
-
-#include "PxGpuCopyDescQueue.h"
-
-namespace nvidia
-{
-namespace apex
-{
-class SceneIntl;
-class IofxManagerDescIntl;
-class DebugRenderParams;
-class IofxRenderCallback;
-}
-namespace iofx
-{
-
-class ModuleIofxImpl;
-class IofxDebugRenderParams;
-class IofxManager;
-
-class IofxScene;
-
-class IofxRenderableIteratorImpl : public IofxRenderableIterator, public ApexRWLockable, public UserAllocated
-{
-public:
-	APEX_RW_LOCKABLE_BOILERPLATE
-
-	virtual IofxRenderable* getFirst();
-	virtual IofxRenderable* getNext();
-	virtual void			  release()
-	{
-		PX_DELETE(this);
-	}
-
-	IofxRenderableIteratorImpl(IofxScene& iofxScene)
-		: mIofxScene(iofxScene), mVolumeCount(0), mVolumeIndex(0)
-		, mActorCount(0), mActorIndex(0), mActorList(NULL)
-	{
-	}
-
-private:
-	PX_INLINE IofxRenderable* findNextInActorList();
-	IofxRenderable* findFirstInNotEmptyVolume();
-
-	IofxScene& mIofxScene;
-
-	uint32_t mVolumeCount;
-	uint32_t mVolumeIndex;
-
-	uint32_t mActorCount;
-	uint32_t mActorIndex;
-	nvidia::apex::IofxActor* const* mActorList;
-};
-
-class IofxScene : public ModuleSceneIntl, public ApexContext, public ApexResourceInterface, public ApexResource
-{
-public:
-	enum StatsDataEnum
-	{
-		SimulatedSpriteParticlesCount,
-		SimulatedMeshParticlesCount,
-		// insert new items before this line
-		NumberOfStats			// The number of stats
-	};
-public:
-	IofxScene(ModuleIofxImpl& module, SceneIntl& scene, RenderDebugInterface* debugRender, ResourceList& list);
-	~IofxScene();
-
-	/* ModuleSceneIntl */
-	void				visualize();
-	void				setModulePhysXScene(PxScene* s);
-	PxScene*			getModulePhysXScene() const
-	{
-		return mPhysXScene;
-	}
-	PxScene*			mPhysXScene;
-
-	virtual Module*	getModule();
-
-	virtual SceneStats* getStats()
-	{
-		return &mModuleSceneStats;
-	}
-
-	bool							lockRenderResources()
-	{
-		renderLockAllActors();	// Lock options not implemented yet
-		return true;
-	}
-
-	bool							unlockRenderResources()
-	{
-		renderUnLockAllActors();	// Lock options not implemented yet
-		return true;
-	}
-
-	/* ApexResourceInterface */
-	uint32_t		getListIndex() const
-	{
-		return m_listIndex;
-	}
-	void				setListIndex(ResourceList& list, uint32_t index)
-	{
-		m_listIndex = index;
-		m_list = &list;
-	}
-	void				release();
-
-	virtual IofxManager* createIofxManager(const IofxAsset& asset, const IofxManagerDescIntl& desc);
-	void				releaseIofxManager(IofxManager* manager);
-
-	void				submitTasks(float elapsedTime, float substepSize, uint32_t numSubSteps);
-	void				fetchResults();
-
-	void				fetchResultsPreRenderLock()
-	{
-		lockLiveRenderVolumes();
-	}
-	void				fetchResultsPostRenderUnlock()
-	{
-		unlockLiveRenderVolumes();
-	}
-
-	virtual void		prepareRenderables();
-
-	PX_INLINE void		lockLiveRenderVolumes();
-	PX_INLINE void		unlockLiveRenderVolumes();
-
-	void				createModuleStats(void);
-	void				destroyModuleStats(void);
-	void				setStatValue(StatsDataEnum index, StatValue dataVal);
-
-	void					setIofxRenderCallback(IofxRenderCallback* callback)
-	{
-		mRenderCallback = callback;
-	}
-	IofxRenderCallback*	getIofxRenderCallback() const
-	{
-		return mRenderCallback;
-	}
-	IofxRenderableIterator* createIofxRenderableIterator()
-	{
-		return PX_NEW(IofxRenderableIteratorImpl)(*this);
-	}
-
-
-	ModuleIofxImpl*		    mModule;
-	SceneIntl*		mApexScene;
-	RenderDebugInterface*	mDebugRender;
-
-	nvidia::Mutex		mFetchResultsLock;
-	shdfnd::ReadWriteLock mManagersLock;
-
-	shdfnd::ReadWriteLock mLiveRenderVolumesLock;
-	nvidia::Mutex		mAddedRenderVolumesLock;
-	nvidia::Mutex		mDeletedRenderVolumesLock;
-	
-	ResourceList		mActorManagers;
-
-	physx::Array<RenderVolumeImpl*> mLiveRenderVolumes;
-	physx::Array<RenderVolumeImpl*> mAddedRenderVolumes;
-	physx::Array<RenderVolumeImpl*> mDeletedRenderVolumes;
-
-	DebugRenderParams*				mDebugRenderParams;
-	IofxDebugRenderParams*			mIofxDebugRenderParams;
-
-	SceneStats	mModuleSceneStats;	
-
-	uint32_t		mPrevTotalSimulatedSpriteParticles;
-	uint32_t		mPrevTotalSimulatedMeshParticles;
-
-	IofxRenderCallback*	mRenderCallback;
-
-	void                destroy();
-
-	void				processDeferredRenderVolumes();
-};
-
-}
-} // namespace nvidia
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/IofxSceneCPU.h b/APEX_1.4/module/iofx/include/IofxSceneCPU.h
deleted file mode 100644
index 358e5963..00000000
--- a/APEX_1.4/module/iofx/include/IofxSceneCPU.h
+++ /dev/null
@@ -1,37 +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 __IOFX_SCENE_CPU_H__
-#define __IOFX_SCENE_CPU_H__
-
-#if ENABLE_TEST
-#include "IofxTestScene.h"
-#define IOFX_SCENE IofxTestScene
-#else
-#include "IofxScene.h"
-#define IOFX_SCENE IofxScene
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-class IofxSceneCPU : public IOFX_SCENE
-{
-public:
-	IofxSceneCPU(ModuleIofxImpl& module, SceneIntl& scene, RenderDebugInterface* debugRender, ResourceList& list);
-};
-
-}
-} // namespace nvidia
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/IofxSceneGPU.h b/APEX_1.4/module/iofx/include/IofxSceneGPU.h
deleted file mode 100644
index acba3ff4..00000000
--- a/APEX_1.4/module/iofx/include/IofxSceneGPU.h
+++ /dev/null
@@ -1,68 +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 __IOFX_SCENE_GPU_H__
-#define __IOFX_SCENE_GPU_H__
-
-#if ENABLE_TEST
-#include "IofxTestScene.h"
-#define IOFX_SCENE IofxTestScene
-#else
-#include "IofxScene.h"
-#define IOFX_SCENE IofxScene
-#endif
-
-#if APEX_CUDA_SUPPORT
-
-#include "ApexCudaWrapper.h"
-#include "ApexCuda.h"
-#include "CudaModuleScene.h"
-
-#include "../cuda/include/common.h"
-#include "ModifierData.h"
-
-#define SCENE_CUDA_OBJ(scene, name) static_cast<IofxSceneGPU&>(scene).APEX_CUDA_OBJ_NAME(name)
-
-namespace nvidia
-{
-namespace iofx
-{
-
-class IofxSceneGPU : public IOFX_SCENE, public CudaModuleScene
-{
-public:
-	IofxSceneGPU(ModuleIofxImpl& module, SceneIntl& scene, RenderDebugInterface* debugRender, ResourceList& list);
-	~IofxSceneGPU();
-
-	void				submitTasks(float elapsedTime, float substepSize, uint32_t numSubSteps);
-
-	virtual void		prepareRenderables();
-
-	void*				getHeadCudaObj()
-	{
-		return CudaModuleScene::getHeadCudaObj();
-	}
-
-//CUDA module objects
-#include "../cuda/include/moduleList.h"
-
-protected:
-	/* device and host pinned buffers, etc */
-	PxCudaContextManager*	mContextManager;
-
-	nvidia::Array<CUgraphicsResource>	mToMapArray, mToUnmapArray;
-};
-
-}
-} // namespace nvidia
-
-#endif
-#endif
diff --git a/APEX_1.4/module/iofx/include/IosObjectData.h b/APEX_1.4/module/iofx/include/IosObjectData.h
deleted file mode 100644
index 62c1bff9..00000000
--- a/APEX_1.4/module/iofx/include/IosObjectData.h
+++ /dev/null
@@ -1,145 +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 __IOS_OBJECT_DATA_H__
-#define __IOS_OBJECT_DATA_H__
-
-#include "ApexUsingNamespace.h"
-#include "PsUserAllocated.h"
-#include "PsSync.h"
-#include "PxVec3.h"
-#include "PxVec4.h"
-#include "IofxManagerIntl.h"
-#include "PxMat33.h"
-#include "ApexMirroredArray.h"
-#include "ApexMath.h"
-
-#include "IofxRenderData.h"
-#include "ModifierData.h"
-
-namespace physx
-{
-class PxCudaContextManager;
-}
-
-namespace nvidia
-{
-namespace iofx
-{
-
-class IosObjectBaseData : public IofxManagerDescIntl, public IosBufferDescIntl, public UserAllocated
-{
-public:
-	IosObjectBaseData(uint32_t instance)
-		: instanceID(instance)
-		, renderData(NULL)
-		, maxStateID(0)
-		, maxInputID(0)
-		, numParticles(0)
-	{
-	}
-	virtual ~IosObjectBaseData()
-	{
-		if (renderData)
-		{
-			renderData->release();
-		}
-	}
-
-	void updateSemantics(IofxScene& scene, uint32_t semantics)
-	{
-		if (renderData)
-		{
-			renderData->updateSemantics(scene, semantics, maxObjectCount, numParticles);
-		}
-	}
-
-	PX_INLINE ModifierCommonParams getCommonParams() const
-	{
-		ModifierCommonParams common;
-
-		common.inputHasCollision = iosSupportsCollision;
-		common.inputHasDensity = iosSupportsDensity;
-		common.inputHasUserData = iosSupportsUserData;
-		common.upVector = upVector;
-		common.eyePosition = eyePosition;
-		common.eyeDirection = eyeDirection;
-		common.eyeAxisX = eyeAxisX;
-		common.eyeAxisY = eyeAxisY;
-		common.zNear = zNear;
-		common.deltaTime = deltaTime;
-
-		return common;
-	}
-
-	const uint32_t		instanceID;
-
-	PxVec3			upVector;
-	float			radius;
-	float			gravity;
-	float			restDensity; //!< resting density of simulation
-
-	float			elapsedTime;			//!< total simulation time
-	float			deltaTime;				//!< SceneIntl::getElapsedTime()
-	PxVec3			eyePosition;			//!< Scene::getEyePosition()
-	PxVec3			eyeDirection;			//!< Scene::getEyeDirection()
-	PxVec3			eyeAxisX;
-	PxVec3			eyeAxisY;
-	float			zNear;
-
-	uint32_t		maxStateID;				//!< From IOS each frame
-	uint32_t		maxInputID;				//!< From IOS each frame
-	uint32_t		numParticles;			//!< From IOS each frame
-
-	IofxSharedRenderDataBase* renderData;
-
-private:
-	IosObjectBaseData& operator=(const IosObjectBaseData&);
-};
-
-class IosObjectCpuData : public IosObjectBaseData
-{
-public:
-	IosObjectCpuData(uint32_t instance)
-		: IosObjectBaseData(instance)
-		, outputToState(NULL)
-		, sortingKeys(NULL)
-	{
-	}
-
-	IofxSlice**				inPubState;
-	IofxSlice**				outPubState;
-	uint32_t					numPubSlices;
-
-	IofxSlice**				inPrivState;
-	IofxSlice**				outPrivState;
-	uint32_t					numPrivSlices;
-
-	uint32_t*					outputToState;
-
-	uint32_t*					sortingKeys;
-};
-
-#if APEX_CUDA_SUPPORT
-class IosObjectGpuData : public IosObjectBaseData
-{
-public:
-	IosObjectGpuData(uint32_t instance)
-		: IosObjectBaseData(instance)
-	{
-	}
-};
-#endif
-
-}
-} // namespace nvidia
-
-#endif /* __IOS_OBJECT_DATA_H__ */
diff --git a/APEX_1.4/module/iofx/include/ModifierData.h b/APEX_1.4/module/iofx/include/ModifierData.h
deleted file mode 100644
index 9a211bf1..00000000
--- a/APEX_1.4/module/iofx/include/ModifierData.h
+++ /dev/null
@@ -1,514 +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 __MODIFIER_DATA_H__
-#define __MODIFIER_DATA_H__
-
-#include "ApexUsingNamespace.h"
-#include "PxVec3.h"
-#include <PxMat33.h>
-#include "InplaceTypes.h"
-#include "InplaceStorage.h"
-#include "RandState.h"
-
-#include "../../../include/iofx/IofxRenderCallback.h"
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#ifndef __CUDACC__
-PX_INLINE float saturate(float x)
-{
-	return (x < 0.0f) ? 0.0f : (1.0f < x) ? 1.0f : x;
-}
-#endif
-
-// output color is RenderDataFormat::B8G8R8A8
-#define FLT_TO_BYTE(x) ( (unsigned int)(saturate(PxAbs(x)) * 255) )
-#define MAKE_COLOR_UBYTE4(r, g, b, a) ( ((r) << 16) | ((g) << 8) | ((b) << 0) | ((a) << 24) )
-
-
-class IosObjectBaseData;
-
-//struct ModifierCommonParams
-#define INPLACE_TYPE_STRUCT_NAME ModifierCommonParams
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(InplaceBool,		inputHasCollision) \
-	INPLACE_TYPE_FIELD(InplaceBool,		inputHasDensity) \
-	INPLACE_TYPE_FIELD(InplaceBool,		inputHasUserData) \
-	INPLACE_TYPE_FIELD(PxVec3,	upVector) \
-	INPLACE_TYPE_FIELD(PxVec3,	eyePosition) \
-	INPLACE_TYPE_FIELD(PxVec3,	eyeDirection) \
-	INPLACE_TYPE_FIELD(PxVec3,	eyeAxisX) \
-	INPLACE_TYPE_FIELD(PxVec3,	eyeAxisY) \
-	INPLACE_TYPE_FIELD(float,	zNear) \
-	INPLACE_TYPE_FIELD(float,	deltaTime)
-#include INPLACE_TYPE_BUILD()
-
-
-// Mesh structs
-struct MeshInput
-{
-	PxVec3		position;
-	float		mass;
-	PxVec3		velocity;
-	float		liferemain;
-	float		density;
-	PxVec3		collisionNormal;
-	uint32_t	collisionFlags;
-	uint32_t	userData;
-
-	PX_INLINE void load(const IosObjectBaseData& objData, uint32_t pos);
-};
-
-struct MeshPublicState
-{
-	PxMat33		rotation;
-	PxVec3		scale;
-
-	float	color[4];
-
-	static APEX_CUDA_CALLABLE PX_INLINE void initDefault(MeshPublicState& state, float objectScale)
-	{
-		state.rotation = PxMat33(PxIdentity);
-		state.scale = PxVec3(objectScale);
-
-		state.color[0] = 1.0f;
-		state.color[1] = 1.0f;
-		state.color[2] = 1.0f;
-		state.color[3] = 1.0f;
-	}
-};
-
-/* TODO: Private state size should be declared by each IOFX asset, so the IOS can allocate
- * the private buffer dynamically based on the IOFX assets used with the IOS.  Each asset would
- * in turn be given an offset for their private data in this buffer.
- */
-struct MeshPrivateState
-{
-	PxMat33			rotation;
-
-	static APEX_CUDA_CALLABLE PX_INLINE void initDefault(MeshPrivateState& state)
-	{
-		state.rotation = PxMat33(PxIdentity);
-	}
-};
-
-
-//struct MeshOutputLayout
-#define INPLACE_TYPE_STRUCT_NAME MeshOutputLayout
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(uint32_t,	stride) \
-	INPLACE_TYPE_FIELD_N(uint32_t,	offsets, IofxMeshRenderLayoutElement::MAX_COUNT)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-#ifdef __CUDACC__
-#define WRITE_TO_FLOAT(data) { *((volatile float*)(sdata + ((offset) >> 2) * pitch) + idx) = (data); offset += 4; }
-#define WRITE_TO_UINT(data) { *((volatile unsigned int*)(sdata + ((offset) >> 2) * pitch + idx)) = (data); offset += 4; }
-
-	__device__ PX_INLINE void write(volatile unsigned int* sdata, unsigned int idx, unsigned int pitch, const MeshInput& input, const MeshPublicState& state, unsigned int outputID) const
-	{
-#else
-#define WRITE_TO_FLOAT(data) { *(float*)(outputPtr + outputID * stride + offset) = (data); offset += 4; }
-#define WRITE_TO_UINT(data) { *(unsigned int*)(outputPtr + outputID * stride + offset) = (data); offset += 4; }
-
-	PX_INLINE void write(uint32_t outputID, const MeshInput& input, const MeshPublicState& state, const uint8_t* outputPtr) const
-	{
-		if (outputPtr == NULL)
-		{
-			return;
-		}
-#endif
-		uint32_t offset;
-		if ((offset = offsets[IofxMeshRenderLayoutElement::POSITION_FLOAT3]) != static_cast<uint32_t>(-1)) //POSITION: 3 dwords
-		{
-			WRITE_TO_FLOAT( input.position.x )
-			WRITE_TO_FLOAT( input.position.y )
-			WRITE_TO_FLOAT( input.position.z )
-		}
-		if ((offset = offsets[IofxMeshRenderLayoutElement::ROTATION_SCALE_FLOAT3x3]) != static_cast<uint32_t>(-1)) //ROTATION_SCALE: 9 dwords
-		{
-			PxVec3 axis0 = state.rotation.column0 * state.scale.x;
-			PxVec3 axis1 = state.rotation.column1 * state.scale.y;
-			PxVec3 axis2 = state.rotation.column2 * state.scale.z;
-
-			WRITE_TO_FLOAT( axis0.x )
-			WRITE_TO_FLOAT( axis0.y )
-			WRITE_TO_FLOAT( axis0.z )
-
-			WRITE_TO_FLOAT( axis1.x )
-			WRITE_TO_FLOAT( axis1.y )
-			WRITE_TO_FLOAT( axis1.z )
-
-			WRITE_TO_FLOAT( axis2.x )
-			WRITE_TO_FLOAT( axis2.y )
-			WRITE_TO_FLOAT( axis2.z )
-		}
-		if ((offset = offsets[IofxMeshRenderLayoutElement::VELOCITY_LIFE_FLOAT4]) != static_cast<uint32_t>(-1)) //VELOCITY: 3 dwords
-		{
-			WRITE_TO_FLOAT( input.velocity.x )
-			WRITE_TO_FLOAT( input.velocity.y )
-			WRITE_TO_FLOAT( input.velocity.z )
-			WRITE_TO_FLOAT( input.liferemain )
-		}
-		if ((offset = offsets[IofxMeshRenderLayoutElement::DENSITY_FLOAT1]) != static_cast<uint32_t>(-1)) //DENSITY: 1 dword
-		{
-			WRITE_TO_FLOAT( input.density )
-		}
-		if ((offset = offsets[IofxMeshRenderLayoutElement::COLOR_BGRA8]) != static_cast<uint32_t>(-1)) //COLOR: 1 dword
-		{
-			WRITE_TO_UINT( MAKE_COLOR_UBYTE4( FLT_TO_BYTE(state.color[0]), 
-											FLT_TO_BYTE(state.color[1]), 
-											FLT_TO_BYTE(state.color[2]), 
-											FLT_TO_BYTE(state.color[3]) ) )
-		}
-		if ((offset = offsets[IofxMeshRenderLayoutElement::COLOR_RGBA8]) != static_cast<uint32_t>(-1)) //COLOR: 1 dword
-		{
-			WRITE_TO_UINT( MAKE_COLOR_UBYTE4( FLT_TO_BYTE(state.color[2]), 
-											FLT_TO_BYTE(state.color[1]), 
-											FLT_TO_BYTE(state.color[0]), 
-											FLT_TO_BYTE(state.color[3]) ) )
-											
-		}
-		if ((offset = offsets[IofxMeshRenderLayoutElement::COLOR_FLOAT4]) != static_cast<uint32_t>(-1)) //COLOR_FLOAT4: 4 dword
-		{
-			WRITE_TO_FLOAT( state.color[0] )
-			WRITE_TO_FLOAT( state.color[1] )
-			WRITE_TO_FLOAT( state.color[2] )
-			WRITE_TO_FLOAT( state.color[3] )
-		}
-		if ((offset = offsets[IofxMeshRenderLayoutElement::USER_DATA_UINT1]) != static_cast<uint32_t>(-1)) //USER_DATA: 1 dword
-		{
-			WRITE_TO_UINT( input.userData )
-		}
-		if ((offset = offsets[IofxMeshRenderLayoutElement::POSE_FLOAT3x4]) != static_cast<uint32_t>(-1)) //POSE: 12 dwords
-		{
-			PxVec3 axis0 = state.rotation.column0 * state.scale.x;
-			PxVec3 axis1 = state.rotation.column1 * state.scale.y;
-			PxVec3 axis2 = state.rotation.column2 * state.scale.z;
-
-			WRITE_TO_FLOAT( axis0.x )
-			WRITE_TO_FLOAT( axis1.x )
-			WRITE_TO_FLOAT( axis2.x )
-			WRITE_TO_FLOAT( input.position.x )
-
-			WRITE_TO_FLOAT( axis0.y )
-			WRITE_TO_FLOAT( axis1.y )
-			WRITE_TO_FLOAT( axis2.y )
-			WRITE_TO_FLOAT( input.position.y )
-
-			WRITE_TO_FLOAT( axis0.z )
-			WRITE_TO_FLOAT( axis1.z )
-			WRITE_TO_FLOAT( axis2.z )
-			WRITE_TO_FLOAT( input.position.z )
-		}
-	}
-#undef WRITE_TO_UINT
-#undef WRITE_TO_FLOAT
-};
-
-
-// Sprite structs
-struct SpriteInput
-{
-	PxVec3		position;
-	float		mass;
-	PxVec3		velocity;
-	float		liferemain;
-	float		density;
-	uint32_t	userData;
-
-	PX_INLINE void load(const IosObjectBaseData& objData, uint32_t pos);
-};
-
-
-struct SpritePublicState
-{
-	PxVec3			scale;
-	float			subTextureId;
-	float			rotation;
-
-	float			color[4];
-
-	static APEX_CUDA_CALLABLE PX_INLINE void initDefault(SpritePublicState& state, float objectScale)
-	{
-		state.scale = PxVec3(objectScale);
-
-		state.subTextureId = 0;
-		state.rotation = 0;
-
-		state.color[0] = 1.0f;
-		state.color[1] = 1.0f;
-		state.color[2] = 1.0f;
-		state.color[3] = 1.0f;
-	}
-};
-
-/* TODO: Private state size should be declared by each IOFX asset, so the IOS can allocate
- * the private buffer dynamically based on the IOFX assets used with the IOS.  Each asset would
- * in turn be given an offset for their private data in this buffer.
- */
-struct SpritePrivateState
-{
-	float	rotation;
-	float	scale;
-
-	static APEX_CUDA_CALLABLE PX_INLINE void initDefault(SpritePrivateState& state)
-	{
-		state.rotation = 0.0f;
-		state.scale = 1.0f;
-	}
-};
-
-//struct SpriteOutputLayout
-#define INPLACE_TYPE_STRUCT_NAME SpriteOutputLayout
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(uint32_t,	stride) \
-	INPLACE_TYPE_FIELD_N(uint32_t,	offsets, IofxSpriteRenderLayoutElement::MAX_COUNT)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-#ifdef __CUDACC__
-#define WRITE_TO_FLOAT(data) { *((volatile float*)(sdata + ((offset) >> 2) * pitch) + idx) = (data); offset += 4; }
-#define WRITE_TO_UINT(data) { *((volatile unsigned int*)(sdata + ((offset) >> 2) * pitch + idx)) = (data); offset += 4; }
-
-	__device__ PX_INLINE void write(volatile unsigned int* sdata, unsigned int idx, unsigned int pitch, const SpriteInput& input, const SpritePublicState& state, unsigned int outputID) const
-	{
-#else
-#define WRITE_TO_FLOAT(data) { *(float*)(outputPtr + outputID * stride + offset) = (data); offset += 4; }
-#define WRITE_TO_UINT(data) { *(unsigned int*)(outputPtr + outputID * stride + offset) = (data); offset += 4; }
-
-	PX_INLINE void write(uint32_t outputID, const SpriteInput& input, const SpritePublicState& state, const uint8_t* outputPtr) const
-	{
-		if (outputPtr == NULL)
-		{
-			return;
-		}
-#endif
-		uint32_t offset;
-		if((offset = offsets[IofxSpriteRenderLayoutElement::POSITION_FLOAT3]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_FLOAT( input.position.x )
-			WRITE_TO_FLOAT( input.position.y )
-			WRITE_TO_FLOAT( input.position.z )
-		}
-		if((offset = offsets[IofxSpriteRenderLayoutElement::COLOR_BGRA8]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_UINT( MAKE_COLOR_UBYTE4(FLT_TO_BYTE(state.color[0]), 
-											FLT_TO_BYTE(state.color[1]), 
-											FLT_TO_BYTE(state.color[2]), 
-											FLT_TO_BYTE(state.color[3])) )
-		}
-		if((offset = offsets[IofxSpriteRenderLayoutElement::COLOR_RGBA8]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_UINT( MAKE_COLOR_UBYTE4(FLT_TO_BYTE(state.color[2]), 
-											FLT_TO_BYTE(state.color[1]), 
-											FLT_TO_BYTE(state.color[0]), 
-											FLT_TO_BYTE(state.color[3])) )
-		}
-		if((offset = offsets[IofxSpriteRenderLayoutElement::COLOR_FLOAT4]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_FLOAT( state.color[0] )
-			WRITE_TO_FLOAT( state.color[1] )
-			WRITE_TO_FLOAT( state.color[2] )
-			WRITE_TO_FLOAT( state.color[3] )
-		}
-		if((offset = offsets[IofxSpriteRenderLayoutElement::VELOCITY_FLOAT3]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_FLOAT( input.velocity.x )
-			WRITE_TO_FLOAT( input.velocity.y )
-			WRITE_TO_FLOAT( input.velocity.z )
-		}
-		if((offset = offsets[IofxSpriteRenderLayoutElement::SCALE_FLOAT2]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_FLOAT( state.scale.x )
-			WRITE_TO_FLOAT( state.scale.y )
-		}
-		if((offset = offsets[IofxSpriteRenderLayoutElement::LIFE_REMAIN_FLOAT1]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_FLOAT( input.liferemain )
-		}
-		if((offset = offsets[IofxSpriteRenderLayoutElement::DENSITY_FLOAT1]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_FLOAT( input.density )
-		}
-		if((offset = offsets[IofxSpriteRenderLayoutElement::SUBTEXTURE_FLOAT1]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_FLOAT( state.subTextureId )
-		}
-		if((offset = offsets[IofxSpriteRenderLayoutElement::ORIENTATION_FLOAT1]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_FLOAT( state.rotation )
-		}
-		if((offset = offsets[IofxSpriteRenderLayoutElement::USER_DATA_UINT1]) != static_cast<uint32_t>(-1))
-		{
-			WRITE_TO_UINT( input.userData )
-		}
-	}
-#undef WRITE_TO_UINT
-#undef WRITE_TO_FLOAT
-};
-
-struct TextureOutputData
-{
-	uint16_t    layout;
-	uint8_t     widthShift;
-	uint8_t     pitchShift;
-};
-
-struct SpriteTextureOutputLayout
-{
-	uint32_t      textureCount;
-	TextureOutputData textureData[4];
-	uint8_t*      texturePtr[4];
-
-#ifdef __CUDACC__
-//#define CHECK_PTR(N) true
-#define WRITE_TO_FLOAT4(N, e0, e1, e2, e3) surf2Dwrite<float4>(make_float4(e0, e1, e2, e3), KERNEL_SURF_REF(APEX_CUDA_CONCAT(Output, N)), (x << 4), y);
-#define WRITE_TO_UINT(N, data) surf2Dwrite<uint32_t>(data, KERNEL_SURF_REF(APEX_CUDA_CONCAT(Output, N)), (x << 2), y);
-
-	__device__ PX_INLINE void write(volatile unsigned int* sdata, unsigned int idx, unsigned int pitch, const SpriteInput& input, const SpritePublicState& state, unsigned int outputID) const
-#else
-//#define CHECK_PTR(N) (texturePtr[N] != NULL)
-#define WRITE_TO_FLOAT4(N, e0, e1, e2, e3) { *(PxVec4*)(texturePtr[N] + (y << textureData[N].pitchShift) + (x << 4)) = PxVec4(e0, e1, e2, e3); }
-#define WRITE_TO_UINT(N, data) { *(unsigned int*)(texturePtr[N] + (y << textureData[N].pitchShift) + (x << 2)) = data; }
-
-	PX_INLINE void write(unsigned int outputID, const SpriteInput& input, const SpritePublicState& state, const uint8_t*) const
-#endif
-	{
-#define WRITE_TO_TEXTURE(N) \
-		if (N < textureCount) \
-		{ \
-			const uint32_t y = (outputID >> textureData[N].widthShift); \
-			const uint32_t x = outputID - (y << textureData[N].widthShift); \
-			switch (textureData[N].layout) \
-			{ \
-			case IofxSpriteRenderLayoutSurfaceElement::POSITION_FLOAT4: \
-				WRITE_TO_FLOAT4(N, input.position.x, input.position.y, input.position.z, 1.0f ) \
-				break; \
-			case IofxSpriteRenderLayoutSurfaceElement::SCALE_ORIENT_SUBTEX_FLOAT4: \
-				WRITE_TO_FLOAT4(N, state.scale.x, state.scale.y, state.rotation, state.subTextureId ) \
-				break; \
-			case IofxSpriteRenderLayoutSurfaceElement::COLOR_BGRA8: \
-				WRITE_TO_UINT(N, MAKE_COLOR_UBYTE4( FLT_TO_BYTE(state.color[0]), FLT_TO_BYTE(state.color[1]), FLT_TO_BYTE(state.color[2]), FLT_TO_BYTE(state.color[3]) ) ) \
-				break; \
-			case IofxSpriteRenderLayoutSurfaceElement::COLOR_RGBA8: \
-				WRITE_TO_UINT(N, MAKE_COLOR_UBYTE4( FLT_TO_BYTE(state.color[2]), FLT_TO_BYTE(state.color[1]), FLT_TO_BYTE(state.color[0]), FLT_TO_BYTE(state.color[3]) ) ) \
-				break; \
-			case IofxSpriteRenderLayoutSurfaceElement::COLOR_FLOAT4: \
-				WRITE_TO_FLOAT4(N, state.color[0], state.color[1], state.color[2], state.color[3] ) \
-				break; \
-			} \
-		}
-
-		WRITE_TO_TEXTURE(0)
-		WRITE_TO_TEXTURE(1)
-		WRITE_TO_TEXTURE(2)
-		WRITE_TO_TEXTURE(3)
-	}
-#undef WRITE_TO_TEXTURE
-#undef WRITE_TO_UINT
-#undef WRITE_TO_FLOAT4
-//#undef CHECK_PTR
-};
-
-//struct CurvePoint
-#define INPLACE_TYPE_STRUCT_NAME CurvePoint
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(float,	x) \
-	INPLACE_TYPE_FIELD(float,	y)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	APEX_CUDA_CALLABLE PX_INLINE CurvePoint() : x(0.0f), y(0.0f) {}
-	APEX_CUDA_CALLABLE PX_INLINE CurvePoint(float _x, float _y) : x(_x), y(_y) {}
-};
-
-APEX_CUDA_CALLABLE PX_INLINE float lerpPoints(float x, const CurvePoint& p0, const CurvePoint& p1)
-{
-	return ((x - p0.x) / (p1.x - p0.x)) * (p1.y - p0.y) + p0.y;
-}
-
-
-//struct Curve
-#define INPLACE_TYPE_STRUCT_NAME Curve
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(InplaceArray<CurvePoint>,	_pointArray)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-#ifndef __CUDACC__
-	PX_INLINE void resize(InplaceStorage& storage, uint32_t numPoints)
-	{
-		_pointArray.resize(storage, numPoints);
-	}
-
-	PX_INLINE void setPoint(InplaceStorage& storage, const CurvePoint& point, uint32_t index)
-	{
-		_pointArray.updateElem(storage, point, index);
-	}
-#endif
-
-	INPLACE_TEMPL_ARGS_DEF
-	APEX_CUDA_CALLABLE PX_INLINE float evaluate(INPLACE_STORAGE_ARGS_DEF, float x) const
-	{
-		uint32_t count = _pointArray.getSize();
-		if (count == 0)
-		{
-			return 0.0f;
-		}
-
-		CurvePoint begPoint;
-		_pointArray.fetchElem(INPLACE_STORAGE_ARGS_VAL, begPoint, 0);
-		if (x <= begPoint.x)
-		{
-			return begPoint.y;
-		}
-
-		CurvePoint endPoint;
-		_pointArray.fetchElem(INPLACE_STORAGE_ARGS_VAL, endPoint, count - 1);
-		if (x >= endPoint.x)
-		{
-			return endPoint.y;
-		}
-
-		//do binary search
-		unsigned int beg = 0;
-		unsigned int end = count;
-		while (beg < end)
-		{
-			unsigned int mid = beg + ((end - beg) >> 1);
-			CurvePoint midPoint;
-			_pointArray.fetchElem(INPLACE_STORAGE_ARGS_VAL, midPoint, mid);
-			if (x < midPoint.x)
-			{
-				end = mid;
-			}
-			else
-			{
-				beg = mid + 1;
-			}
-		}
-		beg = PxMin<uint32_t>(beg, count - 1);
-		CurvePoint point0, point1;
-		_pointArray.fetchElem(INPLACE_STORAGE_ARGS_VAL, point0, beg - 1);
-		_pointArray.fetchElem(INPLACE_STORAGE_ARGS_VAL, point1, beg);
-		return lerpPoints(x, point0, point1);
-	}
-};
-
-}
-} // namespace nvidia
-
-#endif /* __MODIFIER_DATA_H__ */
diff --git a/APEX_1.4/module/iofx/include/ModifierImpl.h b/APEX_1.4/module/iofx/include/ModifierImpl.h
deleted file mode 100644
index 3eb671c9..00000000
--- a/APEX_1.4/module/iofx/include/ModifierImpl.h
+++ /dev/null
@@ -1,1154 +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 __MODIFIER_IMPL_H__
-#define __MODIFIER_IMPL_H__
-
-#include "Modifier.h"
-#include "CurveImpl.h"
-#include "PsUserAllocated.h"
-
-#include "RotationModifierParams.h"
-#include "SimpleScaleModifierParams.h"
-#include "RandomScaleModifierParams.h"
-#include "ScaleByMassModifierParams.h"
-#include "ColorVsLifeModifierParams.h"
-#include "ScaleVsLifeModifierParams.h"
-#include "ScaleVsDensityModifierParams.h"
-#include "ScaleVsCameraDistanceModifierParams.h"
-#include "ColorVsDensityModifierParams.h"
-#include "SubtextureVsLifeModifierParams.h"
-#include "OrientAlongVelocityModifierParams.h"
-#include "ScaleAlongVelocityModifierParams.h"
-#include "RandomSubtextureModifierParams.h"
-#include "RandomRotationModifierParams.h"
-#include "ViewDirectionSortingModifierParams.h"
-#include "RotationRateModifierParams.h"
-#include "RotationRateVsLifeModifierParams.h"
-#include "OrientScaleAlongScreenVelocityModifierParams.h"
-#include "ColorVsVelocityModifierParams.h"
-
-#include "ParamArray.h"
-
-#include "PsArray.h"
-
-namespace nvidia
-{
-namespace apex
-{
-class InplaceStorage;
-class InplaceHandleBase;
-struct RandState;
-}
-namespace iofx
-{
-
-/**
-	Directions for adding a new APEX modifier type (an official modifier, not a user modifier).
-
-	1) In Modifier.h, add a value to the end of ModifierTypeEnum, matching the naming convention of others.
-	2) In Modifier.h, add a new subclass of ModifierT, specialized on your type.
-		- e.g. class MyNewModifier : public ModifierT<NxMyNewModifier> { };
-	3) MyNewModifier should include pure virtual getters (by value), and setters. Do not promise to return
-	   by const-reference.
-    4) In ModifierImpl.h (this file), add a subcless of your public class and ApexAllocateable
-		- e.g. class MyNewModifier : public MyNewModifier, public UserAllocated { };
-	5) The ModifierImpl.h class should provide concrete implementations of all of the functions.
-		- Feel free to do the getters and setters inline in ModifierImpl.h
-	6) In ModifierImpl.cpp, provide the implementations for the serailization functions and 'updateParticles.'
-*/
-
-// Ignore this warning temporarily. It's reset to default level at the bottom of the file.
-// We'll fix this soon, just not "right this second"
-#pragma warning( disable: 4100 )
-
-class IofxModifierHelper
-{
-public:
-
-	// assumes the mParams class contains a "controlPoints" member
-	static void setCurve(const nvidia::apex::Curve* f,
-	                       NvParameterized::Interface* mParams,
-	                       ParamDynamicArrayStruct* controlPoints)
-	{
-		uint32_t cpSize;
-		f->getControlPoints(cpSize);
-
-		NvParameterized::Handle h(*mParams);
-		mParams->getParameterHandle("controlPoints", h);
-		h.resizeArray((int32_t)cpSize);
-
-		ParamArray<ScaleVsCameraDistanceModifierParamsNS::vec2_Type>
-		cpArray(mParams, "controlPoints", controlPoints);
-
-		for (uint32_t i = 0; i < cpSize; i++)
-		{
-			cpArray[i].x = f->getControlPoints(cpSize)[i].x;
-			cpArray[i].y = f->getControlPoints(cpSize)[i].y;
-		}
-	}
-};
-
-
-class ModifierParamsMapperCPU
-{
-public:
-	virtual void beginParams(void* params, size_t size, size_t align, uint32_t randomCount) = 0;
-	virtual void endParams() = 0;
-
-	virtual void mapValue(size_t offset, int32_t value) = 0;
-	void mapValue(size_t offset, uint32_t value)
-	{
-		mapValue(offset, static_cast<int32_t>(value));
-	}
-
-	virtual void mapValue(size_t offset, float value) = 0;
-	void mapValue(size_t offset, const PxVec3& value)
-	{
-		mapValue(offset + offsetof(PxVec3, x), value.x);
-		mapValue(offset + offsetof(PxVec3, y), value.y);
-		mapValue(offset + offsetof(PxVec3, z), value.z);
-	}
-
-	virtual void mapCurve(size_t offset, const nvidia::apex::Curve* curve) = 0;
-};
-
-#if APEX_CUDA_SUPPORT
-
-class ModifierParamsMapperGPU
-{
-public:
-	virtual InplaceStorage& getStorage() = 0;
-
-	virtual void onParams(InplaceHandleBase handle, uint32_t randomCount) = 0;
-};
-#endif
-
-struct MeshInput;
-struct MeshPublicState;
-struct MeshPrivateState;
-struct SpriteInput;
-struct SpritePublicState;
-struct SpritePrivateState;
-struct ModifierCommonParams;
-
-class ModifierImpl
-{
-public:
-	static const ModifierImpl* castFrom(const Modifier*);
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const
-	{
-		PX_ASSERT(!"unimpl");
-	}
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& /*mapper*/) const
-	{
-		PX_ASSERT(!"unimpl");
-	}
-
-
-	typedef void (*updateSpriteFunc)(const void* params, const SpriteInput& input, SpritePublicState& pubState, SpritePrivateState& privState, const ModifierCommonParams& common, RandState& randState);
-	typedef void (*updateMeshFunc)(const void* params, const MeshInput& input, MeshPublicState& pubState, MeshPrivateState& privState, const ModifierCommonParams& common, RandState& randState);
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage /*stage*/) const
-	{
-		PX_ASSERT(!"unimpl");
-		return 0;
-	}
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage /*stage*/) const
-	{
-		PX_ASSERT(!"unimpl");
-		return 0;
-	}
-};
-
-// ------------------------------------------------------------------------------------------------
-class RotationModifierImpl : public RotationModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	RotationModifierImpl(RotationModifierParams* params);
-
-	virtual ApexMeshParticleRollType::Enum getRollType() const
-	{
-		return mRollType;
-	}
-	virtual void setRollType(ApexMeshParticleRollType::Enum rollType);
-	virtual float getMaxSettleRate() const
-	{
-		return mParams->maxSettleRatePerSec;
-	}
-	virtual void setMaxSettleRate(float settleRate)
-	{
-		mParams->maxSettleRatePerSec = settleRate;
-	}
-	virtual float getMaxRotationRate() const
-	{
-		return mParams->maxRotationRatePerSec;
-	}
-	virtual void setMaxRotationRate(float rotationRate)
-	{
-		mParams->maxRotationRatePerSec = rotationRate;
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, rollType), uint32_t(mRollType));
-		mapper.mapValue(offsetof(Params, rollAxis), mRollAxis);
-		mapper.mapValue(offsetof(Params, rollSign), mRollSign);
-
-		mapper.mapValue(offsetof(Params, maxSettleRatePerSec), mParams->maxSettleRatePerSec);
-		mapper.mapValue(offsetof(Params, maxRotationRatePerSec), mParams->maxRotationRatePerSec);
-
-		mapper.mapValue(offsetof(Params, inAirRotationMultiplier), mParams->inAirRotationMultiplier);
-		mapper.mapValue(offsetof(Params, collisionRotationMultiplier), mParams->collisionRotationMultiplier);
-
-		mapper.mapValue(offsetof(Params, includeVerticalDirection), uint32_t(mParams->includeVerticalDirection));
-
-		mapper.endParams();
-	}
-
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	RotationModifierParams* mParams;
-	ApexMeshParticleRollType::Enum mRollType;
-	int32_t mRollAxis;
-	float mRollSign;
-	float mLastUpdateTime;
-};
-
-// ------------------------------------------------------------------------------------------------
-class SimpleScaleModifierImpl : public SimpleScaleModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	SimpleScaleModifierImpl(SimpleScaleModifierParams* params);
-
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::SCALE);
-	}
-
-	virtual PxVec3 getScaleFactor() const
-	{
-		return mParams->scaleFactor;
-	}
-	virtual void setScaleFactor(const PxVec3& s)
-	{
-		mParams->scaleFactor = s;
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, scaleFactor), mParams->scaleFactor);
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	SimpleScaleModifierParams* mParams;
-
-};
-
-// ------------------------------------------------------------------------------------------------
-class ScaleByMassModifierImpl : public ScaleByMassModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	ScaleByMassModifierImpl(ScaleByMassModifierParams* params);
-
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::SCALE);
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	ScaleByMassModifierParams* mParams;
-
-};
-
-// ------------------------------------------------------------------------------------------------
-class RandomScaleModifierImpl : public RandomScaleModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	RandomScaleModifierImpl(RandomScaleModifierParams* params);
-
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::SCALE);
-	}
-
-	virtual Range<float> getScaleFactor() const
-	{
-		Range<float> s;
-		s.minimum = mParams->minScaleFactor;
-		s.maximum = mParams->maxScaleFactor;
-		return s;
-	}
-
-	virtual void setScaleFactor(const Range<float>& s)
-	{
-		mParams->minScaleFactor = s.minimum;
-		mParams->maxScaleFactor = s.maximum;
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, scaleFactorMin), mParams->minScaleFactor);
-		mapper.mapValue(offsetof(Params, scaleFactorMax), mParams->maxScaleFactor);
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	RandomScaleModifierParams* mParams;
-};
-
-// ------------------------------------------------------------------------------------------------
-class ColorVsLifeModifierImpl : public ColorVsLifeModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	ColorVsLifeModifierImpl(ColorVsLifeModifierParams* params);
-
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::COLOR);
-	}
-	virtual uint32_t getModifierMeshSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::COLOR);
-	}
-
-	// Access to expected data members
-	virtual ColorChannel getColorChannel() const
-	{
-		return mColorChannel;
-	}
-	virtual void setColorChannel(ColorChannel colorChannel);
-
-	virtual const nvidia::apex::Curve* getFunction() const
-	{
-		return static_cast<const nvidia::apex::Curve*>(&mCurveFunction);
-	}
-	virtual void setFunction(const nvidia::apex::Curve* f)
-	{
-		const CurveImpl* curve = static_cast<const CurveImpl*>(f);
-		mCurveFunction = *curve;
-
-		IofxModifierHelper::setCurve(f,
-		                               mParams,
-		                               (ParamDynamicArrayStruct*)&mParams->controlPoints);
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, channel), uint32_t(mColorChannel));
-		mapper.mapCurve(offsetof(Params, curve), static_cast<const CurveImpl*>(&mCurveFunction));
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	ColorVsLifeModifierParams* mParams;
-	ColorChannel mColorChannel;
-	CurveImpl mCurveFunction;
-};
-
-// ------------------------------------------------------------------------------------------------
-class ColorVsDensityModifierImpl : public ColorVsDensityModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	ColorVsDensityModifierImpl(ColorVsDensityModifierParams* params);
-
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::COLOR);
-	}
-	virtual uint32_t getModifierMeshSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::COLOR);
-	}
-
-	// Access to expected data members
-	virtual ColorChannel getColorChannel() const
-	{
-		return mColorChannel;
-	}
-	virtual void setColorChannel(ColorChannel colorChannel);
-
-	virtual const nvidia::apex::Curve* getFunction() const
-	{
-		return static_cast<const nvidia::apex::Curve*>(&mCurveFunction);
-	}
-	virtual void setFunction(const nvidia::apex::Curve* f)
-	{
-		const CurveImpl* curve = static_cast<const CurveImpl*>(f);
-		mCurveFunction = *curve;
-
-		IofxModifierHelper::setCurve(f,
-		                               mParams,
-		                               (ParamDynamicArrayStruct*)&mParams->controlPoints);
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, channel), uint32_t(mColorChannel));
-		mapper.mapCurve(offsetof(Params, curve), static_cast<const CurveImpl*>(&mCurveFunction));
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	ColorVsDensityModifierParams* mParams;
-	ColorChannel mColorChannel;
-	CurveImpl mCurveFunction;
-};
-
-// ------------------------------------------------------------------------------------------------
-class ColorVsVelocityModifierImpl : public ColorVsVelocityModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	ColorVsVelocityModifierImpl(ColorVsVelocityModifierParams* params);
-
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::COLOR);
-	}
-	virtual uint32_t getModifierMeshSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::COLOR);
-	}
-
-	// Access to expected data members
-	virtual ColorChannel getColorChannel() const
-	{
-		return mColorChannel;
-	}
-	virtual void setColorChannel(ColorChannel colorChannel);
-
-	virtual const nvidia::apex::Curve* getFunction() const
-	{
-		return static_cast<const nvidia::apex::Curve*>(&mCurveFunction);
-	}
-	virtual void setFunction(const nvidia::apex::Curve* f)
-	{
-		const CurveImpl* curve = static_cast<const CurveImpl*>(f);
-		mCurveFunction = *curve;
-
-		IofxModifierHelper::setCurve(f,
-		                               mParams,
-		                               (ParamDynamicArrayStruct*)&mParams->controlPoints);
-	}
-
-	virtual float getVelocity0() const
-	{
-		return mParams->velocity0;
-	}
-	virtual void setVelocity0(float value)
-	{
-		mParams->velocity0 = value;
-	}
-
-	virtual float getVelocity1() const
-	{
-		return mParams->velocity1;
-	}
-	virtual void setVelocity1(float value)
-	{
-		mParams->velocity1 = value;
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, velocity0), mParams->velocity0);
-		mapper.mapValue(offsetof(Params, velocity1), mParams->velocity1);
-		mapper.mapValue(offsetof(Params, channel), uint32_t(mColorChannel));
-		mapper.mapCurve(offsetof(Params, curve), static_cast<const CurveImpl*>(&mCurveFunction));
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	ColorVsVelocityModifierParams* mParams;
-	ColorChannel mColorChannel;
-	CurveImpl mCurveFunction;
-};
-
-// ------------------------------------------------------------------------------------------------
-class SubtextureVsLifeModifierImpl : public SubtextureVsLifeModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	SubtextureVsLifeModifierImpl(SubtextureVsLifeModifierParams* params);
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::SUBTEXTURE);
-	}
-
-	// Access to expected data members
-	virtual const nvidia::apex::Curve* getFunction() const
-	{
-		return static_cast<const nvidia::apex::Curve*>(&mCurveFunction);
-	}
-	virtual void setFunction(const nvidia::apex::Curve* f)
-	{
-		const CurveImpl* curve = static_cast<const CurveImpl*>(f);
-		mCurveFunction = *curve;
-
-		IofxModifierHelper::setCurve(f,
-		                               mParams,
-		                               (ParamDynamicArrayStruct*)&mParams->controlPoints);
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapCurve(offsetof(Params, curve), static_cast<const CurveImpl*>(&mCurveFunction));
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-
-private:
-	SubtextureVsLifeModifierParams* mParams;
-	CurveImpl mCurveFunction;
-};
-
-// ------------------------------------------------------------------------------------------------
-class OrientAlongVelocityModifierImpl : public OrientAlongVelocityModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	OrientAlongVelocityModifierImpl(OrientAlongVelocityModifierParams* params);
-
-	// Methods from Modifier
-
-	// Access to expected data members
-	virtual PxVec3 getModelForward() const
-	{
-		return mParams->modelForward;
-	}
-	virtual void setModelForward(const PxVec3& s)
-	{
-		mParams->modelForward = s;
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, modelForward), mParams->modelForward);
-
-		mapper.endParams();
-	}
-
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	OrientAlongVelocityModifierParams* mParams;
-};
-
-// ------------------------------------------------------------------------------------------------
-class ScaleAlongVelocityModifierImpl : public ScaleAlongVelocityModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	ScaleAlongVelocityModifierImpl(ScaleAlongVelocityModifierParams* params);
-
-	// Methods from Modifier
-
-	// Access to expected data members
-	virtual float getScaleFactor() const
-	{
-		return mParams->scaleFactor;
-	}
-	virtual void setScaleFactor(const float& s)
-	{
-		mParams->scaleFactor = s;
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, scaleFactor), mParams->scaleFactor);
-
-		mapper.endParams();
-	}
-
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	ScaleAlongVelocityModifierParams* mParams;
-};
-
-// ------------------------------------------------------------------------------------------------
-class RandomSubtextureModifierImpl : public RandomSubtextureModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	RandomSubtextureModifierImpl(RandomSubtextureModifierParams* params);
-
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::SUBTEXTURE);
-	}
-
-	// Access to expected data members
-	virtual Range<float> getSubtextureRange() const
-	{
-		Range<float> s;
-		s.minimum = mParams->minSubtexture;
-		s.maximum = mParams->maxSubtexture;
-		return s;
-	}
-
-	virtual void setSubtextureRange(const Range<float>& s)
-	{
-		mParams->minSubtexture = s.minimum;
-		mParams->maxSubtexture = s.maximum;
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, subtextureRangeMin), mParams->minSubtexture);
-		mapper.mapValue(offsetof(Params, subtextureRangeMax), mParams->maxSubtexture);
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-
-private:
-	RandomSubtextureModifierParams* mParams;
-};
-
-// ------------------------------------------------------------------------------------------------
-class RandomRotationModifierImpl : public RandomRotationModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	RandomRotationModifierImpl(RandomRotationModifierParams* params);
-
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::ORIENTATION);
-	}
-
-	// Access to expected data members
-	virtual Range<float> getRotationRange() const
-	{
-		Range<float> s;
-		s.minimum = mParams->minRotation;
-		s.maximum = mParams->maxRotation;
-		return s;
-	}
-
-	virtual void setRotationRange(const Range<float>& s)
-	{
-		mParams->minRotation = s.minimum;
-		mParams->maxRotation = s.maximum;
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, rotationRangeMin), mParams->minRotation);
-		mapper.mapValue(offsetof(Params, rotationRangeMax), mParams->maxRotation);
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-
-private:
-	RandomRotationModifierParams* mParams;
-};
-
-// ------------------------------------------------------------------------------------------------
-class ScaleVsLifeModifierImpl : public ScaleVsLifeModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	ScaleVsLifeModifierImpl(ScaleVsLifeModifierParams* params);
-
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::SCALE);
-	}
-
-	// Access to expected data members
-	virtual ScaleAxis getScaleAxis() const
-	{
-		return mScaleAxis;
-	}
-	virtual void setScaleAxis(ScaleAxis a);
-	virtual const nvidia::apex::Curve* getFunction() const
-	{
-		return static_cast<const nvidia::apex::Curve*>(&mCurveFunction);
-	}
-	virtual void setFunction(const nvidia::apex::Curve* f)
-	{
-		const CurveImpl* curve = static_cast<const CurveImpl*>(f);
-		mCurveFunction = *curve;
-
-		IofxModifierHelper::setCurve(f,
-		                               mParams,
-		                               (ParamDynamicArrayStruct*)&mParams->controlPoints);
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, axis), uint32_t(mScaleAxis));
-		mapper.mapCurve(offsetof(Params, curve), static_cast<const CurveImpl*>(&mCurveFunction));
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	ScaleVsLifeModifierParams* mParams;
-	ScaleAxis mScaleAxis;
-	CurveImpl mCurveFunction;
-};
-
-// ------------------------------------------------------------------------------------------------
-class ScaleVsDensityModifierImpl : public ScaleVsDensityModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	ScaleVsDensityModifierImpl(ScaleVsDensityModifierParams* params);
-
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::SCALE);
-	}
-
-	// Access to expected data members
-	virtual ScaleAxis getScaleAxis() const
-	{
-		return mScaleAxis;
-	}
-	virtual void setScaleAxis(ScaleAxis a);
-	virtual const nvidia::apex::Curve* getFunction() const
-	{
-		return static_cast<const nvidia::apex::Curve*>(&mCurveFunction);
-	}
-	virtual void setFunction(const nvidia::apex::Curve* f)
-	{
-		const CurveImpl* curve = static_cast<const CurveImpl*>(f);
-		mCurveFunction = *curve;
-
-		IofxModifierHelper::setCurve(f,
-		                               mParams,
-		                               (ParamDynamicArrayStruct*)&mParams->controlPoints);
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, axis), uint32_t(mScaleAxis));
-		mapper.mapCurve(offsetof(Params, curve), static_cast<const CurveImpl*>(&mCurveFunction));
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	ScaleVsDensityModifierParams* mParams;
-	ScaleAxis mScaleAxis;
-	CurveImpl mCurveFunction;
-};
-
-// ------------------------------------------------------------------------------------------------
-class ScaleVsCameraDistanceModifierImpl : public ScaleVsCameraDistanceModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	ScaleVsCameraDistanceModifierImpl(ScaleVsCameraDistanceModifierParams* params);
-
-	// Methods from Modifier
-
-	// Access to expected data members
-	virtual ScaleAxis getScaleAxis() const
-	{
-		return mScaleAxis;
-	}
-	virtual void setScaleAxis(ScaleAxis a);
-	virtual const nvidia::apex::Curve* getFunction() const
-	{
-		return static_cast<const nvidia::apex::Curve*>(&mCurveFunction);
-	}
-	virtual void setFunction(const nvidia::apex::Curve* f)
-	{
-		const CurveImpl* curve = static_cast<const CurveImpl*>(f);
-		mCurveFunction = *curve;
-
-		IofxModifierHelper::setCurve(f,
-		                               mParams,
-		                               (ParamDynamicArrayStruct*)&mParams->controlPoints);
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, axis), uint32_t(mScaleAxis));
-		mapper.mapCurve(offsetof(Params, curve), static_cast<const CurveImpl*>(&mCurveFunction));
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-	virtual updateMeshFunc getUpdateMeshFunc(ModifierStage stage) const;
-
-private:
-	ScaleVsCameraDistanceModifierParams* mParams;
-	ScaleAxis mScaleAxis;
-	CurveImpl mCurveFunction;
-};
-
-/**
-	NvParameterized::Factory for modifiers. TODO: This should be a class that you instantiate, which you can then register objects with,
-	and that you then pass to the Asset class for deserialization.
-*/
-Modifier* CreateModifier(ModifierTypeEnum modifierType, NvParameterized::Interface* objParam, NvParameterized::Handle& h);
-
-// ------------------------------------------------------------------------------------------------
-class ViewDirectionSortingModifierImpl : public ViewDirectionSortingModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	ViewDirectionSortingModifierImpl(ViewDirectionSortingModifierParams* params);
-
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)0;
-	}
-
-	// Access to expected data members
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-
-private:
-	ViewDirectionSortingModifierParams* mParams;
-};
-
-// ------------------------------------------------------------------------------------------------
-class RotationRateModifierImpl : public RotationRateModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	RotationRateModifierImpl(RotationRateModifierParams* params);
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::ORIENTATION);
-	}
-
-	// Access to expected data members
-	virtual float getRotationRate() const
-	{
-		return mParams->rotationRate;
-	}
-	virtual void setRotationRate(const float& r)
-	{
-		mParams->rotationRate = r;
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, rotationRate), mParams->rotationRate);
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-
-private:
-	RotationRateModifierParams* mParams;
-};
-
-// ------------------------------------------------------------------------------------------------
-class RotationRateVsLifeModifierImpl : public RotationRateVsLifeModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	RotationRateVsLifeModifierImpl(RotationRateVsLifeModifierParams* params);
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)(1 << IofxRenderSemantic::ORIENTATION);
-	}
-
-	// Access to expected data members
-	virtual const nvidia::apex::Curve* getFunction() const
-	{
-		return static_cast<const nvidia::apex::Curve*>(&mCurveFunction);
-	}
-	virtual void setFunction(const nvidia::apex::Curve* f)
-	{
-		const CurveImpl* curve = static_cast<const CurveImpl*>(f);
-		mCurveFunction = *curve;
-
-		IofxModifierHelper::setCurve(f,
-		                               mParams,
-		                               (ParamDynamicArrayStruct*)&mParams->controlPoints);
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapCurve(offsetof(Params, curve), static_cast<const CurveImpl*>(&mCurveFunction));
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-
-private:
-	RotationRateVsLifeModifierParams* mParams;
-	CurveImpl mCurveFunction;
-};
-
-// ------------------------------------------------------------------------------------------------
-class OrientScaleAlongScreenVelocityModifierImpl : public OrientScaleAlongScreenVelocityModifier, public ModifierImpl, public UserAllocated
-{
-public:
-	OrientScaleAlongScreenVelocityModifierImpl(OrientScaleAlongScreenVelocityModifierParams* params);
-	// Methods from Modifier
-	virtual uint32_t getModifierSpriteSemantics()
-	{
-		return (uint32_t)((1 << IofxRenderSemantic::ORIENTATION) | (1 << IofxRenderSemantic::SCALE));
-	}
-
-	// Access to expected data members
-	virtual float getScalePerVelocity() const
-	{
-		return mParams->scalePerVelocity;
-	}
-	virtual void setScalePerVelocity(const float& s)
-	{
-		mParams->scalePerVelocity = s;
-	}
-
-	virtual float getScaleChangeLimit() const
-	{
-		return mParams->scaleChangeLimit;
-	}
-	virtual void setScaleChangeLimit(const float& s)
-	{
-		mParams->scaleChangeLimit = s;
-	}
-
-	virtual float getScaleChangeDelay() const
-	{
-		return mParams->scaleChangeDelay;
-	}
-	virtual void setScaleChangeDelay(const float& s)
-	{
-		mParams->scaleChangeDelay = s;
-	}
-
-#if APEX_CUDA_SUPPORT
-	virtual void mapParamsGPU(ModifierParamsMapperGPU& mapper) const;
-#endif
-	virtual void mapParamsCPU(ModifierParamsMapperCPU& mapper) const;
-
-	template <class Mapper, typename Params>
-	void mapParams(Mapper& mapper, Params* params) const
-	{
-		mapper.beginParams(params, sizeof(Params), __alignof(Params), Params::RANDOM_COUNT);
-
-		mapper.mapValue(offsetof(Params, scalePerVelocity), mParams->scalePerVelocity);
-		mapper.mapValue(offsetof(Params, scaleChangeLimit), mParams->scaleChangeLimit);
-		mapper.mapValue(offsetof(Params, scaleChangeDelay), mParams->scaleChangeDelay);
-
-		mapper.endParams();
-	}
-
-	virtual updateSpriteFunc getUpdateSpriteFunc(ModifierStage stage) const;
-
-private:
-	OrientScaleAlongScreenVelocityModifierParams* mParams;
-};
-
-#pragma warning( default: 4100 )
-
-}
-} // namespace nvidia
-
-#endif /* __MODIFIER_IMPL_H__ */
diff --git a/APEX_1.4/module/iofx/include/ModifierList.h b/APEX_1.4/module/iofx/include/ModifierList.h
deleted file mode 100644
index e2831c4d..00000000
--- a/APEX_1.4/module/iofx/include/ModifierList.h
+++ /dev/null
@@ -1,79 +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 _MODIFIER
-#define _MODIFIER(name)
-#endif
-
-#ifndef _MODIFIER_SPRITE
-#define _MODIFIER_SPRITE(name)
-#endif
-
-#ifndef _MODIFIER_MESH
-#define _MODIFIER_MESH(name)
-#endif
-
-//All
-_MODIFIER(Rotation)
-_MODIFIER(SimpleScale)
-_MODIFIER(RandomScale)
-_MODIFIER(ScaleByMass)
-_MODIFIER(ColorVsLife)
-_MODIFIER(ColorVsDensity)
-_MODIFIER(SubtextureVsLife)
-_MODIFIER(OrientAlongVelocity)
-_MODIFIER(ScaleAlongVelocity)
-_MODIFIER(RandomSubtexture)
-_MODIFIER(RandomRotation)
-_MODIFIER(ScaleVsLife)
-_MODIFIER(ScaleVsDensity)
-_MODIFIER(ScaleVsCameraDistance)
-_MODIFIER(ViewDirectionSorting)
-_MODIFIER(RotationRate)
-_MODIFIER(RotationRateVsLife)
-_MODIFIER(OrientScaleAlongScreenVelocity)
-_MODIFIER(ColorVsVelocity)
-
-//Sprite
-_MODIFIER_SPRITE(SimpleScale)
-_MODIFIER_SPRITE(RandomScale)
-_MODIFIER_SPRITE(ScaleByMass)
-_MODIFIER_SPRITE(ColorVsLife)
-_MODIFIER_SPRITE(ColorVsDensity)
-_MODIFIER_SPRITE(SubtextureVsLife)
-_MODIFIER_SPRITE(RandomSubtexture)
-_MODIFIER_SPRITE(RandomRotation)
-_MODIFIER_SPRITE(ScaleVsLife)
-_MODIFIER_SPRITE(ScaleVsDensity)
-_MODIFIER_SPRITE(ScaleVsCameraDistance)
-_MODIFIER_SPRITE(ViewDirectionSorting)
-_MODIFIER_SPRITE(RotationRate)
-_MODIFIER_SPRITE(RotationRateVsLife)
-_MODIFIER_SPRITE(OrientScaleAlongScreenVelocity)
-_MODIFIER_SPRITE(ColorVsVelocity)
-
-//Mesh
-_MODIFIER_MESH(Rotation)
-_MODIFIER_MESH(SimpleScale)
-_MODIFIER_MESH(RandomScale)
-_MODIFIER_MESH(ScaleByMass)
-_MODIFIER_MESH(ColorVsLife)
-_MODIFIER_MESH(ColorVsDensity)
-_MODIFIER_MESH(OrientAlongVelocity)
-_MODIFIER_MESH(ScaleAlongVelocity)
-_MODIFIER_MESH(ScaleVsLife)
-_MODIFIER_MESH(ScaleVsDensity)
-_MODIFIER_MESH(ScaleVsCameraDistance)
-_MODIFIER_MESH(ColorVsVelocity)
-
-#undef _MODIFIER
-#undef _MODIFIER_SPRITE
-#undef _MODIFIER_MESH
diff --git a/APEX_1.4/module/iofx/include/ModifierSrc.h b/APEX_1.4/module/iofx/include/ModifierSrc.h
deleted file mode 100644
index c293c31a..00000000
--- a/APEX_1.4/module/iofx/include/ModifierSrc.h
+++ /dev/null
@@ -1,921 +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.
- */
-
-
-#if defined(__CUDACC__) && defined(__CUDA_ARCH__) && __CUDA_ARCH__ < 200
-#define _CUDA_OPT_LOC_MEM_ 1
-#else
-#define _CUDA_OPT_LOC_MEM_ 0
-#endif
-
-#define PI 3.141592653589793f
-
-//--- Helpers
-
-APEX_CUDA_CALLABLE PX_INLINE unsigned int binSearch(float val, unsigned int count, const float* data)
-{
-	unsigned int beg = 0;
-	unsigned int end = count;
-
-	while (beg < end)
-	{
-		unsigned int mid = beg + ((end - beg) >> 1);
-		if (val < data[mid])
-		{
-			end = mid;
-		}
-		else
-		{
-			beg = mid + 1;
-		}
-	}
-	return beg;
-}
-
-APEX_CUDA_CALLABLE PX_INLINE void approxAxisAngleToMat33(const PxVec3& axisAngle, PxMat33& rot)
-{
-	const float x = 0.5f * axisAngle.x;
-	const float y = 0.5f * axisAngle.y;
-	const float z = 0.5f * axisAngle.z;
-	const float xx = x * x;
-	const float yy = y * y;
-	const float zz = z * z;
-	const float xy = x * y;
-	const float yz = y * z;
-	const float zx = z * x;
-	const float twoRecipNorm2 = 2.0f / (1.0f + xx + yy + zz);	// w = 1
-	rot(0, 0) = 1.0f - twoRecipNorm2 * (yy + zz);
-	rot(0, 1) = twoRecipNorm2 * (xy - z);
-	rot(0, 2) = twoRecipNorm2 * (zx + y);
-	rot(1, 0) = twoRecipNorm2 * (xy + z);
-	rot(1, 1) = 1.0f - twoRecipNorm2 * (zz + xx);
-	rot(1, 2) = twoRecipNorm2 * (yz - x);
-	rot(2, 0) = twoRecipNorm2 * (zx - y);
-	rot(2, 1) = twoRecipNorm2 * (yz + x);
-	rot(2, 2) = 1.0f - twoRecipNorm2 * (xx + yy);
-}
-
-
-APEX_CUDA_CALLABLE PX_INLINE bool approxEquals(float a, float b, float eps)
-{
-	const float diff = PxAbs(a - b);
-	return (diff < eps);
-}
-
-APEX_CUDA_CALLABLE PX_INLINE bool approxEquals(const PxVec3& a, const PxVec3& b, float eps)
-{
-	return	approxEquals(a.x, b.x, eps) &&
-	        approxEquals(a.y, b.y, eps) &&
-	        approxEquals(a.z, b.z, eps);
-}
-
-APEX_CUDA_CALLABLE PX_INLINE int maxAbsElementIndex(const PxVec3& v)
-{
-	const PxVec3 a(PxAbs(v.x), PxAbs(v.y), PxAbs(v.z));
-	const int m01 = (a.y > a.x);
-	const int m2 = (a.z > a[(unsigned)m01]);
-	return (m2 << 1) | (m01 >> m2);
-}
-
-
-APEX_CUDA_CALLABLE PX_INLINE void generateRotationMatrix(const PxVec3& srcVec, const PxVec3& dstVec, PxMat33& outRotMat)
-{
-	if (approxEquals(srcVec, dstVec, 0.0001f))
-	{
-		outRotMat = PxMat33(PxIdentity);
-		return;
-	}
-
-	PxVec3 crossResult = srcVec.cross(dstVec);
-	crossResult *= PxAcos(srcVec.dot(dstVec));
-
-	approxAxisAngleToMat33(crossResult, outRotMat);
-}
-
-APEX_CUDA_CALLABLE PX_INLINE void generateRandomRotation(const PxVec3& srcVec, PxMat33& outRotMat, nvidia::RandState& randState)
-{
-	PxVec3 tmpRotVec(srcVec);
-	tmpRotVec *= randState.nextFloat(0.0f, 2 * PI);
-	approxAxisAngleToMat33(tmpRotVec, outRotMat);
-}
-
-// ------------------------------------------------------------------------------------------------
-
-
-//--- Rotation modifier ---
-
-//struct PARAMS_NAME(Rotation)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(Rotation)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(uint32_t,	rollType) \
-	INPLACE_TYPE_FIELD(int32_t,	rollAxis) \
-	INPLACE_TYPE_FIELD(float,	rollSign) \
-	INPLACE_TYPE_FIELD(float,	maxSettleRatePerSec) \
-	INPLACE_TYPE_FIELD(float,	maxRotationRatePerSec) \
-	INPLACE_TYPE_FIELD(float,	inAirRotationMultiplier) \
-	INPLACE_TYPE_FIELD(float,	collisionRotationMultiplier) \
-	INPLACE_TYPE_FIELD(uint32_t,	includeVerticalDirection)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 3;
-};
-
-APEX_CUDA_CALLABLE PX_INLINE void chooseUp(PxVec3& outUp, unsigned int rollType, nvidia::RandState& randState)
-{
-	const float angle = randState.nextFloat(0.0f, 2 * PI);
-	const float up = angle < PI ? -1.0f : 1.0f;
-	const float cosAng = PxCos(angle);
-	const float sinAng = PxSin(angle);
-
-	switch (rollType)
-	{
-	default:
-		outUp = PxVec3(0.0f, 0.0f, 1.0f);
-		break;
-
-	case nvidia::apex::ApexMeshParticleRollType::FLAT_X:
-		outUp = PxVec3(up, 0.0f, 0.0f);
-		break;
-	case nvidia::apex::ApexMeshParticleRollType::FLAT_Y:
-		outUp = PxVec3(0.0f, up, 0.0f);
-		break;
-	case nvidia::apex::ApexMeshParticleRollType::FLAT_Z:
-		outUp = PxVec3(0.0f, 0.0f, up);
-		break;
-
-	case nvidia::apex::ApexMeshParticleRollType::LONG_X:
-		outUp = PxVec3(0.0f, cosAng, sinAng);
-		break;
-	case nvidia::apex::ApexMeshParticleRollType::LONG_Y:
-		outUp = PxVec3(cosAng, 0.0f, sinAng);
-		break;
-	case nvidia::apex::ApexMeshParticleRollType::LONG_Z:
-		outUp = PxVec3(cosAng, sinAng, 0.0f);
-		break;
-	}
-}
-
-APEX_CUDA_CALLABLE PX_INLINE void updateParticleRollBoxFromCollision(const PARAMS_NAME(Rotation)& params, PxVec3& particleAngularDelta, const PxMat33& rot, const PxVec3& collisionNormal, float timeSlice)
-{
-	const float maxSettle = params.maxSettleRatePerSec * timeSlice;
-	const float maxSettle2 = maxSettle * maxSettle; // where to compute this?
-
-	if (params.rollType != nvidia::apex::ApexMeshParticleRollType::SPHERICAL)
-	{
-		// Settling
-		PxVec3 a;
-		if (params.rollAxis < 0)
-		{
-			// Cubic rolling, must choose most normal-pointing mRollAxis
-			PxVec3 overlap;
-			overlap = rot.transform(collisionNormal);
-			const int32_t bestAxis = maxAbsElementIndex(overlap);
-			a = bestAxis == 0 ? rot.column0 : bestAxis == 1 ? rot.column1 : rot.column2;
-		}
-		else
-		{
-			// Flat or long box, mRollAxis is chosen
-			a = params.rollAxis == 0 ? rot.column0 : params.rollAxis == 1 ? rot.column1 : rot.column2;
-		}
-
-		PxVec3 settle = (params.rollSign * a.dot(collisionNormal)) * a.cross(collisionNormal);
-		if (maxSettle != 0.0f)
-		{
-			const float settle2 = settle.magnitudeSquared();
-			// Cap how much settling is allowed per simulation tick
-			if (settle2 > maxSettle2)
-			{
-				settle *= maxSettle * PxRecipSqrt(settle2);
-			}
-		}
-		particleAngularDelta += settle;
-	}
-}
-
-APEX_CUDA_CALLABLE PX_INLINE void updateParticleRollBoxNoCollision(const PARAMS_NAME(Rotation)& params, PxVec3& particleAngularDelta, float timeSlice)
-{
-	const float maxRotation = params.maxRotationRatePerSec * timeSlice;
-	const float maxRotation2 = maxRotation * maxRotation;
-
-	if (maxRotation != 0.0f)
-	{
-		// Cap the total amount of roll.
-		const float roll2 = particleAngularDelta.magnitudeSquared();
-		if (roll2 > maxRotation2)
-		{
-			particleAngularDelta *= maxRotation * PxRecipSqrt(roll2);
-		}
-	}
-}
-
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierRotation(const PARAMS_NAME(Rotation)& params, const Input& input, PubState& pubState, PrivState& privState, const nvidia::iofx::ModifierCommonParams& common, nvidia::RandState& randState)
-{
-	if (usage == nvidia::apex::ModifierUsage_Mesh)
-	{
-		// TODO: This should really go into a 'settle' modifier, that says that objects should try to settle with one side up
-		// or another, but for now it's here.
-		if (spawn)
-		{
-			// Need to come up with a default pose.
-			PxMat33 rotationOnSpawn;
-			if (params.rollType == nvidia::apex::ApexMeshParticleRollType::SPHERICAL)
-			{
-				PxVec3 randomRotation;
-				randomRotation.x = randState.nextFloat(-PI, PI);
-				randomRotation.y = randState.nextFloat(-PI, PI);
-				randomRotation.z = randState.nextFloat(-PI, PI);
-				approxAxisAngleToMat33(randomRotation, rotationOnSpawn);
-			}
-			else
-			{
-				PxVec3 upVector;
-				chooseUp(upVector, params.rollType, randState);
-
-				PxVec3 unitSystemUp = common.upVector;
-				unitSystemUp.normalize();
-
-				PxMat33 rotateToUp, randomRotation;
-				generateRotationMatrix(upVector, unitSystemUp, rotateToUp);
-				generateRandomRotation(unitSystemUp, randomRotation, randState);
-
-				rotationOnSpawn = randomRotation * rotateToUp;
-			}
-			privState.rotation = rotationOnSpawn;
-			pubState.rotation = rotationOnSpawn;
-		}
-		else
-		{
-			PxVec3 rollDelta;
-			PxVec3 delta = input.velocity * common.deltaTime;
-
-			if (common.inputHasCollision)
-			{
-				if (input.collisionFlags != 0)
-				{
-					rollDelta = params.collisionRotationMultiplier * input.collisionNormal.cross(delta);
-				}
-				else
-				{
-					if (params.includeVerticalDirection)
-					{
-						// I'd like to use the absolute value of the "up" speed... just check it in first.
-						rollDelta = params.inAirRotationMultiplier * delta;
-					}
-					else
-					{
-						rollDelta = params.inAirRotationMultiplier * common.upVector.cross( delta );
-					}
-				}
-
-				updateParticleRollBoxFromCollision(params, rollDelta, privState.rotation, input.collisionNormal, common.deltaTime);
-				updateParticleRollBoxNoCollision(params, rollDelta, common.deltaTime);
-			}
-			else
-			{
-				if (params.includeVerticalDirection)
-				{
-					// I'd like to use the absolute value of the "up" speed... just check it in first.
-					rollDelta = params.inAirRotationMultiplier * delta;
-				}
-				else
-				{
-					rollDelta = params.inAirRotationMultiplier * common.upVector.cross( delta );
-				}
-				updateParticleRollBoxNoCollision(params, rollDelta, common.deltaTime);
-			}
-
-			if (rollDelta.magnitudeSquared() > 0.0f)
-			{
-				// update particle transform
-				// A) This is because maxAngle isn't really working properly
-				// B) This should be a configurable parameter of the system
-				PxMat33 rot;
-				approxAxisAngleToMat33(rollDelta, rot);
-				privState.rotation = rot * privState.rotation;
-			}
-			pubState.rotation = privState.rotation;
-		}
-	}
-}
-
-//--- SimpleScale modifier ---
-
-//struct PARAMS_NAME(SimpleScale)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(SimpleScale)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(PxVec3,	scaleFactor)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierSimpleScale(const PARAMS_NAME(SimpleScale)& params, const Input& /*input*/, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-	pubState.scale.x *= params.scaleFactor.x;
-	pubState.scale.y *= params.scaleFactor.y;
-	pubState.scale.z *= params.scaleFactor.z;
-}
-
-//--- RandomScale modifier ---
-
-//struct PARAMS_NAME(RandomScale)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(RandomScale)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(float,	scaleFactorMin) \
-	INPLACE_TYPE_FIELD(float,	scaleFactorMax)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 1;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierRandomScale(const PARAMS_NAME(RandomScale)& params, const Input& /*input*/, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& randState)
-{
-	const float scaleFactor = randState.nextFloat(params.scaleFactorMin, params.scaleFactorMax);
-
-	pubState.scale *= scaleFactor;
-}
-
-//--- ScaleByMass modifier ---
-
-//struct PARAMS_NAME(ScaleByMass)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(ScaleByMass)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(float,	scaleFactor)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierScaleByMass(const PARAMS_NAME(ScaleByMass)& /*params*/, const Input& input, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-	pubState.scale *= input.mass;
-}
-
-//--- ColorVsLife modifier ---
-
-//struct PARAMS_NAME(ColorVsLife)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(ColorVsLife)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(uint32_t,	channel) \
-	INPLACE_TYPE_FIELD(CURVE_TYPE,		curve)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierColorVsLife(const PARAMS_NAME(ColorVsLife)& params, const Input& input, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-#define _MODIFIER_CODE_(channel) \
-	{ \
-		pubState.color[channel] *= EVAL_CURVE(params.curve, input.liferemain); \
-	}
-#if _CUDA_OPT_LOC_MEM_
-	if (params.channel == 0) _MODIFIER_CODE_(0)
-		else if (params.channel == 1) _MODIFIER_CODE_(1)
-			else if (params.channel == 2) _MODIFIER_CODE_(2)
-				else if (params.channel == 3) _MODIFIER_CODE_(3)
-#else
-	_MODIFIER_CODE_(params.channel)
-#endif
-#undef _MODIFIER_CODE_
-
-				}
-
-//--- ColorVsDensity modifier ---
-
-//struct PARAMS_NAME(ColorVsDensity)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(ColorVsDensity)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(uint32_t,	channel) \
-	INPLACE_TYPE_FIELD(CURVE_TYPE,		curve)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierColorVsDensity(const PARAMS_NAME(ColorVsDensity)& params, const Input& input, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-#define _MODIFIER_CODE_(channel) \
-	{ \
-		pubState.color[channel] *= EVAL_CURVE(params.curve, input.density); \
-	}
-#if _CUDA_OPT_LOC_MEM_
-	if (params.channel == 0) _MODIFIER_CODE_(0)
-		else if (params.channel == 1) _MODIFIER_CODE_(1)
-			else if (params.channel == 2) _MODIFIER_CODE_(2)
-				else if (params.channel == 3) _MODIFIER_CODE_(3)
-#else
-	_MODIFIER_CODE_(params.channel)
-#endif
-#undef _MODIFIER_CODE_
-				}
-
-//--- ColorVsVelocity modifier ---
-
-//struct PARAMS_NAME(ColorVsVelocity)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(ColorVsVelocity)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(float,	velocity0) \
-	INPLACE_TYPE_FIELD(float,	velocity1) \
-	INPLACE_TYPE_FIELD(uint32_t,	channel) \
-	INPLACE_TYPE_FIELD(CURVE_TYPE,		curve)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierColorVsVelocity(const PARAMS_NAME(ColorVsVelocity)& params, const Input& input, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-	float velocity = (input.velocity.magnitude() - params.velocity0) / (params.velocity1 - params.velocity0);
-	velocity = PxClamp(velocity, 0.0f, 1.0f);
-
-#define _MODIFIER_CODE_(channel) \
-	{ \
-		pubState.color[channel] *= EVAL_CURVE(params.curve, velocity); \
-	}
-#if _CUDA_OPT_LOC_MEM_
-	if (params.channel == 0) _MODIFIER_CODE_(0)
-		else if (params.channel == 1) _MODIFIER_CODE_(1)
-			else if (params.channel == 2) _MODIFIER_CODE_(2)
-				else if (params.channel == 3) _MODIFIER_CODE_(3)
-#else
-	_MODIFIER_CODE_(params.channel)
-#endif
-#undef _MODIFIER_CODE_
-}
-
-//--- SubtextureVsLife modifier ---
-
-//struct PARAMS_NAME(SubtextureVsLife)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(SubtextureVsLife)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(CURVE_TYPE,		curve)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierSubtextureVsLife(const PARAMS_NAME(SubtextureVsLife)& params, const Input& input, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-	if (usage == nvidia::apex::ModifierUsage_Sprite)
-	{
-		pubState.subTextureId += EVAL_CURVE(params.curve, input.liferemain);
-	}
-}
-
-//--- OrientAlongVelocity modifier ---
-
-APEX_CUDA_CALLABLE PX_INLINE bool buildRotationMatrix(const PxVec3& srcVec, const PxVec3& dstVec, PxMat33& outRotMat)
-{
-	PxVec3 axis = srcVec.cross(dstVec);
-
-	float cosAngle = srcVec.dot(dstVec);
-	float angle = PxAcos(cosAngle);
-
-	float axisLen = axis.normalize();
-	if (axisLen < 0.0001f)
-	{
-		return false;
-	}
-
-	PxQuat quat(angle, axis);
-	outRotMat = PxMat33(quat);
-	return true;
-}
-
-//struct PARAMS_NAME(OrientAlongVelocity)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(OrientAlongVelocity)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(PxVec3,	modelForward)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierOrientAlongVelocity(const PARAMS_NAME(OrientAlongVelocity)& params, const Input& input, PubState& pubState, PrivState& privState, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-	if (usage == nvidia::apex::ModifierUsage_Mesh)
-	{
-		PxVec3 vel = input.velocity;
-		float velMagnitude = vel.normalize(); // normalize it
-		// If travelling too slowly, this will be unstable, so don't do anything.
-		if (PxAbs(velMagnitude) >= 0.0001f)
-		{
-			PxMat33 rotMat;
-			if (buildRotationMatrix(params.modelForward, vel, rotMat))
-			{
-				privState.rotation = rotMat;
-			}
-		}
-		pubState.rotation = privState.rotation;
-	}
-}
-
-//--- ScaleAlongVelocity modifier ---
-
-///p,q -> p^q = n (n - must be normalized!)
-APEX_CUDA_CALLABLE PX_INLINE void buildPlaneBasis(const PxVec3& n, PxVec3& p, PxVec3& q)
-{
-	const float SQRT1_2 = PxSqrt(float(0.5));
-	if (PxAbs(n.z) > SQRT1_2)
-	{
-		// choose p in y-z plane
-		float k = sqrtf(n.y * n.y + n.z * n.z);
-		p.x = 0;
-		p.y = -n.z / k;
-		p.z = n.y / k;
-		// set q = n x p
-		q.x = k;
-		q.y = -n.x * p.z;
-		q.z = n.x * p.y;
-	}
-	else
-	{
-		// choose p in x-y plane
-		float k = PxSqrt(n.x * n.x + n.y * n.y);
-		p.x = -n.y / k;
-		p.y = n.x / k;
-		p.z = 0;
-		// set q = n x p
-		q.x = -n.z * p.y;
-		q.y = n.z * p.x;
-		q.z = k;
-	}
-}
-
-APEX_CUDA_CALLABLE PX_INLINE void buildScaleAlongAxis(const PxVec3& scaleAxis, float scale, PxMat33& scaleMat)
-{
-	PxVec3 axis0, axis1;
-	buildPlaneBasis(scaleAxis, axis0, axis1);
-
-	PxMat33 rotToAxisMat(axis0, axis1, scaleAxis);
-
-	scaleMat = rotToAxisMat;
-	scaleMat.column2 = scaleAxis * scale;
-
-	//scaleMat.setMultiplyTransposeRight(scaleMat, rotToAxisMat);
-
-	float a = scaleMat.column0.dot(rotToAxisMat.column0);
-	float b = scaleMat(0,0) * rotToAxisMat(0,1) + scaleMat(1,0) * rotToAxisMat(1,1) + scaleMat(2,0) * rotToAxisMat(2,1);
-	float c = scaleMat(0,0) * rotToAxisMat(0,2) + scaleMat(1,0) * rotToAxisMat(1,2) + scaleMat(2,0) * rotToAxisMat(2,2);
-	float d = scaleMat(0,1) * rotToAxisMat(0,0) + scaleMat(1,1) * rotToAxisMat(1,0) + scaleMat(2,1) * rotToAxisMat(2,0);
-	float e = scaleMat(0,1) * rotToAxisMat(0,1) + scaleMat(1,1) * rotToAxisMat(1,1) + scaleMat(2,1) * rotToAxisMat(2,1);
-	float f = scaleMat(0,1) * rotToAxisMat(0,2) + scaleMat(1,1) * rotToAxisMat(1,2) + scaleMat(2,1) * rotToAxisMat(2,2);
-	float g = scaleMat(0,2) * rotToAxisMat(0,0) + scaleMat(1,2) * rotToAxisMat(1,0) + scaleMat(2,2) * rotToAxisMat(2,0);
-	float h = scaleMat(0,2) * rotToAxisMat(0,1) + scaleMat(1,2) * rotToAxisMat(1,1) + scaleMat(2,2) * rotToAxisMat(2,1);
-	float i = scaleMat(0,2) * rotToAxisMat(0,2) + scaleMat(1,2) * rotToAxisMat(1,2) + scaleMat(2,2) * rotToAxisMat(2,2);
-
-	scaleMat(0,0) = a;
-	scaleMat(1,0) = b;
-	scaleMat(2,0) = c;
-
-	scaleMat(0,1) = d;
-	scaleMat(1,1) = e;
-	scaleMat(2,1) = f;
-
-	scaleMat(0,2) = g;
-	scaleMat(1,2) = h;
-	scaleMat(2,2) = i;
-}
-
-//struct PARAMS_NAME(ScaleAlongVelocity)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(ScaleAlongVelocity)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(float,	scaleFactor)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierScaleAlongVelocity(const PARAMS_NAME(ScaleAlongVelocity)& params, const Input& input, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-	if (usage == nvidia::apex::ModifierUsage_Mesh)
-	{
-		PxVec3 vel = input.velocity;
-		float velMagnitude = vel.normalize(); // normalize it
-
-		PxMat33 scaleMat(PxIdentity);
-		if (velMagnitude >= 0.0001f)
-		{
-			float scale = 1.0f + velMagnitude * params.scaleFactor;
-
-			buildScaleAlongAxis(vel, scale, scaleMat);
-		}
-		pubState.rotation = scaleMat * pubState.rotation;
-	}
-}
-
-//--- RandomSubtexture modifier ---
-
-//struct PARAMS_NAME(RandomSubtexture)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(RandomSubtexture)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(float,	subtextureRangeMin) \
-	INPLACE_TYPE_FIELD(float,	subtextureRangeMax)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 1;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierRandomSubtexture(const PARAMS_NAME(RandomSubtexture)& params, const Input& /*input*/, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& randState)
-{
-	if (usage == nvidia::apex::ModifierUsage_Sprite)
-	{
-		pubState.subTextureId += randState.nextFloat(params.subtextureRangeMin, params.subtextureRangeMax);
-	}
-}
-
-//--- RandomRotation modifier ---
-
-//struct PARAMS_NAME(RandomRotation)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(RandomRotation)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(float,	rotationRangeMin) \
-	INPLACE_TYPE_FIELD(float,	rotationRangeMax)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 1;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierRandomRotation(const PARAMS_NAME(RandomRotation)& params, const Input& /*input*/, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& randState)
-{
-	if (usage == nvidia::apex::ModifierUsage_Sprite)
-	{
-		const float DegToRad = PI / 180;
-		pubState.rotation += DegToRad * randState.nextFloat(params.rotationRangeMin, params.rotationRangeMax);
-	}
-}
-
-//--- ScaleVsLife modifier ---
-
-//struct PARAMS_NAME(ScaleVsLife)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(ScaleVsLife)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(uint32_t,	axis) \
-	INPLACE_TYPE_FIELD(CURVE_TYPE,		curve)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierScaleVsLife(const PARAMS_NAME(ScaleVsLife)& params, const Input& input, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-#define _MODIFIER_CODE_(axis) \
-	{ \
-		pubState.scale[axis] *= EVAL_CURVE(params.curve, input.liferemain); \
-	}
-#if _CUDA_OPT_LOC_MEM_
-	if (params.axis == 0) _MODIFIER_CODE_(0)
-		else if (params.axis == 1) _MODIFIER_CODE_(1)
-			else if (params.axis == 2) _MODIFIER_CODE_(2)
-#else
-	_MODIFIER_CODE_(params.axis)
-#endif
-#undef _MODIFIER_CODE_
-			}
-
-//--- ScaleVsDensity modifier ---
-
-//struct PARAMS_NAME(ScaleVsDensity)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(ScaleVsDensity)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(uint32_t,	axis) \
-	INPLACE_TYPE_FIELD(CURVE_TYPE,		curve)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierScaleVsDensity(const PARAMS_NAME(ScaleVsDensity)& params, const Input& input, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-#define _MODIFIER_CODE_(axis) \
-	{ \
-		pubState.scale[axis] *= EVAL_CURVE(params.curve, input.density); \
-	}
-#if _CUDA_OPT_LOC_MEM_
-	if (params.axis == 0) _MODIFIER_CODE_(0)
-		else if (params.axis == 1) _MODIFIER_CODE_(1)
-			else if (params.axis == 2) _MODIFIER_CODE_(2)
-#else
-	_MODIFIER_CODE_(params.axis)
-#endif
-#undef _MODIFIER_CODE_
-			}
-
-//--- ScaleVsCameraDistance modifier ---
-
-//struct PARAMS_NAME(ScaleVsCameraDistance)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(ScaleVsCameraDistance)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(uint32_t,	axis) \
-	INPLACE_TYPE_FIELD(CURVE_TYPE,		curve)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierScaleVsCameraDistance(const PARAMS_NAME(ScaleVsCameraDistance)& params, const Input& input, PubState& pubState, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& common, nvidia::RandState& /*nvidia::RandState*/)
-{
-	float cameraDistance = (input.position - common.eyePosition).magnitude();
-
-#define _MODIFIER_CODE_(axis) \
-	{ \
-		pubState.scale[axis] *= EVAL_CURVE(params.curve, cameraDistance); \
-	}
-#if _CUDA_OPT_LOC_MEM_
-	if (params.axis == 0) _MODIFIER_CODE_(0)
-		else if (params.axis == 1) _MODIFIER_CODE_(1)
-			else if (params.axis == 2) _MODIFIER_CODE_(2)
-#else
-	_MODIFIER_CODE_(params.axis)
-#endif
-#undef _MODIFIER_CODE_
-			}
-
-//--- ViewDirectionSorting modifier ---
-
-//struct PARAMS_NAME(ViewDirectionSorting)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(ViewDirectionSorting)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierViewDirectionSorting(const PARAMS_NAME(ViewDirectionSorting)& /*params*/, const Input& /*input*/, PubState& /*pubState*/, PrivState& /*privState*/, const nvidia::iofx::ModifierCommonParams& /*common*/, nvidia::RandState& /*nvidia::RandState*/)
-{
-}
-
-//--- RotationRate modifier ---
-
-//struct PARAMS_NAME(RotationRate)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(RotationRate)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(float,	rotationRate)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierRotationRate(const PARAMS_NAME(RotationRate)& params, const Input& /*input*/, PubState& pubState, PrivState& privState, const nvidia::iofx::ModifierCommonParams& common, nvidia::RandState& /*nvidia::RandState*/)
-{
-	if (usage == nvidia::apex::ModifierUsage_Sprite)
-	{
-		const float TwoPi = 2 * PI;
-		const float rotationDelta = params.rotationRate * TwoPi * common.deltaTime;
-		privState.rotation += rotationDelta;
-		pubState.rotation += privState.rotation;
-	}
-}
-
-//--- RotationRateVsLife modifier ---
-
-//struct PARAMS_NAME(RotationRateVsLife)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(RotationRateVsLife)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(CURVE_TYPE,		curve)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierRotationRateVsLife(const PARAMS_NAME(RotationRateVsLife)& params, const Input& input, PubState& pubState, PrivState& privState, const nvidia::iofx::ModifierCommonParams& common, nvidia::RandState& /*nvidia::RandState*/)
-{
-	if (usage == nvidia::apex::ModifierUsage_Sprite)
-	{
-		const float TwoPi = 2 * PI;
-		const float rotationDelta = EVAL_CURVE(params.curve, input.liferemain) * TwoPi * common.deltaTime;
-		privState.rotation += rotationDelta;
-		pubState.rotation += privState.rotation;
-	}
-}
-
-//--- OrientScaleAlongScreenVelocity modifier ---
-
-//struct PARAMS_NAME(OrientScaleAlongScreenVelocity)
-#define INPLACE_TYPE_STRUCT_NAME PARAMS_NAME(OrientScaleAlongScreenVelocity)
-#define INPLACE_TYPE_STRUCT_FIELDS \
-	INPLACE_TYPE_FIELD(float,	scalePerVelocity) \
-	INPLACE_TYPE_FIELD(float,	scaleChangeLimit) \
-	INPLACE_TYPE_FIELD(float,	scaleChangeDelay)
-#define INPLACE_TYPE_STRUCT_LEAVE_OPEN 1
-#include INPLACE_TYPE_BUILD()
-
-	static const uint32_t RANDOM_COUNT = 0;
-};
-
-INPLACE_TEMPL_VA_ARGS_DEF(bool spawn, int usage, typename Input, typename PubState, typename PrivState)
-MODIFIER_DECL void modifierOrientScaleAlongScreenVelocity(const PARAMS_NAME(OrientScaleAlongScreenVelocity)& params, const Input& input, PubState& pubState, PrivState& privState, const nvidia::iofx::ModifierCommonParams& common, nvidia::RandState& /*nvidia::RandState*/)
-{
-	if (usage == nvidia::apex::ModifierUsage_Sprite)
-	{
-		PxVec3 viewPos, viewVel; // position & velocity in view space
-
-		viewPos.x = (input.position - common.eyePosition).dot(common.eyeAxisX);
-		viewPos.y = (input.position - common.eyePosition).dot(common.eyeAxisY);
-		viewPos.z = (input.position - common.eyePosition).dot(common.eyeDirection);   // eyeDir = eyeAxisZ
-
-		// 4 is simply a hack that looks decent in UE3 ATM, we should use the FOV to determine when to
-		// cull particles, otherwise you end up with particles around the zNear plane that have huge
-		// 'd' values, resulting in bad scaling
-		if (viewPos.z < common.zNear * 4)
-		{
-			pubState.rotation = privState.rotation;
-			pubState.scale.x = 0.0f;
-			pubState.scale.y = 0.0f;
-			return;
-		}
-
-		viewVel.x = (input.velocity).dot(common.eyeAxisX);
-		viewVel.y = (input.velocity).dot(common.eyeAxisY);
-		viewVel.z = (input.velocity).dot(common.eyeDirection);   // eyeDir = eyeAxisZ
-
-		// tan(angle) = (Vy*Pz - Py*Vz) / (Vx*Pz - Px*Vz)
-		const float velX = viewVel.x * viewPos.z - viewPos.x * viewVel.z;
-		const float velY = viewVel.y * viewPos.z - viewPos.y * viewVel.z;
-
-		const float velLengthMultiplier = 1.0f / viewPos.z;
-
-		const float dx = velX * velLengthMultiplier;
-		const float dy = velY * velLengthMultiplier;
-
-		const float d = PxSqrt(dx * dx + dy * dy);
-
-		if (d >= 1e-5f)
-		{
-			// "Note that the order of arguments is reversed; the function atan2(y,x) computes
-			//  the angle corresponding to the point (x,y)."
-			// see http://en.wikipedia.org/wiki/Atan2
-			privState.rotation = PxAtan2(velY, velX);
-
-			float scale = 1.0f + d * params.scalePerVelocity;
-			if (params.scaleChangeDelay > 0.0f)
-			{
-				const float blendFactor = PxExp(-common.deltaTime / params.scaleChangeDelay);
-				scale *= (1.0f - blendFactor);
-				scale += blendFactor * privState.scale;
-			}
-			if (params.scaleChangeLimit > 0.0f)
-			{
-				const float scaleChangeLimit = params.scaleChangeLimit * common.deltaTime;
-				const float scaleChange = scale - privState.scale;
-				if (scaleChange > +scaleChangeLimit)
-				{
-					scale = privState.scale + scaleChangeLimit;
-				}
-				else if (scaleChange < -scaleChangeLimit)
-				{
-					scale = privState.scale - scaleChangeLimit;
-				}
-			}
-			privState.scale = scale;
-			pubState.scale.x *= scale;
-		}
-		pubState.rotation = privState.rotation;
-	}
-}
-
-#undef _CUDA_OPT_LOC_MEM_
diff --git a/APEX_1.4/module/iofx/include/ModuleEventDefs.h b/APEX_1.4/module/iofx/include/ModuleEventDefs.h
deleted file mode 100644
index 87181235..00000000
--- a/APEX_1.4/module/iofx/include/ModuleEventDefs.h
+++ /dev/null
@@ -1,27 +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.
- */
-
-
-// This file is used to define a list of AgPerfMon events.
-//
-// This file is included exclusively by AgPerfMonEventSrcAPI.h
-// and by AgPerfMonEventSrcAPI.cpp, for the purpose of building
-// an enumeration (enum xx) and an array of strings ()
-// that contain the list of events.
-//
-// This file should only contain event definitions, using the
-// DEFINE_EVENT macro.  E.g.:
-//
-//     DEFINE_EVENT(sample_name_1)
-//     DEFINE_EVENT(sample_name_2)
-//     DEFINE_EVENT(sample_name_3)
-
-DEFINE_EVENT(IofxManagerUpdateEffectsData)
-DEFINE_EVENT(IofxManagerGPUModifiers)
diff --git a/APEX_1.4/module/iofx/include/ModuleIofxImpl.h b/APEX_1.4/module/iofx/include/ModuleIofxImpl.h
deleted file mode 100644
index 6a2d69e6..00000000
--- a/APEX_1.4/module/iofx/include/ModuleIofxImpl.h
+++ /dev/null
@@ -1,169 +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 __MODULE_IOFX_IMPL_H__
-#define __MODULE_IOFX_IMPL_H__
-
-#include "Apex.h"
-#include "ModuleIofx.h"
-#include "ApexSDKIntl.h"
-#include "ModuleBase.h"
-#include "ModuleIofxIntl.h"
-#include "ResourceProviderIntl.h"
-#include "ApexSharedUtils.h"
-#include "ApexSDKHelpers.h"
-#include "ModulePerfScope.h"
-#include "ApexAuthorableObject.h"
-#include "ApexRWLockable.h"
-#include "ModuleIofxRegistration.h"
-#include "ReadCheck.h"
-#include "WriteCheck.h"
-
-
-namespace nvidia
-{
-namespace apex
-{
-class RenderVolume;
-}
-namespace iofx
-{
-class IofxAssetImpl;
-class IofxScene;
-
-class ModuleIofxDesc : public ApexDesc
-{
-public:
-
-	/**
-	\brief constructor sets to default.
-	*/
-	PX_INLINE ModuleIofxDesc() : ApexDesc()
-	{
-		init();
-	}
-
-	/**
-	\brief sets members to default values.
-	*/
-	PX_INLINE void setToDefault()
-	{
-		ApexDesc::setToDefault();
-		init();
-	}
-
-	/**
-	\brief checks if this is a valid descriptor.
-	*/
-	PX_INLINE bool isValid() const
-	{
-		bool retVal = ApexDesc::isValid();
-		return retVal;
-	}
-
-private:
-
-	PX_INLINE void init()
-	{
-	}
-};
-
-class ModuleIofxImpl : public ModuleIofx, public ModuleIofxIntl, public ModuleBase, public ApexRWLockable
-{
-public:
-	APEX_RW_LOCKABLE_BOILERPLATE
-
-	ModuleIofxImpl(ApexSDKIntl* sdk);
-	~ModuleIofxImpl();
-
-	void							init(const ModuleIofxDesc& ModuleIofxDesc);
-
-	// base class methods
-	void							init(NvParameterized::Interface&) {}
-	NvParameterized::Interface* 	getDefaultModuleDesc();
-	void							release()
-	{
-		ModuleBase::release();
-	}
-	void							destroy();
-	const char*						getName() const
-	{
-		READ_ZONE();
-		return ModuleBase::getName();
-	}
-	
-	RenderableIterator*		createRenderableIterator(const Scene&)
-	{
-		WRITE_ZONE();
-		return NULL; //obsolete!
-	}
-
-	void							disableCudaInterop()
-	{
-		WRITE_ZONE();
-		mInteropDisabled = true;
-	}
-	void							disableCudaModifiers()
-	{
-		WRITE_ZONE();
-		mCudaDisabled = true;
-	}
-	void							disableDeferredRenderableAllocation()
-	{
-		WRITE_ZONE();
-		mDeferredDisabled = true;
-	}
-
-	const TestBase*				getTestBase(Scene* apexScene) const;
-
-	bool							setIofxRenderCallback(const Scene& apexScene, IofxRenderCallback* );
-	IofxRenderCallback*			getIofxRenderCallback(const Scene& apexScene) const;
-
-	IofxRenderableIterator*		createIofxRenderableIterator(const Scene&);
-
-	void							prepareRenderables(const Scene&);
-
-	// ModuleIofxIntl methods
-	IofxManagerIntl*					createActorManager(const Scene& scene, const IofxAsset& asset, const IofxManagerDescIntl& desc);
-
-	uint32_t					forceLoadAssets();
-	AuthObjTypeID					getModuleID() const;
-
-	ModuleSceneIntl* 					createInternalModuleScene(SceneIntl&, RenderDebugInterface*);
-	void							releaseModuleSceneIntl(ModuleSceneIntl&);
-
-	IofxScene* 						getIofxScene(const Scene& scene);
-	const IofxScene* 				getIofxScene(const Scene& scene) const;
-
-	RenderVolume* 			createRenderVolume(const Scene& apexScene, const PxBounds3& b, uint32_t priority, bool allIofx);
-	void							releaseRenderVolume(RenderVolume& volume);
-
-protected:
-
-	ResourceList								mAuthorableObjects;
-
-	IofxModuleParameters* 						mModuleParams;
-	bool										mInteropDisabled;
-	bool										mCudaDisabled;
-	bool										mDeferredDisabled;
-
-	ResourceList								mIofxScenes;
-
-	friend class IofxActorImpl;
-	friend class IofxScene;
-	friend class IofxManager;
-	friend class IofxManagerGPU;
-};
-
-}
-} // namespace nvidia
-
-#endif // __MODULE_IOFX_IMPL_H__
diff --git a/APEX_1.4/module/iofx/include/ModulePerfScope.h b/APEX_1.4/module/iofx/include/ModulePerfScope.h
deleted file mode 100644
index 891e6131..00000000
--- a/APEX_1.4/module/iofx/include/ModulePerfScope.h
+++ /dev/null
@@ -1,18 +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 __MODULE_PERF_SCOPE_H___
-#define __MODULE_PERF_SCOPE_H___
-
-#define MODULE_NAMESPACE iofx
-#include "ModuleProfileCommon.h"
-
-#endif
\ No newline at end of file
diff --git a/APEX_1.4/module/iofx/include/RenderVolumeImpl.h b/APEX_1.4/module/iofx/include/RenderVolumeImpl.h
deleted file mode 100644
index bf6b7e1d..00000000
--- a/APEX_1.4/module/iofx/include/RenderVolumeImpl.h
+++ /dev/null
@@ -1,137 +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 __RENDER_VOLUME_IMPL_H__
-#define __RENDER_VOLUME_IMPL_H__
-
-#include "Apex.h"
-#include "RenderVolume.h"
-#include "PsArray.h"
-#include "ApexResource.h"
-#include "ApexRenderable.h"
-#include "ApexRWLockable.h"
-#include "ReadCheck.h"
-#include "WriteCheck.h"
-
-namespace nvidia
-{
-namespace apex
-{
-class IofxAsset;
-class IofxActor;
-}
-namespace iofx
-{
-class IofxScene;
-
-class RenderVolumeImpl : public RenderVolume, public ApexResourceInterface, public ApexResource, public ApexRWLockable
-{
-public:
-	APEX_RW_LOCKABLE_BOILERPLATE
-
-	RenderVolumeImpl(IofxScene& scene, const PxBounds3& b, uint32_t priority, bool allIofx);
-	~RenderVolumeImpl();
-
-	// ApexResourceInterface methods
-	void				release();
-	void			    destroy();
-
-	uint32_t	    getListIndex() const
-	{
-		return m_listIndex;
-	}
-	void	            setListIndex(ResourceList& list, uint32_t index)
-	{
-		m_listIndex = index;
-		m_list = &list;
-	}
-
-	void				setOwnershipBounds(const PxBounds3& b)
-	{
-		WRITE_ZONE();
-		mOwnershipBounds = b;
-	}
-	PxBounds3			getOwnershipBounds(void) const
-	{
-		READ_ZONE();
-		return mOwnershipBounds;
-	}
-	PxBounds3			getBounds() const;
-
-	// methods for use by IOS or IOFX actor
-	bool				addIofxActor(IofxActor& iofx);
-	bool				removeIofxActor(const IofxActor& iofx);
-
-	bool				addIofxAsset(IofxAsset& iofx);
-	void				setPosition(const PxVec3& pos);
-
-	bool				getAffectsAllIofx() const
-	{
-		READ_ZONE();
-		return mAllIofx;
-	}
-
-	IofxActor* const* lockIofxActorList(uint32_t& count)
-	{
-		READ_ZONE();
-		mLock.lockReader();
-		count = mIofxActors.size();
-		return count ? &mIofxActors.front() : NULL;
-	}
-	void unlockIofxActorList()
-	{
-		mLock.unlockReader();
-	}
-
-
-	IofxAsset* const* getIofxAssetList(uint32_t& count) const
-	{
-		READ_ZONE();
-		count = mIofxAssets.size();
-		return count ? &mIofxAssets.front() : NULL;
-	}
-	PxVec3				getPosition() const
-	{
-		READ_ZONE();
-		return mOwnershipBounds.getCenter();
-	}
-	uint32_t				getPriority() const
-	{
-		READ_ZONE();
-		return mPriority;
-	}
-	bool				affectsIofxAsset(const IofxAsset& iofx) const;
-
-	PX_INLINE void	lockReader()
-	{
-		mLock.lockReader();
-	}
-	PX_INLINE void	unlockReader()
-	{
-		mLock.unlockReader();
-	}
-
-protected:
-	// bounds is stored in ApexRenderable::mRenderBounds
-	uint32_t						mPriority;
-	bool							mAllIofx;
-	bool							mPendingDelete;
-	IofxScene&						mScene;
-	nvidia::Array<IofxAsset*>		mIofxAssets;
-	nvidia::Array<IofxActor*>		mIofxActors;
-	physx::PxBounds3				mOwnershipBounds;
-	physx::shdfnd::ReadWriteLock	mLock;
-};
-
-}
-} // namespace nvidia
-
-#endif // __RENDER_VOLUME_IMPL_H__
diff --git a/APEX_1.4/module/iofx/include/autogen/ColorVsDensityCompositeModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ColorVsDensityCompositeModifierParams.h
deleted file mode 100644
index 2f505954..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ColorVsDensityCompositeModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ColorVsDensityCompositeModifierParams_h
-#define HEADER_ColorVsDensityCompositeModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ColorVsDensityCompositeModifierParamsNS
-{
-
-struct colorDensityStruct_Type;
-
-struct colorDensityStruct_DynamicArray1D_Type
-{
-	colorDensityStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct colorDensityStruct_Type
-{
-	float density;
-	physx::PxVec4 color;
-};
-
-struct ParametersStruct
-{
-
-	colorDensityStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x6ee7f5a0, 0xedd1e5d5, 0x6169ab3c, 0x868306ec, };
-
-} // namespace ColorVsDensityCompositeModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ColorVsDensityCompositeModifierParams : public NvParameterized::NvParameters, public ColorVsDensityCompositeModifierParamsNS::ParametersStruct
-{
-public:
-	ColorVsDensityCompositeModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ColorVsDensityCompositeModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ColorVsDensityCompositeModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ColorVsDensityCompositeModifierParamsNS::checksum);
-		return ColorVsDensityCompositeModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ColorVsDensityCompositeModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ColorVsDensityCompositeModifierParams* tmpThis = const_cast<ColorVsDensityCompositeModifierParams*>(this);
-		return *(static_cast<ColorVsDensityCompositeModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ColorVsDensityCompositeModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ColorVsDensityCompositeModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ColorVsDensityCompositeModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ColorVsDensityCompositeModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ColorVsDensityCompositeModifierParams), ColorVsDensityCompositeModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ColorVsDensityCompositeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsDensityCompositeModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ColorVsDensityCompositeModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ColorVsDensityCompositeModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ColorVsDensityCompositeModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ColorVsDensityCompositeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsDensityCompositeModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ColorVsDensityCompositeModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ColorVsDensityCompositeModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ColorVsDensityCompositeModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ColorVsDensityCompositeModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ColorVsDensityCompositeModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ColorVsDensityCompositeModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ColorVsDensityModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ColorVsDensityModifierParams.h
deleted file mode 100644
index 5386b7c5..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ColorVsDensityModifierParams.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ColorVsDensityModifierParams_h
-#define HEADER_ColorVsDensityModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ColorVsDensityModifierParamsNS
-{
-
-struct vec2_Type;
-
-struct vec2_DynamicArray1D_Type
-{
-	vec2_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct vec2_Type
-{
-	float x;
-	float y;
-};
-
-struct ParametersStruct
-{
-
-	const char* colorChannel;
-	vec2_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0xbd1ead31, 0x79bc4460, 0x6a89ef07, 0xbbe13350, };
-
-} // namespace ColorVsDensityModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ColorVsDensityModifierParams : public NvParameterized::NvParameters, public ColorVsDensityModifierParamsNS::ParametersStruct
-{
-public:
-	ColorVsDensityModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ColorVsDensityModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ColorVsDensityModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ColorVsDensityModifierParamsNS::checksum);
-		return ColorVsDensityModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ColorVsDensityModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ColorVsDensityModifierParams* tmpThis = const_cast<ColorVsDensityModifierParams*>(this);
-		return *(static_cast<ColorVsDensityModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ColorVsDensityModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ColorVsDensityModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ColorVsDensityModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ColorVsDensityModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ColorVsDensityModifierParams), ColorVsDensityModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ColorVsDensityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsDensityModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ColorVsDensityModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ColorVsDensityModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ColorVsDensityModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ColorVsDensityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsDensityModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ColorVsDensityModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ColorVsDensityModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ColorVsDensityModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ColorVsDensityModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ColorVsDensityModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ColorVsDensityModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ColorVsLifeCompositeModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ColorVsLifeCompositeModifierParams.h
deleted file mode 100644
index 9a8111ee..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ColorVsLifeCompositeModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ColorVsLifeCompositeModifierParams_h
-#define HEADER_ColorVsLifeCompositeModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ColorVsLifeCompositeModifierParamsNS
-{
-
-struct colorLifeStruct_Type;
-
-struct colorLifeStruct_DynamicArray1D_Type
-{
-	colorLifeStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct colorLifeStruct_Type
-{
-	float lifeRemaining;
-	physx::PxVec4 color;
-};
-
-struct ParametersStruct
-{
-
-	colorLifeStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x2ee279f3, 0x6440bf5b, 0x26d89b02, 0xc90fa659, };
-
-} // namespace ColorVsLifeCompositeModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ColorVsLifeCompositeModifierParams : public NvParameterized::NvParameters, public ColorVsLifeCompositeModifierParamsNS::ParametersStruct
-{
-public:
-	ColorVsLifeCompositeModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ColorVsLifeCompositeModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ColorVsLifeCompositeModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ColorVsLifeCompositeModifierParamsNS::checksum);
-		return ColorVsLifeCompositeModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ColorVsLifeCompositeModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ColorVsLifeCompositeModifierParams* tmpThis = const_cast<ColorVsLifeCompositeModifierParams*>(this);
-		return *(static_cast<ColorVsLifeCompositeModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ColorVsLifeCompositeModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ColorVsLifeCompositeModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ColorVsLifeCompositeModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ColorVsLifeCompositeModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ColorVsLifeCompositeModifierParams), ColorVsLifeCompositeModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ColorVsLifeCompositeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsLifeCompositeModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ColorVsLifeCompositeModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ColorVsLifeCompositeModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ColorVsLifeCompositeModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ColorVsLifeCompositeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsLifeCompositeModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ColorVsLifeCompositeModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ColorVsLifeCompositeModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ColorVsLifeCompositeModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ColorVsLifeCompositeModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ColorVsLifeCompositeModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ColorVsLifeCompositeModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ColorVsLifeModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ColorVsLifeModifierParams.h
deleted file mode 100644
index c146c48d..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ColorVsLifeModifierParams.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ColorVsLifeModifierParams_h
-#define HEADER_ColorVsLifeModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ColorVsLifeModifierParamsNS
-{
-
-struct vec2_Type;
-
-struct vec2_DynamicArray1D_Type
-{
-	vec2_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct vec2_Type
-{
-	float x;
-	float y;
-};
-
-struct ParametersStruct
-{
-
-	const char* colorChannel;
-	vec2_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x6273c5a3, 0xe1a0df26, 0x77f5af16, 0x6a54d1e7, };
-
-} // namespace ColorVsLifeModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ColorVsLifeModifierParams : public NvParameterized::NvParameters, public ColorVsLifeModifierParamsNS::ParametersStruct
-{
-public:
-	ColorVsLifeModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ColorVsLifeModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ColorVsLifeModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ColorVsLifeModifierParamsNS::checksum);
-		return ColorVsLifeModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ColorVsLifeModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ColorVsLifeModifierParams* tmpThis = const_cast<ColorVsLifeModifierParams*>(this);
-		return *(static_cast<ColorVsLifeModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ColorVsLifeModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ColorVsLifeModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ColorVsLifeModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ColorVsLifeModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ColorVsLifeModifierParams), ColorVsLifeModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ColorVsLifeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsLifeModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ColorVsLifeModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ColorVsLifeModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ColorVsLifeModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ColorVsLifeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsLifeModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ColorVsLifeModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ColorVsLifeModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ColorVsLifeModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ColorVsLifeModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ColorVsLifeModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ColorVsLifeModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ColorVsTemperatureCompositeModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ColorVsTemperatureCompositeModifierParams.h
deleted file mode 100644
index e3e84894..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ColorVsTemperatureCompositeModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ColorVsTemperatureCompositeModifierParams_h
-#define HEADER_ColorVsTemperatureCompositeModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ColorVsTemperatureCompositeModifierParamsNS
-{
-
-struct colorTemperatureStruct_Type;
-
-struct colorTemperatureStruct_DynamicArray1D_Type
-{
-	colorTemperatureStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct colorTemperatureStruct_Type
-{
-	float temperature;
-	physx::PxVec4 color;
-};
-
-struct ParametersStruct
-{
-
-	colorTemperatureStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0xb5bad295, 0x1bbde1e7, 0xb10b2dc3, 0xde67581e, };
-
-} // namespace ColorVsTemperatureCompositeModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ColorVsTemperatureCompositeModifierParams : public NvParameterized::NvParameters, public ColorVsTemperatureCompositeModifierParamsNS::ParametersStruct
-{
-public:
-	ColorVsTemperatureCompositeModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ColorVsTemperatureCompositeModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ColorVsTemperatureCompositeModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ColorVsTemperatureCompositeModifierParamsNS::checksum);
-		return ColorVsTemperatureCompositeModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ColorVsTemperatureCompositeModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ColorVsTemperatureCompositeModifierParams* tmpThis = const_cast<ColorVsTemperatureCompositeModifierParams*>(this);
-		return *(static_cast<ColorVsTemperatureCompositeModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ColorVsTemperatureCompositeModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ColorVsTemperatureCompositeModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ColorVsTemperatureCompositeModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ColorVsTemperatureCompositeModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ColorVsTemperatureCompositeModifierParams), ColorVsTemperatureCompositeModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ColorVsTemperatureCompositeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsTemperatureCompositeModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ColorVsTemperatureCompositeModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ColorVsTemperatureCompositeModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ColorVsTemperatureCompositeModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ColorVsTemperatureCompositeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsTemperatureCompositeModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ColorVsTemperatureCompositeModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ColorVsTemperatureCompositeModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ColorVsTemperatureCompositeModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ColorVsTemperatureCompositeModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ColorVsTemperatureCompositeModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ColorVsTemperatureCompositeModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ColorVsTemperatureModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ColorVsTemperatureModifierParams.h
deleted file mode 100644
index 135dc951..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ColorVsTemperatureModifierParams.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ColorVsTemperatureModifierParams_h
-#define HEADER_ColorVsTemperatureModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ColorVsTemperatureModifierParamsNS
-{
-
-struct vec2_Type;
-
-struct vec2_DynamicArray1D_Type
-{
-	vec2_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct vec2_Type
-{
-	float x;
-	float y;
-};
-
-struct ParametersStruct
-{
-
-	const char* colorChannel;
-	vec2_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0xe539a2ca, 0x44cf1564, 0xa6a2c047, 0xec15660d, };
-
-} // namespace ColorVsTemperatureModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ColorVsTemperatureModifierParams : public NvParameterized::NvParameters, public ColorVsTemperatureModifierParamsNS::ParametersStruct
-{
-public:
-	ColorVsTemperatureModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ColorVsTemperatureModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ColorVsTemperatureModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ColorVsTemperatureModifierParamsNS::checksum);
-		return ColorVsTemperatureModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ColorVsTemperatureModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ColorVsTemperatureModifierParams* tmpThis = const_cast<ColorVsTemperatureModifierParams*>(this);
-		return *(static_cast<ColorVsTemperatureModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ColorVsTemperatureModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ColorVsTemperatureModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ColorVsTemperatureModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ColorVsTemperatureModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ColorVsTemperatureModifierParams), ColorVsTemperatureModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ColorVsTemperatureModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsTemperatureModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ColorVsTemperatureModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ColorVsTemperatureModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ColorVsTemperatureModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ColorVsTemperatureModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsTemperatureModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ColorVsTemperatureModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ColorVsTemperatureModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ColorVsTemperatureModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ColorVsTemperatureModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ColorVsTemperatureModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ColorVsTemperatureModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ColorVsVelocityCompositeModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ColorVsVelocityCompositeModifierParams.h
deleted file mode 100644
index 2815ecbf..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ColorVsVelocityCompositeModifierParams.h
+++ /dev/null
@@ -1,246 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ColorVsVelocityCompositeModifierParams_h
-#define HEADER_ColorVsVelocityCompositeModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ColorVsVelocityCompositeModifierParamsNS
-{
-
-struct colorVelocityStruct_Type;
-
-struct colorVelocityStruct_DynamicArray1D_Type
-{
-	colorVelocityStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct colorVelocityStruct_Type
-{
-	float velocity;
-	physx::PxVec4 color;
-};
-
-struct ParametersStruct
-{
-
-	float velocity0;
-	float velocity1;
-	colorVelocityStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x85918a9e, 0x651f465d, 0x179721b9, 0x3bbd630d, };
-
-} // namespace ColorVsVelocityCompositeModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ColorVsVelocityCompositeModifierParams : public NvParameterized::NvParameters, public ColorVsVelocityCompositeModifierParamsNS::ParametersStruct
-{
-public:
-	ColorVsVelocityCompositeModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ColorVsVelocityCompositeModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ColorVsVelocityCompositeModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ColorVsVelocityCompositeModifierParamsNS::checksum);
-		return ColorVsVelocityCompositeModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ColorVsVelocityCompositeModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ColorVsVelocityCompositeModifierParams* tmpThis = const_cast<ColorVsVelocityCompositeModifierParams*>(this);
-		return *(static_cast<ColorVsVelocityCompositeModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ColorVsVelocityCompositeModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ColorVsVelocityCompositeModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ColorVsVelocityCompositeModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ColorVsVelocityCompositeModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ColorVsVelocityCompositeModifierParams), ColorVsVelocityCompositeModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ColorVsVelocityCompositeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsVelocityCompositeModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ColorVsVelocityCompositeModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ColorVsVelocityCompositeModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ColorVsVelocityCompositeModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ColorVsVelocityCompositeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsVelocityCompositeModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ColorVsVelocityCompositeModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ColorVsVelocityCompositeModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ColorVsVelocityCompositeModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ColorVsVelocityCompositeModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ColorVsVelocityCompositeModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ColorVsVelocityCompositeModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ColorVsVelocityModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ColorVsVelocityModifierParams.h
deleted file mode 100644
index 376c875c..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ColorVsVelocityModifierParams.h
+++ /dev/null
@@ -1,247 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ColorVsVelocityModifierParams_h
-#define HEADER_ColorVsVelocityModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ColorVsVelocityModifierParamsNS
-{
-
-struct vec2_Type;
-
-struct vec2_DynamicArray1D_Type
-{
-	vec2_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct vec2_Type
-{
-	float x;
-	float y;
-};
-
-struct ParametersStruct
-{
-
-	const char* colorChannel;
-	float velocity0;
-	float velocity1;
-	vec2_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x4c79c470, 0xac91d48e, 0xa4578ba1, 0x9c1ae2f2, };
-
-} // namespace ColorVsVelocityModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ColorVsVelocityModifierParams : public NvParameterized::NvParameters, public ColorVsVelocityModifierParamsNS::ParametersStruct
-{
-public:
-	ColorVsVelocityModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ColorVsVelocityModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ColorVsVelocityModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ColorVsVelocityModifierParamsNS::checksum);
-		return ColorVsVelocityModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ColorVsVelocityModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ColorVsVelocityModifierParams* tmpThis = const_cast<ColorVsVelocityModifierParams*>(this);
-		return *(static_cast<ColorVsVelocityModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ColorVsVelocityModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ColorVsVelocityModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ColorVsVelocityModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ColorVsVelocityModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ColorVsVelocityModifierParams), ColorVsVelocityModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ColorVsVelocityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsVelocityModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ColorVsVelocityModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ColorVsVelocityModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ColorVsVelocityModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ColorVsVelocityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ColorVsVelocityModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ColorVsVelocityModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ColorVsVelocityModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ColorVsVelocityModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ColorVsVelocityModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ColorVsVelocityModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ColorVsVelocityModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/InitialColorModifierParams.h b/APEX_1.4/module/iofx/include/autogen/InitialColorModifierParams.h
deleted file mode 100644
index 49ba52b0..00000000
--- a/APEX_1.4/module/iofx/include/autogen/InitialColorModifierParams.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_InitialColorModifierParams_h
-#define HEADER_InitialColorModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace InitialColorModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	physx::PxVec4 color;
-
-};
-
-static const uint32_t checksum[] = { 0xeede1183, 0x3f1f709f, 0x0957a3e8, 0x4a27910f, };
-
-} // namespace InitialColorModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class InitialColorModifierParams : public NvParameterized::NvParameters, public InitialColorModifierParamsNS::ParametersStruct
-{
-public:
-	InitialColorModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~InitialColorModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("InitialColorModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(InitialColorModifierParamsNS::checksum);
-		return InitialColorModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const InitialColorModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		InitialColorModifierParams* tmpThis = const_cast<InitialColorModifierParams*>(this);
-		return *(static_cast<InitialColorModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	InitialColorModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<InitialColorModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class InitialColorModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		InitialColorModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(InitialColorModifierParams), InitialColorModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, InitialColorModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class InitialColorModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(InitialColorModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, InitialColorModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, InitialColorModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, InitialColorModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class InitialColorModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of InitialColorModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (InitialColorModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (InitialColorModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (InitialColorModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (InitialColorModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (InitialColorModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/IofxAssetParameters.h b/APEX_1.4/module/iofx/include/autogen/IofxAssetParameters.h
deleted file mode 100644
index 77557890..00000000
--- a/APEX_1.4/module/iofx/include/autogen/IofxAssetParameters.h
+++ /dev/null
@@ -1,237 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_IofxAssetParameters_h
-#define HEADER_IofxAssetParameters_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace IofxAssetParametersNS
-{
-
-struct outputProperties_Type;
-
-struct outputProperties_Type
-{
-	bool useUserSemantic;
-	bool useFloat4Color;
-};
-
-struct ParametersStruct
-{
-
-	NvParameterized::Interface* iofxType;
-	outputProperties_Type renderOutput;
-
-};
-
-static const uint32_t checksum[] = { 0xbb5add57, 0xf771d298, 0xcd7c3bc3, 0x921baa57, };
-
-} // namespace IofxAssetParametersNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class IofxAssetParameters : public NvParameterized::NvParameters, public IofxAssetParametersNS::ParametersStruct
-{
-public:
-	IofxAssetParameters(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~IofxAssetParameters();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("IofxAssetParameters");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)2;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(IofxAssetParametersNS::checksum);
-		return IofxAssetParametersNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const IofxAssetParametersNS::ParametersStruct& parameters(void) const
-	{
-		IofxAssetParameters* tmpThis = const_cast<IofxAssetParameters*>(this);
-		return *(static_cast<IofxAssetParametersNS::ParametersStruct*>(tmpThis));
-	}
-
-	IofxAssetParametersNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<IofxAssetParametersNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class IofxAssetParametersFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		IofxAssetParameters::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(IofxAssetParameters), IofxAssetParameters::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, IofxAssetParameters::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class IofxAssetParameters");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(IofxAssetParameters)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, IofxAssetParameters)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, IofxAssetParameters::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, IofxAssetParameters::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class IofxAssetParameters");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of IofxAssetParameters here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (IofxAssetParameters*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (IofxAssetParameters::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (IofxAssetParameters::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (IofxAssetParameters::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (IofxAssetParameters::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/IofxDebugRenderParams.h b/APEX_1.4/module/iofx/include/autogen/IofxDebugRenderParams.h
deleted file mode 100644
index a26652f3..00000000
--- a/APEX_1.4/module/iofx/include/autogen/IofxDebugRenderParams.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_IofxDebugRenderParams_h
-#define HEADER_IofxDebugRenderParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace IofxDebugRenderParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	bool VISUALIZE_IOFX_ACTOR;
-	bool VISUALIZE_IOFX_BOUNDING_BOX;
-	bool VISUALIZE_IOFX_ACTOR_NAME;
-
-};
-
-static const uint32_t checksum[] = { 0xa907935c, 0x197f0683, 0x47c3ea05, 0x61985bda, };
-
-} // namespace IofxDebugRenderParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class IofxDebugRenderParams : public NvParameterized::NvParameters, public IofxDebugRenderParamsNS::ParametersStruct
-{
-public:
-	IofxDebugRenderParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~IofxDebugRenderParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("IofxDebugRenderParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(IofxDebugRenderParamsNS::checksum);
-		return IofxDebugRenderParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const IofxDebugRenderParamsNS::ParametersStruct& parameters(void) const
-	{
-		IofxDebugRenderParams* tmpThis = const_cast<IofxDebugRenderParams*>(this);
-		return *(static_cast<IofxDebugRenderParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	IofxDebugRenderParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<IofxDebugRenderParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class IofxDebugRenderParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		IofxDebugRenderParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(IofxDebugRenderParams), IofxDebugRenderParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, IofxDebugRenderParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class IofxDebugRenderParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(IofxDebugRenderParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, IofxDebugRenderParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, IofxDebugRenderParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, IofxDebugRenderParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class IofxDebugRenderParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of IofxDebugRenderParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (IofxDebugRenderParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (IofxDebugRenderParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (IofxDebugRenderParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (IofxDebugRenderParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (IofxDebugRenderParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/IofxModuleParameters.h b/APEX_1.4/module/iofx/include/autogen/IofxModuleParameters.h
deleted file mode 100644
index eee1c73f..00000000
--- a/APEX_1.4/module/iofx/include/autogen/IofxModuleParameters.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_IofxModuleParameters_h
-#define HEADER_IofxModuleParameters_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace IofxModuleParametersNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	uint32_t unused;
-
-};
-
-static const uint32_t checksum[] = { 0x70f85d6f, 0xc44790e5, 0x2f3cd6fd, 0x9d4a542b, };
-
-} // namespace IofxModuleParametersNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class IofxModuleParameters : public NvParameterized::NvParameters, public IofxModuleParametersNS::ParametersStruct
-{
-public:
-	IofxModuleParameters(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~IofxModuleParameters();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("IofxModuleParameters");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(IofxModuleParametersNS::checksum);
-		return IofxModuleParametersNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const IofxModuleParametersNS::ParametersStruct& parameters(void) const
-	{
-		IofxModuleParameters* tmpThis = const_cast<IofxModuleParameters*>(this);
-		return *(static_cast<IofxModuleParametersNS::ParametersStruct*>(tmpThis));
-	}
-
-	IofxModuleParametersNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<IofxModuleParametersNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class IofxModuleParametersFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		IofxModuleParameters::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(IofxModuleParameters), IofxModuleParameters::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, IofxModuleParameters::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class IofxModuleParameters");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(IofxModuleParameters)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, IofxModuleParameters)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, IofxModuleParameters::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, IofxModuleParameters::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class IofxModuleParameters");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of IofxModuleParameters here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (IofxModuleParameters*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (IofxModuleParameters::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (IofxModuleParameters::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (IofxModuleParameters::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (IofxModuleParameters::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/MeshIofxParameters.h b/APEX_1.4/module/iofx/include/autogen/MeshIofxParameters.h
deleted file mode 100644
index 8bac4572..00000000
--- a/APEX_1.4/module/iofx/include/autogen/MeshIofxParameters.h
+++ /dev/null
@@ -1,254 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_MeshIofxParameters_h
-#define HEADER_MeshIofxParameters_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace MeshIofxParametersNS
-{
-
-struct meshProperties_Type;
-
-struct meshProperties_DynamicArray1D_Type
-{
-	meshProperties_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct REF_DynamicArray1D_Type
-{
-	NvParameterized::Interface** buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct meshProperties_Type
-{
-	NvParameterized::Interface* meshAssetName;
-	uint32_t weight;
-};
-
-struct ParametersStruct
-{
-
-	meshProperties_DynamicArray1D_Type renderMeshList;
-	REF_DynamicArray1D_Type spawnModifierList;
-	REF_DynamicArray1D_Type continuousModifierList;
-
-};
-
-static const uint32_t checksum[] = { 0x823a573c, 0xd18e2215, 0x6fc4db63, 0x3df0022a, };
-
-} // namespace MeshIofxParametersNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class MeshIofxParameters : public NvParameterized::NvParameters, public MeshIofxParametersNS::ParametersStruct
-{
-public:
-	MeshIofxParameters(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~MeshIofxParameters();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("MeshIofxParameters");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)4;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(MeshIofxParametersNS::checksum);
-		return MeshIofxParametersNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const MeshIofxParametersNS::ParametersStruct& parameters(void) const
-	{
-		MeshIofxParameters* tmpThis = const_cast<MeshIofxParameters*>(this);
-		return *(static_cast<MeshIofxParametersNS::ParametersStruct*>(tmpThis));
-	}
-
-	MeshIofxParametersNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<MeshIofxParametersNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class MeshIofxParametersFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		MeshIofxParameters::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(MeshIofxParameters), MeshIofxParameters::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, MeshIofxParameters::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class MeshIofxParameters");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(MeshIofxParameters)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, MeshIofxParameters)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, MeshIofxParameters::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, MeshIofxParameters::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class MeshIofxParameters");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of MeshIofxParameters here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (MeshIofxParameters*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (MeshIofxParameters::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (MeshIofxParameters::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (MeshIofxParameters::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (MeshIofxParameters::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ModuleIofxRegistration.h b/APEX_1.4/module/iofx/include/autogen/ModuleIofxRegistration.h
deleted file mode 100644
index db457b97..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ModuleIofxRegistration.h
+++ /dev/null
@@ -1,228 +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 MODULE_MODULEIOFXREGISTRATIONH_H
-#define MODULE_MODULEIOFXREGISTRATIONH_H
-
-#include "PsAllocator.h"
-#include "NvRegistrationsForTraitsBase.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "PxAssert.h"
-#include <stdint.h>
-
-// INCLUDE GENERATED FACTORIES
-#include "IofxDebugRenderParams.h"
-#include "IofxAssetParameters.h"
-#include "MeshIofxParameters.h"
-#include "SpriteIofxParameters.h"
-#include "RotationModifierParams.h"
-#include "SimpleScaleModifierParams.h"
-#include "ScaleByMassModifierParams.h"
-#include "RandomScaleModifierParams.h"
-#include "ColorVsLifeModifierParams.h"
-#include "ColorVsLifeCompositeModifierParams.h"
-#include "InitialColorModifierParams.h"
-#include "ScaleVsLifeModifierParams.h"
-#include "ScaleVsLife3DModifierParams.h"
-#include "ScaleVsLife2DModifierParams.h"
-#include "ScaleVsDensityModifierParams.h"
-#include "ScaleVsDensity3DModifierParams.h"
-#include "ScaleVsDensity2DModifierParams.h"
-#include "ScaleVsCameraDistanceModifierParams.h"
-#include "ScaleVsCameraDistance3DModifierParams.h"
-#include "ScaleVsCameraDistance2DModifierParams.h"
-#include "ColorVsDensityModifierParams.h"
-#include "ColorVsDensityCompositeModifierParams.h"
-#include "SubtextureVsLifeModifierParams.h"
-#include "OrientAlongVelocityModifierParams.h"
-#include "ScaleAlongVelocityModifierParams.h"
-#include "RandomSubtextureModifierParams.h"
-#include "RandomRotationModifierParams.h"
-#include "ViewDirectionSortingModifierParams.h"
-#include "RotationRateModifierParams.h"
-#include "RotationRateVsLifeModifierParams.h"
-#include "OrientScaleAlongScreenVelocityModifierParams.h"
-#include "ColorVsVelocityModifierParams.h"
-#include "ColorVsVelocityCompositeModifierParams.h"
-#include "ColorVsTemperatureModifierParams.h"
-#include "ColorVsTemperatureCompositeModifierParams.h"
-#include "ScaleVsTemperatureModifierParams.h"
-#include "ScaleVsTemperature3DModifierParams.h"
-#include "ScaleVsTemperature2DModifierParams.h"
-#include "IofxModuleParameters.h"
-
-
-// INCLUDE GENERATED CONVERSION
-
-
-namespace nvidia {
-namespace iofx {
-
-
-class ModuleIofxRegistration : public NvParameterized::RegistrationsForTraitsBase
-{
-public:
-	static void invokeRegistration(NvParameterized::Traits* parameterizedTraits)
-	{
-		if (parameterizedTraits)
-		{
-			ModuleIofxRegistration().registerAll(*parameterizedTraits);
-		}
-	}
-
-	static void invokeUnregistration(NvParameterized::Traits* parameterizedTraits)
-	{
-		if (parameterizedTraits)
-		{
-			ModuleIofxRegistration().unregisterAll(*parameterizedTraits);
-		}
-	}
-
-	void registerAvailableFactories(NvParameterized::Traits& parameterizedTraits)
-	{
-		::NvParameterized::Factory* factoriesToRegister[] = {
-// REGISTER GENERATED FACTORIES
-			new nvidia::iofx::IofxDebugRenderParamsFactory(),
-			new nvidia::iofx::IofxAssetParametersFactory(),
-			new nvidia::iofx::MeshIofxParametersFactory(),
-			new nvidia::iofx::SpriteIofxParametersFactory(),
-			new nvidia::iofx::RotationModifierParamsFactory(),
-			new nvidia::iofx::SimpleScaleModifierParamsFactory(),
-			new nvidia::iofx::ScaleByMassModifierParamsFactory(),
-			new nvidia::iofx::RandomScaleModifierParamsFactory(),
-			new nvidia::iofx::ColorVsLifeModifierParamsFactory(),
-			new nvidia::iofx::ColorVsLifeCompositeModifierParamsFactory(),
-			new nvidia::iofx::InitialColorModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsLifeModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsLife3DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsLife2DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsDensityModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsDensity3DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsDensity2DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsCameraDistanceModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsCameraDistance3DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsCameraDistance2DModifierParamsFactory(),
-			new nvidia::iofx::ColorVsDensityModifierParamsFactory(),
-			new nvidia::iofx::ColorVsDensityCompositeModifierParamsFactory(),
-			new nvidia::iofx::SubtextureVsLifeModifierParamsFactory(),
-			new nvidia::iofx::OrientAlongVelocityModifierParamsFactory(),
-			new nvidia::iofx::ScaleAlongVelocityModifierParamsFactory(),
-			new nvidia::iofx::RandomSubtextureModifierParamsFactory(),
-			new nvidia::iofx::RandomRotationModifierParamsFactory(),
-			new nvidia::iofx::ViewDirectionSortingModifierParamsFactory(),
-			new nvidia::iofx::RotationRateModifierParamsFactory(),
-			new nvidia::iofx::RotationRateVsLifeModifierParamsFactory(),
-			new nvidia::iofx::OrientScaleAlongScreenVelocityModifierParamsFactory(),
-			new nvidia::iofx::ColorVsVelocityModifierParamsFactory(),
-			new nvidia::iofx::ColorVsVelocityCompositeModifierParamsFactory(),
-			new nvidia::iofx::ColorVsTemperatureModifierParamsFactory(),
-			new nvidia::iofx::ColorVsTemperatureCompositeModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsTemperatureModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsTemperature3DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsTemperature2DModifierParamsFactory(),
-			new nvidia::iofx::IofxModuleParametersFactory(),
-
-		};
-
-		for (size_t i = 0; i < sizeof(factoriesToRegister)/sizeof(factoriesToRegister[0]); ++i)
-		{
-			parameterizedTraits.registerFactory(*factoriesToRegister[i]);
-		}
-	}
-
-	virtual void registerAvailableConverters(NvParameterized::Traits& parameterizedTraits)
-	{
-// REGISTER GENERATED CONVERSION
-PX_UNUSED(parameterizedTraits);
-
-	}
-
-	void unregisterAvailableFactories(NvParameterized::Traits& parameterizedTraits)
-	{
-		struct FactoryDesc
-		{
-			const char* name;
-			uint32_t version;
-		};
-
-		::NvParameterized::Factory* factoriesToUnregister[] = {
-// UNREGISTER GENERATED FACTORIES
-			new nvidia::iofx::IofxDebugRenderParamsFactory(),
-			new nvidia::iofx::IofxAssetParametersFactory(),
-			new nvidia::iofx::MeshIofxParametersFactory(),
-			new nvidia::iofx::SpriteIofxParametersFactory(),
-			new nvidia::iofx::RotationModifierParamsFactory(),
-			new nvidia::iofx::SimpleScaleModifierParamsFactory(),
-			new nvidia::iofx::ScaleByMassModifierParamsFactory(),
-			new nvidia::iofx::RandomScaleModifierParamsFactory(),
-			new nvidia::iofx::ColorVsLifeModifierParamsFactory(),
-			new nvidia::iofx::ColorVsLifeCompositeModifierParamsFactory(),
-			new nvidia::iofx::InitialColorModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsLifeModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsLife3DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsLife2DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsDensityModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsDensity3DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsDensity2DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsCameraDistanceModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsCameraDistance3DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsCameraDistance2DModifierParamsFactory(),
-			new nvidia::iofx::ColorVsDensityModifierParamsFactory(),
-			new nvidia::iofx::ColorVsDensityCompositeModifierParamsFactory(),
-			new nvidia::iofx::SubtextureVsLifeModifierParamsFactory(),
-			new nvidia::iofx::OrientAlongVelocityModifierParamsFactory(),
-			new nvidia::iofx::ScaleAlongVelocityModifierParamsFactory(),
-			new nvidia::iofx::RandomSubtextureModifierParamsFactory(),
-			new nvidia::iofx::RandomRotationModifierParamsFactory(),
-			new nvidia::iofx::ViewDirectionSortingModifierParamsFactory(),
-			new nvidia::iofx::RotationRateModifierParamsFactory(),
-			new nvidia::iofx::RotationRateVsLifeModifierParamsFactory(),
-			new nvidia::iofx::OrientScaleAlongScreenVelocityModifierParamsFactory(),
-			new nvidia::iofx::ColorVsVelocityModifierParamsFactory(),
-			new nvidia::iofx::ColorVsVelocityCompositeModifierParamsFactory(),
-			new nvidia::iofx::ColorVsTemperatureModifierParamsFactory(),
-			new nvidia::iofx::ColorVsTemperatureCompositeModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsTemperatureModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsTemperature3DModifierParamsFactory(),
-			new nvidia::iofx::ScaleVsTemperature2DModifierParamsFactory(),
-			new nvidia::iofx::IofxModuleParametersFactory(),
-
-		};
-
-		for (size_t i = 0; i < sizeof(factoriesToUnregister)/sizeof(factoriesToUnregister[0]); ++i)
-		{
-			::NvParameterized::Factory* removedFactory = parameterizedTraits.removeFactory(factoriesToUnregister[i]->getClassName(), factoriesToUnregister[i]->getVersion());
-			if (!removedFactory) 
-			{
-				PX_ASSERT_WITH_MESSAGE(0, "Factory can not be removed!");
-			}
-			else
-			{
-				removedFactory->freeParameterDefinitionTable(&parameterizedTraits);
-				delete removedFactory;
-				delete factoriesToUnregister[i];
-			}
-		}
-	}
-
-	virtual void unregisterAvailableConverters(NvParameterized::Traits& parameterizedTraits)
-	{
-// UNREGISTER GENERATED CONVERSION
-PX_UNUSED(parameterizedTraits);
-
-	}
-
-};
-
-
-}
-} //nvidia::iofx
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/OrientAlongVelocityModifierParams.h b/APEX_1.4/module/iofx/include/autogen/OrientAlongVelocityModifierParams.h
deleted file mode 100644
index b1769c54..00000000
--- a/APEX_1.4/module/iofx/include/autogen/OrientAlongVelocityModifierParams.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_OrientAlongVelocityModifierParams_h
-#define HEADER_OrientAlongVelocityModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace OrientAlongVelocityModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	physx::PxVec3 modelForward;
-
-};
-
-static const uint32_t checksum[] = { 0xbec07bae, 0xf99a7cd3, 0xa819cd23, 0xe75ba471, };
-
-} // namespace OrientAlongVelocityModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class OrientAlongVelocityModifierParams : public NvParameterized::NvParameters, public OrientAlongVelocityModifierParamsNS::ParametersStruct
-{
-public:
-	OrientAlongVelocityModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~OrientAlongVelocityModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("OrientAlongVelocityModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(OrientAlongVelocityModifierParamsNS::checksum);
-		return OrientAlongVelocityModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const OrientAlongVelocityModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		OrientAlongVelocityModifierParams* tmpThis = const_cast<OrientAlongVelocityModifierParams*>(this);
-		return *(static_cast<OrientAlongVelocityModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	OrientAlongVelocityModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<OrientAlongVelocityModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class OrientAlongVelocityModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		OrientAlongVelocityModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(OrientAlongVelocityModifierParams), OrientAlongVelocityModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, OrientAlongVelocityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class OrientAlongVelocityModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(OrientAlongVelocityModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, OrientAlongVelocityModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, OrientAlongVelocityModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, OrientAlongVelocityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class OrientAlongVelocityModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of OrientAlongVelocityModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (OrientAlongVelocityModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (OrientAlongVelocityModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (OrientAlongVelocityModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (OrientAlongVelocityModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (OrientAlongVelocityModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/OrientScaleAlongScreenVelocityModifierParams.h b/APEX_1.4/module/iofx/include/autogen/OrientScaleAlongScreenVelocityModifierParams.h
deleted file mode 100644
index 2cb0cdea..00000000
--- a/APEX_1.4/module/iofx/include/autogen/OrientScaleAlongScreenVelocityModifierParams.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_OrientScaleAlongScreenVelocityModifierParams_h
-#define HEADER_OrientScaleAlongScreenVelocityModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace OrientScaleAlongScreenVelocityModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	float scalePerVelocity;
-	float scaleChangeLimit;
-	float scaleChangeDelay;
-
-};
-
-static const uint32_t checksum[] = { 0x2a151b3c, 0x4a3faff3, 0xb9e6ebc2, 0x6ec77c7c, };
-
-} // namespace OrientScaleAlongScreenVelocityModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class OrientScaleAlongScreenVelocityModifierParams : public NvParameterized::NvParameters, public OrientScaleAlongScreenVelocityModifierParamsNS::ParametersStruct
-{
-public:
-	OrientScaleAlongScreenVelocityModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~OrientScaleAlongScreenVelocityModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("OrientScaleAlongScreenVelocityModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)1;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(OrientScaleAlongScreenVelocityModifierParamsNS::checksum);
-		return OrientScaleAlongScreenVelocityModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const OrientScaleAlongScreenVelocityModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		OrientScaleAlongScreenVelocityModifierParams* tmpThis = const_cast<OrientScaleAlongScreenVelocityModifierParams*>(this);
-		return *(static_cast<OrientScaleAlongScreenVelocityModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	OrientScaleAlongScreenVelocityModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<OrientScaleAlongScreenVelocityModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class OrientScaleAlongScreenVelocityModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		OrientScaleAlongScreenVelocityModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(OrientScaleAlongScreenVelocityModifierParams), OrientScaleAlongScreenVelocityModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, OrientScaleAlongScreenVelocityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class OrientScaleAlongScreenVelocityModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(OrientScaleAlongScreenVelocityModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, OrientScaleAlongScreenVelocityModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, OrientScaleAlongScreenVelocityModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, OrientScaleAlongScreenVelocityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class OrientScaleAlongScreenVelocityModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of OrientScaleAlongScreenVelocityModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (OrientScaleAlongScreenVelocityModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (OrientScaleAlongScreenVelocityModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (OrientScaleAlongScreenVelocityModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (OrientScaleAlongScreenVelocityModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (OrientScaleAlongScreenVelocityModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/RandomRotationModifierParams.h b/APEX_1.4/module/iofx/include/autogen/RandomRotationModifierParams.h
deleted file mode 100644
index ee380621..00000000
--- a/APEX_1.4/module/iofx/include/autogen/RandomRotationModifierParams.h
+++ /dev/null
@@ -1,231 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_RandomRotationModifierParams_h
-#define HEADER_RandomRotationModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace RandomRotationModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	float minRotation;
-	float maxRotation;
-
-};
-
-static const uint32_t checksum[] = { 0xa4b51fa4, 0x02427ca9, 0xff6c9fc0, 0xe34b89b6, };
-
-} // namespace RandomRotationModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class RandomRotationModifierParams : public NvParameterized::NvParameters, public RandomRotationModifierParamsNS::ParametersStruct
-{
-public:
-	RandomRotationModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~RandomRotationModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("RandomRotationModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(RandomRotationModifierParamsNS::checksum);
-		return RandomRotationModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const RandomRotationModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		RandomRotationModifierParams* tmpThis = const_cast<RandomRotationModifierParams*>(this);
-		return *(static_cast<RandomRotationModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	RandomRotationModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<RandomRotationModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class RandomRotationModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		RandomRotationModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(RandomRotationModifierParams), RandomRotationModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, RandomRotationModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RandomRotationModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(RandomRotationModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, RandomRotationModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, RandomRotationModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, RandomRotationModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RandomRotationModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of RandomRotationModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (RandomRotationModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (RandomRotationModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (RandomRotationModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (RandomRotationModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (RandomRotationModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/RandomScaleModifierParams.h b/APEX_1.4/module/iofx/include/autogen/RandomScaleModifierParams.h
deleted file mode 100644
index 1463126a..00000000
--- a/APEX_1.4/module/iofx/include/autogen/RandomScaleModifierParams.h
+++ /dev/null
@@ -1,231 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_RandomScaleModifierParams_h
-#define HEADER_RandomScaleModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace RandomScaleModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	float minScaleFactor;
-	float maxScaleFactor;
-
-};
-
-static const uint32_t checksum[] = { 0x393214a5, 0x3920927a, 0x6b466949, 0x38714cd7, };
-
-} // namespace RandomScaleModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class RandomScaleModifierParams : public NvParameterized::NvParameters, public RandomScaleModifierParamsNS::ParametersStruct
-{
-public:
-	RandomScaleModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~RandomScaleModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("RandomScaleModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(RandomScaleModifierParamsNS::checksum);
-		return RandomScaleModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const RandomScaleModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		RandomScaleModifierParams* tmpThis = const_cast<RandomScaleModifierParams*>(this);
-		return *(static_cast<RandomScaleModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	RandomScaleModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<RandomScaleModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class RandomScaleModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		RandomScaleModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(RandomScaleModifierParams), RandomScaleModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, RandomScaleModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RandomScaleModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(RandomScaleModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, RandomScaleModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, RandomScaleModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, RandomScaleModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RandomScaleModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of RandomScaleModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (RandomScaleModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (RandomScaleModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (RandomScaleModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (RandomScaleModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (RandomScaleModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/RandomSubtextureModifierParams.h b/APEX_1.4/module/iofx/include/autogen/RandomSubtextureModifierParams.h
deleted file mode 100644
index 78afe359..00000000
--- a/APEX_1.4/module/iofx/include/autogen/RandomSubtextureModifierParams.h
+++ /dev/null
@@ -1,231 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_RandomSubtextureModifierParams_h
-#define HEADER_RandomSubtextureModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace RandomSubtextureModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	float minSubtexture;
-	float maxSubtexture;
-
-};
-
-static const uint32_t checksum[] = { 0x08f8796a, 0xa2e2f9c5, 0x8997cd3a, 0xc27f7e3a, };
-
-} // namespace RandomSubtextureModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class RandomSubtextureModifierParams : public NvParameterized::NvParameters, public RandomSubtextureModifierParamsNS::ParametersStruct
-{
-public:
-	RandomSubtextureModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~RandomSubtextureModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("RandomSubtextureModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(RandomSubtextureModifierParamsNS::checksum);
-		return RandomSubtextureModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const RandomSubtextureModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		RandomSubtextureModifierParams* tmpThis = const_cast<RandomSubtextureModifierParams*>(this);
-		return *(static_cast<RandomSubtextureModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	RandomSubtextureModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<RandomSubtextureModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class RandomSubtextureModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		RandomSubtextureModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(RandomSubtextureModifierParams), RandomSubtextureModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, RandomSubtextureModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RandomSubtextureModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(RandomSubtextureModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, RandomSubtextureModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, RandomSubtextureModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, RandomSubtextureModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RandomSubtextureModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of RandomSubtextureModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (RandomSubtextureModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (RandomSubtextureModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (RandomSubtextureModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (RandomSubtextureModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (RandomSubtextureModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/RotationModifierParams.h b/APEX_1.4/module/iofx/include/autogen/RotationModifierParams.h
deleted file mode 100644
index 4bc2a457..00000000
--- a/APEX_1.4/module/iofx/include/autogen/RotationModifierParams.h
+++ /dev/null
@@ -1,235 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_RotationModifierParams_h
-#define HEADER_RotationModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace RotationModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	const char* rollType;
-	float maxRotationRatePerSec;
-	float maxSettleRatePerSec;
-	float inAirRotationMultiplier;
-	float collisionRotationMultiplier;
-	bool includeVerticalDirection;
-
-};
-
-static const uint32_t checksum[] = { 0xd2cf5d27, 0xa1732803, 0xcaa84b84, 0x18ed9e7c, };
-
-} // namespace RotationModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class RotationModifierParams : public NvParameterized::NvParameters, public RotationModifierParamsNS::ParametersStruct
-{
-public:
-	RotationModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~RotationModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("RotationModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)2;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(RotationModifierParamsNS::checksum);
-		return RotationModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const RotationModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		RotationModifierParams* tmpThis = const_cast<RotationModifierParams*>(this);
-		return *(static_cast<RotationModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	RotationModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<RotationModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class RotationModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		RotationModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(RotationModifierParams), RotationModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, RotationModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RotationModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(RotationModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, RotationModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, RotationModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, RotationModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RotationModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of RotationModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (RotationModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (RotationModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (RotationModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (RotationModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (RotationModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/RotationRateModifierParams.h b/APEX_1.4/module/iofx/include/autogen/RotationRateModifierParams.h
deleted file mode 100644
index 5290b1ae..00000000
--- a/APEX_1.4/module/iofx/include/autogen/RotationRateModifierParams.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_RotationRateModifierParams_h
-#define HEADER_RotationRateModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace RotationRateModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	float rotationRate;
-
-};
-
-static const uint32_t checksum[] = { 0x250808c0, 0x4e8042ab, 0x9e0339e9, 0x3130e44d, };
-
-} // namespace RotationRateModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class RotationRateModifierParams : public NvParameterized::NvParameters, public RotationRateModifierParamsNS::ParametersStruct
-{
-public:
-	RotationRateModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~RotationRateModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("RotationRateModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(RotationRateModifierParamsNS::checksum);
-		return RotationRateModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const RotationRateModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		RotationRateModifierParams* tmpThis = const_cast<RotationRateModifierParams*>(this);
-		return *(static_cast<RotationRateModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	RotationRateModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<RotationRateModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class RotationRateModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		RotationRateModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(RotationRateModifierParams), RotationRateModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, RotationRateModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RotationRateModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(RotationRateModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, RotationRateModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, RotationRateModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, RotationRateModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RotationRateModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of RotationRateModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (RotationRateModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (RotationRateModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (RotationRateModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (RotationRateModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (RotationRateModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/RotationRateVsLifeModifierParams.h b/APEX_1.4/module/iofx/include/autogen/RotationRateVsLifeModifierParams.h
deleted file mode 100644
index 4ab0547f..00000000
--- a/APEX_1.4/module/iofx/include/autogen/RotationRateVsLifeModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_RotationRateVsLifeModifierParams_h
-#define HEADER_RotationRateVsLifeModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace RotationRateVsLifeModifierParamsNS
-{
-
-struct vec2_Type;
-
-struct vec2_DynamicArray1D_Type
-{
-	vec2_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct vec2_Type
-{
-	float x;
-	float y;
-};
-
-struct ParametersStruct
-{
-
-	vec2_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x704cda91, 0xcc96c538, 0x11f054f6, 0xa3fc1c9e, };
-
-} // namespace RotationRateVsLifeModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class RotationRateVsLifeModifierParams : public NvParameterized::NvParameters, public RotationRateVsLifeModifierParamsNS::ParametersStruct
-{
-public:
-	RotationRateVsLifeModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~RotationRateVsLifeModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("RotationRateVsLifeModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(RotationRateVsLifeModifierParamsNS::checksum);
-		return RotationRateVsLifeModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const RotationRateVsLifeModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		RotationRateVsLifeModifierParams* tmpThis = const_cast<RotationRateVsLifeModifierParams*>(this);
-		return *(static_cast<RotationRateVsLifeModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	RotationRateVsLifeModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<RotationRateVsLifeModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class RotationRateVsLifeModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		RotationRateVsLifeModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(RotationRateVsLifeModifierParams), RotationRateVsLifeModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, RotationRateVsLifeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RotationRateVsLifeModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(RotationRateVsLifeModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, RotationRateVsLifeModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, RotationRateVsLifeModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, RotationRateVsLifeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class RotationRateVsLifeModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of RotationRateVsLifeModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (RotationRateVsLifeModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (RotationRateVsLifeModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (RotationRateVsLifeModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (RotationRateVsLifeModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (RotationRateVsLifeModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleAlongVelocityModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleAlongVelocityModifierParams.h
deleted file mode 100644
index c6ae8535..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleAlongVelocityModifierParams.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleAlongVelocityModifierParams_h
-#define HEADER_ScaleAlongVelocityModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleAlongVelocityModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	float scaleFactor;
-
-};
-
-static const uint32_t checksum[] = { 0x3c361211, 0x221d234b, 0x639bf597, 0xcca2608b, };
-
-} // namespace ScaleAlongVelocityModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleAlongVelocityModifierParams : public NvParameterized::NvParameters, public ScaleAlongVelocityModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleAlongVelocityModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleAlongVelocityModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleAlongVelocityModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleAlongVelocityModifierParamsNS::checksum);
-		return ScaleAlongVelocityModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleAlongVelocityModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleAlongVelocityModifierParams* tmpThis = const_cast<ScaleAlongVelocityModifierParams*>(this);
-		return *(static_cast<ScaleAlongVelocityModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleAlongVelocityModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleAlongVelocityModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleAlongVelocityModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleAlongVelocityModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleAlongVelocityModifierParams), ScaleAlongVelocityModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleAlongVelocityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleAlongVelocityModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleAlongVelocityModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleAlongVelocityModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleAlongVelocityModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleAlongVelocityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleAlongVelocityModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleAlongVelocityModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleAlongVelocityModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleAlongVelocityModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleAlongVelocityModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleAlongVelocityModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleAlongVelocityModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleByMassModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleByMassModifierParams.h
deleted file mode 100644
index 27735cc6..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleByMassModifierParams.h
+++ /dev/null
@@ -1,229 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleByMassModifierParams_h
-#define HEADER_ScaleByMassModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleByMassModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-
-};
-
-static const uint32_t checksum[] = { 0x0164ba51, 0x109896dc, 0x1c51ccab, 0xc0cebd7a, };
-
-} // namespace ScaleByMassModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleByMassModifierParams : public NvParameterized::NvParameters, public ScaleByMassModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleByMassModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleByMassModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleByMassModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleByMassModifierParamsNS::checksum);
-		return ScaleByMassModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleByMassModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleByMassModifierParams* tmpThis = const_cast<ScaleByMassModifierParams*>(this);
-		return *(static_cast<ScaleByMassModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleByMassModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleByMassModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleByMassModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleByMassModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleByMassModifierParams), ScaleByMassModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleByMassModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleByMassModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleByMassModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleByMassModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleByMassModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleByMassModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleByMassModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleByMassModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleByMassModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleByMassModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleByMassModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleByMassModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleByMassModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsCameraDistance2DModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsCameraDistance2DModifierParams.h
deleted file mode 100644
index 9addb5c9..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsCameraDistance2DModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsCameraDistance2DModifierParams_h
-#define HEADER_ScaleVsCameraDistance2DModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsCameraDistance2DModifierParamsNS
-{
-
-struct scaleCameraDistanceStruct_Type;
-
-struct scaleCameraDistanceStruct_DynamicArray1D_Type
-{
-	scaleCameraDistanceStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct scaleCameraDistanceStruct_Type
-{
-	float cameraDistance;
-	physx::PxVec2 scale;
-};
-
-struct ParametersStruct
-{
-
-	scaleCameraDistanceStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0xa1847ef6, 0x35e96cc6, 0xd3de86e9, 0x977d685a, };
-
-} // namespace ScaleVsCameraDistance2DModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsCameraDistance2DModifierParams : public NvParameterized::NvParameters, public ScaleVsCameraDistance2DModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsCameraDistance2DModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsCameraDistance2DModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsCameraDistance2DModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsCameraDistance2DModifierParamsNS::checksum);
-		return ScaleVsCameraDistance2DModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsCameraDistance2DModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsCameraDistance2DModifierParams* tmpThis = const_cast<ScaleVsCameraDistance2DModifierParams*>(this);
-		return *(static_cast<ScaleVsCameraDistance2DModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsCameraDistance2DModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsCameraDistance2DModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsCameraDistance2DModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsCameraDistance2DModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsCameraDistance2DModifierParams), ScaleVsCameraDistance2DModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsCameraDistance2DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsCameraDistance2DModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsCameraDistance2DModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsCameraDistance2DModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsCameraDistance2DModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsCameraDistance2DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsCameraDistance2DModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsCameraDistance2DModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsCameraDistance2DModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsCameraDistance2DModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsCameraDistance2DModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsCameraDistance2DModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsCameraDistance2DModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsCameraDistance3DModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsCameraDistance3DModifierParams.h
deleted file mode 100644
index 715ac901..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsCameraDistance3DModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsCameraDistance3DModifierParams_h
-#define HEADER_ScaleVsCameraDistance3DModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsCameraDistance3DModifierParamsNS
-{
-
-struct scaleCameraDistanceStruct_Type;
-
-struct scaleCameraDistanceStruct_DynamicArray1D_Type
-{
-	scaleCameraDistanceStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct scaleCameraDistanceStruct_Type
-{
-	float cameraDistance;
-	physx::PxVec3 scale;
-};
-
-struct ParametersStruct
-{
-
-	scaleCameraDistanceStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x661390b6, 0x5566a427, 0x6507630a, 0x6aff3b6e, };
-
-} // namespace ScaleVsCameraDistance3DModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsCameraDistance3DModifierParams : public NvParameterized::NvParameters, public ScaleVsCameraDistance3DModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsCameraDistance3DModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsCameraDistance3DModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsCameraDistance3DModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsCameraDistance3DModifierParamsNS::checksum);
-		return ScaleVsCameraDistance3DModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsCameraDistance3DModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsCameraDistance3DModifierParams* tmpThis = const_cast<ScaleVsCameraDistance3DModifierParams*>(this);
-		return *(static_cast<ScaleVsCameraDistance3DModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsCameraDistance3DModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsCameraDistance3DModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsCameraDistance3DModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsCameraDistance3DModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsCameraDistance3DModifierParams), ScaleVsCameraDistance3DModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsCameraDistance3DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsCameraDistance3DModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsCameraDistance3DModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsCameraDistance3DModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsCameraDistance3DModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsCameraDistance3DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsCameraDistance3DModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsCameraDistance3DModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsCameraDistance3DModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsCameraDistance3DModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsCameraDistance3DModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsCameraDistance3DModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsCameraDistance3DModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsCameraDistanceModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsCameraDistanceModifierParams.h
deleted file mode 100644
index 253eabce..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsCameraDistanceModifierParams.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsCameraDistanceModifierParams_h
-#define HEADER_ScaleVsCameraDistanceModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsCameraDistanceModifierParamsNS
-{
-
-struct vec2_Type;
-
-struct vec2_DynamicArray1D_Type
-{
-	vec2_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct vec2_Type
-{
-	float x;
-	float y;
-};
-
-struct ParametersStruct
-{
-
-	const char* scaleAxis;
-	vec2_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x2c4aba3d, 0xa1d08f53, 0xfb08d5f3, 0xe12927dd, };
-
-} // namespace ScaleVsCameraDistanceModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsCameraDistanceModifierParams : public NvParameterized::NvParameters, public ScaleVsCameraDistanceModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsCameraDistanceModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsCameraDistanceModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsCameraDistanceModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsCameraDistanceModifierParamsNS::checksum);
-		return ScaleVsCameraDistanceModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsCameraDistanceModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsCameraDistanceModifierParams* tmpThis = const_cast<ScaleVsCameraDistanceModifierParams*>(this);
-		return *(static_cast<ScaleVsCameraDistanceModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsCameraDistanceModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsCameraDistanceModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsCameraDistanceModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsCameraDistanceModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsCameraDistanceModifierParams), ScaleVsCameraDistanceModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsCameraDistanceModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsCameraDistanceModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsCameraDistanceModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsCameraDistanceModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsCameraDistanceModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsCameraDistanceModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsCameraDistanceModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsCameraDistanceModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsCameraDistanceModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsCameraDistanceModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsCameraDistanceModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsCameraDistanceModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsCameraDistanceModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsDensity2DModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsDensity2DModifierParams.h
deleted file mode 100644
index fb5f0e4f..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsDensity2DModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsDensity2DModifierParams_h
-#define HEADER_ScaleVsDensity2DModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsDensity2DModifierParamsNS
-{
-
-struct scaleDensityStruct_Type;
-
-struct scaleDensityStruct_DynamicArray1D_Type
-{
-	scaleDensityStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct scaleDensityStruct_Type
-{
-	float density;
-	physx::PxVec2 scale;
-};
-
-struct ParametersStruct
-{
-
-	scaleDensityStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x67c772d8, 0x2f573535, 0xdd3f3715, 0xea4c896d, };
-
-} // namespace ScaleVsDensity2DModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsDensity2DModifierParams : public NvParameterized::NvParameters, public ScaleVsDensity2DModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsDensity2DModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsDensity2DModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsDensity2DModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsDensity2DModifierParamsNS::checksum);
-		return ScaleVsDensity2DModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsDensity2DModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsDensity2DModifierParams* tmpThis = const_cast<ScaleVsDensity2DModifierParams*>(this);
-		return *(static_cast<ScaleVsDensity2DModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsDensity2DModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsDensity2DModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsDensity2DModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsDensity2DModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsDensity2DModifierParams), ScaleVsDensity2DModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsDensity2DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsDensity2DModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsDensity2DModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsDensity2DModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsDensity2DModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsDensity2DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsDensity2DModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsDensity2DModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsDensity2DModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsDensity2DModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsDensity2DModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsDensity2DModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsDensity2DModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsDensity3DModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsDensity3DModifierParams.h
deleted file mode 100644
index de04c5b1..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsDensity3DModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsDensity3DModifierParams_h
-#define HEADER_ScaleVsDensity3DModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsDensity3DModifierParamsNS
-{
-
-struct scaleDensityStruct_Type;
-
-struct scaleDensityStruct_DynamicArray1D_Type
-{
-	scaleDensityStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct scaleDensityStruct_Type
-{
-	float density;
-	physx::PxVec3 scale;
-};
-
-struct ParametersStruct
-{
-
-	scaleDensityStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x0dddf0d6, 0x459996e0, 0x32b4d7ce, 0x8e0d1b52, };
-
-} // namespace ScaleVsDensity3DModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsDensity3DModifierParams : public NvParameterized::NvParameters, public ScaleVsDensity3DModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsDensity3DModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsDensity3DModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsDensity3DModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsDensity3DModifierParamsNS::checksum);
-		return ScaleVsDensity3DModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsDensity3DModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsDensity3DModifierParams* tmpThis = const_cast<ScaleVsDensity3DModifierParams*>(this);
-		return *(static_cast<ScaleVsDensity3DModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsDensity3DModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsDensity3DModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsDensity3DModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsDensity3DModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsDensity3DModifierParams), ScaleVsDensity3DModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsDensity3DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsDensity3DModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsDensity3DModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsDensity3DModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsDensity3DModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsDensity3DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsDensity3DModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsDensity3DModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsDensity3DModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsDensity3DModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsDensity3DModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsDensity3DModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsDensity3DModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsDensityModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsDensityModifierParams.h
deleted file mode 100644
index 3e1b38ea..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsDensityModifierParams.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsDensityModifierParams_h
-#define HEADER_ScaleVsDensityModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsDensityModifierParamsNS
-{
-
-struct vec2_Type;
-
-struct vec2_DynamicArray1D_Type
-{
-	vec2_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct vec2_Type
-{
-	float x;
-	float y;
-};
-
-struct ParametersStruct
-{
-
-	const char* scaleAxis;
-	vec2_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x6f22ca8e, 0x609b223e, 0x81d9cacc, 0x9ca002f4, };
-
-} // namespace ScaleVsDensityModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsDensityModifierParams : public NvParameterized::NvParameters, public ScaleVsDensityModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsDensityModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsDensityModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsDensityModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsDensityModifierParamsNS::checksum);
-		return ScaleVsDensityModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsDensityModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsDensityModifierParams* tmpThis = const_cast<ScaleVsDensityModifierParams*>(this);
-		return *(static_cast<ScaleVsDensityModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsDensityModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsDensityModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsDensityModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsDensityModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsDensityModifierParams), ScaleVsDensityModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsDensityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsDensityModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsDensityModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsDensityModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsDensityModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsDensityModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsDensityModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsDensityModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsDensityModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsDensityModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsDensityModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsDensityModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsDensityModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsLife2DModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsLife2DModifierParams.h
deleted file mode 100644
index 7b51e51b..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsLife2DModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsLife2DModifierParams_h
-#define HEADER_ScaleVsLife2DModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsLife2DModifierParamsNS
-{
-
-struct scaleLifeStruct_Type;
-
-struct scaleLifeStruct_DynamicArray1D_Type
-{
-	scaleLifeStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct scaleLifeStruct_Type
-{
-	float lifeRemaining;
-	physx::PxVec2 scale;
-};
-
-struct ParametersStruct
-{
-
-	scaleLifeStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x6db3956a, 0xa58c530d, 0xff315c26, 0xddb49833, };
-
-} // namespace ScaleVsLife2DModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsLife2DModifierParams : public NvParameterized::NvParameters, public ScaleVsLife2DModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsLife2DModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsLife2DModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsLife2DModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsLife2DModifierParamsNS::checksum);
-		return ScaleVsLife2DModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsLife2DModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsLife2DModifierParams* tmpThis = const_cast<ScaleVsLife2DModifierParams*>(this);
-		return *(static_cast<ScaleVsLife2DModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsLife2DModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsLife2DModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsLife2DModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsLife2DModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsLife2DModifierParams), ScaleVsLife2DModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsLife2DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsLife2DModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsLife2DModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsLife2DModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsLife2DModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsLife2DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsLife2DModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsLife2DModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsLife2DModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsLife2DModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsLife2DModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsLife2DModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsLife2DModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsLife3DModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsLife3DModifierParams.h
deleted file mode 100644
index d1dcb372..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsLife3DModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsLife3DModifierParams_h
-#define HEADER_ScaleVsLife3DModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsLife3DModifierParamsNS
-{
-
-struct scaleLifeStruct_Type;
-
-struct scaleLifeStruct_DynamicArray1D_Type
-{
-	scaleLifeStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct scaleLifeStruct_Type
-{
-	float lifeRemaining;
-	physx::PxVec3 scale;
-};
-
-struct ParametersStruct
-{
-
-	scaleLifeStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0xbaddcfda, 0x2f4deda9, 0x2c23286e, 0xf19659fd, };
-
-} // namespace ScaleVsLife3DModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsLife3DModifierParams : public NvParameterized::NvParameters, public ScaleVsLife3DModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsLife3DModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsLife3DModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsLife3DModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsLife3DModifierParamsNS::checksum);
-		return ScaleVsLife3DModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsLife3DModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsLife3DModifierParams* tmpThis = const_cast<ScaleVsLife3DModifierParams*>(this);
-		return *(static_cast<ScaleVsLife3DModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsLife3DModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsLife3DModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsLife3DModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsLife3DModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsLife3DModifierParams), ScaleVsLife3DModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsLife3DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsLife3DModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsLife3DModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsLife3DModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsLife3DModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsLife3DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsLife3DModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsLife3DModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsLife3DModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsLife3DModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsLife3DModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsLife3DModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsLife3DModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsLifeModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsLifeModifierParams.h
deleted file mode 100644
index d087f4bc..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsLifeModifierParams.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsLifeModifierParams_h
-#define HEADER_ScaleVsLifeModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsLifeModifierParamsNS
-{
-
-struct vec2_Type;
-
-struct vec2_DynamicArray1D_Type
-{
-	vec2_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct vec2_Type
-{
-	float x;
-	float y;
-};
-
-struct ParametersStruct
-{
-
-	const char* scaleAxis;
-	vec2_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0xfed4c822, 0x131f7e2d, 0x1bedc356, 0xcbf77236, };
-
-} // namespace ScaleVsLifeModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsLifeModifierParams : public NvParameterized::NvParameters, public ScaleVsLifeModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsLifeModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsLifeModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsLifeModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsLifeModifierParamsNS::checksum);
-		return ScaleVsLifeModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsLifeModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsLifeModifierParams* tmpThis = const_cast<ScaleVsLifeModifierParams*>(this);
-		return *(static_cast<ScaleVsLifeModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsLifeModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsLifeModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsLifeModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsLifeModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsLifeModifierParams), ScaleVsLifeModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsLifeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsLifeModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsLifeModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsLifeModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsLifeModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsLifeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsLifeModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsLifeModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsLifeModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsLifeModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsLifeModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsLifeModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsLifeModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsTemperature2DModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsTemperature2DModifierParams.h
deleted file mode 100644
index 59ebbf6d..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsTemperature2DModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsTemperature2DModifierParams_h
-#define HEADER_ScaleVsTemperature2DModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsTemperature2DModifierParamsNS
-{
-
-struct scaleTemperatureStruct_Type;
-
-struct scaleTemperatureStruct_DynamicArray1D_Type
-{
-	scaleTemperatureStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct scaleTemperatureStruct_Type
-{
-	float temperature;
-	physx::PxVec2 scale;
-};
-
-struct ParametersStruct
-{
-
-	scaleTemperatureStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0xd5330296, 0xc6fa1947, 0x152d1b30, 0x07453e5c, };
-
-} // namespace ScaleVsTemperature2DModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsTemperature2DModifierParams : public NvParameterized::NvParameters, public ScaleVsTemperature2DModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsTemperature2DModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsTemperature2DModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsTemperature2DModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsTemperature2DModifierParamsNS::checksum);
-		return ScaleVsTemperature2DModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsTemperature2DModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsTemperature2DModifierParams* tmpThis = const_cast<ScaleVsTemperature2DModifierParams*>(this);
-		return *(static_cast<ScaleVsTemperature2DModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsTemperature2DModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsTemperature2DModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsTemperature2DModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsTemperature2DModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsTemperature2DModifierParams), ScaleVsTemperature2DModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsTemperature2DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsTemperature2DModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsTemperature2DModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsTemperature2DModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsTemperature2DModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsTemperature2DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsTemperature2DModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsTemperature2DModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsTemperature2DModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsTemperature2DModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsTemperature2DModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsTemperature2DModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsTemperature2DModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsTemperature3DModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsTemperature3DModifierParams.h
deleted file mode 100644
index 986e223b..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsTemperature3DModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsTemperature3DModifierParams_h
-#define HEADER_ScaleVsTemperature3DModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsTemperature3DModifierParamsNS
-{
-
-struct scaleTemperatureStruct_Type;
-
-struct scaleTemperatureStruct_DynamicArray1D_Type
-{
-	scaleTemperatureStruct_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct scaleTemperatureStruct_Type
-{
-	float temperature;
-	physx::PxVec3 scale;
-};
-
-struct ParametersStruct
-{
-
-	scaleTemperatureStruct_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x25b25469, 0xa653dacc, 0x1c3167df, 0xd3a6b16f, };
-
-} // namespace ScaleVsTemperature3DModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsTemperature3DModifierParams : public NvParameterized::NvParameters, public ScaleVsTemperature3DModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsTemperature3DModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsTemperature3DModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsTemperature3DModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsTemperature3DModifierParamsNS::checksum);
-		return ScaleVsTemperature3DModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsTemperature3DModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsTemperature3DModifierParams* tmpThis = const_cast<ScaleVsTemperature3DModifierParams*>(this);
-		return *(static_cast<ScaleVsTemperature3DModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsTemperature3DModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsTemperature3DModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsTemperature3DModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsTemperature3DModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsTemperature3DModifierParams), ScaleVsTemperature3DModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsTemperature3DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsTemperature3DModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsTemperature3DModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsTemperature3DModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsTemperature3DModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsTemperature3DModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsTemperature3DModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsTemperature3DModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsTemperature3DModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsTemperature3DModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsTemperature3DModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsTemperature3DModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsTemperature3DModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ScaleVsTemperatureModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ScaleVsTemperatureModifierParams.h
deleted file mode 100644
index 5d4ee275..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ScaleVsTemperatureModifierParams.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ScaleVsTemperatureModifierParams_h
-#define HEADER_ScaleVsTemperatureModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ScaleVsTemperatureModifierParamsNS
-{
-
-struct vec2_Type;
-
-struct vec2_DynamicArray1D_Type
-{
-	vec2_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct vec2_Type
-{
-	float x;
-	float y;
-};
-
-struct ParametersStruct
-{
-
-	const char* scaleAxis;
-	vec2_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0xd0fc7da0, 0x19500653, 0x8b0cfc22, 0xa80392bd, };
-
-} // namespace ScaleVsTemperatureModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ScaleVsTemperatureModifierParams : public NvParameterized::NvParameters, public ScaleVsTemperatureModifierParamsNS::ParametersStruct
-{
-public:
-	ScaleVsTemperatureModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ScaleVsTemperatureModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ScaleVsTemperatureModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ScaleVsTemperatureModifierParamsNS::checksum);
-		return ScaleVsTemperatureModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ScaleVsTemperatureModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ScaleVsTemperatureModifierParams* tmpThis = const_cast<ScaleVsTemperatureModifierParams*>(this);
-		return *(static_cast<ScaleVsTemperatureModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ScaleVsTemperatureModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ScaleVsTemperatureModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ScaleVsTemperatureModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ScaleVsTemperatureModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ScaleVsTemperatureModifierParams), ScaleVsTemperatureModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ScaleVsTemperatureModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsTemperatureModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ScaleVsTemperatureModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ScaleVsTemperatureModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ScaleVsTemperatureModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ScaleVsTemperatureModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ScaleVsTemperatureModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ScaleVsTemperatureModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ScaleVsTemperatureModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ScaleVsTemperatureModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ScaleVsTemperatureModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ScaleVsTemperatureModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ScaleVsTemperatureModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/SimpleScaleModifierParams.h b/APEX_1.4/module/iofx/include/autogen/SimpleScaleModifierParams.h
deleted file mode 100644
index cc86d886..00000000
--- a/APEX_1.4/module/iofx/include/autogen/SimpleScaleModifierParams.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_SimpleScaleModifierParams_h
-#define HEADER_SimpleScaleModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace SimpleScaleModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	physx::PxVec3 scaleFactor;
-
-};
-
-static const uint32_t checksum[] = { 0x7a1ac6ca, 0x76ef1cd2, 0x991bfe05, 0x30c11a09, };
-
-} // namespace SimpleScaleModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class SimpleScaleModifierParams : public NvParameterized::NvParameters, public SimpleScaleModifierParamsNS::ParametersStruct
-{
-public:
-	SimpleScaleModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~SimpleScaleModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("SimpleScaleModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(SimpleScaleModifierParamsNS::checksum);
-		return SimpleScaleModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const SimpleScaleModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		SimpleScaleModifierParams* tmpThis = const_cast<SimpleScaleModifierParams*>(this);
-		return *(static_cast<SimpleScaleModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	SimpleScaleModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<SimpleScaleModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class SimpleScaleModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		SimpleScaleModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(SimpleScaleModifierParams), SimpleScaleModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, SimpleScaleModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class SimpleScaleModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(SimpleScaleModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, SimpleScaleModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, SimpleScaleModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, SimpleScaleModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class SimpleScaleModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of SimpleScaleModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (SimpleScaleModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (SimpleScaleModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (SimpleScaleModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (SimpleScaleModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (SimpleScaleModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/SpriteIofxParameters.h b/APEX_1.4/module/iofx/include/autogen/SpriteIofxParameters.h
deleted file mode 100644
index 28292c11..00000000
--- a/APEX_1.4/module/iofx/include/autogen/SpriteIofxParameters.h
+++ /dev/null
@@ -1,240 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_SpriteIofxParameters_h
-#define HEADER_SpriteIofxParameters_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace SpriteIofxParametersNS
-{
-
-
-struct REF_DynamicArray1D_Type
-{
-	NvParameterized::Interface** buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-
-struct ParametersStruct
-{
-
-	NvParameterized::Interface* spriteMaterialName;
-	REF_DynamicArray1D_Type spawnModifierList;
-	REF_DynamicArray1D_Type continuousModifierList;
-
-};
-
-static const uint32_t checksum[] = { 0x9763d523, 0x7dae1ae1, 0x3bb7aa9d, 0x67a8d368, };
-
-} // namespace SpriteIofxParametersNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class SpriteIofxParameters : public NvParameterized::NvParameters, public SpriteIofxParametersNS::ParametersStruct
-{
-public:
-	SpriteIofxParameters(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~SpriteIofxParameters();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("SpriteIofxParameters");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)4;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(SpriteIofxParametersNS::checksum);
-		return SpriteIofxParametersNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const SpriteIofxParametersNS::ParametersStruct& parameters(void) const
-	{
-		SpriteIofxParameters* tmpThis = const_cast<SpriteIofxParameters*>(this);
-		return *(static_cast<SpriteIofxParametersNS::ParametersStruct*>(tmpThis));
-	}
-
-	SpriteIofxParametersNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<SpriteIofxParametersNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class SpriteIofxParametersFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		SpriteIofxParameters::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(SpriteIofxParameters), SpriteIofxParameters::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, SpriteIofxParameters::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class SpriteIofxParameters");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(SpriteIofxParameters)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, SpriteIofxParameters)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, SpriteIofxParameters::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, SpriteIofxParameters::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class SpriteIofxParameters");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of SpriteIofxParameters here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (SpriteIofxParameters*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (SpriteIofxParameters::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (SpriteIofxParameters::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (SpriteIofxParameters::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (SpriteIofxParameters::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/SubtextureVsLifeModifierParams.h b/APEX_1.4/module/iofx/include/autogen/SubtextureVsLifeModifierParams.h
deleted file mode 100644
index 59793101..00000000
--- a/APEX_1.4/module/iofx/include/autogen/SubtextureVsLifeModifierParams.h
+++ /dev/null
@@ -1,244 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_SubtextureVsLifeModifierParams_h
-#define HEADER_SubtextureVsLifeModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace SubtextureVsLifeModifierParamsNS
-{
-
-struct vec2_Type;
-
-struct vec2_DynamicArray1D_Type
-{
-	vec2_Type* buf;
-	bool isAllocated;
-	int32_t elementSize;
-	int32_t arraySizes[1];
-};
-
-struct vec2_Type
-{
-	float x;
-	float y;
-};
-
-struct ParametersStruct
-{
-
-	vec2_DynamicArray1D_Type controlPoints;
-
-};
-
-static const uint32_t checksum[] = { 0x38be217d, 0xe6774f18, 0x591a0a04, 0x64e61b1e, };
-
-} // namespace SubtextureVsLifeModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class SubtextureVsLifeModifierParams : public NvParameterized::NvParameters, public SubtextureVsLifeModifierParamsNS::ParametersStruct
-{
-public:
-	SubtextureVsLifeModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~SubtextureVsLifeModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("SubtextureVsLifeModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(SubtextureVsLifeModifierParamsNS::checksum);
-		return SubtextureVsLifeModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const SubtextureVsLifeModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		SubtextureVsLifeModifierParams* tmpThis = const_cast<SubtextureVsLifeModifierParams*>(this);
-		return *(static_cast<SubtextureVsLifeModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	SubtextureVsLifeModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<SubtextureVsLifeModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class SubtextureVsLifeModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		SubtextureVsLifeModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(SubtextureVsLifeModifierParams), SubtextureVsLifeModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, SubtextureVsLifeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class SubtextureVsLifeModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(SubtextureVsLifeModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, SubtextureVsLifeModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, SubtextureVsLifeModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, SubtextureVsLifeModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class SubtextureVsLifeModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of SubtextureVsLifeModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (SubtextureVsLifeModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (SubtextureVsLifeModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (SubtextureVsLifeModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (SubtextureVsLifeModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (SubtextureVsLifeModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif
diff --git a/APEX_1.4/module/iofx/include/autogen/ViewDirectionSortingModifierParams.h b/APEX_1.4/module/iofx/include/autogen/ViewDirectionSortingModifierParams.h
deleted file mode 100644
index eea2ddf0..00000000
--- a/APEX_1.4/module/iofx/include/autogen/ViewDirectionSortingModifierParams.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and 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.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2015 NVIDIA Corporation. All rights reserved.
-
-// This file was generated by NvParameterized/scripts/GenParameterized.pl
-
-
-#ifndef HEADER_ViewDirectionSortingModifierParams_h
-#define HEADER_ViewDirectionSortingModifierParams_h
-
-#include "NvParametersTypes.h"
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-#include "nvparameterized/NvParameterized.h"
-#include "nvparameterized/NvParameterizedTraits.h"
-#include "NvParameters.h"
-#include "NvTraitsInternal.h"
-#endif
-
-namespace nvidia
-{
-namespace iofx
-{
-
-#if PX_VC
-#pragma warning(push)
-#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#endif
-
-namespace ViewDirectionSortingModifierParamsNS
-{
-
-
-
-struct ParametersStruct
-{
-
-	const char* sortType;
-
-};
-
-static const uint32_t checksum[] = { 0x273be54c, 0xc9bfbfeb, 0x0523921d, 0x48c3bc2d, };
-
-} // namespace ViewDirectionSortingModifierParamsNS
-
-#ifndef NV_PARAMETERIZED_ONLY_LAYOUTS
-class ViewDirectionSortingModifierParams : public NvParameterized::NvParameters, public ViewDirectionSortingModifierParamsNS::ParametersStruct
-{
-public:
-	ViewDirectionSortingModifierParams(NvParameterized::Traits* traits, void* buf = 0, int32_t* refCount = 0);
-
-	virtual ~ViewDirectionSortingModifierParams();
-
-	virtual void destroy();
-
-	static const char* staticClassName(void)
-	{
-		return("ViewDirectionSortingModifierParams");
-	}
-
-	const char* className(void) const
-	{
-		return(staticClassName());
-	}
-
-	static const uint32_t ClassVersion = ((uint32_t)0 << 16) + (uint32_t)0;
-
-	static uint32_t staticVersion(void)
-	{
-		return ClassVersion;
-	}
-
-	uint32_t version(void) const
-	{
-		return(staticVersion());
-	}
-
-	static const uint32_t ClassAlignment = 8;
-
-	static const uint32_t* staticChecksum(uint32_t& bits)
-	{
-		bits = 8 * sizeof(ViewDirectionSortingModifierParamsNS::checksum);
-		return ViewDirectionSortingModifierParamsNS::checksum;
-	}
-
-	static void freeParameterDefinitionTable(NvParameterized::Traits* traits);
-
-	const uint32_t* checksum(uint32_t& bits) const
-	{
-		return staticChecksum(bits);
-	}
-
-	const ViewDirectionSortingModifierParamsNS::ParametersStruct& parameters(void) const
-	{
-		ViewDirectionSortingModifierParams* tmpThis = const_cast<ViewDirectionSortingModifierParams*>(this);
-		return *(static_cast<ViewDirectionSortingModifierParamsNS::ParametersStruct*>(tmpThis));
-	}
-
-	ViewDirectionSortingModifierParamsNS::ParametersStruct& parameters(void)
-	{
-		return *(static_cast<ViewDirectionSortingModifierParamsNS::ParametersStruct*>(this));
-	}
-
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle) const;
-	virtual NvParameterized::ErrorType getParameterHandle(const char* long_name, NvParameterized::Handle& handle);
-
-	void initDefaults(void);
-
-protected:
-
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void);
-	virtual const NvParameterized::DefinitionImpl* getParameterDefinitionTree(void) const;
-
-
-	virtual void getVarPtr(const NvParameterized::Handle& handle, void*& ptr, size_t& offset) const;
-
-private:
-
-	void buildTree(void);
-	void initDynamicArrays(void);
-	void initStrings(void);
-	void initReferences(void);
-	void freeDynamicArrays(void);
-	void freeStrings(void);
-	void freeReferences(void);
-
-	static bool mBuiltFlag;
-	static NvParameterized::MutexType mBuiltFlagMutex;
-};
-
-class ViewDirectionSortingModifierParamsFactory : public NvParameterized::Factory
-{
-	static const char* const vptr;
-
-public:
-
-	virtual void freeParameterDefinitionTable(NvParameterized::Traits* traits)
-	{
-		ViewDirectionSortingModifierParams::freeParameterDefinitionTable(traits);
-	}
-
-	virtual NvParameterized::Interface* create(NvParameterized::Traits* paramTraits)
-	{
-		// placement new on this class using mParameterizedTraits
-
-		void* newPtr = paramTraits->alloc(sizeof(ViewDirectionSortingModifierParams), ViewDirectionSortingModifierParams::ClassAlignment);
-		if (!NvParameterized::IsAligned(newPtr, ViewDirectionSortingModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ViewDirectionSortingModifierParams");
-			paramTraits->free(newPtr);
-			return 0;
-		}
-
-		memset(newPtr, 0, sizeof(ViewDirectionSortingModifierParams)); // always initialize memory allocated to zero for default values
-		return NV_PARAM_PLACEMENT_NEW(newPtr, ViewDirectionSortingModifierParams)(paramTraits);
-	}
-
-	virtual NvParameterized::Interface* finish(NvParameterized::Traits* paramTraits, void* bufObj, void* bufStart, int32_t* refCount)
-	{
-		if (!NvParameterized::IsAligned(bufObj, ViewDirectionSortingModifierParams::ClassAlignment)
-		        || !NvParameterized::IsAligned(bufStart, ViewDirectionSortingModifierParams::ClassAlignment))
-		{
-			NV_PARAM_TRAITS_WARNING(paramTraits, "Unaligned memory allocation for class ViewDirectionSortingModifierParams");
-			return 0;
-		}
-
-		// Init NvParameters-part
-		// We used to call empty constructor of ViewDirectionSortingModifierParams here
-		// but it may call default constructors of members and spoil the data
-		NV_PARAM_PLACEMENT_NEW(bufObj, NvParameterized::NvParameters)(paramTraits, bufStart, refCount);
-
-		// Init vtable (everything else is already initialized)
-		*(const char**)bufObj = vptr;
-
-		return (ViewDirectionSortingModifierParams*)bufObj;
-	}
-
-	virtual const char* getClassName()
-	{
-		return (ViewDirectionSortingModifierParams::staticClassName());
-	}
-
-	virtual uint32_t getVersion()
-	{
-		return (ViewDirectionSortingModifierParams::staticVersion());
-	}
-
-	virtual uint32_t getAlignment()
-	{
-		return (ViewDirectionSortingModifierParams::ClassAlignment);
-	}
-
-	virtual const uint32_t* getChecksum(uint32_t& bits)
-	{
-		return (ViewDirectionSortingModifierParams::staticChecksum(bits));
-	}
-};
-#endif // NV_PARAMETERIZED_ONLY_LAYOUTS
-
-} // namespace iofx
-} // namespace nvidia
-
-#if PX_VC
-#pragma warning(pop)
-#endif
-
-#endif