aboutsummaryrefslogtreecommitdiff
path: root/APEX_1.4/samples_v2
diff options
context:
space:
mode:
authorsschirm <[email protected]>2016-12-23 14:20:36 +0100
committersschirm <[email protected]>2016-12-23 14:56:17 +0100
commitef6937e69e8ee3f409cf9d460d5ad300a65d5924 (patch)
tree710426e8daa605551ce3f34b581897011101c30f /APEX_1.4/samples_v2
parentInitial commit: (diff)
downloadphysx-3.4-ef6937e69e8ee3f409cf9d460d5ad300a65d5924.tar.xz
physx-3.4-ef6937e69e8ee3f409cf9d460d5ad300a65d5924.zip
PhysX 3.4 / APEX 1.4 release candidate @21506124
Diffstat (limited to 'APEX_1.4/samples_v2')
-rw-r--r--APEX_1.4/samples_v2/SampleBase/ApexController.cpp25
-rw-r--r--APEX_1.4/samples_v2/SampleBase/ApexController.h33
-rw-r--r--APEX_1.4/samples_v2/SampleBase/ApexRenderer.cpp12
-rw-r--r--APEX_1.4/samples_v2/SampleBase/CommonUIController.cpp35
-rw-r--r--APEX_1.4/samples_v2/SampleBase/CommonUIController.h8
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageEffectPackagesDatabase.apbbin16216 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageEmittersDatabase.apbbin8600 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageFieldSamplersDatabase.apbbin11016 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageGraphicsEffectsDatabase.apbbin13000 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageGraphicsMaterialsDatabase.apbbin2496 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageParticleSimulationsDatabase.apbbin6484 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/concreteChunkMesh.apbbin4172 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/materials/concrete_debris.xml4
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/materials/wood_debris.xml4
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/meshParticleIosPhysX3.apx53
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/testImpactEmitter.apx34
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/testMeshEmitter4ParticleIos.apx36
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/testMeshIofx.apx61
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/testParticleIos.apx53
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/textures/GrayRock_Tileable_D.ddsbin43832 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/textures/SpriteTexture1.ddsbin5616 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/textures/Wood_Tileable.ddsbin43832 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/textures/flare.ddsbin5616 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/textures/smoke.ddsbin349680 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesBase/woodChunkMesh.apbbin4308 -> 0 bytes
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesHelloWorld/Main.cpp51
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleSceneController.cpp221
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleSceneController.h77
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleUIController.cpp105
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleUIController.h42
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesImpactParticles/Main.cpp51
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleSceneController.cpp92
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleSceneController.h54
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleUIController.cpp70
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleUIController.h39
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesMeshParticles/Main.cpp51
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleSceneController.cpp67
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleSceneController.h39
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleUIController.cpp58
-rw-r--r--APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleUIController.h39
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleBase.vcxproj25
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleBase.vcxproj.filters136
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/Samples.sln21
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleBase.vcxproj25
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleBase.vcxproj.filters136
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/Samples.sln21
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleBase.vcxproj25
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleBase.vcxproj.filters136
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/Samples.sln21
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleBase.vcxproj25
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleBase.vcxproj.filters136
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj4
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/Samples.sln21
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleBase.vcxproj72
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleBase.vcxproj.filters136
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj51
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj51
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj51
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/Samples.sln21
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleBase.vcxproj68
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleBase.vcxproj.filters136
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj47
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj47
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj47
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters46
-rw-r--r--APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/Samples.sln21
94 files changed, 1428 insertions, 2338 deletions
diff --git a/APEX_1.4/samples_v2/SampleBase/ApexController.cpp b/APEX_1.4/samples_v2/SampleBase/ApexController.cpp
index d8c7eb67..cf63f274 100644
--- a/APEX_1.4/samples_v2/SampleBase/ApexController.cpp
+++ b/APEX_1.4/samples_v2/SampleBase/ApexController.cpp
@@ -32,6 +32,9 @@ ApexController::ApexController(PxSimulationFilterShader filterShader, CFirstPers
, mFilterShader(filterShader)
, mLastSimulationTime(0)
, mPaused(false)
+, mUseFixedTimestep(true)
+, mFixedTimestep(1.0/60.0)
+, mTimeRemainder(0.0)
{
QueryPerformanceFrequency(&mPerformanceFreq);
}
@@ -271,8 +274,26 @@ void ApexController::Animate(double dt)
if (mPaused)
return;
- // slower physics if fps is too low
- dt = PxClamp(dt, 0.001, 0.33);
+ if (mFixedTimestep)
+ {
+ mTimeRemainder += dt;
+ if (mTimeRemainder <= 0.0)
+ {
+ return;
+ }
+ mTimeRemainder -= mFixedTimestep;
+ if (mTimeRemainder > 0.0)
+ {
+ // slower physics if fps is below 1/mFixedTimestep
+ mTimeRemainder = 0.0;
+ }
+ dt = mFixedTimestep;
+ }
+ else
+ {
+ // slower physics if fps is too low
+ dt = PxClamp(dt, 0.001, 0.33);
+ }
LARGE_INTEGER time0;
QueryPerformanceCounter(&time0);
diff --git a/APEX_1.4/samples_v2/SampleBase/ApexController.h b/APEX_1.4/samples_v2/SampleBase/ApexController.h
index 15ecaf64..653e47ee 100644
--- a/APEX_1.4/samples_v2/SampleBase/ApexController.h
+++ b/APEX_1.4/samples_v2/SampleBase/ApexController.h
@@ -126,7 +126,34 @@ class ApexController : public ISampleController
mPaused = !mPaused;
}
- private:
+ void toggleFixedTimestep()
+ {
+ mUseFixedTimestep = !mUseFixedTimestep;
+ if (mUseFixedTimestep)
+ {
+ mTimeRemainder = 0.0;
+ }
+ }
+
+ bool usingFixedTimestep() const
+ {
+ return mUseFixedTimestep;
+ }
+
+ void setFixedTimestep(double fixedTimestep)
+ {
+ if (fixedTimestep > 0.0)
+ {
+ mFixedTimestep = fixedTimestep;
+ }
+ }
+
+ double getFixedTimestep()
+ {
+ return mFixedTimestep;
+ }
+
+private:
void initPhysX();
void releasePhysX();
@@ -187,6 +214,10 @@ class ApexController : public ISampleController
LARGE_INTEGER mPerformanceFreq;
bool mPaused;
+
+ bool mUseFixedTimestep;
+ double mFixedTimestep;
+ double mTimeRemainder;
};
#endif
diff --git a/APEX_1.4/samples_v2/SampleBase/ApexRenderer.cpp b/APEX_1.4/samples_v2/SampleBase/ApexRenderer.cpp
index 54328c65..62a23f54 100644
--- a/APEX_1.4/samples_v2/SampleBase/ApexRenderer.cpp
+++ b/APEX_1.4/samples_v2/SampleBase/ApexRenderer.cpp
@@ -253,16 +253,10 @@ void ApexRenderer::DeviceDestroyed()
void ApexRenderer::onInitialize()
{
- std::stringstream ss;
- ss << GetCommandLineA();
char buf[256];
- ss >> &buf[0];
-
- PathRemoveFileSpecA(&buf[0]);
-
- ss.clear();
- ss << buf << "/../../samples_v2/";
- ss >> buf;
+ sprintf(buf, "%s", GetCommandLineA());
+ PathRemoveFileSpecA(buf);
+ sprintf(buf + strlen(buf), "/../../samples_v2/");
mApex.getResourceCallback()->addSearchDir(&buf[1]);
diff --git a/APEX_1.4/samples_v2/SampleBase/CommonUIController.cpp b/APEX_1.4/samples_v2/SampleBase/CommonUIController.cpp
index 08be4392..f548d36b 100644
--- a/APEX_1.4/samples_v2/SampleBase/CommonUIController.cpp
+++ b/APEX_1.4/samples_v2/SampleBase/CommonUIController.cpp
@@ -45,6 +45,10 @@ HRESULT CommonUIController::DeviceCreated(ID3D11Device* pDevice)
TwAddVarCB(mSettingsBar, "WireFrame", TW_TYPE_BOOLCPP, CommonUIController::setWireframeEnabled,
CommonUIController::getWireframeEnabled, this, "group=Main key=o");
TwAddButton(mSettingsBar, "Reload Shaders", CommonUIController::onReloadShadersButton, this, "group=Main key=f5");
+ TwAddVarCB(mSettingsBar, "Fixed Sim Frequency Enabled", TW_TYPE_BOOLCPP, CommonUIController::setFixedTimestepEnabled,
+ CommonUIController::getFixedTimestepEnabled, this, "group=Main key=t");
+ TwAddVarCB(mSettingsBar, "Fixed Sim Frequency", TW_TYPE_UINT32, CommonUIController::setFixedSimFrequency,
+ CommonUIController::getFixedSimFrequency, this, "group=Main min=30 max=1000");
TwAddVarRW(mSettingsBar, "Ambient Color", TW_TYPE_COLOR3F, &(mApexRenderer->getAmbientColor()), "group='Scene'");
TwAddVarRW(mSettingsBar, "Point Light Color", TW_TYPE_COLOR3F, &(mApexRenderer->getPointLightColor()), "group='Scene'");
TwAddVarRW(mSettingsBar, "Point Light Pos", TW_TYPE_DIR3F, &(mApexRenderer->getPointLightPos()), "group='Scene'");
@@ -60,6 +64,7 @@ HRESULT CommonUIController::DeviceCreated(ID3D11Device* pDevice)
addHintLine("Rotate camera - RMB");
addHintLine("Move camera - WASDQE(SHIFT)");
addHintLine("Play/Pause - P");
+ addHintLine("Fixed/Variable sim freq - T");
addHintLine("Reload shaders - F5");
addHintLine("Wireframe - O");
@@ -205,6 +210,36 @@ void TW_CALL CommonUIController::getWireframeEnabled(void* value, void* clientDa
}
+void TW_CALL CommonUIController::setFixedTimestepEnabled(const void* value, void* clientData)
+{
+ CommonUIController* controller = static_cast<CommonUIController*>(clientData);
+ const bool enable = *static_cast<const bool*>(value);
+ if (controller->mApexController->usingFixedTimestep() != enable)
+ {
+ controller->mApexController->toggleFixedTimestep();
+ }
+}
+
+void TW_CALL CommonUIController::getFixedTimestepEnabled(void* value, void* clientData)
+{
+ CommonUIController* controller = static_cast<CommonUIController*>(clientData);
+ *static_cast<bool*>(value) = controller->mApexController->usingFixedTimestep();
+}
+
+
+void TW_CALL CommonUIController::setFixedSimFrequency(const void* value, void* clientData)
+{
+ CommonUIController* controller = static_cast<CommonUIController*>(clientData);
+ controller->mApexController->setFixedTimestep(1.0 / *static_cast<const uint32_t*>(value));
+}
+
+void TW_CALL CommonUIController::getFixedSimFrequency(void* value, void* clientData)
+{
+ CommonUIController* controller = static_cast<CommonUIController*>(clientData);
+ *static_cast<uint32_t*>(value) = static_cast<uint32_t>(1.0 / controller->mApexController->getFixedTimestep() + 0.5);
+}
+
+
void TW_CALL CommonUIController::onReloadShadersButton(void* clientData)
{
CommonUIController* controller = static_cast<CommonUIController*>(clientData);
diff --git a/APEX_1.4/samples_v2/SampleBase/CommonUIController.h b/APEX_1.4/samples_v2/SampleBase/CommonUIController.h
index 9790957f..252395fd 100644
--- a/APEX_1.4/samples_v2/SampleBase/CommonUIController.h
+++ b/APEX_1.4/samples_v2/SampleBase/CommonUIController.h
@@ -51,7 +51,13 @@ class CommonUIController : public ISampleController
static void TW_CALL onReloadShadersButton(void* clientData);
- private:
+ static void TW_CALL setFixedTimestepEnabled(const void* value, void* clientData);
+ static void TW_CALL getFixedTimestepEnabled(void* value, void* clientData);
+
+ static void TW_CALL setFixedSimFrequency(const void* value, void* clientData);
+ static void TW_CALL getFixedSimFrequency(void* value, void* clientData);
+
+private:
void toggleCameraSpeed(bool overspeed);
CFirstPersonCamera* mCamera;
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageEffectPackagesDatabase.apb b/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageEffectPackagesDatabase.apb
deleted file mode 100644
index ab899fd3..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageEffectPackagesDatabase.apb
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageEmittersDatabase.apb b/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageEmittersDatabase.apb
deleted file mode 100644
index 145f0eea..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageEmittersDatabase.apb
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageFieldSamplersDatabase.apb b/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageFieldSamplersDatabase.apb
deleted file mode 100644
index 78d9dbd9..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageFieldSamplersDatabase.apb
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageGraphicsEffectsDatabase.apb b/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageGraphicsEffectsDatabase.apb
deleted file mode 100644
index c8ec2e40..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageGraphicsEffectsDatabase.apb
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageGraphicsMaterialsDatabase.apb b/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageGraphicsMaterialsDatabase.apb
deleted file mode 100644
index 10cc023a..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageGraphicsMaterialsDatabase.apb
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageParticleSimulationsDatabase.apb b/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageParticleSimulationsDatabase.apb
deleted file mode 100644
index 90ec1ae8..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/EffectPackageParticleSimulationsDatabase.apb
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/concreteChunkMesh.apb b/APEX_1.4/samples_v2/SampleParticlesBase/concreteChunkMesh.apb
deleted file mode 100644
index 0482f076..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/concreteChunkMesh.apb
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/materials/concrete_debris.xml b/APEX_1.4/samples_v2/SampleParticlesBase/materials/concrete_debris.xml
deleted file mode 100644
index 1ccc58e2..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/materials/concrete_debris.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<material>
- <shader>mesh_particle</shader>
- <texture>GrayRock_Tileable_D.dds</texture>
-</material>
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/materials/wood_debris.xml b/APEX_1.4/samples_v2/SampleParticlesBase/materials/wood_debris.xml
deleted file mode 100644
index 87202810..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/materials/wood_debris.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<material>
- <shader>mesh_particle</shader>
- <texture>Wood_Tileable.dds</texture>
-</material>
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/meshParticleIosPhysX3.apx b/APEX_1.4/samples_v2/SampleParticlesBase/meshParticleIosPhysX3.apx
deleted file mode 100644
index 5da5440a..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/meshParticleIosPhysX3.apx
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE NvParameters>
-<NvParameters numObjects="1" version="1.0" >
-<value name="" type="Ref" className="ParticleIosAssetParam" version="0.4" checksum="0x2fe48a73 0x7f6aafee 0x621cd7cd 0x20a3c0e5">
- <struct name="">
- <value name="particleType" type="Ref" included="1" className="SimpleParticleSystemParams" version="0.3" checksum="0xf872dc0a 0xe40cb32 0x1627d31b 0xfa23979d">
- <struct name="">
- <struct name="GridDensity">
- <value name="Enabled" type="Bool">false</value>
- <value name="Resolution" type="Enum">GDG_16</value>
- <value name="GridSize" type="F32">10</value>
- <value name="MaxCellCount" type="U32">16</value>
- </struct>
- </struct>
- </value>
- <value name="maxParticleCount" type="U32">8192</value>
- <value name="particleRadius" type="F32">1</value>
- <value name="maxInjectedParticleCount" type="F32">0.100000001</value>
- <value name="maxMotionDistance" type="F32">0.400000006</value>
- <value name="contactOffset" type="F32">0.200000003</value>
- <value name="restOffset" type="F32">0.100000001</value>
- <value name="gridSize" type="F32">25.6000004</value>
- <value name="damping" type="F32">0</value>
- <value name="externalAcceleration" type="Vec3">0 0 0</value>
- <value name="projectionPlaneNormal" type="Vec3">0 0 1</value>
- <value name="projectionPlaneDistance" type="F32">0</value>
- <value name="particleMass" type="F32">0.00100000005</value>
- <value name="restitution" type="F32">0.5</value>
- <value name="dynamicFriction" type="F32">0.0500000007</value>
- <value name="staticFriction" type="F32">0</value>
- <value name="simulationFilterData" null="1" type="String"></value>
- <value name="fieldSamplerFilterData" type="String">MESH_PARTICLE_FS_GRP_MASK</value>
- <value name="CollisionTwoway" type="Bool">false</value>
- <value name="CollisionWithDynamicActors" type="Bool">true</value>
- <value name="Enable" type="Bool">true</value>
- <value name="ProjectToPlane" type="Bool">false</value>
- <value name="PerParticleRestOffset" type="Bool">false</value>
- <value name="PerParticleCollisionCacheHint" type="Bool">true</value>
- <value name="DensityBuffer" type="Bool">false</value>
- <value name="enableTemperatureBuffer" type="Bool">false</value>
- <value name="enableCouplingOverride" type="Bool">false</value>
- <struct name="particleToGridCoupling">
- <value name="accelTimeConstant" type="F32">0.00999999978</value>
- <value name="decelTimeConstant" type="F32">10</value>
- <value name="thresholdMultiplier" type="F32">2</value>
- </struct>
- <struct name="gridToParticleCoupling">
- <value name="accelTimeConstant" type="F32">0.00999999978</value>
- <value name="decelTimeConstant" type="F32">0.00999999978</value>
- <value name="thresholdMultiplier" type="F32">1</value>
- </struct>
- </struct>
-</value>
-</NvParameters>
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/testImpactEmitter.apx b/APEX_1.4/samples_v2/SampleParticlesBase/testImpactEmitter.apx
deleted file mode 100644
index 7a001f12..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/testImpactEmitter.apx
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE NvParameters>
-<NvParameters numObjects="1" version="1.0" >
-<value name="" type="Ref" className="ImpactEmitterAssetParameters" version="0.0" checksum="0x5b78e967 0xd4e18888 0xaac77873 0xef2e1cba">
- <struct name="">
- <array name="eventSetList" size="1" type="Ref">
- <value type="Ref" included="1" className="ImpactObjectEvent" version="0.1" checksum="0x18bc25ae 0xb43f2a22 0x8b698b9d 0xdce8fd3">
- <struct name="">
- <value name="eventSetName" type="String">meshParticleEvent</value>
- <value name="iofxAssetName" type="Ref" included="0" className="IOFX" objectName="testMeshIofx"></value>
- <value name="iosAssetName" type="Ref" included="0" className="ParticleIosAsset" objectName="meshParticleIosPhysX3"></value>
- <value name="angleLow" type="F32">0</value>
- <value name="angleHigh" type="F32">45</value>
- <value name="speedLow" type="F32">10</value>
- <value name="speedHigh" type="F32">40</value>
- <value name="lifeLow" type="F32">5</value>
- <value name="lifeHigh" type="F32">10</value>
- <value name="delay" type="F32">0</value>
- <value name="particleSpawnCount" type="U32">25</value>
- <value name="impactAxis" type="Enum">reflection</value>
- <struct name="lodParamDesc">
- <value name="version" type="U32">0</value>
- <value name="maxDistance" type="F32">10000</value>
- <value name="distanceWeight" type="F32">1</value>
- <value name="speedWeight" type="F32">0</value>
- <value name="lifeWeight" type="F32">0</value>
- <value name="separationWeight" type="F32">0</value>
- <value name="bias" type="F32">0</value>
- </struct>
- </struct>
- </value>
- </array>
- </struct>
-</value>
-</NvParameters>
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/testMeshEmitter4ParticleIos.apx b/APEX_1.4/samples_v2/SampleParticlesBase/testMeshEmitter4ParticleIos.apx
deleted file mode 100644
index 852b74b5..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/testMeshEmitter4ParticleIos.apx
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE NvParameters>
-<NvParameters numObjects="1" version="1.0" >
-<value name="" type="Ref" className="ApexEmitterAssetParameters" version="0.7" checksum="0xa5880469 0x3f58f022 0xa16cd302 0xa56e2069">
- <struct name="">
- <value name="density" type="F32">1</value>
- <value name="rate" type="F32">1000</value>
- <value name="lifetimeLow" type="F32">20</value>
- <value name="lifetimeHigh" type="F32">22</value>
- <value name="velocityLow" type="Vec3">-3 0 -3</value>
- <value name="velocityHigh" type="Vec3">3 6 3</value>
- <value name="maxSamples" type="U32">10000</value>
- <struct name="lodParamDesc">
- <value name="version" type="U32">0</value>
- <value name="maxDistance" type="F32">1000</value>
- <value name="distanceWeight" type="F32">0.699999988</value>
- <value name="speedWeight" type="F32">0</value>
- <value name="lifeWeight" type="F32">0.300000012</value>
- <value name="separationWeight" type="F32">0</value>
- <value name="bias" type="F32">0</value>
- </struct>
- <value name="iofxAssetName" type="Ref" included="0" className="IOFX" objectName="testMeshIofx"></value>
- <value name="iosAssetName" type="Ref" included="0" className="ParticleIosAsset" objectName="testParticleIos"></value>
- <value name="geometryType" type="Ref" included="1" className="EmitterGeomSphereParams" version="0.1" checksum="0x79a261ec 0x91a7400d 0xfb6ba037 0x3c13e11f">
- <struct name="">
- <value name="emitterType" type="Enum">rate</value>
- <value name="radius" type="F32">2</value>
- <value name="hemisphere" type="F32">0</value>
- </struct>
- </value>
- <value name="emitterDuration" type="F32">NV_MAX_F32</value>
- <value name="emitterVelocityScale" type="F32">0</value>
- <value name="minSamplingFPS" type="U32">0</value>
- <array name="rateVsTimeCurvePoints" size="0" type="Struct" structElements="x(F32),y(F32)"></array>
- </struct>
-</value>
-</NvParameters>
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/testMeshIofx.apx b/APEX_1.4/samples_v2/SampleParticlesBase/testMeshIofx.apx
deleted file mode 100644
index 2bf51f80..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/testMeshIofx.apx
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE NvParameters>
-<NvParameters numObjects="1" version="1.0" >
-<value name="" type="Ref" className="IofxAssetParameters" version="0.2" checksum="0xbb5add57 0xf771d298 0xcd7c3bc3 0x921baa57">
- <struct name="">
- <value name="iofxType" type="Ref" included="1" className="MeshIofxParameters" version="0.4" checksum="0x823a573c 0xd18e2215 0x6fc4db63 0x3df0022a">
- <struct name="">
- <array name="renderMeshList" size="2" type="Struct">
- <struct>
- <value name="meshAssetName" type="Ref" included="0" className="ApexRenderMesh" objectName="woodChunkmesh"></value>
- <value name="weight" type="U32">1</value>
- </struct>
- <struct>
- <value name="meshAssetName" type="Ref" included="0" className="ApexRenderMesh" objectName="concreteChunkMesh"></value>
- <value name="weight" type="U32">1</value>
- </struct>
- </array>
- <array name="spawnModifierList" size="2" type="Ref">
- <value type="Ref" included="1" className="SimpleScaleModifierParams" version="0.0" checksum="0x7a1ac6ca 0x76ef1cd2 0x991bfe05 0x30c11a09">
- <struct name="">
- <value name="scaleFactor" type="Vec3">0.0250000004 0.0250000004 0.0250000004</value>
- </struct>
- </value>
- <value type="Ref" included="1" className="RotationModifierParams" version="0.2" checksum="0xd2cf5d27 0xa1732803 0xcaa84b84 0x18ed9e7c">
- <struct name="">
- <value name="rollType" type="Enum">SPHERICAL</value>
- <value name="maxRotationRatePerSec" type="F32">0</value>
- <value name="maxSettleRatePerSec" type="F32">1</value>
- <value name="inAirRotationMultiplier" type="F32">1</value>
- <value name="collisionRotationMultiplier" type="F32">1</value>
- <value name="includeVerticalDirection" type="Bool">false</value>
- </struct>
- </value>
- </array>
- <array name="continuousModifierList" size="2" type="Ref">
- <value type="Ref" included="1" className="RotationModifierParams" version="0.2" checksum="0xd2cf5d27 0xa1732803 0xcaa84b84 0x18ed9e7c">
- <struct name="">
- <value name="rollType" type="Enum">SPHERICAL</value>
- <value name="maxRotationRatePerSec" type="F32">300</value>
- <value name="maxSettleRatePerSec" type="F32">100</value>
- <value name="inAirRotationMultiplier" type="F32">1</value>
- <value name="collisionRotationMultiplier" type="F32">80</value>
- <value name="includeVerticalDirection" type="Bool">false</value>
- </struct>
- </value>
- <value type="Ref" included="1" className="ScaleVsLife3DModifierParams" version="0.0" checksum="0xbaddcfda 0x2f4deda9 0x2c23286e 0xf19659fd">
- <struct name="">
- <array name="controlPoints" size="3" type="Struct" structElements="lifeRemaining(F32),scale(Vec3)">
- 1 1.52666676 1.52666676 1.52666676,0.337500036 1.00666666 1.00666666 1.00666666,0 0.0133333337 0.0133333337 0.0133333337
- </array>
- </struct>
- </value>
- </array>
- </struct>
- </value>
- <struct name="renderOutput">
- <value name="useUserSemantic" type="Bool">false</value>
- <value name="useFloat4Color" type="Bool">false</value>
- </struct>
- </struct>
-</value>
-</NvParameters>
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/testParticleIos.apx b/APEX_1.4/samples_v2/SampleParticlesBase/testParticleIos.apx
deleted file mode 100644
index 2952498a..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/testParticleIos.apx
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE NvParameters>
-<NvParameters numObjects="1" version="1.0" >
-<value name="" type="Ref" className="ParticleIosAssetParam" version="0.4" checksum="0x2fe48a73 0x7f6aafee 0x621cd7cd 0x20a3c0e5">
- <struct name="">
- <value name="particleType" type="Ref" included="1" className="SimpleParticleSystemParams" version="0.3" checksum="0xf872dc0a 0xe40cb32 0x1627d31b 0xfa23979d">
- <struct name="">
- <struct name="GridDensity">
- <value name="Enabled" type="Bool">false</value>
- <value name="Resolution" type="Enum">GDG_16</value>
- <value name="GridSize" type="F32">10</value>
- <value name="MaxCellCount" type="U32">16</value>
- </struct>
- </struct>
- </value>
- <value name="maxParticleCount" type="U32">16384</value>
- <value name="particleRadius" type="F32">1</value>
- <value name="maxInjectedParticleCount" type="F32">0.100000001</value>
- <value name="maxMotionDistance" type="F32">0.300000012</value>
- <value name="contactOffset" type="F32">0.479999989</value>
- <value name="restOffset" type="F32">0.239999995</value>
- <value name="gridSize" type="F32">5</value>
- <value name="damping" type="F32">0</value>
- <value name="externalAcceleration" type="Vec3">0 0 0</value>
- <value name="projectionPlaneNormal" type="Vec3">0 0 1</value>
- <value name="projectionPlaneDistance" type="F32">0</value>
- <value name="particleMass" type="F32">0.00100000005</value>
- <value name="restitution" type="F32">0.5</value>
- <value name="dynamicFriction" type="F32">0.00100000005</value>
- <value name="staticFriction" type="F32">0</value>
- <value name="simulationFilterData" null="1" type="String"></value>
- <value name="fieldSamplerFilterData" type="String">MESH_PARTICLE_FS_GRP_MASK</value>
- <value name="CollisionTwoway" type="Bool">false</value>
- <value name="CollisionWithDynamicActors" type="Bool">true</value>
- <value name="Enable" type="Bool">true</value>
- <value name="ProjectToPlane" type="Bool">false</value>
- <value name="PerParticleRestOffset" type="Bool">false</value>
- <value name="PerParticleCollisionCacheHint" type="Bool">true</value>
- <value name="DensityBuffer" type="Bool">false</value>
- <value name="enableTemperatureBuffer" type="Bool">false</value>
- <value name="enableCouplingOverride" type="Bool">false</value>
- <struct name="particleToGridCoupling">
- <value name="accelTimeConstant" type="F32">0.00999999978</value>
- <value name="decelTimeConstant" type="F32">10</value>
- <value name="thresholdMultiplier" type="F32">2</value>
- </struct>
- <struct name="gridToParticleCoupling">
- <value name="accelTimeConstant" type="F32">0.00999999978</value>
- <value name="decelTimeConstant" type="F32">0.00999999978</value>
- <value name="thresholdMultiplier" type="F32">1</value>
- </struct>
- </struct>
-</value>
-</NvParameters>
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/textures/GrayRock_Tileable_D.dds b/APEX_1.4/samples_v2/SampleParticlesBase/textures/GrayRock_Tileable_D.dds
deleted file mode 100644
index 7fd5d2ae..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/textures/GrayRock_Tileable_D.dds
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/textures/SpriteTexture1.dds b/APEX_1.4/samples_v2/SampleParticlesBase/textures/SpriteTexture1.dds
deleted file mode 100644
index 13f7972e..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/textures/SpriteTexture1.dds
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/textures/Wood_Tileable.dds b/APEX_1.4/samples_v2/SampleParticlesBase/textures/Wood_Tileable.dds
deleted file mode 100644
index 5d1c1b75..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/textures/Wood_Tileable.dds
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/textures/flare.dds b/APEX_1.4/samples_v2/SampleParticlesBase/textures/flare.dds
deleted file mode 100644
index 13f7972e..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/textures/flare.dds
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/textures/smoke.dds b/APEX_1.4/samples_v2/SampleParticlesBase/textures/smoke.dds
deleted file mode 100644
index 58a0791d..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/textures/smoke.dds
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesBase/woodChunkMesh.apb b/APEX_1.4/samples_v2/SampleParticlesBase/woodChunkMesh.apb
deleted file mode 100644
index 3e017f12..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesBase/woodChunkMesh.apb
+++ /dev/null
Binary files differ
diff --git a/APEX_1.4/samples_v2/SampleParticlesHelloWorld/Main.cpp b/APEX_1.4/samples_v2/SampleParticlesHelloWorld/Main.cpp
deleted file mode 100644
index 2948e391..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesHelloWorld/Main.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "Utils.h"
-
-#include <DirectXMath.h>
-#include "XInput.h"
-#include "DXUTMisc.h"
-#include "DXUTCamera.h"
-
-
-#include "ApexController.h"
-#include "ApexRenderer.h"
-#include "CommonUIController.h"
-#include "SampleUIController.h"
-#include "SampleSceneController.h"
-
-#include "SampleManager.h"
-
-int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
-{
- PX_UNUSED(hInstance);
- PX_UNUSED(hPrevInstance);
- PX_UNUSED(lpCmdLine);
- PX_UNUSED(nCmdShow);
-
-// Enable run-time memory check for debug builds.
-#if defined(DEBUG) | defined(_DEBUG)
- _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
- AllocConsole();
-#endif
-
- SampleManager* sampleManager = new SampleManager(L"APEX Particles Sample: Hello World");
-
- CFirstPersonCamera camera;
-
- auto apexController = ApexController(PxDefaultSimulationFilterShader, &camera);
- auto apexRender = ApexRenderer(&camera, apexController);
- auto sceneController = SampleSceneController(&camera, apexController);
- auto commonUiController = CommonUIController(&camera, &apexRender, &apexController);
- auto sampleUIController = SampleUIController(&sceneController, &commonUiController);
-
- sampleManager->addControllerToFront(&apexController);
- sampleManager->addControllerToFront(&apexRender);
- sampleManager->addControllerToFront(&sceneController);
- sampleManager->addControllerToFront(&sampleUIController);
- sampleManager->addControllerToFront(&commonUiController);
-
- int result = sampleManager->run();
-
- delete sampleManager;
-
- return result;
-}
diff --git a/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleSceneController.cpp b/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleSceneController.cpp
deleted file mode 100644
index 306badce..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleSceneController.cpp
+++ /dev/null
@@ -1,221 +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.
-*/
-
-#include "SampleSceneController.h"
-#include "ApexRenderer.h" // for matrix conversion
-#include <DirectXMath.h>
-#include "XInput.h"
-#include "DXUTMisc.h"
-#pragma warning(push)
-#pragma warning(disable : 4481) // Suppress "nonstandard extension used" warning
-#include "DXUTCamera.h"
-#pragma warning(pop)
-
-#include "PxPhysicsAPI.h"
-#include "PxMath.h"
-
-#include "ApexResourceCallback.h"
-#include "PhysXPrimitive.h"
-
-using namespace physx;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Scenes Setup
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-SampleSceneController::AssetDescription SampleSceneController::ASSETS[] =
-{
- { "defaultEffectPackage", "defaultEffectPackage" },
- { "hotlava", "hotlava" },
- { "pulseblast", "pulseblast" },
- { "bigtesteffect", "bigtesteffect" },
- { "ThreeEmitterScaleTest", "ThreeEmitterScaleTest" },
- { "smoketest", "smoketest" }
-};
-
-int SampleSceneController::getAssetsCount()
-{
- return sizeof(ASSETS) / sizeof(ASSETS[0]);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-SampleSceneController::SampleSceneController(CFirstPersonCamera* camera, ApexController& apex)
- : mApex(apex), mCamera(camera), mDraggingActor(NULL)
-{
-}
-
-SampleSceneController::~SampleSceneController()
-{
-}
-
-void SampleSceneController::onSampleStart()
-{
- // setup camera
- DirectX::XMVECTORF32 lookAtPt = { 0, 2, 0, 0 };
- DirectX::XMVECTORF32 eyePt = { 0, 5, 10, 0 };
- mCamera->SetViewParams(eyePt, lookAtPt);
- mCamera->SetRotateButtons(false, false, true, false);
- mCamera->SetEnablePositionMovement(true);
-
- // load effect package DB
- loadEffectPackageDatabase();
-
- // spawn actor
- setCurrentAsset(0);
-}
-
-void SampleSceneController::loadEffectPackageDatabase()
-{
- NvParameterized::Interface *iface;
-
- ApexResourceCallback* resourceCallback = mApex.getResourceCallback();
- ModuleParticles* moduleParticles = mApex.getModuleParticles();
-
- // Load the EffectPackage database
- iface = resourceCallback->deserializeFromFile("EffectPackageEffectPackagesDatabase.apb");
- PX_ASSERT(iface);
- if (iface)
- {
- moduleParticles->setEffectPackageDatabase(iface);
- iface->destroy();
- }
-
- // Load the Emitter database
- iface = resourceCallback->deserializeFromFile("EffectPackageEmittersDatabase.apb");
- PX_ASSERT(iface);
- if (iface)
- {
- moduleParticles->setEffectPackageEmitterDatabase(iface);
- iface->destroy();
- }
-
- // Load the FieldSampler database
- iface = resourceCallback->deserializeFromFile("EffectPackageFieldSamplersDatabase.apb");
- PX_ASSERT(iface);
- if (iface)
- {
- moduleParticles->setEffectPackageFieldSamplerDatabase(iface);
- iface->destroy();
- }
- // Load the GraphicsEffects database (IOFX)
- iface = resourceCallback->deserializeFromFile("EffectPackageGraphicsEffectsDatabase.apb");
- PX_ASSERT(iface);
- if (iface)
- {
- moduleParticles->setEffectPackageIOFXDatabase(iface);
- iface->destroy();
- }
-
- // Load the GraphicsMaterials database
- iface = resourceCallback->deserializeFromFile("EffectPackageGraphicsMaterialsDatabase.apb");
- PX_ASSERT(iface);
- if (iface)
- {
- moduleParticles->setEffectPackageGraphicsMaterialsDatabase(iface);
- iface->destroy();
- }
-
- // Load the Particle Simulations (IOS) database
- iface = resourceCallback->deserializeFromFile("EffectPackageParticleSimulationsDatabase.apb");
- PX_ASSERT(iface);
- if (iface)
- {
- moduleParticles->setEffectPackageIOSDatabase(iface);
- iface->destroy();
- }
-}
-
-void SampleSceneController::setCurrentAsset(int num)
-{
- int assetsCount = getAssetsCount();
- num = nvidia::PxClamp(num, 0, assetsCount - 1);
-
- mCurrentAsset = num;
- if (mActor != NULL)
- {
- mApex.removeActor(mActor);
- mActor = NULL;
- }
- mActor = mApex.spawnEffectPackageActor(ASSETS[num].model);
-}
-
-void SampleSceneController::Animate(double dt)
-{
- if (mDraggingActor != NULL)
- {
- const float DRAGGING_FORCE_FACTOR = 10.0f;
- const float DRAGGING_VELOCITY_FACTOR = 2.0f;
- PxVec3 direction = (mDragAttractionPoint - mDraggingActor->getGlobalPose().transform(mDraggingActorHookLocalPoint));
- nvidia::PxVec3 force = (direction * DRAGGING_FORCE_FACTOR - DRAGGING_VELOCITY_FACTOR * mDraggingActor->getLinearVelocity()) * mDraggingActor->getMass() * dt;
- physx::PxRigidBodyExt::addForceAtLocalPos(*mDraggingActor, force, mDraggingActorHookLocalPoint, physx::PxForceMode::eIMPULSE, true);
- }
-}
-
-void SampleSceneController::throwCube()
-{
- PxVec3 eyePos = XMVECTORToPxVec4(mCamera->GetEyePt()).getXYZ();
- PxVec3 lookAtPos = XMVECTORToPxVec4(mCamera->GetLookAtPt()).getXYZ();
- PhysXPrimitive* box = mApex.spawnPhysXPrimitiveBox(PxTransform(eyePos));
- PxRigidDynamic* rigidDynamic = box->getActor()->is<PxRigidDynamic>();
-
- const float CUBE_SPEED = 30.0f;
- PxVec3 dir = (lookAtPos - eyePos).getNormalized();
- rigidDynamic->setLinearVelocity(dir * CUBE_SPEED);
-}
-
-void SampleSceneController::onTouchEvent(TouchEvent touchEvent, float mouseX, float mouseY)
-{
- PxVec3 eyePos, pickDir;
- mApex.getEyePoseAndPickDir(mouseX, mouseY, eyePos, pickDir);
- pickDir = pickDir.getNormalized();
-
- if (touchEvent == TouchEvent::ePRESS)
- {
- if (pickDir.magnitude() > 0)
- {
- physx::PxRaycastHit hit;
- physx::PxRaycastBuffer rcBuffer(&hit, 1);
- bool isHit = mApex.getApexScene()->getPhysXScene()->raycast(eyePos, pickDir, PX_MAX_F32, rcBuffer, physx::PxHitFlag::ePOSITION, physx::PxQueryFilterData(physx::PxQueryFlag::eDYNAMIC));
- if (isHit)
- {
- mDragDistance = (eyePos - hit.position).magnitude();
- mDraggingActor = hit.actor->is<PxRigidDynamic>();
- mDraggingActorHookLocalPoint = mDraggingActor->getGlobalPose().getInverse().transform(hit.position);
- mDraggingActor->setLinearVelocity(PxVec3(0, 0, 0));
- mDraggingActor->setAngularVelocity(PxVec3(0, 0, 0));
- }
- }
- }
- else if (touchEvent == TouchEvent::eDRAG)
- {
- physx::PxRaycastHit hit;
- physx::PxRaycastBuffer rcBuffer(&hit, 1);
- bool isHit = mApex.getApexScene()->getPhysXScene()->raycast(eyePos, pickDir, PX_MAX_F32, rcBuffer, physx::PxHitFlag::ePOSITION, physx::PxQueryFilterData(physx::PxQueryFlag::eSTATIC));
- if (isHit)
- {
- mDragDistance = PxMin(mDragDistance, (eyePos - hit.position).magnitude());
- }
-
- mDragAttractionPoint = eyePos + pickDir * mDragDistance;
- }
- else if (touchEvent == TouchEvent::eRELEASE)
- {
- mDraggingActor = NULL;
- }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
diff --git a/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleSceneController.h b/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleSceneController.h
deleted file mode 100644
index 3bf18c79..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleSceneController.h
+++ /dev/null
@@ -1,77 +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 SCENE_CONTROLLER_H
-#define SCENE_CONTROLLER_H
-
-#include "ApexController.h"
-#include "SampleManager.h"
-#include "PxPhysicsAPI.h"
-
-class CFirstPersonCamera;
-
-using namespace physx;
-using namespace nvidia;
-
-class SampleSceneController : public ISampleController
-{
-public:
- SampleSceneController(CFirstPersonCamera* camera, ApexController& apex);
- virtual ~SampleSceneController();
-
- struct AssetDescription
- {
- const char* model;
- const char* uiName;
- };
- static AssetDescription ASSETS[];
- static int getAssetsCount();
-
- void setCurrentAsset(int);
-
- int getCurrentAsset()
- {
- return mCurrentAsset;
- }
-
- virtual void onSampleStart();
- virtual void Animate(double dt);
-
- void throwCube();
-
- enum TouchEvent
- {
- ePRESS,
- eDRAG,
- eRELEASE
- };
-
- void onTouchEvent(TouchEvent touchEvent, float mouseX, float mouseY);
-
-private:
- SampleSceneController& operator= (SampleSceneController&);
-
- void loadEffectPackageDatabase();
-
- int mCurrentAsset;
-
- PxRigidDynamic* mDraggingActor;
- nvidia::PxVec3 mDraggingActorHookLocalPoint;
- nvidia::PxVec3 mDragAttractionPoint;
- float mDragDistance;
-
- ApexController& mApex;
- CFirstPersonCamera* mCamera;
-
- EffectPackageActor* mActor;
-
-};
-
-#endif \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleUIController.cpp b/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleUIController.cpp
deleted file mode 100644
index 4c074bdc..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleUIController.cpp
+++ /dev/null
@@ -1,105 +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.
-*/
-
-#include "SampleUIController.h"
-#include "SampleSceneController.h"
-#include "CommonUIController.h"
-
-SampleUIController::SampleUIController(SampleSceneController* s, CommonUIController* c) : mScene(s), mCommonUIController(c)
-{
-}
-
-void SampleUIController::onInitialize()
-{
- TwBar* sampleBar = TwNewBar("Sample");
- PX_UNUSED(sampleBar);
- TwDefine("Sample color='19 25 59' alpha=128 text=light size='200 150' iconified=false valueswidth=150 position='12 480' label='Select Asset'");
-
- UINT assetsCount = (UINT)SampleSceneController::getAssetsCount();
- TwEnumVal* enumAssets = new TwEnumVal[assetsCount];
- for (UINT i = 0; i < assetsCount; i++)
- {
- enumAssets[i].Value = (int32_t)i;
- enumAssets[i].Label = SampleSceneController::ASSETS[i].uiName;
- }
- TwType enumSceneType = TwDefineEnum("Assets", enumAssets, assetsCount);
- delete[] enumAssets;
- TwAddVarCB(sampleBar, "Assets", enumSceneType, SampleUIController::setCurrentScene,
- SampleUIController::getCurrentScene, this, "group='Select Scene'");
-
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_POSITION);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_VELOCITY);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_COLLISION_NORMAL);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_BOUNDS);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_GRID);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_BROADPHASE_BOUNDS);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_MAX_MOTION_DISTANCE);
-
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_VELOCITY", "TurbulenceFS", 1.0f, "TurbulenceFS velocities");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_BBOX", "TurbulenceFS", 1.0f, "TurbulenceFS BBOX");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_ACTOR_NAME", "TurbulenceFS", 1.0f, "TurbulenceFS name");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_VELOCITY_FIELD", "TurbulenceFS", 1.0f, "TurbulenceFS velocity field");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_STREAMLINES", "TurbulenceFS", 1.0f, "TurbulenceFS streamlines");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_IOFX_ACTOR", "Iofx", 1.0f, "IOFX actor");
- mCommonUIController->addApexDebugRenderParam("apexEmitterParameters.VISUALIZE_APEX_EMITTER_ACTOR", "Emitter", 1.0f, "Emitter actor");
-
- mCommonUIController->addHintLine("Throw cube - SPACE");
- mCommonUIController->addHintLine("Hook cube - LMB");
-}
-
-LRESULT SampleUIController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
- PX_UNUSED(hWnd);
- PX_UNUSED(wParam);
- PX_UNUSED(lParam);
-
- if(uMsg == WM_LBUTTONDOWN || uMsg == WM_MOUSEMOVE || uMsg == WM_LBUTTONUP)
- {
- short mouseX = (short)LOWORD(lParam);
- short mouseY = (short)HIWORD(lParam);
- SampleSceneController::TouchEvent touchEvent = uMsg == WM_LBUTTONDOWN ? SampleSceneController::ePRESS : (uMsg == WM_MOUSEMOVE ? SampleSceneController::eDRAG : SampleSceneController::eRELEASE);
- mScene->onTouchEvent(touchEvent, mouseX / static_cast<float>(mWidth), mouseY / static_cast<float>(mHeight));
- }
-
- if (uMsg == WM_KEYDOWN)
- {
- int iKeyPressed = static_cast<int>(wParam);
- if (iKeyPressed == VK_SPACE)
- {
- mScene->throwCube();
- }
- }
-
- return 1;
-}
-
-void SampleUIController::BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc)
-{
- PX_UNUSED(pDevice);
-
- mWidth = pBackBufferSurfaceDesc->Width;
- mHeight = pBackBufferSurfaceDesc->Height;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// UI Callbacks
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void TW_CALL SampleUIController::setCurrentScene(const void* value, void* clientData)
-{
- SampleUIController* controller = static_cast<SampleUIController*>(clientData);
- controller->mScene->setCurrentAsset(*static_cast<const int*>(value));
-}
-
-void TW_CALL SampleUIController::getCurrentScene(void* value, void* clientData)
-{
- SampleUIController* controller = static_cast<SampleUIController*>(clientData);
- *static_cast<int*>(value) = controller->mScene->getCurrentAsset();
-} \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleUIController.h b/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleUIController.h
deleted file mode 100644
index aba590cd..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesHelloWorld/SampleUIController.h
+++ /dev/null
@@ -1,42 +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 SAMPLE_UI_CONTROLLER_H
-#define SAMPLE_UI_CONTROLLER_H
-
-#include "SampleManager.h"
-#include <DirectXMath.h>
-#include "AntTweakBar.h"
-
-class SampleSceneController;
-class CommonUIController;
-
-class SampleUIController : public ISampleController
-{
- public:
- SampleUIController(SampleSceneController* s, CommonUIController* c);
-
- virtual void onInitialize();
- virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
- virtual void BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc);
-
- static void TW_CALL setCurrentScene(const void* value, void* clientData);
- static void TW_CALL getCurrentScene(void* value, void* clientData);
-
- private:
- SampleSceneController* mScene;
- CommonUIController* mCommonUIController;
- TwBar* mSettingsBar;
-
- UINT mWidth;
- UINT mHeight;
-};
-
-#endif \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/SampleParticlesImpactParticles/Main.cpp b/APEX_1.4/samples_v2/SampleParticlesImpactParticles/Main.cpp
deleted file mode 100644
index 2dda1416..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesImpactParticles/Main.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "Utils.h"
-
-#include <DirectXMath.h>
-#include "XInput.h"
-#include "DXUTMisc.h"
-#include "DXUTCamera.h"
-
-
-#include "ApexController.h"
-#include "ApexRenderer.h"
-#include "CommonUIController.h"
-#include "SampleUIController.h"
-#include "SampleSceneController.h"
-
-#include "SampleManager.h"
-
-int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
-{
- PX_UNUSED(hInstance);
- PX_UNUSED(hPrevInstance);
- PX_UNUSED(lpCmdLine);
- PX_UNUSED(nCmdShow);
-
-// Enable run-time memory check for debug builds.
-#if defined(DEBUG) | defined(_DEBUG)
- _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
- AllocConsole();
-#endif
-
- SampleManager* sampleManager = new SampleManager(L"APEX Particles Sample: Impact Particles");
-
- CFirstPersonCamera camera;
-
- auto apexController = ApexController(PxDefaultSimulationFilterShader, &camera);
- auto apexRender = ApexRenderer(&camera, apexController);
- auto sceneController = SampleSceneController(&camera, apexController);
- auto commonUiController = CommonUIController(&camera, &apexRender, &apexController);
- auto sampleUIController = SampleUIController(&sceneController, &commonUiController);
-
- sampleManager->addControllerToFront(&apexController);
- sampleManager->addControllerToFront(&apexRender);
- sampleManager->addControllerToFront(&sceneController);
- sampleManager->addControllerToFront(&sampleUIController);
- sampleManager->addControllerToFront(&commonUiController);
-
- int result = sampleManager->run();
-
- delete sampleManager;
-
- return result;
-}
diff --git a/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleSceneController.cpp b/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleSceneController.cpp
deleted file mode 100644
index 6e8d3adb..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleSceneController.cpp
+++ /dev/null
@@ -1,92 +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.
-*/
-
-#include "SampleSceneController.h"
-#include "ApexRenderer.h" // for matrix conversion
-#include <DirectXMath.h>
-#include "XInput.h"
-#include "DXUTMisc.h"
-#pragma warning(push)
-#pragma warning(disable : 4481) // Suppress "nonstandard extension used" warning
-#include "DXUTCamera.h"
-#pragma warning(pop)
-
-#include "PxPhysicsAPI.h"
-#include "PxMath.h"
-
-#include "ApexResourceCallback.h"
-#include "PhysXPrimitive.h"
-
-#include "ImpactEmitterAsset.h"
-#include "ImpactEmitterActor.h"
-
-using namespace physx;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-SampleSceneController::SampleSceneController(CFirstPersonCamera* camera, ApexController& apex)
- : mApex(apex), mCamera(camera)
-{
-}
-
-SampleSceneController::~SampleSceneController()
-{
-}
-
-void SampleSceneController::onSampleStart()
-{
- // setup camera
- DirectX::XMVECTORF32 lookAtPt = { 0, 2, 0, 0 };
- DirectX::XMVECTORF32 eyePt = { 0, 5, 10, 0 };
- mCamera->SetViewParams(eyePt, lookAtPt);
- mCamera->SetRotateButtons(false, false, true, false);
- mCamera->SetEnablePositionMovement(true);
-
- // spawn mesh emitter
- mAsset = (nvidia::apex::ImpactEmitterAsset *)mApex.getApexSDK()->getNamedResourceProvider()->getResource(IMPACT_EMITTER_AUTHORING_TYPE_NAME, "testImpactEmitter");
- NvParameterized::Interface *defaultActorDesc = mAsset->getDefaultActorDesc();
- NvParameterized::setParamTransform(*defaultActorDesc, "InitialPose", PxTransform(PxIdentity));
- mActor = (ImpactEmitterActor *)mAsset->createApexActor(*defaultActorDesc, *(mApex.getApexScene()));
-
-}
-
-
-void SampleSceneController::fire(float mouseX, float mouseY)
-{
- PxVec3 eyePos, pickDir;
- mApex.getEyePoseAndPickDir(mouseX, mouseY, eyePos, pickDir);
-
- if (pickDir.normalize() <= 0)
- {
- return;
- }
-
- PxHitFlags outputFlags;
- outputFlags |= PxHitFlag::ePOSITION;
- outputFlags |= PxHitFlag::eDISTANCE;
- PxRaycastBuffer rcBuffer;
- bool collision = false;
-
- PxScene* scene = mApex.getApexScene()->getPhysXScene();
- scene->lockRead(__FILE__, __LINE__);
- collision = scene->raycast(eyePos, pickDir, 1e6, rcBuffer, outputFlags);
- scene->unlockRead();
-
- uint32_t surfType = mAsset->querySetID("meshParticleEvent");
-
- mActor->registerImpact(rcBuffer.block.position, pickDir, rcBuffer.block.normal, surfType);
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
diff --git a/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleSceneController.h b/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleSceneController.h
deleted file mode 100644
index ef84613c..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleSceneController.h
+++ /dev/null
@@ -1,54 +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 SCENE_CONTROLLER_H
-#define SCENE_CONTROLLER_H
-
-#include "ApexController.h"
-#include "SampleManager.h"
-#include "PxPhysicsAPI.h"
-
-class CFirstPersonCamera;
-
-namespace nvidia
-{
- namespace apex
- {
- class ImpactEmitterActor;
- class ImpactEmitterAsset;
- }
-}
-
-using namespace physx;
-using namespace nvidia;
-
-
-class SampleSceneController : public ISampleController
-{
-public:
- SampleSceneController(CFirstPersonCamera* camera, ApexController& apex);
- virtual ~SampleSceneController();
-
- virtual void onSampleStart();
-
- // commands
- void fire(float mouseX, float mouseY);
-
-private:
- SampleSceneController& operator= (SampleSceneController&);
-
- ApexController& mApex;
- CFirstPersonCamera* mCamera;
-
- nvidia::apex::ImpactEmitterActor* mActor;
- nvidia::apex::ImpactEmitterAsset* mAsset;
-};
-
-#endif \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleUIController.cpp b/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleUIController.cpp
deleted file mode 100644
index 2448f65a..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleUIController.cpp
+++ /dev/null
@@ -1,70 +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.
-*/
-
-#include "SampleUIController.h"
-#include "SampleSceneController.h"
-#include "CommonUIController.h"
-
-SampleUIController::SampleUIController(SampleSceneController* s, CommonUIController* c) : mScene(s), mCommonUIController(c)
-{
-}
-
-void SampleUIController::onInitialize()
-{
- TwBar* sampleBar = TwNewBar("Sample");
- PX_UNUSED(sampleBar);
- TwDefine("Sample color='19 25 59' alpha=128 text=light size='200 150' iconified=false valueswidth=150 position='12 480' label='Select Asset'");
-
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_POSITION);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_VELOCITY);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_COLLISION_NORMAL);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_BOUNDS);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_GRID);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_BROADPHASE_BOUNDS);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_MAX_MOTION_DISTANCE);
-
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_VELOCITY", "TurbulenceFS", 1.0f, "TurbulenceFS velocities");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_BBOX", "TurbulenceFS", 1.0f, "TurbulenceFS BBOX");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_ACTOR_NAME", "TurbulenceFS", 1.0f, "TurbulenceFS name");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_VELOCITY_FIELD", "TurbulenceFS", 1.0f, "TurbulenceFS velocity field");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_STREAMLINES", "TurbulenceFS", 1.0f, "TurbulenceFS streamlines");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_IOFX_ACTOR", "Iofx", 1.0f, "IOFX actor");
- mCommonUIController->addApexDebugRenderParam("apexEmitterParameters.VISUALIZE_APEX_EMITTER_ACTOR", "Emitter", 1.0f, "Emitter actor");
-
- mCommonUIController->addHintLine("Impact - LMB");
-}
-
-LRESULT SampleUIController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
- PX_UNUSED(hWnd);
- PX_UNUSED(wParam);
- PX_UNUSED(lParam);
-
- if (uMsg == WM_LBUTTONDOWN)
- {
- short mouseX = (short)LOWORD(lParam);
- short mouseY = (short)HIWORD(lParam);
- mScene->fire(mouseX / static_cast<float>(mWidth), mouseY / static_cast<float>(mHeight));
- }
-
- return 1;
-}
-
-void SampleUIController::BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc)
-{
- PX_UNUSED(pDevice);
-
- mWidth = pBackBufferSurfaceDesc->Width;
- mHeight = pBackBufferSurfaceDesc->Height;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// UI Callbacks
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleUIController.h b/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleUIController.h
deleted file mode 100644
index 93fe5bbf..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesImpactParticles/SampleUIController.h
+++ /dev/null
@@ -1,39 +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 SAMPLE_UI_CONTROLLER_H
-#define SAMPLE_UI_CONTROLLER_H
-
-#include "SampleManager.h"
-#include <DirectXMath.h>
-#include "AntTweakBar.h"
-
-class SampleSceneController;
-class CommonUIController;
-
-class SampleUIController : public ISampleController
-{
- public:
- SampleUIController(SampleSceneController* s, CommonUIController* c);
-
- virtual void onInitialize();
- virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
- virtual void BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc);
-
- private:
- SampleSceneController* mScene;
- CommonUIController* mCommonUIController;
- TwBar* mSettingsBar;
-
- UINT mWidth;
- UINT mHeight;
-};
-
-#endif \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/SampleParticlesMeshParticles/Main.cpp b/APEX_1.4/samples_v2/SampleParticlesMeshParticles/Main.cpp
deleted file mode 100644
index 61565451..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesMeshParticles/Main.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "Utils.h"
-
-#include <DirectXMath.h>
-#include "XInput.h"
-#include "DXUTMisc.h"
-#include "DXUTCamera.h"
-
-
-#include "ApexController.h"
-#include "ApexRenderer.h"
-#include "CommonUIController.h"
-#include "SampleUIController.h"
-#include "SampleSceneController.h"
-
-#include "SampleManager.h"
-
-int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
-{
- PX_UNUSED(hInstance);
- PX_UNUSED(hPrevInstance);
- PX_UNUSED(lpCmdLine);
- PX_UNUSED(nCmdShow);
-
-// Enable run-time memory check for debug builds.
-#if defined(DEBUG) | defined(_DEBUG)
- _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
- AllocConsole();
-#endif
-
- SampleManager* sampleManager = new SampleManager(L"APEX Particles Sample: Mesh Particles");
-
- CFirstPersonCamera camera;
-
- auto apexController = ApexController(PxDefaultSimulationFilterShader, &camera);
- auto apexRender = ApexRenderer(&camera, apexController);
- auto sceneController = SampleSceneController(&camera, apexController);
- auto commonUiController = CommonUIController(&camera, &apexRender, &apexController);
- auto sampleUIController = SampleUIController(&sceneController, &commonUiController);
-
- sampleManager->addControllerToFront(&apexController);
- sampleManager->addControllerToFront(&apexRender);
- sampleManager->addControllerToFront(&sceneController);
- sampleManager->addControllerToFront(&sampleUIController);
- sampleManager->addControllerToFront(&commonUiController);
-
- int result = sampleManager->run();
-
- delete sampleManager;
-
- return result;
-}
diff --git a/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleSceneController.cpp b/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleSceneController.cpp
deleted file mode 100644
index 9df8d0f9..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleSceneController.cpp
+++ /dev/null
@@ -1,67 +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.
-*/
-
-#include "SampleSceneController.h"
-#include "ApexRenderer.h" // for matrix conversion
-#include <DirectXMath.h>
-#include "XInput.h"
-#include "DXUTMisc.h"
-#pragma warning(push)
-#pragma warning(disable : 4481) // Suppress "nonstandard extension used" warning
-#include "DXUTCamera.h"
-#pragma warning(pop)
-
-#include "PxPhysicsAPI.h"
-#include "PxMath.h"
-
-#include "ApexResourceCallback.h"
-#include "PhysXPrimitive.h"
-
-#include "EmitterAsset.h"
-#include "EmitterActor.h"
-
-using namespace physx;
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-SampleSceneController::SampleSceneController(CFirstPersonCamera* camera, ApexController& apex)
- : mApex(apex), mCamera(camera)
-{
-}
-
-SampleSceneController::~SampleSceneController()
-{
-}
-
-void SampleSceneController::onSampleStart()
-{
- // setup camera
- DirectX::XMVECTORF32 lookAtPt = { 0, 2, 0, 0 };
- DirectX::XMVECTORF32 eyePt = { 0, 5, 10, 0 };
- mCamera->SetViewParams(eyePt, lookAtPt);
- mCamera->SetRotateButtons(false, false, true, false);
- mCamera->SetEnablePositionMovement(true);
-
- // spawn mesh emitter
- nvidia::apex::Asset *asset = (nvidia::apex::Asset *)mApex.getApexSDK()->getNamedResourceProvider()->getResource(EMITTER_AUTHORING_TYPE_NAME, "testMeshEmitter4ParticleIos");
- NvParameterized::Interface *defaultActorDesc = asset->getDefaultActorDesc();
- NvParameterized::setParamTransform(*defaultActorDesc, "InitialPose", PxTransform(PxIdentity));
- EmitterActor *actor = (EmitterActor*)asset->createApexActor(*defaultActorDesc, *(mApex.getApexScene()));
-
- actor->startEmit(true);
-
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
diff --git a/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleSceneController.h b/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleSceneController.h
deleted file mode 100644
index 34656862..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleSceneController.h
+++ /dev/null
@@ -1,39 +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 SCENE_CONTROLLER_H
-#define SCENE_CONTROLLER_H
-
-#include "ApexController.h"
-#include "SampleManager.h"
-#include "PxPhysicsAPI.h"
-
-class CFirstPersonCamera;
-
-using namespace physx;
-using namespace nvidia;
-
-class SampleSceneController : public ISampleController
-{
-public:
- SampleSceneController(CFirstPersonCamera* camera, ApexController& apex);
- virtual ~SampleSceneController();
-
- virtual void onSampleStart();
-
-private:
- SampleSceneController& operator= (const SampleSceneController&);
-
- ApexController& mApex;
- CFirstPersonCamera* mCamera;
-
-};
-
-#endif \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleUIController.cpp b/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleUIController.cpp
deleted file mode 100644
index d6ddca20..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleUIController.cpp
+++ /dev/null
@@ -1,58 +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.
-*/
-
-#include "SampleUIController.h"
-#include "SampleSceneController.h"
-#include "CommonUIController.h"
-
-SampleUIController::SampleUIController(SampleSceneController* s, CommonUIController* c) : mScene(s), mCommonUIController(c)
-{
-}
-
-void SampleUIController::onInitialize()
-{
- TwBar* sampleBar = TwNewBar("Sample");
- PX_UNUSED(sampleBar);
- TwDefine("Sample color='19 25 59' alpha=128 text=light size='200 150' iconified=false valueswidth=150 position='12 480' label='Select Asset'");
-
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_POSITION);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_VELOCITY);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_COLLISION_NORMAL);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_BOUNDS);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_GRID);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_BROADPHASE_BOUNDS);
- mCommonUIController->addPhysXDebugRenderParam(PxVisualizationParameter::ePARTICLE_SYSTEM_MAX_MOTION_DISTANCE);
-
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_VELOCITY", "TurbulenceFS", 1.0f, "TurbulenceFS velocities");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_BBOX", "TurbulenceFS", 1.0f, "TurbulenceFS BBOX");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_ACTOR_NAME", "TurbulenceFS", 1.0f, "TurbulenceFS name");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_VELOCITY_FIELD", "TurbulenceFS", 1.0f, "TurbulenceFS velocity field");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_TURBULENCE_FS_STREAMLINES", "TurbulenceFS", 1.0f, "TurbulenceFS streamlines");
- mCommonUIController->addApexDebugRenderParam("VISUALIZE_IOFX_ACTOR", "Iofx", 1.0f, "IOFX actor");
- mCommonUIController->addApexDebugRenderParam("apexEmitterParameters.VISUALIZE_APEX_EMITTER_ACTOR", "Emitter", 1.0f, "Emitter actor");
-}
-
-LRESULT SampleUIController::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
- PX_UNUSED(hWnd);
- PX_UNUSED(uMsg);
- PX_UNUSED(wParam);
- PX_UNUSED(lParam);;
-
- return 1;
-}
-
-void SampleUIController::BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc)
-{
- PX_UNUSED(pDevice);
-
- mWidth = pBackBufferSurfaceDesc->Width;
- mHeight = pBackBufferSurfaceDesc->Height;
-}
diff --git a/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleUIController.h b/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleUIController.h
deleted file mode 100644
index 93fe5bbf..00000000
--- a/APEX_1.4/samples_v2/SampleParticlesMeshParticles/SampleUIController.h
+++ /dev/null
@@ -1,39 +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 SAMPLE_UI_CONTROLLER_H
-#define SAMPLE_UI_CONTROLLER_H
-
-#include "SampleManager.h"
-#include <DirectXMath.h>
-#include "AntTweakBar.h"
-
-class SampleSceneController;
-class CommonUIController;
-
-class SampleUIController : public ISampleController
-{
- public:
- SampleUIController(SampleSceneController* s, CommonUIController* c);
-
- virtual void onInitialize();
- virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
- virtual void BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc);
-
- private:
- SampleSceneController* mScene;
- CommonUIController* mCommonUIController;
- TwBar* mSettingsBar;
-
- UINT mWidth;
- UINT mHeight;
-};
-
-#endif \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleBase.vcxproj b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleBase.vcxproj
index 23dbbdfc..3bdd1fe3 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleBase.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleBase.vcxproj
@@ -273,6 +273,31 @@
<ClInclude Include="..\..\SampleBase\Utils.h">
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2012WIN32/DirectXTex.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2012WIN32/DXUT.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2012WIN32/Effects11.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvsimplemesh.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvidiautils.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"></ImportGroup>
</Project>
diff --git a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleBase.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleBase.vcxproj.filters
index 58636869..047a4ff6 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleBase.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleBase.vcxproj.filters
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleBase\ApexController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\Utils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleBase\ApexController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\CommonUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\SampleManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\Utils.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleBase\ApexController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\Utils.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleBase\ApexController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\CommonUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\SampleManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\Utils.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj
index ef62561b..0a6090a8 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj
@@ -267,12 +267,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
index 4a343c59..da8aca0c 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
index e0c73335..90e70b02 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
@@ -267,12 +267,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
index 79738e80..9270a1bc 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
index 60337411..82b6bb76 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
@@ -267,12 +267,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN32/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
index 32c0c082..2be1e60d 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/Samples.sln b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/Samples.sln
index 74c46c0d..6c55e197 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/Samples.sln
+++ b/APEX_1.4/samples_v2/compiler/vc11win32-PhysX_3.4/Samples.sln
@@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleBase", "./SampleBase.vcxproj", "{DD323D8B-0B68-74C5-043C-91BBE6A810A7}"
ProjectSection(ProjectDependencies) = postProject
+ {E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
+ {4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
+ {223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
+ {1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld", "./SampleDestructionHelloWorld.vcxproj", "{F26C39BF-31B2-B855-F75A-4BE9DC2DC412}"
@@ -9,8 +14,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -19,8 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionImpactDama
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -29,8 +34,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleClothingHelloWorld",
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -94,34 +99,24 @@ Global
{961D3695-F024-7FB6-D236-2180AF48561A}.profile|Win32.Build.0 = profile|Win32
{961D3695-F024-7FB6-D236-2180AF48561A}.release|Win32.ActiveCfg = release|Win32
{961D3695-F024-7FB6-D236-2180AF48561A}.release|Win32.Build.0 = release|Win32
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.checked|Win32.ActiveCfg = checked|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|Win32.ActiveCfg = debug|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|Win32.Build.0 = debug|Win32
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.profile|Win32.ActiveCfg = profile|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|Win32.ActiveCfg = release|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|Win32.Build.0 = release|Win32
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.checked|Win32.ActiveCfg = checked|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|Win32.ActiveCfg = debug|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|Win32.Build.0 = debug|Win32
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.profile|Win32.ActiveCfg = profile|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|Win32.ActiveCfg = release|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|Win32.Build.0 = release|Win32
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.checked|Win32.ActiveCfg = checked|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|Win32.ActiveCfg = debug|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|Win32.Build.0 = debug|Win32
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.profile|Win32.ActiveCfg = profile|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|Win32.ActiveCfg = release|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|Win32.Build.0 = release|Win32
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.checked|Win32.ActiveCfg = checked|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|Win32.ActiveCfg = debug|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|Win32.Build.0 = debug|Win32
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.profile|Win32.ActiveCfg = profile|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|Win32.ActiveCfg = release|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|Win32.Build.0 = release|Win32
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.checked|Win32.ActiveCfg = checked|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|Win32.ActiveCfg = debug|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|Win32.Build.0 = debug|Win32
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.profile|Win32.ActiveCfg = profile|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|Win32.ActiveCfg = release|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|Win32.Build.0 = release|Win32
EndGlobalSection
diff --git a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleBase.vcxproj b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleBase.vcxproj
index c83e870f..0868a0bd 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleBase.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleBase.vcxproj
@@ -269,6 +269,31 @@
<ClInclude Include="..\..\SampleBase\Utils.h">
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2012WIN64/DirectXTex.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2012WIN64/DXUT.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2012WIN64/Effects11.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvsimplemesh.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvidiautils.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"></ImportGroup>
</Project>
diff --git a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleBase.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleBase.vcxproj.filters
index 58636869..047a4ff6 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleBase.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleBase.vcxproj.filters
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleBase\ApexController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\Utils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleBase\ApexController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\CommonUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\SampleManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\Utils.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleBase\ApexController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\Utils.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleBase\ApexController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\CommonUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\SampleManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\Utils.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj
index 51d85489..e8f1c04a 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj
@@ -263,12 +263,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
index 4a343c59..da8aca0c 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
index dabf7d3b..811b6324 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
@@ -263,12 +263,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
index 79738e80..9270a1bc 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
index a81dec0d..a5d0711d 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
@@ -263,12 +263,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2012WIN64/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
index 32c0c082..2be1e60d 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/Samples.sln b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/Samples.sln
index dc289058..897dac5d 100644
--- a/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/Samples.sln
+++ b/APEX_1.4/samples_v2/compiler/vc11win64-PhysX_3.4/Samples.sln
@@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleBase", "./SampleBase.vcxproj", "{DD323D8B-0B68-74C5-043C-91BBE6A810A7}"
ProjectSection(ProjectDependencies) = postProject
+ {E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
+ {4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
+ {223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
+ {1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld", "./SampleDestructionHelloWorld.vcxproj", "{F26C39BF-31B2-B855-F75A-4BE9DC2DC412}"
@@ -9,8 +14,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -19,8 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionImpactDama
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -29,8 +34,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleClothingHelloWorld",
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -94,34 +99,24 @@ Global
{961D3695-F024-7FB6-D236-2180AF48561A}.profile|x64.Build.0 = profile|x64
{961D3695-F024-7FB6-D236-2180AF48561A}.release|x64.ActiveCfg = release|x64
{961D3695-F024-7FB6-D236-2180AF48561A}.release|x64.Build.0 = release|x64
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.checked|x64.ActiveCfg = checked|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|x64.ActiveCfg = debug|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|x64.Build.0 = debug|x64
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.profile|x64.ActiveCfg = profile|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|x64.ActiveCfg = release|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|x64.Build.0 = release|x64
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.checked|x64.ActiveCfg = checked|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|x64.ActiveCfg = debug|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|x64.Build.0 = debug|x64
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.profile|x64.ActiveCfg = profile|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|x64.ActiveCfg = release|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|x64.Build.0 = release|x64
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.checked|x64.ActiveCfg = checked|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|x64.ActiveCfg = debug|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|x64.Build.0 = debug|x64
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.profile|x64.ActiveCfg = profile|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|x64.ActiveCfg = release|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|x64.Build.0 = release|x64
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.checked|x64.ActiveCfg = checked|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|x64.ActiveCfg = debug|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|x64.Build.0 = debug|x64
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.profile|x64.ActiveCfg = profile|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|x64.ActiveCfg = release|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|x64.Build.0 = release|x64
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.checked|x64.ActiveCfg = checked|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|x64.ActiveCfg = debug|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|x64.Build.0 = debug|x64
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.profile|x64.ActiveCfg = profile|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|x64.ActiveCfg = release|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|x64.Build.0 = release|x64
EndGlobalSection
diff --git a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleBase.vcxproj b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleBase.vcxproj
index ea1a6052..73b51a89 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleBase.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleBase.vcxproj
@@ -273,6 +273,31 @@
<ClInclude Include="..\..\SampleBase\Utils.h">
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2013WIN32/DirectXTex.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2013WIN32/DXUT.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2013WIN32/Effects11.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvsimplemesh.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvidiautils.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"></ImportGroup>
</Project>
diff --git a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleBase.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleBase.vcxproj.filters
index 58636869..047a4ff6 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleBase.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleBase.vcxproj.filters
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleBase\ApexController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\Utils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleBase\ApexController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\CommonUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\SampleManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\Utils.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleBase\ApexController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\Utils.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleBase\ApexController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\CommonUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\SampleManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\Utils.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj
index 0ddcaffc..479f20ee 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj
@@ -267,12 +267,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
index 4a343c59..da8aca0c 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
index 8202fbb8..b864b849 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
@@ -267,12 +267,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
index 79738e80..9270a1bc 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
index 294befc8..5af4bad9 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
@@ -267,12 +267,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN32/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
index 32c0c082..2be1e60d 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/Samples.sln b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/Samples.sln
index 2b110188..cb5be80e 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/Samples.sln
+++ b/APEX_1.4/samples_v2/compiler/vc12win32-PhysX_3.4/Samples.sln
@@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleBase", "./SampleBase.vcxproj", "{DD323D8B-0B68-74C5-043C-91BBE6A810A7}"
ProjectSection(ProjectDependencies) = postProject
+ {E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
+ {4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
+ {223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
+ {1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld", "./SampleDestructionHelloWorld.vcxproj", "{F26C39BF-31B2-B855-F75A-4BE9DC2DC412}"
@@ -9,8 +14,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -19,8 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionImpactDama
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -29,8 +34,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleClothingHelloWorld",
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -94,34 +99,24 @@ Global
{961D3695-F024-7FB6-D236-2180AF48561A}.profile|Win32.Build.0 = profile|Win32
{961D3695-F024-7FB6-D236-2180AF48561A}.release|Win32.ActiveCfg = release|Win32
{961D3695-F024-7FB6-D236-2180AF48561A}.release|Win32.Build.0 = release|Win32
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.checked|Win32.ActiveCfg = checked|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|Win32.ActiveCfg = debug|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|Win32.Build.0 = debug|Win32
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.profile|Win32.ActiveCfg = profile|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|Win32.ActiveCfg = release|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|Win32.Build.0 = release|Win32
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.checked|Win32.ActiveCfg = checked|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|Win32.ActiveCfg = debug|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|Win32.Build.0 = debug|Win32
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.profile|Win32.ActiveCfg = profile|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|Win32.ActiveCfg = release|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|Win32.Build.0 = release|Win32
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.checked|Win32.ActiveCfg = checked|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|Win32.ActiveCfg = debug|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|Win32.Build.0 = debug|Win32
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.profile|Win32.ActiveCfg = profile|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|Win32.ActiveCfg = release|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|Win32.Build.0 = release|Win32
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.checked|Win32.ActiveCfg = checked|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|Win32.ActiveCfg = debug|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|Win32.Build.0 = debug|Win32
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.profile|Win32.ActiveCfg = profile|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|Win32.ActiveCfg = release|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|Win32.Build.0 = release|Win32
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.checked|Win32.ActiveCfg = checked|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|Win32.ActiveCfg = debug|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|Win32.Build.0 = debug|Win32
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.profile|Win32.ActiveCfg = profile|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|Win32.ActiveCfg = release|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|Win32.Build.0 = release|Win32
EndGlobalSection
diff --git a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleBase.vcxproj b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleBase.vcxproj
index 398d5c6b..668ad271 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleBase.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleBase.vcxproj
@@ -269,6 +269,31 @@
<ClInclude Include="..\..\SampleBase\Utils.h">
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2013WIN64/DirectXTex.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2013WIN64/DXUT.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2013WIN64/Effects11.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvsimplemesh.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvidiautils.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"></ImportGroup>
</Project>
diff --git a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleBase.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleBase.vcxproj.filters
index 58636869..047a4ff6 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleBase.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleBase.vcxproj.filters
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleBase\ApexController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\Utils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleBase\ApexController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\CommonUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\SampleManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\Utils.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleBase\ApexController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\Utils.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleBase\ApexController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\CommonUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\SampleManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\Utils.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj
index b9745bd3..2b073078 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj
@@ -263,12 +263,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
index 4a343c59..da8aca0c 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
index def6653e..8a95e1f4 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
@@ -263,12 +263,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
index 79738e80..9270a1bc 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
index fcaa0304..23304d97 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
@@ -263,12 +263,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2013WIN64/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
index 32c0c082..2be1e60d 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/Samples.sln b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/Samples.sln
index dd1f4110..7cce24aa 100644
--- a/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/Samples.sln
+++ b/APEX_1.4/samples_v2/compiler/vc12win64-PhysX_3.4/Samples.sln
@@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleBase", "./SampleBase.vcxproj", "{DD323D8B-0B68-74C5-043C-91BBE6A810A7}"
ProjectSection(ProjectDependencies) = postProject
+ {E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
+ {4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
+ {223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
+ {1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld", "./SampleDestructionHelloWorld.vcxproj", "{F26C39BF-31B2-B855-F75A-4BE9DC2DC412}"
@@ -9,8 +14,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -19,8 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionImpactDama
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -29,8 +34,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleClothingHelloWorld",
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -94,34 +99,24 @@ Global
{961D3695-F024-7FB6-D236-2180AF48561A}.profile|x64.Build.0 = profile|x64
{961D3695-F024-7FB6-D236-2180AF48561A}.release|x64.ActiveCfg = release|x64
{961D3695-F024-7FB6-D236-2180AF48561A}.release|x64.Build.0 = release|x64
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.checked|x64.ActiveCfg = checked|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|x64.ActiveCfg = debug|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|x64.Build.0 = debug|x64
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.profile|x64.ActiveCfg = profile|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|x64.ActiveCfg = release|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|x64.Build.0 = release|x64
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.checked|x64.ActiveCfg = checked|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|x64.ActiveCfg = debug|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|x64.Build.0 = debug|x64
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.profile|x64.ActiveCfg = profile|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|x64.ActiveCfg = release|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|x64.Build.0 = release|x64
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.checked|x64.ActiveCfg = checked|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|x64.ActiveCfg = debug|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|x64.Build.0 = debug|x64
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.profile|x64.ActiveCfg = profile|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|x64.ActiveCfg = release|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|x64.Build.0 = release|x64
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.checked|x64.ActiveCfg = checked|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|x64.ActiveCfg = debug|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|x64.Build.0 = debug|x64
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.profile|x64.ActiveCfg = profile|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|x64.ActiveCfg = release|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|x64.Build.0 = release|x64
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.checked|x64.ActiveCfg = checked|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|x64.ActiveCfg = debug|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|x64.Build.0 = debug|x64
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.profile|x64.ActiveCfg = profile|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|x64.ActiveCfg = release|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|x64.Build.0 = release|x64
EndGlobalSection
diff --git a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleBase.vcxproj b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleBase.vcxproj
index 567219c7..4cd7a370 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleBase.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleBase.vcxproj
@@ -69,8 +69,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Od /RTCsu /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -106,9 +113,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -143,9 +156,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -180,9 +199,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -248,6 +273,31 @@
<ClInclude Include="..\..\SampleBase\Utils.h">
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2015WIN32/DirectXTex.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2015WIN32/DXUT.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2015WIN32/Effects11.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvsimplemesh.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvidiautils.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"></ImportGroup>
</Project>
diff --git a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleBase.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleBase.vcxproj.filters
index 58636869..047a4ff6 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleBase.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleBase.vcxproj.filters
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleBase\ApexController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\Utils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleBase\ApexController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\CommonUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\SampleManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\Utils.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleBase\ApexController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\Utils.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleBase\ApexController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\CommonUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\SampleManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\Utils.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj
index 020ea229..4d313014 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj
@@ -69,8 +69,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Od /RTCsu /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -108,9 +115,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -147,9 +160,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -186,9 +205,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -242,12 +267,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
index 4a343c59..da8aca0c 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
index cd48f9c8..30bf4975 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
@@ -69,8 +69,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Od /RTCsu /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -108,9 +115,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -147,9 +160,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -186,9 +205,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -242,12 +267,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
index 79738e80..9270a1bc 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
index a7b6626c..e98383f1 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
@@ -69,8 +69,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Od /RTCsu /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -108,9 +115,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -147,9 +160,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -186,9 +205,15 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|Win32'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /arch:SSE2 /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -242,12 +267,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN32/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
index 32c0c082..2be1e60d 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/Samples.sln b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/Samples.sln
index c1974bbe..4d05ef6e 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/Samples.sln
+++ b/APEX_1.4/samples_v2/compiler/vc14win32-PhysX_3.4/Samples.sln
@@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleBase", "./SampleBase.vcxproj", "{DD323D8B-0B68-74C5-043C-91BBE6A810A7}"
ProjectSection(ProjectDependencies) = postProject
+ {E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
+ {4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
+ {223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
+ {1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld", "./SampleDestructionHelloWorld.vcxproj", "{F26C39BF-31B2-B855-F75A-4BE9DC2DC412}"
@@ -9,8 +14,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -19,8 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionImpactDama
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -29,8 +34,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleClothingHelloWorld",
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -94,34 +99,24 @@ Global
{961D3695-F024-7FB6-D236-2180AF48561A}.profile|Win32.Build.0 = profile|Win32
{961D3695-F024-7FB6-D236-2180AF48561A}.release|Win32.ActiveCfg = release|Win32
{961D3695-F024-7FB6-D236-2180AF48561A}.release|Win32.Build.0 = release|Win32
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.checked|Win32.ActiveCfg = checked|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|Win32.ActiveCfg = debug|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|Win32.Build.0 = debug|Win32
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.profile|Win32.ActiveCfg = profile|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|Win32.ActiveCfg = release|Win32
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|Win32.Build.0 = release|Win32
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.checked|Win32.ActiveCfg = checked|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|Win32.ActiveCfg = debug|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|Win32.Build.0 = debug|Win32
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.profile|Win32.ActiveCfg = profile|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|Win32.ActiveCfg = release|Win32
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|Win32.Build.0 = release|Win32
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.checked|Win32.ActiveCfg = checked|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|Win32.ActiveCfg = debug|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|Win32.Build.0 = debug|Win32
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.profile|Win32.ActiveCfg = profile|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|Win32.ActiveCfg = release|Win32
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|Win32.Build.0 = release|Win32
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.checked|Win32.ActiveCfg = checked|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|Win32.ActiveCfg = debug|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|Win32.Build.0 = debug|Win32
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.profile|Win32.ActiveCfg = profile|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|Win32.ActiveCfg = release|Win32
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|Win32.Build.0 = release|Win32
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.checked|Win32.ActiveCfg = checked|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|Win32.ActiveCfg = debug|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|Win32.Build.0 = debug|Win32
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.profile|Win32.ActiveCfg = profile|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|Win32.ActiveCfg = release|Win32
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|Win32.Build.0 = release|Win32
EndGlobalSection
diff --git a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleBase.vcxproj b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleBase.vcxproj
index bc0b8e0c..1559f3c3 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleBase.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleBase.vcxproj
@@ -69,8 +69,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Od /RTCsu /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -106,9 +112,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -143,9 +154,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -180,9 +196,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -248,6 +269,31 @@
<ClInclude Include="..\..\SampleBase\Utils.h">
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2015WIN64/DirectXTex.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2015WIN64/DXUT.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/externals/build/vs2015WIN64/Effects11.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvsimplemesh.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvidiautils.vcxproj">
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"></ImportGroup>
</Project>
diff --git a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleBase.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleBase.vcxproj.filters
index 58636869..047a4ff6 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleBase.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleBase.vcxproj.filters
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleBase\ApexController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleBase\Utils.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleBase\ApexController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\CommonUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\SampleManager.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleBase\Utils.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleBase\ApexController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderMaterial.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResourceManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexRenderResources.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\ApexResourceCallback.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\CommonUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\PhysXPrimitive.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\SampleManager.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleBase\Utils.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleBase\ApexController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderer.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderMaterial.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResourceManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexRenderResources.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\ApexResourceCallback.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\CommonUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\PhysXPrimitive.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\SampleManager.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleBase\Utils.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj
index b2260938..30b90c63 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj
@@ -69,8 +69,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Od /RTCsu /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -108,9 +114,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -147,9 +158,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -186,9 +202,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -242,12 +263,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
index 4a343c59..da8aca0c 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleClothingHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleClothingHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleClothingHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
index 572b1ae9..7c8431d5 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj
@@ -69,8 +69,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Od /RTCsu /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -108,9 +114,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -147,9 +158,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -186,9 +202,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -242,12 +263,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
index 79738e80..9270a1bc 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionHelloWorld.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionHelloWorld\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionHelloWorld\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
index 6aefbfad..d2dbdf1b 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
+++ b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj
@@ -69,8 +69,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Od /RTCsu /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_DEBUG;PX_DEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -108,9 +114,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;APEX_SHIPPING;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -147,9 +158,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='profile|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_PROFILE;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -186,9 +202,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='checked|x64'">
<ClCompile>
- <FloatingPointModel>Precise</FloatingPointModel>
- <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /GR- /GF /WX /fp:fast /MP /Ox /fp:fast /WX- /Zi /Oi /Oy- /Gm- /EHsc /GS /Gd /nologo /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
- <Optimization>Disabled</Optimization>
+ <StringPooling>true</StringPooling>
+ <CallingConvention>Cdecl</CallingConvention>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeTypeInfo>false</RuntimeTypeInfo>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <AdditionalOptions>/wd4201 /wd4324 /Wall /wd4514 /wd4820 /wd4127 /wd4710 /wd4711 /wd4061 /wd4668 /wd4626 /wd4266 /wd4263 /wd4264 /wd4640 /wd4625 /wd4574 /wd4191 /wd4987 /wd4986 /wd4946 /wd4836 /wd4571 /wd4826 /wd4577 /wd4458 /wd4456 /wd4457 /wd4548 /wd5026 /wd5027 /wd4464 /MP /WX- /Oy- /Gm- /EHsc /wd4005 /wd4244 /d2Zi+</AdditionalOptions>
+ <Optimization>Full</Optimization>
<AdditionalIncludeDirectories>../../../../PxShared/include;../../../../PxShared/include/filebuf;../../../../PxShared/include/foundation;../../../../PxShared/include/task;../../../../PxShared/include/cudamanager;../../../../PxShared/include/pvd;../../../../PxShared/src/foundation/include;../../../../PxShared/src/filebuf/include;../../../../PxShared/src/fastxml/include;../../../../PxShared/src/pvd/include;./../../../include;./../../../include/PhysX3;./../../../include/basicios;./../../../include/clothing;./../../../include/destructible;./../../../include/emitter;./../../../include/particles;./../../../include/iofx;./../../../include/pxparticleios;../../../../PhysX_3.4/Include;./../../../shared/external/include;./../../../shared/general/shared;./../../../shared/general/RenderDebug/public;./../../../include;./../../../include/PhysX3;$(WindowsSDK_IncludePath);./../../../externals/extensions/externals/include/directxtex;./../../../externals/extensions/externals/include/dxut/Core;./../../../externals/extensions/externals/include/dxut/Optional;./../../../externals/extensions/externals/include/effects11;./../../../externals/extensions/externals/include/simpleopt;./../../../externals/extensions/include/nvidiautils;./../../../externals/extensions/include/nvsimplemesh;./../../../externals/extensions/externals/include;./../../../externals/extensions/externals/include/anttweakbar;./../../../externals/extensions/externals/include/assimp;./../../SampleBase;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;NDEBUG;PX_CHECKED;PHYSX_PROFILE_SDK;PX_SUPPORT_VISUAL_DEBUGGER;PX_ENABLE_CHECKED_ASSERTS;PX_NVTX=1;_SECURE_SCL=0;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -242,12 +263,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvidiautils.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvsimplemesh.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvsimplemesh.vcxproj">
+ <ProjectReference Include="./../../../externals/extensions/build/vs2015WIN64/nvidiautils.vcxproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
diff --git a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
index 32c0c082..2be1e60d 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
+++ b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/SampleDestructionImpactDamage.vcxproj.filters
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
- <Filter>Source Files</Filter>
- </ClInclude>
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleSceneController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\SampleDestructionImpactDamage\SampleUIController.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleSceneController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\SampleDestructionImpactDamage\SampleUIController.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/Samples.sln b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/Samples.sln
index b9da205e..96069a9c 100644
--- a/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/Samples.sln
+++ b/APEX_1.4/samples_v2/compiler/vc14win64-PhysX_3.4/Samples.sln
@@ -2,6 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleBase", "./SampleBase.vcxproj", "{DD323D8B-0B68-74C5-043C-91BBE6A810A7}"
ProjectSection(ProjectDependencies) = postProject
+ {E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
+ {4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
+ {223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
+ {1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld", "./SampleDestructionHelloWorld.vcxproj", "{F26C39BF-31B2-B855-F75A-4BE9DC2DC412}"
@@ -9,8 +14,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionHelloWorld
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -19,8 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleDestructionImpactDama
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -29,8 +34,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleClothingHelloWorld",
{E4300CA4-818C-5C30-C94C-91C4220872A0} = {E4300CA4-818C-5C30-C94C-91C4220872A0}
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D} = {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}
{223559A7-4AD8-97C2-820A-599906DBF2CC} = {223559A7-4AD8-97C2-820A-599906DBF2CC}
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29} = {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}
+ {AC3E98F3-4039-0B48-2EE8-CC39B49070B0} = {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}
{DD323D8B-0B68-74C5-043C-91BBE6A810A7} = {DD323D8B-0B68-74C5-043C-91BBE6A810A7}
EndProjectSection
EndProject
@@ -94,34 +99,24 @@ Global
{961D3695-F024-7FB6-D236-2180AF48561A}.profile|x64.Build.0 = profile|x64
{961D3695-F024-7FB6-D236-2180AF48561A}.release|x64.ActiveCfg = release|x64
{961D3695-F024-7FB6-D236-2180AF48561A}.release|x64.Build.0 = release|x64
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.checked|x64.ActiveCfg = checked|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|x64.ActiveCfg = debug|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.debug|x64.Build.0 = debug|x64
- {E4300CA4-818C-5C30-C94C-91C4220872A0}.profile|x64.ActiveCfg = profile|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|x64.ActiveCfg = release|x64
{E4300CA4-818C-5C30-C94C-91C4220872A0}.release|x64.Build.0 = release|x64
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.checked|x64.ActiveCfg = checked|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|x64.ActiveCfg = debug|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.debug|x64.Build.0 = debug|x64
- {4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.profile|x64.ActiveCfg = profile|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|x64.ActiveCfg = release|x64
{4507D448-C038-EA54-7F1E-7EA0C6B84F9D}.release|x64.Build.0 = release|x64
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.checked|x64.ActiveCfg = checked|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|x64.ActiveCfg = debug|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.debug|x64.Build.0 = debug|x64
- {223559A7-4AD8-97C2-820A-599906DBF2CC}.profile|x64.ActiveCfg = profile|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|x64.ActiveCfg = release|x64
{223559A7-4AD8-97C2-820A-599906DBF2CC}.release|x64.Build.0 = release|x64
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.checked|x64.ActiveCfg = checked|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|x64.ActiveCfg = debug|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.debug|x64.Build.0 = debug|x64
- {AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.profile|x64.ActiveCfg = profile|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|x64.ActiveCfg = release|x64
{AC3E98F3-4039-0B48-2EE8-CC39B49070B0}.release|x64.Build.0 = release|x64
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.checked|x64.ActiveCfg = checked|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|x64.ActiveCfg = debug|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.debug|x64.Build.0 = debug|x64
- {1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.profile|x64.ActiveCfg = profile|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|x64.ActiveCfg = release|x64
{1B4A9376-FB36-9386-4BA2-0BCEEC657D29}.release|x64.Build.0 = release|x64
EndGlobalSection