Compare commits

..

1 Commits

Author SHA1 Message Date
151873afb1 main: setforegroundwindow 2026-01-13 16:18:10 -06:00
3 changed files with 25 additions and 28 deletions

View File

@ -2,13 +2,10 @@ BUILD_TYPE ?= debug
ifeq ($(BUILD_TYPE),debug) ifeq ($(BUILD_TYPE),debug)
OPT = -g -Og OPT = -g -Og
CFLAGS += -D_DEBUG
LDFLAGS += -mconsole
LDOPT = LDOPT =
else else
OPT = -O2 OPT = -O2
LDOPT = -flto LDOPT = -flto
LDFLAGS += -mwindows
endif endif
PREFIX = i686-w64-mingw32- PREFIX = i686-w64-mingw32-
@ -21,8 +18,8 @@ CFLAGS += -march=core2
CFLAGS += -Wall -Werror -Wfatal-errors CFLAGS += -Wall -Werror -Wfatal-errors
CFLAGS += -Wno-unused-but-set-variable CFLAGS += -Wno-unused-but-set-variable
CFLAGS += -Wno-unknown-pragmas CFLAGS += -Wno-unknown-pragmas
CFLAGS += -I./include
CFLAGS += -municode CFLAGS += -municode
CFLAGS += -I./include
LDFLAGS += -municode LDFLAGS += -municode
LIBS += -ld3d10 LIBS += -ld3d10
@ -65,14 +62,3 @@ OBJS = \
$(BUILD_TYPE)/d3d10.exe: $(OBJS) $(BUILD_TYPE)/d3d10.exe: $(OBJS)
@mkdir -p $(@D) @mkdir -p $(@D)
$(CXX) $(LDFLAGS) $(LDOPT) -o $@ $(OBJS) $(LIBS) $(CXX) $(LDFLAGS) $(LDOPT) -o $@ $(OBJS) $(LIBS)
.SUFFIXES:
.INTERMEDIATE:
.SECONDARY:
.PHONY: all clean
%: RCS/%,v
%: RCS/%
%: %,v
%: s.%
%: SCCS/s.%

View File

@ -60,8 +60,13 @@ ID3D10EffectShaderResourceVariable * g_pDiffuseAVariableBloom = NULL;
ID3D10EffectVectorVariable * g_pInvScreenSizeVariableBloom = NULL; ID3D10EffectVectorVariable * g_pInvScreenSizeVariableBloom = NULL;
ID3D10EffectVectorVariable * g_pDirVariableBloom = NULL; ID3D10EffectVectorVariable * g_pDirVariableBloom = NULL;
ID3D10EffectScalarVariable * g_pExposureVariableBloom = NULL; ID3D10EffectScalarVariable * g_pExposureVariableBloom = NULL;
#ifdef _DEBUG
int g_bloomPasses = 0;
float g_exposure = 3.7f;
#else
int g_bloomPasses = 4; int g_bloomPasses = 4;
float g_exposure = 3.4f; float g_exposure = 3.4f;
#endif
typedef XMFLOAT2 BloomVertex; typedef XMFLOAT2 BloomVertex;
@ -225,6 +230,8 @@ HRESULT InitWindow(HINSTANCE hInstance, int nCmdShow)
ShowWindow(g_hWnd, nCmdShow); ShowWindow(g_hWnd, nCmdShow);
SetForegroundWindow(g_hWnd);
return S_OK; return S_OK;
} }
@ -903,7 +910,11 @@ HRESULT InitDirect3DDevice()
D3D10_RASTERIZER_DESC RSDesc; D3D10_RASTERIZER_DESC RSDesc;
RSDesc.FillMode = D3D10_FILL_SOLID; RSDesc.FillMode = D3D10_FILL_SOLID;
#ifdef _DEBUG
RSDesc.CullMode = D3D10_CULL_BACK; RSDesc.CullMode = D3D10_CULL_BACK;
#else
RSDesc.CullMode = D3D10_CULL_NONE;
#endif
RSDesc.FrontCounterClockwise = FALSE; RSDesc.FrontCounterClockwise = FALSE;
RSDesc.DepthBias = 0; RSDesc.DepthBias = 0;
RSDesc.SlopeScaledDepthBias = 0.0f; RSDesc.SlopeScaledDepthBias = 0.0f;
@ -1575,11 +1586,16 @@ void RenderVolumeMesh()
void Render() void Render()
{ {
static float t = 0.0f;
#ifdef _DEBUG
t += XM_PI * 0.0125f * 0.5f;
#else
static DWORD dwTimeStart = 0; static DWORD dwTimeStart = 0;
DWORD dwTimeCur = GetTickCount(); DWORD dwTimeCur = GetTickCount();
if (dwTimeStart == 0) if (dwTimeStart == 0)
dwTimeStart = dwTimeCur; dwTimeStart = dwTimeCur;
float t = (dwTimeCur - dwTimeStart) / 1000.0f; t = (dwTimeCur - dwTimeStart) / 1000.0f;
#endif
Update(t); Update(t);

View File

@ -8,7 +8,7 @@ void print(LPCSTR fmt, ...)
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
char buf[512]; char buf[512];
STRSAFE_LPSTR end = NULL; STRSAFE_LPSTR end;
StringCbVPrintfExA(buf, StringCbVPrintfExA(buf,
(sizeof (buf)), (sizeof (buf)),
@ -19,11 +19,11 @@ void print(LPCSTR fmt, ...)
args); args);
va_end(args); va_end(args);
#ifdef _DEBUG #ifdef _DEBUG
//OutputDebugStringA(buf); OutputDebugStringA(buf);
size_t length = end - &buf[0];
HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
WriteConsoleA(hOutput, buf, (DWORD)length, NULL, NULL);
#endif #endif
//size_t length = end - &buf[0];
//HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
//WriteConsoleA(hOutput, buf, (DWORD)length, NULL, NULL);
} }
void printW(LPCWSTR fmt, ...) void printW(LPCWSTR fmt, ...)
@ -31,20 +31,15 @@ void printW(LPCWSTR fmt, ...)
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
WCHAR buf[512]; WCHAR buf[512];
STRSAFE_LPWSTR end = NULL;
StringCbVPrintfExW(buf, StringCbVPrintfExW(buf,
(sizeof (buf)), (sizeof (buf)),
&end, NULL,
NULL, NULL,
STRSAFE_NULL_ON_FAILURE, STRSAFE_NULL_ON_FAILURE,
fmt, fmt,
args); args);
va_end(args); va_end(args);
#ifdef _DEBUG #ifdef _DEBUG
//OutputDebugStringW(buf); OutputDebugStringW(buf);
size_t length = end - &buf[0];
HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
WriteConsoleW(hOutput, buf, (DWORD)length, NULL, NULL);
#endif #endif
} }