ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1181 from Frank-74/Fix-ups 

Fix up Glide dialog, spellings
This commit is contained in:
zilmar 2016-08-22 08:17:36 +10:00 committed by GitHub
parent 0fe208fbe3 323c135ce6
commit f9bac05ba7
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Glide64/Config.cpp
View File

@ -776,7 +776,7 @@ public:
m_cbxHrsLetFly.SetCheck(g_settings->ghq_hirs_let_texartists_fly > 0 ? BST_CHECKED : BST_UNCHECKED); m_cbxHrsLetFly.SetCheck(g_settings->ghq_hirs_let_texartists_fly > 0 ? BST_CHECKED : BST_UNCHECKED);
m_cbxSaveTexCache.Attach(GetDlgItem(IDC_CHK_TEX_CACHE_HD)); m_cbxSaveTexCache.Attach(GetDlgItem(IDC_CHK_TEX_CACHE_HD));
TTSetTxt(IDC_CHK_TEX_CACHE_HD, "Save texture cache to HD:\n\nFor enhanced textures cache:\nThis will save all previously loaded and enhanced textures to HD.\nSo upon next game launch, all the textures will be instantly loaded, resulting in smoother performance.\n\nFor high-resolution textures cache:\nAfter creation, loading hi-res texture will take only a few seconds upon game launch, as opposed to the 5 to 60 seconds a pack can take to load without this cache file.\nThe only downside here is upon any changes to the pack, the cache file will need to be manually deleted.\n\nSaved cache files go into a folder called \"Cache\" within the Plugins folder.\n\n[Highly Recommended: on]"); TTSetTxt(IDC_CHK_TEX_CACHE_HD, "Save texture cache to HD:\n\nFor enhanced textures cache:\nThis will save all previously loaded and enhanced textures to HD.\nSo upon next game launch, all the textures will be instantly loaded, resulting in smoother performance.\n\nFor high-resolution textures cache:\nAfter creation, loading hi-res texture will take only a few seconds upon game launch, as opposed to the 5 to 60 seconds a pack can take to load without this cache file.\nThe only downside here is upon any changes to the pack, the cache file will need to be manually deleted.\n\nSaved cache files go into a folder called \"Cache\" within the Textures folder.\n\n[Highly Recommended: on]");
m_cbxSaveTexCache.SetCheck(g_settings->ghq_cache_save > 0 ? BST_CHECKED : BST_UNCHECKED); m_cbxSaveTexCache.SetCheck(g_settings->ghq_cache_save > 0 ? BST_CHECKED : BST_UNCHECKED);
return TRUE; return TRUE;
} }

16
Source/Glide64/Glide64.rc
View File

@ -85,17 +85,17 @@ CAPTION "Basic Settings"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
GROUPBOX "Rendering",IDC_STATIC,6,2,161,128 GROUPBOX "Rendering",IDC_STATIC,6,2,161,128
LTEXT "Windowed Resultion",IDC_STATIC,11,17,67,8 LTEXT "Windowed Resolution",IDC_STATIC,11,17,75,8
COMBOBOX IDC_CMB_WINDOW_RES,80,16,84,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_CMB_WINDOW_RES,86,15,77,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Vertical Sync",IDC_CHK_VERTICAL_SYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,30,120,10 CONTROL "Vertical sync",IDC_CHK_VERTICAL_SYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,30,120,10
GROUPBOX "OpenGL settings",IDC_STATIC,11,47,153,82 GROUPBOX "OpenGL settings",IDC_STATIC,11,47,153,82
LTEXT "Full screen resolution:",IDC_STATIC,15,59,45,17 LTEXT "Full screen resolution:",IDC_STATIC,15,59,45,17
COMBOBOX IDC_CMB_FS_RESOLUTION,64,61,97,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_CMB_FS_RESOLUTION,64,61,97,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Anisotropic filtering",IDC_CBXANISOTROPIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,78,143,10 CONTROL "Anisotropic filtering",IDC_CBXANISOTROPIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,78,143,10
CONTROL "Autodetect VRAM size",IDC_CHK_AUTODETECT_VRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,91,80,10 CONTROL "Autodetect VRAM size",IDC_CHK_AUTODETECT_VRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,91,88,10
EDITTEXT IDC_TXT_VRAM_SIZE,101,90,28,12,ES_AUTOHSCROLL EDITTEXT IDC_TXT_VRAM_SIZE,106,90,32,12,ES_AUTOHSCROLL
CONTROL "",IDC_SPIN_VRAM_SIZE,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,127,89,10,12 CONTROL "",IDC_SPIN_VRAM_SIZE,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS,136,90,11,12
LTEXT "Mb",IDC_LBL_MB,141,91,10,8 LTEXT "Mb",IDC_LBL_MB,150,92,10,8
GROUPBOX "Frame buffer emulation",IDC_STATIC,14,103,146,23 GROUPBOX "Frame buffer emulation",IDC_STATIC,14,103,146,23
CONTROL "Use frame buffer objects",IDC_CHK_USE_FRAME_BUFFER_OBJECT, CONTROL "Use frame buffer objects",IDC_CHK_USE_FRAME_BUFFER_OBJECT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,113,133,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,113,133,10
@ -107,7 +107,7 @@ BEGIN
GROUPBOX "Time",IDC_STATIC,180,64,124,36 GROUPBOX "Time",IDC_STATIC,180,64,124,36
CONTROL "Clock enabled",IDC_CHK_CLOCK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,75,59,10 CONTROL "Clock enabled",IDC_CHK_CLOCK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,75,59,10
CONTROL "Clock is 24-hour",IDC_CHK_CLOCK_24,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,88,52,8 CONTROL "Clock is 24-hour",IDC_CHK_CLOCK_24,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,88,52,8
CONTROL "Transparent text background",IDC_CHK_TRANSPARENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,184,103,102,14 CONTROL "Transparent text background",IDC_CHK_TRANSPARENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,184,103,117,14
GROUPBOX "Other",IDC_STATIC,7,132,303,36 GROUPBOX "Other",IDC_STATIC,7,132,303,36
CONTROL "Show texture enhancement options",IDC_CHK_SHOW_TEXTURE_ENHANCEMENT, CONTROL "Show texture enhancement options",IDC_CHK_SHOW_TEXTURE_ENHANCEMENT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,140,123,11 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,140,123,11

4
Source/GlideHQ/TxHiResCache.cpp
View File

@ -75,7 +75,7 @@ TxHiResCache::~TxHiResCache()
std::string filename = _ident + "_HIRESTEXTURES.dat"; std::string filename = _ident + "_HIRESTEXTURES.dat";
CPath cachepath(_path.c_str(), ""); CPath cachepath(_path.c_str(), "");
cachepath.AppendDirectory("cache"); cachepath.AppendDirectory("Cache");
int config = _options & (HIRESTEXTURES_MASK | COMPRESS_HIRESTEX | COMPRESSION_MASK | TILE_HIRESTEX | FORCE16BPP_HIRESTEX | GZ_HIRESTEXCACHE | LET_TEXARTISTS_FLY); int config = _options & (HIRESTEXTURES_MASK | COMPRESS_HIRESTEX | COMPRESSION_MASK | TILE_HIRESTEX | FORCE16BPP_HIRESTEX | GZ_HIRESTEXCACHE | LET_TEXARTISTS_FLY);
TxCache::save(cachepath, filename.c_str(), config); TxCache::save(cachepath, filename.c_str(), config);
@ -118,7 +118,7 @@ TxCache((options & ~GZ_TEXCACHE), 0, path, ident, callback)
/* find it on disk */ /* find it on disk */
std::string filename = _ident + "_HIRESTEXTURES.dat"; std::string filename = _ident + "_HIRESTEXTURES.dat";
CPath cachepath(_path.c_str(), ""); CPath cachepath(_path.c_str(), "");
cachepath.AppendDirectory("cache"); cachepath.AppendDirectory("Cache");
int config = _options & (HIRESTEXTURES_MASK | COMPRESS_HIRESTEX | COMPRESSION_MASK | TILE_HIRESTEX | FORCE16BPP_HIRESTEX | GZ_HIRESTEXCACHE | LET_TEXARTISTS_FLY); int config = _options & (HIRESTEXTURES_MASK | COMPRESS_HIRESTEX | COMPRESSION_MASK | TILE_HIRESTEX | FORCE16BPP_HIRESTEX | GZ_HIRESTEXCACHE | LET_TEXARTISTS_FLY);
_haveCache = TxCache::load(cachepath, filename.c_str(), config); _haveCache = TxCache::load(cachepath, filename.c_str(), config);

4
Source/GlideHQ/TxTexCache.cpp
View File

@ -43,7 +43,7 @@ TxTexCache::~TxTexCache()
/* dump cache to disk */ /* dump cache to disk */
std::string filename = _ident + "_MEMORYCACHE.dat"; std::string filename = _ident + "_MEMORYCACHE.dat";
CPath cachepath(_path.c_str(), ""); CPath cachepath(_path.c_str(), "");
cachepath.AppendDirectory("cache"); cachepath.AppendDirectory("Cache");
int config = _options & (FILTER_MASK | ENHANCEMENT_MASK | COMPRESS_TEX | COMPRESSION_MASK | FORCE16BPP_TEX | GZ_TEXCACHE); int config = _options & (FILTER_MASK | ENHANCEMENT_MASK | COMPRESS_TEX | COMPRESSION_MASK | FORCE16BPP_TEX | GZ_TEXCACHE);
@ -67,7 +67,7 @@ TxCache((options & ~GZ_HIRESTEXCACHE), cachesize, path, ident, callback)
/* find it on disk */ /* find it on disk */
std::string filename = _ident + "_MEMORYCACHE.dat"; std::string filename = _ident + "_MEMORYCACHE.dat";
CPath cachepath(_path.c_str(), ""); CPath cachepath(_path.c_str(), "");
cachepath.AppendDirectory("cache"); cachepath.AppendDirectory("Cache");
int config = _options & (FILTER_MASK | ENHANCEMENT_MASK | COMPRESS_TEX | COMPRESSION_MASK | FORCE16BPP_TEX | GZ_TEXCACHE); int config = _options & (FILTER_MASK | ENHANCEMENT_MASK | COMPRESS_TEX | COMPRESSION_MASK | FORCE16BPP_TEX | GZ_TEXCACHE);
TxCache::load(cachepath, filename.c_str(), config); TxCache::load(cachepath, filename.c_str(), config);

2
Source/Project64-core/AppInit.cpp
View File

@ -319,7 +319,7 @@ void FixDirectories(void)
} }
Directory.UpDirectory(); Directory.UpDirectory();
Directory.AppendDirectory("textures"); Directory.AppendDirectory("Textures");
if (!Directory.DirectoryExists()) if (!Directory.DirectoryExists())
{ {
WriteTrace(TraceAppInit, TraceDebug, "Creating %s", (const char *)Directory); WriteTrace(TraceAppInit, TraceDebug, "Creating %s", (const char *)Directory);

2
Source/Project64/UserInterface/UIResources.rc
View File

@ -119,7 +119,7 @@ BEGIN
EDITTEXT IDC_SNAP_DIR,18,118,170,12,ES_AUTOHSCROLL EDITTEXT IDC_SNAP_DIR,18,118,170,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_SELECT_SNAP_DIR,193,118,14,12 PUSHBUTTON "...",IDC_SELECT_SNAP_DIR,193,118,14,12
GROUPBOX "Texture Directory",IDC_DIR_TEXTURE_FRAME,5,131,208,34 GROUPBOX "Texture Directory",IDC_DIR_TEXTURE_FRAME,5,131,208,34
CONTROL "$AppPath\\textures\\",IDC_TEXTURE_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,6,140,179,8 CONTROL "$AppPath\\Textures\\",IDC_TEXTURE_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,6,140,179,8
CONTROL "",IDC_TEXTURE_OTHER,"Button",BS_AUTORADIOBUTTON,6,150,11,12 CONTROL "",IDC_TEXTURE_OTHER,"Button",BS_AUTORADIOBUTTON,6,150,11,12
EDITTEXT IDC_TEXTURE_DIR,18,149,170,12,ES_AUTOHSCROLL EDITTEXT IDC_TEXTURE_DIR,18,149,170,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_SELECT_TEXTURE_DIR,193,149,14,12 PUSHBUTTON "...",IDC_SELECT_TEXTURE_DIR,193,149,14,12