History

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

Andrzej Kapolka committed 13 years ago

Commit 591cf982 parents cd902c5 8c85c5c31 files · +953 −1347Browse files

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

Unified · Split

interface/src/Application.cpp+4−4
@@ -72,8 +72,8 @@ · 71 unmodified lines
7272 using namespace std;
7373
7474 // Starfield information
75−static char STAR_FILE[] = "http://s3-us-west-1.amazonaws.com/highfidelity/stars.txt";
76−static char STAR_CACHE_FILE[] = "cachedStars.txt";
75+static unsigned STARFIELD_NUM_STARS = 50000;
76+static unsigned STARFIELD_SEED = 1;
7777
7878 static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored
7979
@@ -2491,8 +2491,8 @@ void Application::displaySide(Camera& whichCamera) { · 2411 unmodified lines
24912491 if (Menu::getInstance()->isOptionChecked(MenuOption::Stars)) {
24922492 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
24932493 "Application::displaySide() ... stars...");
2494− if (!_stars.getFileLoaded()) {
2495− _stars.readInput(STAR_FILE, STAR_CACHE_FILE, 0);
2494+ if (!_stars.isStarsLoaded()) {
2495+ _stars.generate(STARFIELD_NUM_STARS, STARFIELD_SEED);
24962496 }
24972497 // should be the first rendering pass - w/o depth buffer / lighting
24982498

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