1.6.2

serge-rgb · May 29, 2019 · 225f638 · 225f638
1 parent 1702eaf
commit 225f638
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/Milton.iss b/Milton.iss
@@ -3,13 +3,13 @@
 
 [Setup]
 AppName=Milton
-AppVersion=1.6.0
+AppVersion=1.6.1
 DefaultDirName={pf}\Milton
 DefaultGroupName=Milton
 ;UninstallDisplayIcon={app}\Milton.exe
 Compression=lzma2
 SolidCompression=yes
-OutputBaseFilename=MiltonSetup_1.6.0_x64
+OutputBaseFilename=MiltonSetup_1.6.1_x64
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
 ChangesAssociations=yes

diff --git a/build.bat b/build.bat
@@ -25,7 +25,7 @@ pushd build
          copy ..\Milton.rc Milton.rc
          rc Milton.rc
 
-set compiler_flags=/Od /MTd /Zi %includeFlags% %warnFlags% /Femilton.exe /wd4217 /link ..\third_party\bin\%platform%\SDL2.lib OpenGL32.lib gdi32.lib shell32.lib comdlg32.lib ole32.lib oleAut32.lib winmm.lib advapi32.lib version.lib
+set compiler_flags=/O2 /MTd /Zi %includeFlags% %warnFlags% /Femilton.exe /wd4217 /link ..\third_party\bin\%platform%\SDL2.lib OpenGL32.lib gdi32.lib shell32.lib comdlg32.lib ole32.lib oleAut32.lib winmm.lib advapi32.lib version.lib
 
 if "%1"=="test" (
    cl ..\src\unity_tests.cc %compiler_flags /SUBSYSTEM:Console

diff --git a/src/bindings.cc b/src/bindings.cc
@@ -86,7 +86,7 @@ set_default_bindings(MiltonBindings* bs)
 
    binding_with_release(bs, Modifier_NONE, '`', Action_PEEK_OUT, ActionRelease_PEEK_OUT);
 
-#if MILTON_DEBUG
+#if MILTON_ENABLE_PROFILING
    binding(bs, Modifier_CTRL, '`', Action_TOGGLE_DEBUG_WINDOW);
 #endif
 }
@@ -252,7 +252,7 @@ binding_dispatch_action(BindableAction a, MiltonInput* input, Milton* milton, v2
       case ActionRelease_PEEK_OUT: {
           peek_out_trigger_stop(milton);
       } break;
-   #if MILTON_DEBUG
+   #if MILTON_ENABLE_PROFILING
       case Action_TOGGLE_DEBUG_WINDOW: {
          milton->viz_window_visible = !milton->viz_window_visible;
       } break;

diff --git a/src/milton.cc b/src/milton.cc
@@ -1002,6 +1002,7 @@ peek_out_duration_ms(Milton* milton)
 void
 peek_out_trigger_start(Milton* milton)
 {
+    milton_set_zoom_at_screen_center(milton);
     milton->peek_out->begin_pan = milton->view->pan_center;
 
     milton->peek_out->low_scale = milton_render_scale(milton);

diff --git a/src/milton_configuration.h b/src/milton_configuration.h
@@ -7,28 +7,28 @@
 #define MILTON_MINOR_VERSION 6
 #define MILTON_MICRO_VERSION 1
 
-#define MILTON_DEBUG 1
 
 #if !defined(MILTON_DEBUG)  // Might be defined by cmake
     #define MILTON_DEBUG 0
 #endif
 
-#define MILTON_ZOOM_DEBUG 0
 
-// Windows Options
+// Debug settings
+
+#define MILTON_ZOOM_DEBUG 0
+#define MILTON_ENABLE_PROFILING 0
+#define REDRAW_EVERY_FRAME 0
+#define GRAPHICS_DEBUG 0
+#define STROKE_DEBUG_VIZ 0
+#define DEBUG_MEMORY_USAGE 0
+// Windows Debug Options
 #if defined(_WIN32)
     // If 1, print to VS console. Debug messages always print to log file.
     #define WIN32_DEBUGGER_OUTPUT 1
 #endif
 
-#define MILTON_MULTITHREADED 1
 
-#define MILTON_ENABLE_PROFILING 1
-
-#define REDRAW_EVERY_FRAME 0
-#define GRAPHICS_DEBUG 0
-
-#define STROKE_DEBUG_VIZ 0
+#define MILTON_MULTITHREADED 1
 
 #define MILTON_HARDWARE_BRUSH_CURSOR 1
 
@@ -69,7 +69,6 @@
         #define USE_GL_3_2 1
     #endif
 
-#define DEBUG_MEMORY_USAGE 0
 
 // Spawn threads to save the canvas.
 #define MILTON_SAVE_ASYNC 1
@@ -95,7 +94,7 @@
     #define USE_GL_3_2 0
 
     #undef REDRAW_EVERY_FRAME
-    #define REDRAW_EVERY_FRAME 1
+    #define REDRAW_EVERY_FRAME 0
 
     #undef STROKE_DEBUG_VIZ
     #define STROKE_DEBUG_VIZ 0