Simplified resource loading

This commit is contained in:
Silent 2017-04-12 00:47:27 +02:00
parent 6fa6ff2afe
commit 758186aa50

View file

@ -720,13 +720,10 @@ void DrawMoonWithPhases(int moonColor, float* screenPos, float sizeX, float size
else else
{ {
// Load from memory // Load from memory
HMODULE thisModule; HRSRC resource = FindResourceW(hDLLModule, MAKEINTRESOURCE(IDR_LUNAR64), RT_RCDATA);
GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, (LPCWSTR)DrawMoonWithPhases, &thisModule); void* pMoonMask = LockResource( LoadResource(hDLLModule, resource) );
HRSRC resource = FindResourceW(thisModule, MAKEINTRESOURCE(IDR_LUNAR64), RT_RCDATA); gpMoonMask = CPNGFile::ReadFromMemory(pMoonMask, SizeofResource(hDLLModule, resource));
void* pMoonMask = LockResource( LoadResource(thisModule, resource) );
gpMoonMask = CPNGFile::ReadFromMemory(pMoonMask, SizeofResource(thisModule, resource));
} }
} }
//D3DPERF_BeginEvent(D3DCOLOR_ARGB(0,0,0,0), L"render moon"); //D3DPERF_BeginEvent(D3DCOLOR_ARGB(0,0,0,0), L"render moon");
@ -1250,11 +1247,8 @@ bool ShaderAttach()
// CGame::InitialiseRenderWare // CGame::InitialiseRenderWare
if ( InitialiseRenderWare() ) if ( InitialiseRenderWare() )
{ {
HMODULE thisModule; HRSRC resource = FindResourceW(hDLLModule, MAKEINTRESOURCE(IDR_NVCSHADER), RT_RCDATA);
GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, (LPCWSTR)ShaderAttach, &thisModule); RwUInt32* shader = static_cast<RwUInt32*>(LockResource( LoadResource(hDLLModule, resource) ));
HRSRC resource = FindResourceW(thisModule, MAKEINTRESOURCE(IDR_NVCSHADER), RT_RCDATA);
RwUInt32* shader = static_cast<RwUInt32*>(LockResource( LoadResource(thisModule, resource) ));
RwD3D9CreateVertexShader(shader, reinterpret_cast<void**>(&pNVCShader)); RwD3D9CreateVertexShader(shader, reinterpret_cast<void**>(&pNVCShader));