server: novodex: removed unused things from code

SNMetamorph · Sep 9, 2023 · 9d9e9d8 · 9d9e9d8
1 parent 9d6cc53
commit 9d9e9d8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/server/novodex.cpp b/server/novodex.cpp
@@ -71,7 +71,6 @@ CPhysicNovodex::CPhysicNovodex()
 	m_fLoaded = false;
 	m_fDisableWarning = false;
 	m_fWorldChanged = false;
-	m_fNeedFetchResults = false;
 	m_flAccumulator = 0.0;
 
 	m_szMapName[0] = '\0';
@@ -107,8 +106,8 @@ void CPhysicNovodex :: InitPhysic( void )
 
 	m_pVisualDebugger = PxCreatePvd(*m_pFoundation);
 	if (DebugEnabled()) {
-	PxPvdTransport *transport = PxDefaultPvdSocketTransportCreate("127.0.0.1", 5425, 1000);
-	m_pVisualDebugger->connect(*transport, PxPvdInstrumentationFlag::eALL);
+		PxPvdTransport *transport = PxDefaultPvdSocketTransportCreate("127.0.0.1", 5425, 1000);
+		m_pVisualDebugger->connect(*transport, PxPvdInstrumentationFlag::eALL);
 	}
 
 	m_pPhysics = PxCreatePhysics(PX_PHYSICS_VERSION, *m_pFoundation, scale, false, m_pVisualDebugger);
@@ -134,10 +133,7 @@ void CPhysicNovodex :: InitPhysic( void )
 	PxSceneDesc sceneDesc(scale);
 	sceneDesc.simulationEventCallback = &ContactReport::getInstance();
 	sceneDesc.gravity = PxVec3(0.0f, 0.0f, -800.0f);
-	//sceneDesc.bounceThresholdVelocity = 0.2 * scale.speed;
 	sceneDesc.flags = PxSceneFlag::eENABLE_CCD;
-	//sceneDesc.broadPhaseType = PxBroadPhaseType::eMBP;
-	//sceneDesc.dynamicStructure = PxPruningStructureType::eDYNAMIC_AABB_TREE;
 	sceneDesc.cpuDispatcher = m_pDispatcher;
 	sceneDesc.filterShader = [](
 		PxFilterObjectAttributes attributes0, PxFilterData filterData0,
@@ -161,23 +157,22 @@ void CPhysicNovodex :: InitPhysic( void )
 	if (DebugEnabled())
 	{
 		PxPvdSceneClient *pvdClient = m_pScene->getScenePvdClient();
-	m_pScene->setVisualizationParameter(PxVisualizationParameter::eSCALE, 1.0f); // disable on release build because performance impact
-	m_pScene->setVisualizationParameter(PxVisualizationParameter::eCOLLISION_SHAPES, 1.0f);
-	m_pScene->setVisualizationParameter(PxVisualizationParameter::eCONTACT_POINT, 1.0f);
-	m_pScene->setVisualizationParameter(PxVisualizationParameter::eCONTACT_NORMAL, 1.0f);
-	m_pScene->setVisualizationParameter(PxVisualizationParameter::eBODY_AXES, 1.0f);
+		m_pScene->setVisualizationParameter(PxVisualizationParameter::eSCALE, 1.0f); // disable on release build because performance impact
+		m_pScene->setVisualizationParameter(PxVisualizationParameter::eCOLLISION_SHAPES, 1.0f);
+		m_pScene->setVisualizationParameter(PxVisualizationParameter::eCONTACT_POINT, 1.0f);
+		m_pScene->setVisualizationParameter(PxVisualizationParameter::eCONTACT_NORMAL, 1.0f);
+		m_pScene->setVisualizationParameter(PxVisualizationParameter::eBODY_AXES, 1.0f);
 
-	if (pvdClient)
-	{
-		pvdClient->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_CONSTRAINTS, true);
-		pvdClient->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_CONTACTS, true);
-		pvdClient->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_SCENEQUERIES, true);
-	}
+		if (pvdClient)
+		{
+			pvdClient->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_CONSTRAINTS, true);
+			pvdClient->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_CONTACTS, true);
+			pvdClient->setScenePvdFlag(PxPvdSceneFlag::eTRANSMIT_SCENEQUERIES, true);
+		}
 	}
 
 	m_pDefaultMaterial = m_pPhysics->createMaterial(0.5f, 0.5f, 0.0f);
 	m_pConveyorMaterial = m_pPhysics->createMaterial(1.0f, 1.0f, 0.0f);
-	m_fNeedFetchResults = FALSE;
 }
 
 void CPhysicNovodex :: FreePhysic( void )
@@ -2183,7 +2178,7 @@ void CPhysicNovodex :: TeleportCharacter( CBaseEntity *pEntity )
 		return;
 
 	PxRigidBody *pRigidBody = pActor->is<PxRigidBody>();
-	if(pRigidBody->getNbShapes() <= 0 || m_fNeedFetchResults )
+	if (pRigidBody->getNbShapes() <= 0)
 		return;
 
 	PxShape *pShape;
@@ -2225,7 +2220,7 @@ void CPhysicNovodex :: MoveCharacter( CBaseEntity *pEntity )
 		return;
 
 	PxRigidDynamic *pRigidBody = pActor->is<PxRigidDynamic>();
-	if( m_fNeedFetchResults || pRigidBody->getNbShapes() <= 0)
+	if (pRigidBody->getNbShapes() <= 0)
 		return;
 
 	PxShape *pShape;
@@ -2260,7 +2255,7 @@ void CPhysicNovodex :: MoveKinematic( CBaseEntity *pEntity )
 		return;
 
 	PxRigidDynamic *pRigidBody = pActor->is<PxRigidDynamic>();
-	if( m_fNeedFetchResults || pRigidBody->getNbShapes() <= 0)
+	if (pRigidBody->getNbShapes() <= 0)
 		return;
 
 	if( pEntity->pev->solid == SOLID_NOT || pEntity->pev->solid == SOLID_TRIGGER )

diff --git a/server/novodex.h b/server/novodex.h
@@ -120,7 +120,6 @@ class CPhysicNovodex : public IPhysicLayer
 	bool m_fLoaded;	// collision tree is loaded and actual
 	bool m_fDisableWarning;	// some warnings will be swallowed
 	bool m_fWorldChanged;	// world is changed refresh the statics in case their scale was changed too
-	bool m_fNeedFetchResults;
 	double m_flAccumulator;
 
 	physx::PxTriangleMesh *m_pSceneMesh;
@@ -135,6 +134,4 @@ class CPhysicNovodex : public IPhysicLayer
 	physx::PxCooking *m_pCooking;
 	physx::PxDefaultAllocator m_Allocator;
 	physx::PxPvd *m_pVisualDebugger;
-
-	cvar_t		*fps_max;
 };