wip - sample

Author: ikpil

src/Box2D.NET.Samples/Primitives/SampleEntry.cs

@@ -15,7 +15,7 @@ public class SampleEntry
     public readonly Func<SampleContext, Sample> CreateFcn;
     public readonly Func<B2Capacity> CapacityFcn;
 
-    public SampleEntry(string category, string name, Func<SampleContext, Sample> createFcn, Func<B2Capacity> capacityFcn = null)
+    public SampleEntry(string category, string name, Func<SampleContext, Sample> createFcn, Func<B2Capacity> capacityFcn)
     {
         Category = category;
         Name = name;

src/Box2D.NET.Samples/Samples/Sample.cs

@@ -61,6 +61,7 @@ public class Sample : IDisposable
     //
     private B2Profile m_totalProfile;
     private static bool s_showProfilePlots;
+    private static readonly bool[] s_profileRowOpen = new bool[22];
 
     //
     private bool m_didStep;
@@ -157,82 +158,89 @@ public virtual void UpdateGui()
     {
         float fontSize = ImGui.GetFontSize();
 
-        if (m_context.frameTime)
-        {
-            UpdateFrameTimeGui();
-        }
-
         if (m_context.drawProfile)
         {
             ImGui.SetNextWindowPos(new Vector2(fontSize, 8.0f * fontSize), ImGuiCond.FirstUseEver);
             ImGui.Begin("Profile (ms)", ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize);
 
-            B2Profile aveProfile = new B2Profile();
+            int count = (int)(m_profileWriteIndex - m_profileReadIndex);
+
+            const int rowCount = 22;
+            float[][] histories = new float[rowCount][];
+            for (int row = 0; row < rowCount; ++row)
+            {
+                histories[row] = new float[m_profileCapacity];
+            }
+
+            for (int i = 0; i < count; ++i)
+            {
+                int index = (int)((m_profileReadIndex + (ulong)i) & (m_profileCapacity - 1));
+                B2Profile profile = m_profiles[index];
+                for (int row = 0; row < rowCount; ++row)
+                {
+                    histories[row][i] = GetProfileValue(profile, row);
+                }
+            }
+
+            float[] avg = new float[rowCount];
             if (m_stepCount > 0)
             {
                 float scale = 1.0f / m_stepCount;
-                aveProfile.step = scale * m_totalProfile.step;
-                aveProfile.pairs = scale * m_totalProfile.pairs;
-                aveProfile.collide = scale * m_totalProfile.collide;
-                aveProfile.solve = scale * m_totalProfile.solve;
-                aveProfile.solverSetup = scale * m_totalProfile.solverSetup;
-                aveProfile.constraints = scale * m_totalProfile.constraints;
-                aveProfile.prepareConstraints = scale * m_totalProfile.prepareConstraints;
-                aveProfile.integrateVelocities = scale * m_totalProfile.integrateVelocities;
-                aveProfile.warmStart = scale * m_totalProfile.warmStart;
-                aveProfile.solveImpulses = scale * m_totalProfile.solveImpulses;
-                aveProfile.integratePositions = scale * m_totalProfile.integratePositions;
-                aveProfile.relaxImpulses = scale * m_totalProfile.relaxImpulses;
-                aveProfile.applyRestitution = scale * m_totalProfile.applyRestitution;
-                aveProfile.storeImpulses = scale * m_totalProfile.storeImpulses;
-                aveProfile.transforms = scale * m_totalProfile.transforms;
-                aveProfile.splitIslands = scale * m_totalProfile.splitIslands;
-                aveProfile.jointEvents = scale * m_totalProfile.jointEvents;
-                aveProfile.hitEvents = scale * m_totalProfile.hitEvents;
-                aveProfile.refit = scale * m_totalProfile.refit;
-                aveProfile.bullets = scale * m_totalProfile.bullets;
-                aveProfile.sleepIslands = scale * m_totalProfile.sleepIslands;
-                aveProfile.sensors = scale * m_totalProfile.sensors;
+                for (int row = 0; row < rowCount; ++row)
+                {
+                    avg[row] = scale * GetProfileValue(m_totalProfile, row);
+                }
             }
 
-            ref readonly B2Profile p = ref m_profiles[m_currentProfileIndex];
+            ref readonly B2Profile current = ref m_profiles[m_currentProfileIndex];
             string[] names =
             [
-                "step", "pairs", "collide", "solve", "solver setup", "constraints", "prepare constraints",
-                "integrate velocities", "warm start", "solve impulses", "integrate positions", "relax impulses",
-                "apply restitution", "store impulses", "split islands", "update transforms", "joint events",
-                "hit events", "refit BVH", "sleep islands", "bullets", "sensors"
+                "step", "pairs", "collide", "solve", "setup", "constraints", "prepare",
+                "velocities", "warm start", "bias", "positions", "relax",
+                "restitution", "store", "split islands", "transforms", "joint events",
+                "hit events", "refit BVH", "sleep", "bullets", "sensors"
             ];
             int[] indents = [0, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 0];
+            int[] parents = new int[rowCount];
+            bool[] hasChildren = new bool[rowCount];
+            int[] stack = new int[8];
+            int stackSize = 0;
+            for (int i = 0; i < rowCount; ++i)
+            {
+                while (stackSize > 0 && indents[stack[stackSize - 1]] >= indents[i])
+                {
+                    stackSize -= 1;
+                }
+
+                parents[i] = stackSize > 0 ? stack[stackSize - 1] : -1;
+                stack[stackSize] = i;
+                stackSize += 1;
+
+                if (parents[i] >= 0)
+                {
+                    hasChildren[parents[i]] = true;
+                }
+            }
+
+            Vector4 colorStep = new Vector4(102.0f / 255.0f, 153.0f / 255.0f, 1.0f, 1.0f);
+            Vector4 colorCollide = new Vector4(1.0f, 140.0f / 255.0f, 51.0f / 255.0f, 1.0f);
+            Vector4 colorSolve = new Vector4(102.0f / 255.0f, 204.0f / 255.0f, 102.0f / 255.0f, 1.0f);
+            Vector4 colorDefault = new Vector4(220.0f / 255.0f, 220.0f / 255.0f, 220.0f / 255.0f, 1.0f);
+
             Vector4[] colors =
             [
-                new Vector4(0.85f, 0.85f, 0.85f, 1.0f), new Vector4(0.75f, 0.75f, 0.75f, 1.0f),
-                new Vector4(0.95f, 0.65f, 0.20f, 1.0f), new Vector4(0.30f, 0.85f, 0.45f, 1.0f),
-                new Vector4(0.55f, 0.75f, 1.0f, 1.0f), new Vector4(0.35f, 0.95f, 0.65f, 1.0f),
-                new Vector4(0.35f, 0.75f, 0.95f, 1.0f), new Vector4(0.90f, 0.50f, 0.95f, 1.0f),
-                new Vector4(0.95f, 0.85f, 0.35f, 1.0f), new Vector4(0.95f, 0.45f, 0.45f, 1.0f),
-                new Vector4(0.45f, 0.95f, 0.90f, 1.0f), new Vector4(0.75f, 0.95f, 0.45f, 1.0f),
-                new Vector4(0.95f, 0.70f, 0.45f, 1.0f), new Vector4(0.70f, 0.70f, 1.0f, 1.0f),
-                new Vector4(0.80f, 0.80f, 0.55f, 1.0f), new Vector4(0.45f, 0.95f, 0.55f, 1.0f),
-                new Vector4(0.95f, 0.55f, 0.75f, 1.0f), new Vector4(0.95f, 0.35f, 0.35f, 1.0f),
-                new Vector4(0.55f, 0.85f, 0.95f, 1.0f), new Vector4(0.65f, 0.85f, 0.55f, 1.0f),
-                new Vector4(0.85f, 0.65f, 0.95f, 1.0f), new Vector4(0.70f, 0.90f, 0.90f, 1.0f)
+                colorStep, colorDefault, colorCollide, colorSolve, colorDefault, colorDefault,
+                colorDefault, colorDefault, colorDefault, colorDefault, colorDefault, colorDefault,
+                colorDefault, colorDefault, colorDefault, colorDefault, colorDefault, colorDefault,
+                colorDefault, colorDefault, colorDefault, colorDefault
             ];
             float[] now =
             [
-                p.step, p.pairs, p.collide, p.solve, p.solverSetup, p.constraints, p.prepareConstraints,
-                p.integrateVelocities, p.warmStart, p.solveImpulses, p.integratePositions, p.relaxImpulses,
-                p.applyRestitution, p.storeImpulses, p.splitIslands, p.transforms, p.jointEvents,
-                p.hitEvents, p.refit, p.sleepIslands, p.bullets, p.sensors
-            ];
-            float[] avg =
-            [
-                aveProfile.step, aveProfile.pairs, aveProfile.collide, aveProfile.solve, aveProfile.solverSetup,
-                aveProfile.constraints, aveProfile.prepareConstraints, aveProfile.integrateVelocities,
-                aveProfile.warmStart, aveProfile.solveImpulses, aveProfile.integratePositions,
-                aveProfile.relaxImpulses, aveProfile.applyRestitution, aveProfile.storeImpulses,
-                aveProfile.splitIslands, aveProfile.transforms, aveProfile.jointEvents, aveProfile.hitEvents,
-                aveProfile.refit, aveProfile.sleepIslands, aveProfile.bullets, aveProfile.sensors
+                current.step, current.pairs, current.collide, current.solve, current.solverSetup,
+                current.constraints, current.prepareConstraints, current.integrateVelocities, current.warmStart,
+                current.solveImpulses, current.integratePositions, current.relaxImpulses, current.applyRestitution,
+                current.storeImpulses, current.splitIslands, current.transforms, current.jointEvents,
+                current.hitEvents, current.refit, current.sleepIslands, current.bullets, current.sensors
             ];
 
             if (ImGui.Button("Reset"))
@@ -247,28 +255,41 @@ public virtual void UpdateGui()
             int columnCount = s_showProfilePlots ? 6 : 5;
             if (ImGui.BeginTable("profile", columnCount, tableFlags))
             {
-                ImGui.TableSetupColumn("section", ImGuiTableColumnFlags.WidthFixed, 10.0f * fontSize);
-                ImGui.TableSetupColumn("now", ImGuiTableColumnFlags.WidthFixed, 4.0f * fontSize);
-                ImGui.TableSetupColumn("avg", ImGuiTableColumnFlags.WidthFixed, 4.0f * fontSize);
-                ImGui.TableSetupColumn("max", ImGuiTableColumnFlags.WidthFixed, 4.0f * fontSize);
+                ImGui.TableSetupColumn("section", ImGuiTableColumnFlags.WidthFixed, 8.0f * fontSize);
+                ImGui.TableSetupColumn("now", ImGuiTableColumnFlags.WidthFixed, 3.0f * fontSize);
+                ImGui.TableSetupColumn("avg", ImGuiTableColumnFlags.WidthFixed, 3.0f * fontSize);
+                ImGui.TableSetupColumn("max", ImGuiTableColumnFlags.WidthFixed, 3.0f * fontSize);
                 ImGui.TableSetupColumn("% step", ImGuiTableColumnFlags.WidthFixed, 8.0f * fontSize);
                 if (s_showProfilePlots)
                 {
                     ImGui.TableSetupColumn("history", ImGuiTableColumnFlags.WidthFixed, 16.0f * fontSize);
                 }
                 ImGui.TableHeadersRow();
 
-                int count = (int)(m_profileWriteIndex - m_profileReadIndex);
-                float stepNow = b2MaxFloat(p.step, 0.001f);
-                float[] history = new float[m_profileCapacity];
+                float rowHeight = 1.5f * fontSize;
+                float stepNow = b2MaxFloat(current.step, 0.001f);
 
-                for (int row = 0; row < names.Length; ++row)
+                for (int row = 0; row < rowCount; ++row)
                 {
+                    bool visible = true;
+                    for (int parent = parents[row]; parent >= 0; parent = parents[parent])
+                    {
+                        if (s_profileRowOpen[parent] == false)
+                        {
+                            visible = false;
+                            break;
+                        }
+                    }
+
+                    if (visible == false)
+                    {
+                        continue;
+                    }
+
+                    float[] history = histories[row];
                     float rollingMax = 0.0f;
                     for (int i = 0; i < count; ++i)
                     {
-                        int index = (int)((m_profileReadIndex + (ulong)i) & (m_profileCapacity - 1));
-                        history[i] = GetProfileValue(m_profiles[index], row);
                         rollingMax = b2MaxFloat(rollingMax, history[i]);
                     }
 
@@ -278,9 +299,23 @@ public virtual void UpdateGui()
                     {
                         ImGui.Indent(indents[row] * fontSize);
                     }
-                    ImGui.PushStyleColor(ImGuiCol.Text, colors[row]);
-                    ImGui.TextUnformatted(names[row]);
-                    ImGui.PopStyleColor();
+                    if (hasChildren[row])
+                    {
+                        ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags.OpenOnArrow | ImGuiTreeNodeFlags.OpenOnDoubleClick |
+                                                   ImGuiTreeNodeFlags.NoTreePushOnOpen;
+                        ImGui.PushStyleColor(ImGuiCol.Text, colors[row]);
+                        s_profileRowOpen[row] = ImGui.TreeNodeEx(names[row], flags);
+                        ImGui.PopStyleColor();
+                    }
+                    else
+                    {
+                        float leafIndent = ImGui.GetTreeNodeToLabelSpacing();
+                        ImGui.Indent(leafIndent);
+                        ImGui.PushStyleColor(ImGuiCol.Text, colors[row]);
+                        ImGui.TextUnformatted(names[row]);
+                        ImGui.PopStyleColor();
+                        ImGui.Unindent(leafIndent);
+                    }
                     if (indents[row] > 0)
                     {
                         ImGui.Unindent(indents[row] * fontSize);
@@ -305,7 +340,7 @@ public virtual void UpdateGui()
                         if (count > 1)
                         {
                             ImGui.PushStyleColor(ImGuiCol.PlotLines, colors[row]);
-                            ImGui.PlotLines($"##h{row}", ref history[0], count, 0, null, 0.0f, rollingMax * 1.05f + 0.001f, new Vector2(-float.Epsilon, 1.5f * fontSize));
+                            ImGui.PlotLines($"##h{row}", ref history[0], count, 0, null, 0.0f, rollingMax * 1.05f + 0.001f, new Vector2(-float.Epsilon, rowHeight));
                             ImGui.PopStyleColor();
                         }
                     }
@@ -399,6 +434,11 @@ public virtual void UpdateGui()
 
             ImGui.End();
         }
+
+        if (m_context.frameTime)
+        {
+            UpdateFrameTimeGui(fontSize);
+        }
     }
 
     private static float GetProfileValue(in B2Profile profile, int row)
@@ -437,16 +477,16 @@ private static Vector4 HexToColor(B2HexColor color)
         return new Vector4(((hex >> 16) & 0xFF) / 255.0f, ((hex >> 8) & 0xFF) / 255.0f, (hex & 0xFF) / 255.0f, 1.0f);
     }
 
-    private void UpdateFrameTimeGui()
+    private void UpdateFrameTimeGui(float fontSize)
     {
-        const float frameTimeHeight = 400.0f;
-        const float frameTimeWidth = 800.0f;
+        float frameTimeHeight = 30.0f * fontSize;
+        float frameTimeWidth = 50.0f * fontSize;
 
-        ImGui.SetNextWindowPos(new Vector2(30.0f, 30.0f), ImGuiCond.FirstUseEver);
+        ImGui.SetNextWindowPos(new Vector2(3.0f * fontSize, 3.0f * fontSize), ImGuiCond.FirstUseEver);
         ImGui.SetNextWindowSize(new Vector2(frameTimeWidth, frameTimeHeight), ImGuiCond.FirstUseEver);
 
         ImGui.Begin("Frame Time", ref m_context.frameTime, ImGuiWindowFlags.NoCollapse);
-        ImGui.PushItemWidth(ImGui.GetWindowWidth() - 20.0f);
+        ImGui.PushItemWidth(ImGui.GetWindowWidth() - 2.0f * fontSize);
 
         int count = (int)(m_profileWriteIndex - m_profileReadIndex);
         float maxValue = 0.0f;
@@ -458,7 +498,7 @@ private void UpdateFrameTimeGui()
         }
 
         // This is the pixel size, not the range.
-        Vector2 plotSize = new Vector2(-1.0f, 22.0f * ImGui.GetTextLineHeight());
+        Vector2 plotSize = new Vector2(-1.0f, 22.0f * fontSize);
         DrawProfilePlot("Profile", count, maxValue, plotSize);
 
         ImGui.PopItemWidth();

src/Box2D.NET.Samples/Samples/SampleFactory.cs

@@ -29,7 +29,7 @@ private SampleFactory()
     public int RegisterSample(string category, string name, Func<SampleContext, Sample> fcn)
     {
         int index = _sampleEntries.Count;
-        var entry = new SampleEntry(category, name, fcn);
+        var entry = new SampleEntry(category, name, fcn, null);
         _sampleEntries.Add(entry);
         return index;
     }