From a0072cd57bdd55911d59b666364009ef174d3150 Mon Sep 17 00:00:00 2001 From: Peter Slattery Date: Sun, 21 Jun 2020 21:26:13 -0700 Subject: [PATCH] removed foldhaus_debug_visuals.h Cleaned up assembly parsing. --- src/app/foldhaus_app.cpp | 13 ++-- src/app/foldhaus_debug_visuals.h | 126 ------------------------------- src/gs_libs/gs_string.h | 2 +- 3 files changed, 6 insertions(+), 135 deletions(-) delete mode 100644 src/app/foldhaus_debug_visuals.h diff --git a/src/app/foldhaus_app.cpp b/src/app/foldhaus_app.cpp index f6c4828..57ce966 100644 --- a/src/app/foldhaus_app.cpp +++ b/src/app/foldhaus_app.cpp @@ -181,7 +181,7 @@ INITIALIZE_APPLICATION(InitializeApplication) State->LedSystem = LedSystemInitialize(Context.PlatformMemory, 128); #if 1 - string SculpturePath = MakeStringLiteral("data/blumen_lumen_v2.fold"); + string SculpturePath = MakeStringLiteral("data/radialumia_v2.fold"); LoadAssembly(&State->Assemblies, &State->LedSystem, &State->Transient, Context, SculpturePath, State->GlobalLog); #endif @@ -213,9 +213,7 @@ INITIALIZE_APPLICATION(InitializeApplication) InitializePanelSystem(&State->PanelSystem); panel* Panel = TakeNewPanel(&State->PanelSystem); - SplitPanelVertically(Panel, .5f, &State->PanelSystem); - SetPanelDefinition(&Panel->Left->Panel, PanelType_ProfilerView, State); - SetPanelDefinition(&Panel->Right->Panel, PanelType_SculptureView, State); + SetPanelDefinition(Panel, PanelType_SculptureView, State); } internal void @@ -378,8 +376,6 @@ UPDATE_AND_RENDER(UpdateAndRender) assembly* Assembly = &State->Assemblies.Values[AssemblyIndex]; led_buffer* AssemblyLedBuffer = LedSystemGetBuffer(&State->LedSystem, Assembly->LedBufferIndex); - arena_snapshot ResetAssemblyMemorySnapshot = TakeSnapshotOfArena(&State->Transient); - for (u32 Layer = 0; Layer < CurrentBlocksMax; Layer++) { if (!CurrentBlocksFilled[Layer]) { continue; } @@ -463,11 +459,11 @@ UPDATE_AND_RENDER(UpdateAndRender) }break; } } - - ClearArenaToSnapshot(&State->Transient, ResetAssemblyMemorySnapshot); } } + // Skipped for performance at the moment +#if 0 s32 HeaderSize = State->NetworkProtocolHeaderSize; dmx_buffer_list* DMXBuffers = 0; for (u32 i = 0; i < State->Assemblies.Count; i++) @@ -504,6 +500,7 @@ UPDATE_AND_RENDER(UpdateAndRender) InvalidDefaultCase; } } +#endif PushRenderOrthographic(RenderBuffer, 0, 0, gs_Width(State->WindowBounds), gs_Height(State->WindowBounds)); PushRenderClearScreen(RenderBuffer); diff --git a/src/app/foldhaus_debug_visuals.h b/src/app/foldhaus_debug_visuals.h deleted file mode 100644 index 3158e78..0000000 --- a/src/app/foldhaus_debug_visuals.h +++ /dev/null @@ -1,126 +0,0 @@ -// -// File: foldhaus_debug_visuals.h -// Author: Peter Slattery -// Creation Date: 2020-01-01 -// -#ifndef FOLDHAUS_DEBUG_VISUALS_H - -internal void -DrawDebugInterface (render_command_buffer* RenderBuffer, r32 StartX, interface_config Interface, r32 WindowWidth, r32 WindowHeight, r32 DeltaTime, app_state* State, camera Camera, mouse_state Mouse, memory_arena* Transient) -{ - DEBUG_TRACK_SCOPE(DrawDebugInterface); - - v2 TopOfDebugView = v2{StartX, WindowHeight - (NewLineYOffset(*Interface.Font) + 5)}; - v2 TopOfScreenLinePos = TopOfDebugView; - - string DebugString = InitializeEmptyString(PushArray(Transient, char, 256), 256); - - if (GlobalDebugServices->Interface.ShowCameraMouse) - { - PushRenderQuad2D(RenderBuffer, - v2{TopOfDebugView.x, TopOfDebugView.y - 500}, - v2{TopOfDebugView.x + 700, TopOfDebugView.y}, - v4{0, 0, 0, .8f}); - } - - r32 FramesPerSecond = 1.0f / DeltaTime; - - PrintF(&DebugString, "Framerate: %.*f s %d fps | Modes: %d Memory Used: %d / %d | Commands: %d | HI SAM!!!! ", - 5, DeltaTime, - (u32)FramesPerSecond, - State->Modes.ActiveModesCount, - State->Modes.Arena.TotalUsed, - State->Modes.Arena.TotalSize, - State->CommandQueue.Used); - DrawString(RenderBuffer, DebugString, Interface.Font, TopOfScreenLinePos, WhiteV4); - - v2 ButtonDim = v2{200, (r32)NewLineYOffset(*Interface.Font) + 10}; - TopOfScreenLinePos.y -= ButtonDim.y + 10; - v2 ButtonPos = TopOfScreenLinePos; - button_result CameraBtn = EvaluateButton(RenderBuffer, ButtonPos, ButtonPos + ButtonDim, - MakeStringLiteral("Camera"), Interface, Mouse); - - ButtonPos.x += ButtonDim.x + 10; - button_result ScopeTimeBtn = EvaluateButton(RenderBuffer, ButtonPos, ButtonPos + ButtonDim, - MakeStringLiteral("Scope Time"), Interface, Mouse); - ButtonPos.x += ButtonDim.x + 10; - button_result RenderSculptureBtn = EvaluateButton(RenderBuffer, ButtonPos, ButtonPos + ButtonDim, - MakeStringLiteral("Visualize"), Interface, Mouse); - - ButtonPos.x += ButtonDim.x + 10; - - string SACNButtonString; - if (GlobalDebugServices->Interface.SendSACNData) - { - SACNButtonString = MakeStringLiteral("Turn SACN Off"); - } - else - { - SACNButtonString = MakeStringLiteral("Turn SACN On"); - } - - button_result SendSACNDataBtn = EvaluateButton(RenderBuffer, ButtonPos, ButtonPos + ButtonDim, - SACNButtonString, Interface, Mouse); - - TopOfScreenLinePos.y -= NewLineYOffset(*Interface.Font) + 10; - - if (CameraBtn.Pressed) - { - GlobalDebugServices->Interface.ShowCameraMouse = !GlobalDebugServices->Interface.ShowCameraMouse; - } - - if (ScopeTimeBtn.Pressed) - { - GlobalDebugServices->Interface.ShowTrackedScopes = !GlobalDebugServices->Interface.ShowTrackedScopes; - } - - if (RenderSculptureBtn.Pressed) - { - GlobalDebugServices->Interface.RenderSculpture = - !GlobalDebugServices->Interface.RenderSculpture; - } - - if (SendSACNDataBtn.Pressed) - { - GlobalDebugServices->Interface.SendSACNData = !GlobalDebugServices->Interface.SendSACNData; - } - - if (GlobalDebugServices->Interface.ShowCameraMouse) - { - PrintF(&DebugString, "Camera x=%.*f y=%.*f z=%.*f LookAt x=%.*f y=%.*f z=%.*f", - 3, Camera.Position.x, - 3, Camera.Position.y, - 3, Camera.Position.z, - 3, Camera.LookAt.x, - 3, Camera.LookAt.y, - 3, Camera.LookAt.z); - DrawString(RenderBuffer, DebugString, Interface.Font, TopOfScreenLinePos, v4{1.0f, 1.0f, 1.0f, 1.0f}); - TopOfScreenLinePos.y -= NewLineYOffset(*Interface.Font); - - b32 LeftButtonIsDown = (Mouse.LeftButtonState & KeyState_IsDown) > 0; - b32 LeftButtonWasDown = (Mouse.LeftButtonState & KeyState_WasDown) > 0; - - s32 MousePrecision = 0; - PrintF(&DebugString, "Mouse Pos: (%.*f, %.*f) Down: (%.*f, %.*f) State: %s %s", - MousePrecision, Mouse.Pos.x, - MousePrecision, Mouse.Pos.y, - MousePrecision, Mouse.DownPos.x, - MousePrecision, Mouse.DownPos.y, - (LeftButtonIsDown ? "Is Down" : "Is Not Down"), - (LeftButtonWasDown ? "Was Down" : "Was Not Down")); - DrawString(RenderBuffer, DebugString, Interface.Font, - TopOfScreenLinePos, WhiteV4); - TopOfScreenLinePos.y -= NewLineYOffset(*Interface.Font); - - PrintF(&DebugString, "Render Buffer: %d / %d (at this point)", - RenderBuffer->CommandMemoryUsed, - RenderBuffer->CommandMemorySize); - DrawString(RenderBuffer, DebugString, Interface.Font, - TopOfScreenLinePos, WhiteV4); - TopOfScreenLinePos.y -= NewLineYOffset(*Interface.Font); - } -} - - -#define FOLDHAUS_DEBUG_VISUALS_H -#endif // FOLDHAUS_DEBUG_VISUALS_H \ No newline at end of file diff --git a/src/gs_libs/gs_string.h b/src/gs_libs/gs_string.h index edd80c7..9b3f4c0 100644 --- a/src/gs_libs/gs_string.h +++ b/src/gs_libs/gs_string.h @@ -448,7 +448,7 @@ static bool IsNumeric (char C) } static bool IsNumericExtended (char C) { - return (IsNumeric(C) || (C == 'x') || (C == 'f') || (C == '.')); + return (IsNumeric(C) || (C == '-') || (C == 'x') || (C == 'f') || (C == '.')); } static bool IsAlphaNumeric (char C) {