History

move Avatar goHome to Avatar slot

Stephen Birarda committed 13 years ago

Commit bbe23961 parent ce3afbc5 files · +20 −21Browse files

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

Unified · Split

interface/src/Application.cpp+0−11
@@ -72,11 +72,6 @@ static char STAR_CACHE_FILE[] = "cachedStars.txt"; · 71 unmodified lines
72 72
73static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored 73static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored
74 74
75// Where one's own Avatar begins in the world (will be overwritten if avatar data file is found)
76// this is basically in the center of the ground plane. Slightly adjusted. This was asked for by
77// Grayson as he's building a street around here for demo dinner 2
78const glm::vec3 START_LOCATION(0.485f * TREE_SCALE, 0.f, 0.5f * TREE_SCALE);
79
80const int IDLE_SIMULATE_MSECS = 16; // How often should call simulate and other stuff75const int IDLE_SIMULATE_MSECS = 16; // How often should call simulate and other stuff
81 // in the idle loop? (60 FPS is default)76 // in the idle loop? (60 FPS is default)
82static QTimer* idleTimer = NULL;77static QTimer* idleTimer = NULL;
@@ -3365,12 +3360,6 @@ void Application::eyedropperVoxelUnderCursor() { · 3282 unmodified lines
3365 }3360 }
3366}3361}
3367 3362
3368void Application::goHome() {
3369 qDebug("Going Home!\n");
3370 _myAvatar.setPosition(START_LOCATION);
3371}
3372
3373
3374void Application::toggleFollowMode() {3363void Application::toggleFollowMode() {
3375 glm::vec3 mouseRayOrigin, mouseRayDirection;3364 glm::vec3 mouseRayOrigin, mouseRayDirection;
3376 _viewFrustum.computePickRay(_pieMenu.getX() / (float)_glWidget->width(),3365 _viewFrustum.computePickRay(_pieMenu.getX() / (float)_glWidget->width(),

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