Merge pull request #865 from ey6es/ssao

Basic screen space ambient occlusion effect. Defaults to off, because at the moment it slows things down substantially.

Stephen Birarda committed 13 years ago

Commit d0ab8312 parents 7ab0f18 dec4a4c14 files · +382 −17Browse files

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

Unified · Split

@@ -163,6 +163,7 @@ Menu::Menu() : · 162 unmodified lines
163	appInstance->getGlowEffect(),	163	appInstance->getGlowEffect(),
164	SLOT(cycleRenderMode()));	164	SLOT(cycleRenderMode()));
165		165
		166	addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::AmbientOcclusion);
166	addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::FrameTimer);	167	addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::FrameTimer);
167	addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::LookAtVectors);	168	addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::LookAtVectors);
168	addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::LookAtIndicator, 0, true);	169	addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::LookAtIndicator, 0, true);