History

Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels

ZappoMan committed 13 years ago

Commit 1b302f62 parents b8dfc38 b0bfba338 files · +1171 −1506Browse files

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

Unified · Split

interface/src/Application.cpp+4−4
@@ -72,8 +72,8 @@ · 71 unmodified lines
72using namespace std;72using namespace std;
73 73
74// Starfield information74// Starfield information
75static char STAR_FILE[] = "http://s3-us-west-1.amazonaws.com/highfidelity/stars.txt";75static unsigned STARFIELD_NUM_STARS = 50000;
76static char STAR_CACHE_FILE[] = "cachedStars.txt";76static unsigned STARFIELD_SEED = 1;
77 77
78static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored 78static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored
79 79
@@ -2510,8 +2510,8 @@ void Application::displaySide(Camera& whichCamera) { · 2430 unmodified lines
2510 if (Menu::getInstance()->isOptionChecked(MenuOption::Stars)) {2510 if (Menu::getInstance()->isOptionChecked(MenuOption::Stars)) {
2511 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), 2511 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2512 "Application::displaySide() ... stars...");2512 "Application::displaySide() ... stars...");
2513 if (!_stars.getFileLoaded()) {2513 if (!_stars.isStarsLoaded()) {
2514 _stars.readInput(STAR_FILE, STAR_CACHE_FILE, 0);2514 _stars.generate(STARFIELD_NUM_STARS, STARFIELD_SEED);
2515 }2515 }
2516 // should be the first rendering pass - w/o depth buffer / lighting2516 // should be the first rendering pass - w/o depth buffer / lighting
2517 2517

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