History

Merge pull request #3078 from PhilipRosedale/master

Improved toy ball, JS calls for palm position, concertCamera.js

Clément Brisset committed 12 years ago

Commit 463ac9c2 parents cd53b72 64c89df17 files · +469 −50Browse files

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

Unified · Split

interface/src/Application.cpp+2−2
@@ -134,7 +134,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 133 unmodified lines
134134 _nodeThread(new QThread(this)),
135135 _datagramProcessor(),
136136 _frameCount(0),
137− _fps(120.0f),
137+ _fps(60.0f),
138138 _justStarted(true),
139139 _voxelImporter(NULL),
140140 _importSucceded(false),
@@ -553,7 +553,7 @@ void Application::initializeGL() { · 412 unmodified lines
553553 }
554554
555555 // update before the first render
556− update(0.0f);
556+ update(1.f / _fps);
557557
558558 InfoView::showFirstTime();
559559 }

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