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
1947 return false;1947 return false;
1948 }1948 }
1949 1949
1950 if (args->_renderMode == RenderArgs::DEBUG_RENDER_MODE && _renderCollisionHull == false) {1950 if (args->_debugFlags == RenderArgs::RENDER_DEBUG_HULLS && _renderCollisionHull == false) {
1951 // turning collision hull rendering on1951 // turning collision hull rendering on
1952 _renderCollisionHull = true;1952 _renderCollisionHull = true;
1953 _nextGeometry = _collisionGeometry;1953 _nextGeometry = _collisionGeometry;
1954 _saveNonCollisionGeometry = _geometry;1954 _saveNonCollisionGeometry = _geometry;
1955 updateGeometry();1955 updateGeometry();
1956 simulate(0.0, true);1956 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) {
1958 // turning collision hull rendering off1958 // turning collision hull rendering off
1959 _renderCollisionHull = false;1959 _renderCollisionHull = false;
1960 _nextGeometry = _saveNonCollisionGeometry;1960 _nextGeometry = _saveNonCollisionGeometry;