소스 검색

3rdparty: bullet3: remove custom debug color

Part-of: #259
Daniele Bartolini 3 달 전
부모
커밋
2b7962f21d

+ 0 - 24
3rdparty/bullet3/src/BulletCollision/CollisionDispatch/btCollisionObject.h

@@ -123,8 +123,6 @@ public:
 	///internal update revision number. It will be increased when the object changes. This allows some subsystems to perform lazy evaluation.
 	int m_updateRevision;
 
-	btVector3 m_customDebugColorRGB;
-
 public:
 	BT_DECLARE_ALIGNED_ALLOCATOR();
 
@@ -139,7 +137,6 @@ public:
 		CF_DISABLE_VISUALIZE_OBJECT = 32,          //disable debug drawing
 		CF_DISABLE_SPU_COLLISION_PROCESSING = 64,  //disable parallel/SPU processing
 		CF_HAS_CONTACT_STIFFNESS_DAMPING = 128,
-		CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR = 256,
 		CF_HAS_FRICTION_ANCHOR = 512,
 		CF_HAS_COLLISION_SOUND_TRIGGER = 1024
 	};
@@ -326,27 +323,6 @@ public:
 		return m_ccdMotionThreshold * m_ccdMotionThreshold;
 	}
 
-	void setCustomDebugColor(const btVector3& colorRGB)
-	{
-		m_customDebugColorRGB = colorRGB;
-		m_collisionFlags |= CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR;
-	}
-
-	void removeCustomDebugColor()
-	{
-		m_collisionFlags &= ~CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR;
-	}
-
-	bool getCustomDebugColor(btVector3 & colorRGB) const
-	{
-		bool hasCustomColor = (0 != (m_collisionFlags & CF_HAS_CUSTOM_DEBUG_RENDERING_COLOR));
-		if (hasCustomColor)
-		{
-			colorRGB = m_customDebugColorRGB;
-		}
-		return hasCustomColor;
-	}
-
 	inline bool checkCollideWith(const btCollisionObject* co) const
 	{
 		if (m_checkCollideWith)

+ 0 - 2
3rdparty/bullet3/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp

@@ -1530,8 +1530,6 @@ void btCollisionWorld::debugDrawWorld()
 							}
 						};
 
-						colObj->getCustomDebugColor(color);
-
 						debugDrawObject(colObj->m_worldTransform, colObj->m_collisionShape, color);
 					}
 					if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb))