vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve RT64 error handling on device creation, update RT64 blending mode with background for alpha elements, tone down brightness in CCM, tweak self lighting for cloud textures.

This commit is contained in:
Dario 2021-05-08 23:52:21 -03:00
parent 679ef2cd0d
commit 091379eea3
5 changed files with 76 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/rt64/rt64.h
View File

@ -252,6 +252,7 @@ typedef void (*SetMaterialInspectorPtr)(RT64_INSPECTOR* inspectorPtr, RT64_MATER
typedef void(*SetLightsInspectorPtr)(RT64_INSPECTOR* inspectorPtr, RT64_LIGHT* lights, int *lightCount, int maxLightCount);
typedef void(*PrintToInspectorPtr)(RT64_INSPECTOR* inspectorPtr, const char* message);
typedef void(*DestroyInspectorPtr)(RT64_INSPECTOR* inspectorPtr);
typedef const char *(*GetLastErrorPtr)();
// Stores all the function pointers used in the RT64 library.
typedef struct {
@ -281,6 +282,7 @@ typedef struct {
SetMaterialInspectorPtr SetMaterialInspector;
SetLightsInspectorPtr SetLightsInspector;
DestroyInspectorPtr DestroyInspector;
GetLastErrorPtr GetLastError;
} RT64_LIBRARY;
@ -318,6 +320,7 @@ inline RT64_LIBRARY RT64_LoadLibrary() {
lib.SetLightsInspector = (SetLightsInspectorPtr)(GetProcAddress(lib.handle, "RT64_SetLightsInspector"));
lib.PrintToInspector = (PrintToInspectorPtr)(GetProcAddress(lib.handle, "RT64_PrintToInspector"));
lib.DestroyInspector = (DestroyInspectorPtr)(GetProcAddress(lib.handle, "RT64_DestroyInspector"));
lib.GetLastError = (GetLastErrorPtr)(GetProcAddress(lib.handle, "RT64_GetLastError"));
}
else {
char errorMessage[256];

BIN
lib/rt64/rt64lib.dll
View File

Binary file not shown.

6
rt64/config/level_lights.json
View File

@ -1805,9 +1805,9 @@
"attenuationExponent": 0.0,
"attenuationRadius": 99999997952.0,
"diffuseColor": [
0.699999988079071,
0.6000000238418579,
0.5
0.6499999761581421,
0.550000011920929,
0.44999998807907104
],
"flickerIntensity": 0.0,
"groupBits": 1,

6
rt64/config/texture_mods.json
View File

@ -814,9 +814,9 @@
"ignoreNormalFactor": 1.0,
"lightGroupMaskBits": 0,
"selfLight": [
1.0,
1.0,
1.0
0.699999988079071,
0.699999988079071,
0.699999988079071
]
},
"name": "levels/totwc/3.ia16"

123
src/pc/gfx/gfx_rt64.cpp
View File

@ -103,10 +103,10 @@ struct {
// Library data.
RT64_LIBRARY lib;
RT64_DEVICE *device;
RT64_INSPECTOR *inspector;
RT64_SCENE *scene;
RT64_VIEW *view;
RT64_DEVICE *device = nullptr;
RT64_INSPECTOR *inspector = nullptr;
RT64_SCENE *scene = nullptr;
RT64_VIEW *view = nullptr;
RT64_MATERIAL defaultMaterial;
RT64_TEXTURE *blankTexture;
RT64_INSTANCE *instances[MAX_INSTANCES];
@ -716,60 +716,65 @@ LRESULT CALLBACK gfx_rt64_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, LPARA
onkeyup(wParam, lParam);
break;
case WM_PAINT: {
if (configWindow.settings_changed) {
gfx_rt64_apply_config();
configWindow.settings_changed = false;
}
LARGE_INTEGER ElapsedMicroseconds;
// Just draw the current frame while paused.
if (RT64.pauseMode) {
RT64.lib.DrawDevice(RT64.device, RT64.turboMode ? 0 : 1);
}
// Run one game iteration.
else if (RT64.run_one_game_iter != nullptr) {
LARGE_INTEGER StartTime, EndTime;
QueryPerformanceCounter(&StartTime);
RT64.run_one_game_iter();
QueryPerformanceCounter(&EndTime);
elapsed_time(StartTime, EndTime, RT64.Frequency, ElapsedMicroseconds);
if (RT64.inspector != nullptr) {
char message[64];
sprintf(message, "FRAMETIME: %.3f ms\n", ElapsedMicroseconds.QuadPart / 1000.0);
RT64.lib.PrintToInspector(RT64.inspector, message);
}
}
if (!RT64.turboMode) {
// Try to maintain the fixed framerate.
const int FixedFramerate = 30;
const int FramerateMicroseconds = 1000000 / FixedFramerate;
int cyclesWaited = 0;
// Sleep if possible to avoid busy waiting too much.
QueryPerformanceCounter(&RT64.EndingTime);
elapsed_time(RT64.StartingTime, RT64.EndingTime, RT64.Frequency, ElapsedMicroseconds);
int SleepMs = ((FramerateMicroseconds - ElapsedMicroseconds.QuadPart) - 500) / 1000;
if (SleepMs > 0) {
Sleep(SleepMs);
cyclesWaited++;
if (RT64.view != nullptr) {
if (configWindow.settings_changed) {
gfx_rt64_apply_config();
configWindow.settings_changed = false;
}
// Busy wait to reach the desired framerate.
do {
LARGE_INTEGER ElapsedMicroseconds;
// Just draw the current frame while paused.
if (RT64.pauseMode) {
RT64.lib.DrawDevice(RT64.device, RT64.turboMode ? 0 : 1);
}
// Run one game iteration.
else if (RT64.run_one_game_iter != nullptr) {
LARGE_INTEGER StartTime, EndTime;
QueryPerformanceCounter(&StartTime);
RT64.run_one_game_iter();
QueryPerformanceCounter(&EndTime);
elapsed_time(StartTime, EndTime, RT64.Frequency, ElapsedMicroseconds);
if (RT64.inspector != nullptr) {
char message[64];
sprintf(message, "FRAMETIME: %.3f ms\n", ElapsedMicroseconds.QuadPart / 1000.0);
RT64.lib.PrintToInspector(RT64.inspector, message);
}
}
if (!RT64.turboMode) {
// Try to maintain the fixed framerate.
const int FixedFramerate = 30;
const int FramerateMicroseconds = 1000000 / FixedFramerate;
int cyclesWaited = 0;
// Sleep if possible to avoid busy waiting too much.
QueryPerformanceCounter(&RT64.EndingTime);
elapsed_time(RT64.StartingTime, RT64.EndingTime, RT64.Frequency, ElapsedMicroseconds);
cyclesWaited++;
} while (ElapsedMicroseconds.QuadPart < FramerateMicroseconds);
int SleepMs = ((FramerateMicroseconds - ElapsedMicroseconds.QuadPart) - 500) / 1000;
if (SleepMs > 0) {
Sleep(SleepMs);
cyclesWaited++;
}
RT64.StartingTime = RT64.EndingTime;
// Busy wait to reach the desired framerate.
do {
QueryPerformanceCounter(&RT64.EndingTime);
elapsed_time(RT64.StartingTime, RT64.EndingTime, RT64.Frequency, ElapsedMicroseconds);
cyclesWaited++;
} while (ElapsedMicroseconds.QuadPart < FramerateMicroseconds);
// Drop the next frame if we didn't wait any cycles.
RT64.dropNextFrame = (cyclesWaited == 1);
RT64.StartingTime = RT64.EndingTime;
// Drop the next frame if we didn't wait any cycles.
RT64.dropNextFrame = (cyclesWaited == 1);
}
return 0;
}
else {
return DefWindowProc(hWnd, message, wParam, lParam);
}
break;
}
default:
return DefWindowProc(hWnd, message, wParam, lParam);
@ -778,17 +783,16 @@ LRESULT CALLBACK gfx_rt64_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, LPARA
return 0;
}
static void gfx_rt64_fatal(const char *window_title, const char *error_message) {
fprintf(stderr, "%s\n", error_message);
static void gfx_rt64_error_message(const char *window_title, const char *error_message) {
MessageBox(NULL, error_message, window_title, MB_OK | MB_ICONEXCLAMATION);
abort();
}
static void gfx_rt64_wapi_init(const char *window_title) {
// Setup library.
RT64.lib = RT64_LoadLibrary();
if (RT64.lib.handle == 0) {
gfx_rt64_fatal(window_title, "Failed to load library. Please make sure rt64.dll and dxil.dll are placed next to the game's executable and are up to date.");
gfx_rt64_error_message(window_title, "Failed to load library. Please make sure rt64.dll and dxil.dll are placed next to the game's executable and are up to date.");
abort();
}
// Register window class.
@ -815,7 +819,14 @@ static void gfx_rt64_wapi_init(const char *window_title) {
// Setup device.
RT64.device = RT64.lib.CreateDevice(RT64.hwnd);
if (RT64.device == nullptr) {
gfx_rt64_fatal(window_title, "Failed to create device. Please make sure you have D3D12 and DXR compatible hardware.");
gfx_rt64_error_message(window_title, RT64.lib.GetLastError());
gfx_rt64_error_message(window_title,
"Failed to initialize RT64.\n\n"
"Please make sure your GPU drivers are up to date and the Direct3D 12.1 feature level is supported.\n\n"
"Windows 10 version 2004 or newer is also required for this feature level to work properly.\n\n"
"If you're a mobile user, make sure that the high performance device is selected for this application on your system's settings.");
abort();
}
// Setup inspector.