History

removing VoxelShader and PointShader which were both disabled

ZappoMan committed 11 years ago

Commit 29672ae1 parent 7f493679 files · +111 −617Browse files

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

Unified · Split

interface/src/Application.cpp+0−4
@@ -1915,8 +1915,6 @@ void Application::init() { · 1914 unmodified lines
19151915 _deferredLightingEffect.init();
19161916 _glowEffect.init();
19171917 _ambientOcclusionEffect.init();
1918− _voxelShader.init();
1919− _pointShader.init();
19201918
19211919 // TODO: move _myAvatar out of Application. Move relevant code to MyAvataar or AvatarManager
19221920 _avatarManager.init();
@@ -1987,8 +1985,6 @@ void Application::init() { · 64 unmodified lines
19871985
19881986 // Set up VoxelSystem after loading preferences so we can get the desired max voxel count
19891987 _voxels.setMaxVoxels(Menu::getInstance()->getMaxVoxels());
1990− _voxels.setUseVoxelShader(false);
1991− _voxels.setVoxelsAsPoints(false);
19921988 _voxels.setDisableFastVoxelPipeline(false);
19931989 _voxels.init();
19941990

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t