ソースを参照

update

tags/day-25
Ledda 4ヶ月前
コミット
82ddd12239
6個のファイルの変更114行の追加65行の削除
  1. +1
    -1
      misc/bdebug.bat
  2. +1
    -1
      misc/brun.bat
  3. +1
    -1
      misc/build.bat
  4. +30
    -0
      src/handmade.cpp
  5. +44
    -0
      src/handmade.h
  6. +37
    -62
      src/win32_handmade.cpp

+ 1
- 1
misc/bdebug.bat ファイルの表示

@@ -1,2 +1,2 @@
call build || exit /b %errorlevel%
devenv .\build\main.exe
devenv .\build\handmade.exe

+ 1
- 1
misc/brun.bat ファイルの表示

@@ -1,2 +1,2 @@
call build || exit /b %errorlevel%
.\build\main.exe
.\build\handmade.exe

+ 1
- 1
misc/build.bat ファイルの表示

@@ -2,7 +2,7 @@
mkdir .\build
pushd .\build
pwd
cl -FC -Zi ..\src\main.cpp user32.lib Gdi32.lib
cl -FC -Zi -Fe:handmade.exe ..\src\win32_handmade.cpp user32.lib Gdi32.lib
popd
exit /b



+ 30
- 0
src/handmade.cpp ファイルの表示

@@ -0,0 +1,30 @@
#include "handmade.h"

void debug_printf(wchar_t* format, ...) {
int bufsize = wcslen(format)*10;
wchar_t *output = (wchar_t*)malloc(bufsize);
va_list list;
va_start(list, format);
vswprintf(output, bufsize, format, list);
OutputDebugStringW(output);
free(output);
}

internal void renderWeirdGradient(GameOffscreenBuffer *buffer, int xOffset, int yOffset) {
int bytesPerPixel = 4;
int pitch = buffer->width*bytesPerPixel;
uint8 *row = (uint8 *)buffer->memory;
for (int y = 0; y < buffer->height; y++) {
uint32 *pixel = (uint32*)row;
for (int x = 0; x < buffer->width; x++) {
uint8 blue = x + xOffset;
uint8 green = y + yOffset;
*pixel++ = (green << 8) | blue;
}
row += pitch;
}
}

internal void gameUpdateAndRender(GameOffscreenBuffer *buffer, GameInput *input) {
renderWeirdGradient(buffer, input->xOffset, input->yOffset);
}

+ 44
- 0
src/handmade.h ファイルの表示

@@ -0,0 +1,44 @@
#include <stdarg.h>
#include <stdint.h>
#include <stdio.h>
#include <math.h>
#include <windows.h>

#pragma once

#define internal static // for functions
#define local_persist static // for static variables in a scope
#define global static // for global variables

typedef uint8_t uint8;
typedef uint16_t uint16;
typedef uint32_t uint32;
typedef uint64_t uint64;

typedef int8_t int8;
typedef int16_t int16;
typedef int32_t int32;
typedef int64_t int64;

typedef float real32;
typedef double real64;

typedef int32_t bool32;

void debug_printf(wchar_t* format, ...);

// Game to platform layer services
struct GameInput {
int xOffset;
int yOffset;
};

struct GameOffscreenBuffer {
void *memory;
int width;
int height;
};

void gameUpdateAndRender();

// Platform to game services

src/main.cpp → src/win32_handmade.cpp ファイルの表示

@@ -1,30 +1,9 @@
#include <cstdarg>
#include <cstdio>
#include <cstdlib>
// Windows and Windows DLLs
#include <windows.h>
#include <stdint.h>
#include <Xinput.h>
#include <dsound.h>
#include <math.h>

#define internal static // for functions
#define local_persist static // for static variables in a scope
#define global static // for global variables

typedef uint8_t uint8;
typedef uint16_t uint16;
typedef uint32_t uint32;
typedef uint64_t uint64;

typedef int8_t int8;
typedef int16_t int16;
typedef int32_t int32;
typedef int64_t int64;

typedef float real32;
typedef double real64;

typedef int32_t bool32;
#include "handmade.cpp"

struct Win32OffscreenBuffer {
BITMAPINFO info;
@@ -46,16 +25,6 @@ global bool running;
global Win32OffscreenBuffer globalBackBuffer;
global LPDIRECTSOUNDBUFFER globalSecondaryBuffer;

void debug_printf(char* format, ...) {
int bufsize = strlen(format)*10;
char *output = (char*)malloc(bufsize);
va_list list;
va_start(list, format);
vsprintf_s(output, bufsize, format, list);
OutputDebugStringA(output);
free(output);
}

// XInputGetState
#define X_INPUT_GET_STATE(name) DWORD WINAPI name(DWORD dwUserIndex, XINPUT_STATE *pState)
typedef X_INPUT_GET_STATE(XInputGetStateFn);
@@ -72,21 +41,6 @@ global XInputSetStateFn *XInputSetStateDyn = XInputSetStateStub;

typedef HRESULT WINAPI DirectSoundCreateFn(LPCGUID pcGuidDevice, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter);

internal void renderWeirdGradient(Win32OffscreenBuffer *buffer, int xOffset, int yOffset) {
int bytesPerPixel = 4;
int pitch = buffer->width*bytesPerPixel;
uint8 *row = (uint8 *)buffer->memory;
for (int y = 0; y < buffer->height; y++) {
uint32 *pixel = (uint32*)row;
for (int x = 0; x < buffer->width; x++) {
uint8 blue = x + xOffset;
uint8 green = y + yOffset;
*pixel++ = (green << 8) | blue;
}
row += pitch;
}
}

internal void resizeDIBSection(Win32OffscreenBuffer *buffer, int width, int height) {
if (buffer->memory) {
VirtualFree(buffer->memory, NULL, MEM_RELEASE);
@@ -94,7 +48,6 @@ internal void resizeDIBSection(Win32OffscreenBuffer *buffer, int width, int heig

buffer->width = width;
buffer->height = height;
buffer->bytesPerPixel = 4;

buffer->info.bmiHeader.biSize = sizeof(buffer->info.bmiHeader);
buffer->info.bmiHeader.biWidth = buffer->width;
@@ -103,7 +56,7 @@ internal void resizeDIBSection(Win32OffscreenBuffer *buffer, int width, int heig
buffer->info.bmiHeader.biBitCount = 32;
buffer->info.bmiHeader.biCompression = BI_RGB;

int bitmapSize = buffer->width*buffer->height*buffer->bytesPerPixel;
int bitmapSize = buffer->width*buffer->height*4;
buffer->memory = VirtualAlloc(NULL, bitmapSize, MEM_COMMIT, PAGE_READWRITE);
}

@@ -300,17 +253,14 @@ internal void win32FillSoundBuffer(Win32SoundOutput *soundOutput, DWORD byteToLo
}
globalSecondaryBuffer->Unlock(region1, region1Size, region2, region2Size);
} else {
OutputDebugStringA("No lock!\n");
// no lock!
}
}

int APIENTRY WinMain(
HINSTANCE instance,
HINSTANCE prevInstance,
PSTR commandLine,
int commandShow
) {
win32LoadXInput();
int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, PSTR commandLine, int commandShow) {
LARGE_INTEGER performanceFrequencyResult;
QueryPerformanceFrequency(&performanceFrequencyResult);
int64 performanceFrequency = performanceFrequencyResult.QuadPart;

WNDCLASSA windowClass = {};
windowClass.style = CS_VREDRAW | CS_HREDRAW;
@@ -356,10 +306,15 @@ int APIENTRY WinMain(
soundOutput.bytesPerSample = sizeof(int16)*2;
soundOutput.secondaryBufferSize = soundOutput.samplesPerSecond*soundOutput.bytesPerSample;

win32LoadXInput();
win32InitSound(window, soundOutput.samplesPerSecond, soundOutput.secondaryBufferSize);

win32FillSoundBuffer(&soundOutput, 0, soundOutput.secondaryBufferSize);
globalSecondaryBuffer->Play(0, 0, DSBPLAY_LOOPING);

LARGE_INTEGER lastCounter;
QueryPerformanceCounter(&lastCounter);
int64 lastCycleCount = __rdtsc();
while (running) {
while (PeekMessageA(&message, NULL, NULL, NULL, PM_REMOVE)) {
if (message.message == WM_QUIT) {
@@ -402,10 +357,19 @@ int APIENTRY WinMain(
stickXNorm = stickX / 32767.0;
}

yOffset += stickY/5000;
xOffset -= stickX/5000;
float factor = leftShoulder ? 2.5 : 1.0;
yOffset += stickY/5000.0 * factor;
xOffset -= stickX/5000.0 * factor;

renderWeirdGradient(&globalBackBuffer, xOffset, yOffset);
GameOffscreenBuffer buffer = {};
buffer.memory = globalBackBuffer.memory;
buffer.width = globalBackBuffer.width;
buffer.height = globalBackBuffer.height;

GameInput input = {};
input.xOffset = xOffset;
input.yOffset = yOffset;
gameUpdateAndRender(&buffer, &input);

// Sound test
DWORD playCursor;
@@ -424,6 +388,18 @@ int APIENTRY WinMain(
}

win32DrawBufferInWindow(&globalBackBuffer, window);

LARGE_INTEGER endCounter;
QueryPerformanceCounter(&endCounter);
int64 endCycleCount = __rdtsc();
int32 cyclesElapsed = endCycleCount - lastCycleCount;
lastCycleCount = endCycleCount;

int64 counterElapsed = endCounter.QuadPart - lastCounter.QuadPart;
real32 msElapsed = (real32)(1000.0f*counterElapsed) / performanceFrequency;
real32 fps = (real32)(1000.0f*performanceFrequency/(real32)counterElapsed)/1000.0f;
debug_printf(L"%f ms, %f fps, %f Mcl, %fGHz\n", msElapsed, fps, cyclesElapsed / 1000000.0f, (cyclesElapsed/(msElapsed*1000))/1000000.0f);
lastCounter = endCounter;
}
} else {
// failed
@@ -434,4 +410,3 @@ int APIENTRY WinMain(
return(0);
}



読み込み中…
キャンセル
保存