Merge pull request #5369 from ericrius1/hitEffect

Added functionality for displaying a screen-space hit effect

samcake committed 11 years ago

Commit 4ebc75d2 parents a1e6fdc 65e043310 files · +218 −0Browse files

Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all

Unified · Split

@@ -3270,6 +3270,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 3269 unmodified lines
3270	renderContext._maxDrawnOverlay3DItems = sceneInterface->getEngineMaxDrawnOverlay3DItems();	3270	renderContext._maxDrawnOverlay3DItems = sceneInterface->getEngineMaxDrawnOverlay3DItems();
3271		3271
3272	renderContext._drawItemStatus = sceneInterface->doEngineDisplayItemStatus();	3272	renderContext._drawItemStatus = sceneInterface->doEngineDisplayItemStatus();
		3273	renderContext._drawHitEffect = sceneInterface->doEngineDisplayHitEffect();
3273		3274
3274	renderContext._occlusionStatus = Menu::getInstance()->isOptionChecked(MenuOption::DebugAmbientOcclusion);	3275	renderContext._occlusionStatus = Menu::getInstance()->isOptionChecked(MenuOption::DebugAmbientOcclusion);
3275		3276

Keyboard shortcuts