Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all
Unified · Split
| @@ -1915,8 +1915,6 @@ void Application::init() { · 1914 unmodified lines | |||
| 1915 | _deferredLightingEffect.init(); | 1915 | _deferredLightingEffect.init(); |
| 1916 | _glowEffect.init(); | 1916 | _glowEffect.init(); |
| 1917 | _ambientOcclusionEffect.init(); | 1917 | _ambientOcclusionEffect.init(); |
| 1918 | _voxelShader.init(); | ||
| 1919 | _pointShader.init(); | ||
| 1920 | 1918 | ||
| 1921 | // TODO: move _myAvatar out of Application. Move relevant code to MyAvataar or AvatarManager | 1919 | // TODO: move _myAvatar out of Application. Move relevant code to MyAvataar or AvatarManager |
| 1922 | _avatarManager.init(); | 1920 | _avatarManager.init(); |
| @@ -1987,8 +1985,6 @@ void Application::init() { · 64 unmodified lines | |||
| 1987 | 1985 | ||
| 1988 | // Set up VoxelSystem after loading preferences so we can get the desired max voxel count | 1986 | // Set up VoxelSystem after loading preferences so we can get the desired max voxel count |
| 1989 | _voxels.setMaxVoxels(Menu::getInstance()->getMaxVoxels()); | 1987 | _voxels.setMaxVoxels(Menu::getInstance()->getMaxVoxels()); |
| 1990 | _voxels.setUseVoxelShader(false); | ||
| 1991 | _voxels.setVoxelsAsPoints(false); | ||
| 1992 | _voxels.setDisableFastVoxelPipeline(false); | 1988 | _voxels.setDisableFastVoxelPipeline(false); |
| 1993 | _voxels.init(); | 1989 | _voxels.init(); |
| 1994 | 1990 | ||