History

hook up menu-items to control debug rendering of collision hulls and owned simulations

Seth Alves committed 11 years ago

Commit e0076171 parent 265115711 files · +50 −28Browse files

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

Unified · Split

libraries/render-utils/src/Model.cpp+2−2
@@ -1947,14 +1947,14 @@ bool Model::renderInScene(float alpha, RenderArgs* args) { · 1946 unmodified lines
19471947 return false;
19481948 }
19491949
1950− if (args->_renderMode == RenderArgs::DEBUG_RENDER_MODE && _renderCollisionHull == false) {
1950+ if (args->_debugFlags == RenderArgs::RENDER_DEBUG_HULLS && _renderCollisionHull == false) {
19511951 // turning collision hull rendering on
19521952 _renderCollisionHull = true;
19531953 _nextGeometry = _collisionGeometry;
19541954 _saveNonCollisionGeometry = _geometry;
19551955 updateGeometry();
19561956 simulate(0.0, true);
1957− } else if (args->_renderMode != RenderArgs::DEBUG_RENDER_MODE && _renderCollisionHull == true) {
1957+ } else if (args->_debugFlags != RenderArgs::RENDER_DEBUG_HULLS && _renderCollisionHull == true) {
19581958 // turning collision hull rendering off
19591959 _renderCollisionHull = false;
19601960 _nextGeometry = _saveNonCollisionGeometry;