make sphere entities use sphere shape for better collisions

ZappoMan committed 12 years ago

Commit 2f0a9b51 parent 9cd76983 files · +16 −4Browse files

Showing the changes to libraries/entities/src/EntityCollisionSystem.cpp (1 of 3 files). Show all

Unified · Split

libraries/entities/src/EntityCollisionSystem.cpp+1−2

@@ -105,14 +105,13 @@ void EntityCollisionSystem::updateCollisionWithVoxels(EntityItem* entity) { · 104 unmodified lines
105	105	}
106	106
107	107	void EntityCollisionSystem::updateCollisionWithEntities(EntityItem* entityA) {
108		− glm::vec3 center = entityA->getPosition() * (float)(TREE_SCALE);
109		− float radius = entityA->getRadius() * (float)(TREE_SCALE);
110	108	glm::vec3 penetration;
111	109	EntityItem* entityB = NULL;
112	110
113	111	const float MAX_COLLISIONS_PER_ENTITY = 32;
114	112	CollisionList collisions(MAX_COLLISIONS_PER_ENTITY);
115	113	bool shapeCollisionsAccurate = false;
	114	+
116	115	bool shapeCollisions = _entities->findShapeCollisions(&entityA->getCollisionShapeInMeters(),
117	116	collisions, Octree::NoLock, &shapeCollisionsAccurate);
118	117