diff --git a/Core/EmulationSettings.cpp b/Core/EmulationSettings.cpp index 00f81f81..11300d33 100644 --- a/Core/EmulationSettings.cpp +++ b/Core/EmulationSettings.cpp @@ -2,10 +2,10 @@ #include "EmulationSettings.h" #include "VsControlManager.h" -//Version 0.6.1 +//Version 0.7.0 uint16_t EmulationSettings::_versionMajor = 0; -uint8_t EmulationSettings::_versionMinor = 6; -uint8_t EmulationSettings::_versionRevision = 1; +uint8_t EmulationSettings::_versionMinor = 7; +uint8_t EmulationSettings::_versionRevision = 0; Language EmulationSettings::_displayLanguage = Language::English; diff --git a/GUI.NET/Config/Configuration.cs b/GUI.NET/Config/Configuration.cs index f743ceb9..8c0440f6 100644 --- a/GUI.NET/Config/Configuration.cs +++ b/GUI.NET/Config/Configuration.cs @@ -13,7 +13,7 @@ namespace Mesen.GUI.Config private const int MaxRecentFiles = 10; private bool _needToSave = false; - public string MesenVersion = "0.6.1"; + public string MesenVersion = "0.7.0"; public PreferenceInfo PreferenceInfo; public AudioInfo AudioInfo; public VideoInfo VideoInfo; diff --git a/GUI.NET/Dependencies/resources.es.xml b/GUI.NET/Dependencies/resources.es.xml index 8ece2bca..796edfc5 100644 --- a/GUI.NET/Dependencies/resources.es.xml +++ b/GUI.NET/Dependencies/resources.es.xml @@ -450,7 +450,7 @@ © 2016 M. Bibaud (aka Sour) Sitio web: www.mesen.ca - Versión: 0.6.1 (Beta) + Versión: 0.7.0 (Beta) Si deseas colaborar con Mesen, por favor considera hacer una donación. ¡Gracias por tu colaboración! &OK diff --git a/GUI.NET/Dependencies/resources.fr.xml b/GUI.NET/Dependencies/resources.fr.xml index 541c9f47..c5be65b8 100644 --- a/GUI.NET/Dependencies/resources.fr.xml +++ b/GUI.NET/Dependencies/resources.fr.xml @@ -463,7 +463,7 @@ © 2016 M. Bibaud (aka Sour) Site web: www.mesen.ca - Version: 0.6.1 (Beta) + Version: 0.7.0 (Beta) Si vous voulez supporter le développement de Mesen, vous pouvez faire une donation. Merci de votre support! &OK diff --git a/GUI.NET/Dependencies/resources.ja.xml b/GUI.NET/Dependencies/resources.ja.xml index 2f2ab8c6..af390c65 100644 --- a/GUI.NET/Dependencies/resources.ja.xml +++ b/GUI.NET/Dependencies/resources.ja.xml @@ -450,7 +450,7 @@ © 2016 M. Bibaud (aka Sour) サイト: www.mesen.ca - バージョン: 0.6.1 (ベータ版) + バージョン: 0.7.0 (ベータ版) 応援ありがとうございます！ &OK diff --git a/GUI.NET/Dependencies/resources.pt.xml b/GUI.NET/Dependencies/resources.pt.xml index 73554258..fa2e1395 100644 --- a/GUI.NET/Dependencies/resources.pt.xml +++ b/GUI.NET/Dependencies/resources.pt.xml @@ -450,7 +450,7 @@ © 2016 M. Bibaud (aka Sour) Site: www.mesen.ca - Versão: 0.6.1 (Beta) + Versão: 0.7.0 (Beta) Caso queira apoiar Mesen, por favor considere fazer uma doação ao projeto. Obrigado pelo seu apoio! &OK diff --git a/GUI.NET/Dependencies/resources.ru.xml b/GUI.NET/Dependencies/resources.ru.xml index 3c44ed58..32f4aeeb 100644 --- a/GUI.NET/Dependencies/resources.ru.xml +++ b/GUI.NET/Dependencies/resources.ru.xml @@ -454,7 +454,7 @@ © 2016 M. Bibaud (aka Sour) Сайт: www.mesen.ca - Версия: 0.6.1 (Beta) + Версия: 0.7.0 (Beta) If you want to support Mesen, please consider donating. Thank you for your support! &OK diff --git a/GUI.NET/Dependencies/resources.uk.xml b/GUI.NET/Dependencies/resources.uk.xml index 0d70c5de..6e8b6741 100644 --- a/GUI.NET/Dependencies/resources.uk.xml +++ b/GUI.NET/Dependencies/resources.uk.xml @@ -453,7 +453,7 @@ © 2016 M. Bibaud (aka Sour) Сайт: www.mesen.ca - Версiя: 0.6.1 (Beta) + Версiя: 0.7.0 (Beta) If you want to support Mesen, please consider donating. Thank you for your support! &OK diff --git a/GUI.NET/Forms/frmAbout.Designer.cs b/GUI.NET/Forms/frmAbout.Designer.cs index 88e4b429..121f86c7 100644 --- a/GUI.NET/Forms/frmAbout.Designer.cs +++ b/GUI.NET/Forms/frmAbout.Designer.cs @@ -152,7 +152,7 @@ this.labelVersion.Name = "labelVersion"; this.labelVersion.Size = new System.Drawing.Size(146, 17); this.labelVersion.TabIndex = 0; - this.labelVersion.Text = "Version: 0.6.1 (Beta)"; + this.labelVersion.Text = "Version: 0.7.0 (Beta)"; this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // okButton diff --git a/GUI.NET/Properties/AssemblyInfo.cs b/GUI.NET/Properties/AssemblyInfo.cs index 67085b60..05b3e783 100644 --- a/GUI.NET/Properties/AssemblyInfo.cs +++ b/GUI.NET/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.6.1.0")] -[assembly: AssemblyFileVersion("0.6.1.0")] +[assembly: AssemblyVersion("0.7.0.0")] +[assembly: AssemblyFileVersion("0.7.0.0")] diff --git a/PGOHelper/PGOHelper.cpp b/PGOHelper/PGOHelper.cpp index 77a2b72c..4706c3b7 100644 --- a/PGOHelper/PGOHelper.cpp +++ b/PGOHelper/PGOHelper.cpp @@ -3,7 +3,36 @@ #include #include +enum class VideoFilterType +{ + None = 0, + NTSC = 1, + BisqwitNtscQuarterRes = 2, + BisqwitNtscHalfRes = 3, + BisqwitNtsc = 4, + xBRZ2x = 5, + xBRZ3x = 6, + xBRZ4x = 7, + xBRZ5x = 8, + xBRZ6x = 9, + HQ2x = 10, + HQ3x = 11, + HQ4x = 12, + Scale2x = 13, + Scale3x = 14, + Scale4x = 15, + _2xSai = 16, + Super2xSai = 17, + SuperEagle = 18, + Prescale2x = 19, + Prescale3x = 20, + Prescale4x = 21, + HdPack = 999 +}; + + extern "C" { + void __stdcall SetVideoFilter(VideoFilterType filter); void __stdcall InitializeEmu(char* homeFolder, void*, void*, bool, bool, bool); void __stdcall LoadROM(const char* filename, int32_t archiveFileIndex, char* ipsFile); void __stdcall Run(); @@ -35,10 +64,28 @@ int main(int argc, char* argv[]) InitializeEmu("C:\\Windows\\Temp\\Mesen", nullptr, nullptr, false, false, false); LoadROM(testRoms[0], -1, ""); std::cout << "Running: " << testRoms[0] << std::endl; + thread testThread([testRoms] { + VideoFilterType filterTypes[13] = { + VideoFilterType::BisqwitNtscQuarterRes, + VideoFilterType::HQ2x, + VideoFilterType::HQ3x, + VideoFilterType::HQ4x, + VideoFilterType::NTSC, + VideoFilterType::Scale2x, + VideoFilterType::Scale3x, + VideoFilterType::Scale4x, + VideoFilterType::xBRZ2x, + VideoFilterType::xBRZ3x, + VideoFilterType::xBRZ4x, + VideoFilterType::xBRZ5x, + VideoFilterType::xBRZ6x, + }; + for(size_t i = 1; i < testRoms.size(); i++) { std::this_thread::sleep_for(std::chrono::duration(5000)); std::cout << "Running: " << testRoms[i] << std::endl; + SetVideoFilter(filterTypes[i % 13]); LoadROM(testRoms[i], -1, ""); } std::this_thread::sleep_for(std::chrono::duration(5000));