From b37f0e1b8fce45acbf492e22890b5f421a7f3ee5 Mon Sep 17 00:00:00 2001 From: Ledda Date: Tue, 9 Jul 2024 22:38:21 +0100 Subject: [PATCH] update --- src/handmade.cpp | 8 +++++--- src/win32_handmade.cpp | 28 +--------------------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/src/handmade.cpp b/src/handmade.cpp index 1735688..f374ba8 100644 --- a/src/handmade.cpp +++ b/src/handmade.cpp @@ -12,10 +12,9 @@ void debug_printf(wchar_t* format, ...) { free(output); } -internal void outputSound(GameSoundOutputBuffer *soundBuffer) { +internal void outputSound(GameSoundOutputBuffer *soundBuffer, int toneHz) { local_persist real32 tSine; int16 toneVolume = 3000; - int toneHz = 440; int wavePeriod = soundBuffer->samplesPerSecond/toneHz; int16 *sampleOut = soundBuffer->samples; @@ -43,6 +42,9 @@ internal void renderWeirdGradient(GameOffscreenBuffer *buffer, int xOffset, int } internal void gameUpdateAndRender(GameOffscreenBuffer *videoBuf, GameInput *input, GameSoundOutputBuffer *soundBuf) { - outputSound(soundBuf); + local_persist int greenOffset = 0; + local_persist int blueOffset = 0; + local_persist int toneHz = 440; + outputSound(soundBuf, toneHz); renderWeirdGradient(videoBuf, input->xOffset, input->yOffset); } diff --git a/src/win32_handmade.cpp b/src/win32_handmade.cpp index 37b3391..29bd37a 100644 --- a/src/win32_handmade.cpp +++ b/src/win32_handmade.cpp @@ -3,21 +3,9 @@ #include #include +#include "win32_handmade.h" #include "handmade.cpp" -struct Win32OffscreenBuffer { - BITMAPINFO info; - void *memory; - int width; - int height; - int bytesPerPixel; -}; - -struct Win32WindowDimensions { - int width; - int height; -}; - global ATOM HH_CTRLW; global bool running; global Win32OffscreenBuffer globalBackBuffer; @@ -216,18 +204,6 @@ LRESULT mainWindowCallback( return result; } -struct Win32SoundOutput { - int samplesPerSecond; - int toneHz; - int wavePeriod; - int16 toneVolume; - uint32 runningSampleIndex; - int bytesPerSample; - int secondaryBufferSize; - real32 tSine; - int latencySampleCount; -}; - internal void win32ClearBuffer(Win32SoundOutput *soundOutput) { VOID *region1; DWORD region1Size; @@ -321,9 +297,7 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, PSTR commandLin // sound test Win32SoundOutput soundOutput = {}; soundOutput.samplesPerSecond = 48000; - soundOutput.toneHz = 440; // A above middle C soundOutput.wavePeriod = soundOutput.samplesPerSecond / soundOutput.toneHz; - soundOutput.toneVolume = 6000; soundOutput.runningSampleIndex = 0; soundOutput.bytesPerSample = sizeof(int16)*2; soundOutput.secondaryBufferSize = soundOutput.samplesPerSecond*soundOutput.bytesPerSample;