commit d65e051a0769f69235a65cbb29ee38db5f71bc7c
author ocornut <omarcornut@gmail.com> Wed Feb 11 18:14:39 2015 +0000
committer ocornut <omarcornut@gmail.com> Wed Feb 11 18:14:39 2015 +0000
tree e31e92f3ee72769312a6ff494c065c9fee52260c
parent a5976646720edded1bfbeb557194db1a65758332

Minor formatting tweaks, comments

examples/directx11_example/main.cpp

diff --git a/examples/directx11_example/main.cpp b/examples/directx11_example/main.cpp
index ce6fbb2..c07aa9a 100644
--- a/examples/directx11_example/main.cpp
+++ b/examples/directx11_example/main.cpp
@@ -570,14 +570,14 @@
             if (ImGui::Button("Another Window")) show_another_window ^= 1;
 
             // Calculate and show frame rate
-            static float ms_per_frame[120] = { 0 };
-            static int ms_per_frame_idx = 0;
+            static int   ms_per_frame_idx = 0;
+            static float ms_per_frame[60] = { 0 };
             static float ms_per_frame_accum = 0.0f;
             ms_per_frame_accum -= ms_per_frame[ms_per_frame_idx];
             ms_per_frame[ms_per_frame_idx] = ImGui::GetIO().DeltaTime * 1000.0f;
             ms_per_frame_accum += ms_per_frame[ms_per_frame_idx];
-            ms_per_frame_idx = (ms_per_frame_idx + 1) % 120;
-            const float ms_per_frame_avg = ms_per_frame_accum / 120;
+            ms_per_frame_idx = (ms_per_frame_idx + 1) % 60;
+            const float ms_per_frame_avg = ms_per_frame_accum / 60;
             ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", ms_per_frame_avg, 1000.0f / ms_per_frame_avg);
         }
 

examples/directx9_example/main.cpp

diff --git a/examples/directx9_example/main.cpp b/examples/directx9_example/main.cpp
index 1c5e630..752e257 100644
--- a/examples/directx9_example/main.cpp
+++ b/examples/directx9_example/main.cpp
@@ -336,14 +336,14 @@
             if (ImGui::Button("Another Window")) show_another_window ^= 1;
 
             // Calculate and show frame rate
-            static float ms_per_frame[120] = { 0 };
-            static int ms_per_frame_idx = 0;
+            static int   ms_per_frame_idx = 0;
+            static float ms_per_frame[60] = { 0 };
             static float ms_per_frame_accum = 0.0f;
             ms_per_frame_accum -= ms_per_frame[ms_per_frame_idx];
             ms_per_frame[ms_per_frame_idx] = ImGui::GetIO().DeltaTime * 1000.0f;
             ms_per_frame_accum += ms_per_frame[ms_per_frame_idx];
-            ms_per_frame_idx = (ms_per_frame_idx + 1) % 120;
-            const float ms_per_frame_avg = ms_per_frame_accum / 120;
+            ms_per_frame_idx = (ms_per_frame_idx + 1) % 60;
+            const float ms_per_frame_avg = ms_per_frame_accum / 60;
             ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", ms_per_frame_avg, 1000.0f / ms_per_frame_avg);
         }
 

examples/opengl3_example/main.cpp

diff --git a/examples/opengl3_example/main.cpp b/examples/opengl3_example/main.cpp
index 8ee8c8c..a9a2716 100644
--- a/examples/opengl3_example/main.cpp
+++ b/examples/opengl3_example/main.cpp
@@ -348,14 +348,14 @@
             if (ImGui::Button("Another Window")) show_another_window ^= 1;
 
             // Calculate and show frame rate
-            static float ms_per_frame[120] = { 0 };
-            static int ms_per_frame_idx = 0;
+            static int   ms_per_frame_idx = 0;
+            static float ms_per_frame[60] = { 0 };
             static float ms_per_frame_accum = 0.0f;
             ms_per_frame_accum -= ms_per_frame[ms_per_frame_idx];
             ms_per_frame[ms_per_frame_idx] = ImGui::GetIO().DeltaTime * 1000.0f;
             ms_per_frame_accum += ms_per_frame[ms_per_frame_idx];
-            ms_per_frame_idx = (ms_per_frame_idx + 1) % 120;
-            const float ms_per_frame_avg = ms_per_frame_accum / 120;
+            ms_per_frame_idx = (ms_per_frame_idx + 1) % 60;
+            const float ms_per_frame_avg = ms_per_frame_accum / 60;
             ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", ms_per_frame_avg, 1000.0f / ms_per_frame_avg);
         }
 

examples/opengl_example/main.cpp

diff --git a/examples/opengl_example/main.cpp b/examples/opengl_example/main.cpp
index e589981..b69507e 100644
--- a/examples/opengl_example/main.cpp
+++ b/examples/opengl_example/main.cpp
@@ -257,14 +257,14 @@
             if (ImGui::Button("Another Window")) show_another_window ^= 1;
 
             // Calculate and show frame rate
-            static float ms_per_frame[120] = { 0 };
-            static int ms_per_frame_idx = 0;
+            static int   ms_per_frame_idx = 0;
+            static float ms_per_frame[60] = { 0 };
             static float ms_per_frame_accum = 0.0f;
             ms_per_frame_accum -= ms_per_frame[ms_per_frame_idx];
             ms_per_frame[ms_per_frame_idx] = ImGui::GetIO().DeltaTime * 1000.0f;
             ms_per_frame_accum += ms_per_frame[ms_per_frame_idx];
-            ms_per_frame_idx = (ms_per_frame_idx + 1) % 120;
-            const float ms_per_frame_avg = ms_per_frame_accum / 120;
+            ms_per_frame_idx = (ms_per_frame_idx + 1) % 60;
+            const float ms_per_frame_avg = ms_per_frame_accum / 60;
             ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", ms_per_frame_avg, 1000.0f / ms_per_frame_avg);
         }
 

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index f03b1ab..e12d261 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -956,6 +956,7 @@
     static void             RenderTextScrolledClipped(ImFont* font, float font_size, const char* text, ImVec2 pos_base, float width, float scroll_x);
 };
 
+// Data saved in imgui.ini file
 struct ImGuiIniData
 {
     char*   Name;
@@ -967,6 +968,7 @@
     ~ImGuiIniData() { if (Name) { ImGui::MemFree(Name); Name = NULL; } }
 };
 
+// Main state for ImGui
 struct ImGuiState
 {
     bool                    Initialized;