Merge pull request kmammou#44 from jratcliff63367/update-float-math

Minor revisions to the source and libraries.

DebugView/NvRenderDebug/NvRenderDebug.h

@@ -17,16 +17,21 @@
 /**
 \brief This defines the version number of the API.  If the API changes in anyway, this version number needs to be bumped.
 */
-#define RENDER_DEBUG_VERSION 1009
+#define RENDER_DEBUG_VERSION 1010
 /**
 \brief This defines the version number for the communications layer.  If the format or layout of any packets change in a way that will not be backwards compatible, this needs to be bumped
 */
-#define RENDER_DEBUG_COMM_VERSION 1009
+#define RENDER_DEBUG_COMM_VERSION 1010
 /**
 \brief The default port number for RenderDebug client/server connections.  You can change this if you wish, but you must make sure both your client and server code uses the new port number.
 */
 #define RENDER_DEBUG_PORT 5525
 
+namespace nvidia
+{
+	class NvAllocatorCallback;
+	class NvErrorCallback;
+}
 
 namespace RENDER_DEBUG
 {
@@ -897,7 +902,7 @@ class RenderDebug
 			dllName = "RenderDebug_x86.dll";
 			versionNumber = RENDER_DEBUG_VERSION;
 			runMode = RM_LOCAL;
-			recordFileName = nullptr; //"RenderDebug.rec";
+			recordFileName = NULL; //"RenderDebug.rec";
 			errorCode = 0;
 			echoFileLocally = false;
 			hostName = "localhost";
@@ -973,12 +978,12 @@ class RenderDebug
 		/**
 		\brief This is an optional callback interface to vector all memory allocations performed back to the application.
 		*/
-		void *allocatorCallback;
+		nvidia::NvAllocatorCallback *allocatorCallback;
 
 		/**
 		\brief This is an optional callback interface to vector all warning and error messages back to the application
 		*/
-		void		*errorCallback;
+		nvidia::NvErrorCallback		*errorCallback;
 
 		/**
 		\brief This is an optional filename to record all commands received from the remote connection. This is a debugging feature only.

DebugView/NvRenderDebug/NvRenderDebugBinding.cpp

@@ -1,10 +1,20 @@
 #include "NvRenderDebug.h"
 #include <stdio.h>
 
+#if NV_SIGNED_LIBRARY
+#undef NV_SIGNED_LIBRARY
+#endif
+
 #ifdef _MSC_VER
 
 #include <windows.h>
 
+#ifdef NV_SIGNED_LIBRARY
+#include "nvSecureLoadLibrary.h"
+#endif
+
+
+
 namespace RENDER_DEBUG
 {
 
@@ -15,7 +25,11 @@ RENDER_DEBUG::RenderDebug *createRenderDebug(RenderDebug::Desc &desc)
 	UINT errorMode = 0;
 	errorMode = SEM_FAILCRITICALERRORS;
 	UINT oldErrorMode = SetErrorMode(errorMode);
+#ifdef NV_SIGNED_LIBRARY
+	HMODULE module = nvLoadLibraryExA(desc.dllName,0,true);
+#else
 	HMODULE module = LoadLibraryA(desc.dllName);
+#endif
 	SetErrorMode(oldErrorMode);
 	if ( module )
 	{

DebugView/PhysXFramework/NvPhysXFramework.h

@@ -79,6 +79,14 @@ class PhysXFramework
 			uint32_t swing2Limit) = 0;		// Swing 2 limit in degrees (if used)
 
 		virtual bool getXform(float xform[16],uint32_t index) = 0;
+		virtual bool getConstraintXform(float xform[16], uint32_t constraint) = 0;
+
+		// If we are mouse dragging and the currently selected object is an actor in this compound
+		// system, then return true and assign 'bodyIndex' to the index number of the body selected.
+		virtual bool getSelectedBody(uint32_t &bodyIndex) = 0;
+
+		// Sets the collision filter pairs.
+		virtual void setCollisionFilterPairs(uint32_t pairCount, const uint32_t *collisionPairs) = 0;
 
 		virtual void release(void) = 0;
 	};