fixes #3054: move desktop test app keybindings output to startup log

mapbox · Nov 17, 2015 · ac10cc1 · ac10cc1
1 parent 85ab486
commit ac10cc1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/docs/DEVELOP_LINUX.md b/docs/DEVELOP_LINUX.md
@@ -49,10 +49,4 @@ The `zsh` will treat the * in this command as a glob, so you'll need to run
 
 ### Usage
 
-- Press `S` to cycle through bundled styles
-- Press `X` to reset the transform
-- Press `N` to reset north
-- Press `Tab` to toggle debug information
-- Press `C` to toggle symbol collision debug boxes
-- Press `Esc` to quit
-- Press `1` through `6` to add increasing numbers of point annotations for testing
+Keyboard shortcuts for testing functionality are logged to the console when the test app is started.
diff --git a/docs/DEVELOP_OSX.md b/docs/DEVELOP_OSX.md
@@ -20,10 +20,4 @@ Set up the access token by editing the scheme for the application target, then a
 
 ### Usage
 
-- Press `S` to cycle through bundled styles
-- Press `X` to reset the transform
-- Press `N` to reset north
-- Press `Tab` to toggle debug information
-- Press `C` to toggle symbol collision debug boxes
-- Press `Esc` to quit
-- Press `1` through `6` to add increasing numbers of point annotations for testing
+Keyboard shortcuts for testing functionality are logged to the console when the test app is started.
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
@@ -82,6 +82,31 @@ GLFWView::GLFWView(bool fullscreen_, bool benchmark_)
     pixelRatio = static_cast<float>(fbWidth) / width;
 
     glfwMakeContextCurrent(nullptr);
+
+    printf("\n");
+    printf("================================================================================\n");
+    printf("\n");
+    printf("- Press `S` to cycle through bundled styles\n");
+    printf("- Press `X` to reset the transform\n");
+    printf("- Press `N` to reset north\n");
+    printf("- Press `C` to toggle symbol collision debug boxes\n");
+    printf("- Press `R` to toggle any available `night` style class\n");
+    printf("\n");
+    printf("- Press `1` through `6` to add increasing numbers of point annotations for testing\n");
+    printf("- Press `7` through `0` to add increasing numbers of shape annotations for testing\n");
+    printf("\n");
+    printf("- Press `Q` to remove annotations\n");
+    printf("- Press `P` to add a random custom runtime imagery annotation\n");
+    printf("- Press `W` to pop the last-added annotation off\n");
+    printf("\n");
+    printf("- `Control` + mouse drag to rotate\n");
+    printf("- `Shift` + mouse drag to tilt\n");
+    printf("\n");
+    printf("- Press `Tab` to toggle debug information\n");
+    printf("- Press `Esc` to quit\n");
+    printf("\n");
+    printf("================================================================================\n");
+    printf("\n");
 }
 
 GLFWView::~GLFWView() {