From 61560af28f6da61b316577456924980ee0653c4b Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 6 Aug 2013 19:21:46 -0700 Subject: [PATCH] cleanup --- animation-server/src/main.cpp | 9 ++++----- interface/src/Application.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/animation-server/src/main.cpp b/animation-server/src/main.cpp index 47cf94ff2e..dec8f2ea5d 100644 --- a/animation-server/src/main.cpp +++ b/animation-server/src/main.cpp @@ -31,11 +31,11 @@ #endif bool shouldShowPacketsPerSecond = false; // do we want to debug packets per second -bool includeBillboard = false; -bool includeBorderTracer = false; -bool includeMovingBug = false; +bool includeBillboard = true; +bool includeBorderTracer = true; +bool includeMovingBug = true; bool includeBlinkingVoxel = false; -bool includeDanceFloor = false; +bool includeDanceFloor = true; bool buildStreet = false; @@ -624,7 +624,6 @@ const float ROAD_BRICK_SIZE = 0.125f/TREE_SCALE; //(ROAD_WIDTH_METERS / TREE_SCA const int ROAD_LENGTH = 1.0f / ROAD_BRICK_SIZE; // in bricks const int ROAD_WIDTH = BRICKS_ACROSS_ROAD; // in bricks glm::vec3 roadPosition(0.5f - (ROAD_BRICK_SIZE * BRICKS_ACROSS_ROAD), 0.0f, 0.0f); -//glm::vec3 roadPosition(0.0f, 0.0f, 0.0f); const int BRICKS_PER_PACKET = 32; // guessing const int PACKETS_PER_ROAD = VOXELS_PER_PACKET / (ROAD_LENGTH * ROAD_WIDTH); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 821a21d604..19b889a918 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -77,8 +77,10 @@ static char STAR_CACHE_FILE[] = "cachedStars.txt"; static const int BANDWIDTH_METER_CLICK_MAX_DRAG_LENGTH = 6; // farther dragged clicks are ignored -const glm::vec3 START_LOCATION(0.485f * TREE_SCALE, 0.f, 0.5f * TREE_SCALE); // Where one's own node begins in the world - // (will be overwritten if avatar data file is found) +// Where one's own Avatar begins in the world (will be overwritten if avatar data file is found) +// this is basically in the center of the ground plane. Slightly adjusted. This was asked for by +// Grayson as he's building a street around here for demo dinner 2 +const glm::vec3 START_LOCATION(0.485f * TREE_SCALE, 0.f, 0.5f * TREE_SCALE); const int IDLE_SIMULATE_MSECS = 16; // How often should call simulate and other stuff // in the idle loop? (60 FPS is default)