History

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

Andrzej Kapolka committed 13 years ago

Commit 675c0cb2 parents 39a70ce 04b291820 files · +936 −638Browse files

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

Unified · Split

interface/src/main.cpp+1−6
@@ -305,6 +305,7 @@ void init(void) · 304 unmodified lines
305{305{
306 voxels.init();306 voxels.init();
307 voxels.setViewerAvatar(&myAvatar);307 voxels.setViewerAvatar(&myAvatar);
308 voxels.setCamera(&myCamera);
308 309
309 handControl.setScreenDimensions(WIDTH, HEIGHT);310 handControl.setScreenDimensions(WIDTH, HEIGHT);
310 311
@@ -1624,12 +1625,6 @@ int main(int argc, const char * argv[]) · 1313 unmodified lines
1624 // we need to create a QApplication instance in order to use Qt's font rendering1625 // we need to create a QApplication instance in order to use Qt's font rendering
1625 app = new QApplication(argc, const_cast<char**>(argv));1626 app = new QApplication(argc, const_cast<char**>(argv));
1626 1627
1627 // Quick test of the Orientation class on startup!
1628 if (cmdOptionExists(argc, argv, "--testOrientation")) {
1629 testOrientationClass();
1630 return EXIT_SUCCESS;
1631 }
1632
1633 unsigned int listenPort = AGENT_SOCKET_LISTEN_PORT;1628 unsigned int listenPort = AGENT_SOCKET_LISTEN_PORT;
1634 const char* portStr = getCmdOption(argc, argv, "--listenPort");1629 const char* portStr = getCmdOption(argc, argv, "--listenPort");
1635 if (portStr) {1630 if (portStr) {

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