empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved text readability + multiple messages shown at once

Browse source
This commit is contained in:
Souryo 2014-07-09 21:11:02 -04:00
parent e79dcf3303
commit 1ad66f714f
5 changed files with 61 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Core/Console.cpp
View file

@ -54,6 +54,7 @@ void Console::Initialize(wstring filename)
ResetComponents(false);
Console::SendNotification(ConsoleNotificationType::GameLoaded);
Console::DisplayMessage(wstring(L"Game loaded: ") + FolderUtilities::GetFilename(filename, false));
}
void Console::LoadROM(wstring filename)
@ -263,8 +264,6 @@ void Console::SaveState(wstring filename)
Console::SaveState(file);
Console::Resume();
file.close();
Console::DisplayMessage(L"State saved.");
}
}
@ -278,7 +277,6 @@ bool Console::LoadState(wstring filename)
Console::Resume();
file.close();
Console::DisplayMessage(L"State loaded.");
return true;
}
@ -295,6 +293,8 @@ void Console::SaveState(ostream &saveStream)
Instance->_mapper->SaveSnapshot(&saveStream);
Instance->_apu->SaveSnapshot(&saveStream);
Instance->_controlManager->SaveSnapshot(&saveStream);
Console::DisplayMessage(L"State saved.");
}
}
@ -307,7 +307,8 @@ void Console::LoadState(istream &loadStream)
Instance->_mapper->LoadSnapshot(&loadStream);
Instance->_apu->LoadSnapshot(&loadStream);
Instance->_controlManager->LoadSnapshot(&loadStream);
Console::DisplayMessage(L"State loaded.");
Console::SendNotification(ConsoleNotificationType::StateLoaded);
}
}

12
Core/GameClientConnection.cpp
View file

@ -33,6 +33,10 @@ void GameClientConnection::SendHandshake()
void GameClientConnection::ProcessMessage(NetMessage* message)
{
uint8_t port;
uint8_t state;
GameInformationMessage* gameInfo;
switch(message->Type) {
case MessageType::SaveState:
if(_gameLoaded) {
@ -51,8 +55,6 @@ void GameClientConnection::ProcessMessage(NetMessage* message)
break;
case MessageType::MovieData:
if(_gameLoaded) {
uint8_t port;
uint8_t state;
port = ((MovieDataMessage*)message)->PortNumber;
state = ((MovieDataMessage*)message)->InputState;
@ -60,9 +62,11 @@ void GameClientConnection::ProcessMessage(NetMessage* message)
}
break;
case MessageType::GameInformation:
GameInformationMessage* gameInfo;
gameInfo = (GameInformationMessage*)message;
Console::DisplayMessage(wstring(L"Connected as player ") + std::to_wstring(((GameInformationMessage*)message)->ControllerPort + 1) + L".");
if(gameInfo->ControllerPort != _controllerPort) {
_controllerPort = gameInfo->ControllerPort;
Console::DisplayMessage(wstring(L"Connected as player ") + std::to_wstring(_controllerPort + 1));
}
_virtualControllers.clear();
_gameLoaded = gameInfo->AttemptLoadGame();
break;

1
Core/GameClientConnection.h
View file

@ -10,6 +10,7 @@ private:
IControlDevice* _controlDevice;
uint8_t _lastInputSent = 0x00;
bool _gameLoaded = false;
uint8_t _controllerPort = 255;
private:
void SendHandshake();

75
GUI/Renderer.cpp
View file

@ -278,8 +278,39 @@ namespace NES
void Renderer::DisplayMessage(wstring text)
{
_displayMessage = text;
_displayTimestamp = timeGetTime() + 3000; //3 secs
_displayMessages.push_front(text);
_displayTimestamps.push_front(timeGetTime() + 4000); //4 secs
}
void Renderer::RemoveOldMessages()
{
uint32_t currentTime = timeGetTime();
while(!_displayTimestamps.empty()) {
if(_displayTimestamps.back() < currentTime) {
_displayMessages.pop_back();
_displayTimestamps.pop_back();
} else {
break;
}
}
}
void Renderer::DrawOutlinedString(wstring message, float x, float y, DirectX::FXMVECTOR color, float scale)
{
SpriteBatch* spritebatch = _spriteBatch.get();
const wchar_t* msg = message.c_str();
for(uint8_t offset = 3; offset > 0; offset--) {
_font->DrawString(spritebatch, msg, XMFLOAT2(x + offset, y + offset), Colors::Black, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, msg, XMFLOAT2(x - offset, y + offset), Colors::Black, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, msg, XMFLOAT2(x + offset, y - offset), Colors::Black, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, msg, XMFLOAT2(x - offset, y - offset), Colors::Black, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, msg, XMFLOAT2(x + offset, y), Colors::Black, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, msg, XMFLOAT2(x + offset, y), Colors::Black, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, msg, XMFLOAT2(x, y + offset), Colors::Black, 0.0f, XMFLOAT2(0, 0), scale);
_font->DrawString(spritebatch, msg, XMFLOAT2(x, y - offset), Colors::Black, 0.0f, XMFLOAT2(0, 0), scale);
}
_font->DrawString(spritebatch, msg, XMFLOAT2(x, y), color, 0.0f, XMFLOAT2(0, 0), scale);
}
void Renderer::DrawNESScreen()
@ -332,36 +363,12 @@ namespace NES
_spriteBatch->Draw(shaderResourceView, destRect); // , position, &sourceRect, Colors::White, 0.0f, position, 4.0f);
shaderResourceView->Release();
_font->DrawString(_spriteBatch.get(), L"PAUSED", XMFLOAT2((float)_hdScreenWidth / 2 - 142, (float)_hdScreenHeight / 2 - 77), Colors::Black, 0.0f, XMFLOAT2(0, 0), 2.0f);
_font->DrawString(_spriteBatch.get(), L"PAUSED", XMFLOAT2((float)_hdScreenWidth / 2 - 145, (float)_hdScreenHeight / 2 - 80), Colors::AntiqueWhite, 0.0f, XMFLOAT2(0, 0), 2.0f);
DrawOutlinedString(L"PAUSED", (float)_hdScreenWidth / 2 - 145, (float)_hdScreenHeight / 2 - 77, Colors::AntiqueWhite, 2.0f);
}
/*
HRESULT Renderer::CompileShader(wstring filename, LPCSTR szEntryPoint, LPCSTR szShaderModel, ID3DBlob** ppBlobOut)
{
DWORD dwShaderFlags = D3DCOMPILE_ENABLE_STRICTNESS;
#ifdef _DEBUG
dwShaderFlags |= D3DCOMPILE_DEBUG;
#endif
ID3DBlob* pErrorBlob = nullptr;
HRESULT hr = D3DCompileFromFile(filename.c_str(), nullptr, nullptr, szEntryPoint, szShaderModel, dwShaderFlags, 0, ppBlobOut, &pErrorBlob);
if(FAILED(hr) && pErrorBlob != nullptr) {
std::cout << (char*)pErrorBlob->GetBufferPointer();
}
if(pErrorBlob) {
pErrorBlob->Release();
}
return hr;
}*/
void Renderer::Render()
{
if(_displayTimestamp < timeGetTime()) {
_displayMessage.clear();
}
if(_frameChanged || CheckFlag(UIFlags::ShowPauseScreen) || !_displayMessage.empty()) {
if(_frameChanged || CheckFlag(UIFlags::ShowPauseScreen) || !_displayMessages.empty()) {
_frameChanged = false;
// Clear the back buffer
_pDeviceContext->ClearRenderTargetView(_pRenderTargetView, Colors::Black);
@ -383,13 +390,15 @@ namespace NES
//Draw FPS counter
if(CheckFlag(UIFlags::ShowFPS)) {
_font->DrawString(_spriteBatch.get(), (wstring(L"FPS: ") + std::to_wstring(Console::GetFPS())).c_str(), XMFLOAT2(256 * 4 - 149, 13), Colors::Black, 0.0f, XMFLOAT2(0, 0), 1.0f);
_font->DrawString(_spriteBatch.get(), (wstring(L"FPS: ") + std::to_wstring(Console::GetFPS())).c_str(), XMFLOAT2(256 * 4 - 150, 11), Colors::AntiqueWhite, 0.0f, XMFLOAT2(0, 0), 1.0f);
wstring fpsString = wstring(L"FPS: ") + std::to_wstring(Console::GetFPS());
DrawOutlinedString(fpsString, 256 * 4 - 149, 13, Colors::AntiqueWhite, 1.0f);
}
if(!_displayMessage.empty() && _displayTimestamp > timeGetTime()) {
_font->DrawString(_spriteBatch.get(), _displayMessage.c_str(), XMFLOAT2(12, 13), Colors::Black, 0.0f, XMFLOAT2(0, 0), 1.0f);
_font->DrawString(_spriteBatch.get(), _displayMessage.c_str(), XMFLOAT2(11, 11), Colors::AntiqueWhite, 0.0f, XMFLOAT2(0, 0), 1.0f);
RemoveOldMessages();
int counter = 0;
for(wstring message : _displayMessages) {
DrawOutlinedString(message, 11, 11 + (float)counter*50, Colors::AntiqueWhite, 1.0f);
counter++;
}
_spriteBatch->End();

7
GUI/Renderer.h
View file

@ -52,8 +52,8 @@ namespace NES {
uint32_t _flags = 0;
wstring _displayMessage = L"";
uint32_t _displayTimestamp = 0;
list<wstring> _displayMessages;
list<uint32_t> _displayTimestamps;
HRESULT InitDevice();
void CleanupDevice();
@ -64,6 +64,9 @@ namespace NES {
void DrawNESScreen();
void DrawPauseScreen();
void RemoveOldMessages();
void DrawOutlinedString(wstring message, float x, float y, DirectX::FXMVECTOR color, float scale);
//HRESULT CompileShader(wstring filename, LPCSTR szEntryPoint, LPCSTR szShaderModel, ID3DBlob** ppBlobOut);
public: