remove non-batch versions of GeometryCache renderXYZ() methods

ZappoMan committed 11 years ago

Commit c2113ea1 parent 36f63e412 files · +13 −203Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 12 files). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+2−2

@@ -946,7 +946,7 @@ void Model::removeFromScene(std::shared_ptr<render::Scene> scene, render::Pendin · 945 unmodified lines
946	_readyWhenAdded = false;	946	_readyWhenAdded = false;
947	}	947	}
948		948
949	void Model::renderDebugMeshBoxes() {	949	void Model::renderDebugMeshBoxes(gpu::Batch& batch) {
950	int colorNdx = 0;	950	int colorNdx = 0;
951	_mutex.lock();	951	_mutex.lock();
952	foreach(AABox box, _calculatedMeshBoxes) {	952	foreach(AABox box, _calculatedMeshBoxes) {
@@ -995,7 +995,7 @@ void Model::renderDebugMeshBoxes() { · 42 unmodified lines
995	{ 0.0f, 0.5f, 0.5f, 1.0f } };	995	{ 0.0f, 0.5f, 0.5f, 1.0f } };
996		996
997	DependencyManager::get<GeometryCache>()->updateVertices(_debugMeshBoxesID, points, color[colorNdx]);	997	DependencyManager::get<GeometryCache>()->updateVertices(_debugMeshBoxesID, points, color[colorNdx]);
998	DependencyManager::get<GeometryCache>()->renderVertices(gpu::LINES, _debugMeshBoxesID);	998	DependencyManager::get<GeometryCache>()->renderVertices(batch, gpu::LINES, _debugMeshBoxesID);
999	colorNdx++;	999	colorNdx++;
1000	}	1000	}
1001	_mutex.unlock();	1001	_mutex.unlock();