yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Setup/ImageGen

Browse Source 
* consider preconverted png images when initially checking resources
 * fixed minor bugs
This commit is contained in:
Sarjuuk
2024-05-09 15:16:10 +02:00
parent d7fa4a900e
commit 9a1cb5f2f9
3 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/tools/CLISetup.class.php
View File

@@ -266,7 +266,7 @@ class CLISetup
return false; return false;
// backslash to forward slash // backslash to forward slash
$_ = strtolower(str_replace('\\', '/', $file)); $_ = strtolower(CLI::nicePath($file));
// remove trailing slash // remove trailing slash
if (mb_substr($_, -1, 1) == '/') if (mb_substr($_, -1, 1) == '/')
@@ -291,7 +291,7 @@ class CLISetup
return []; return [];
// backslash to forward slash // backslash to forward slash
$_ = strtolower(str_replace('\\', '/', $path)); $_ = strtolower(CLI::nicePath($path));
foreach (self::$mpqFiles as $lowerFile => $realFile) foreach (self::$mpqFiles as $lowerFile => $realFile)
{ {

7
setup/tools/filegen/complexImg.func.php
View File

@@ -522,7 +522,7 @@ if (!CLI)
$multiLevel = 0; $multiLevel = 0;
do do
{ {
if (!CLISetup::filesInPath('/'.$textureStr.'\/'.$textureStr.($multiLevel + 1).'_\d\.blp/i', true)) if (!CLISetup::filesInPath('/'.$textureStr.'\/'.$textureStr.($multiLevel + 1).'_\d\.(blp|png)/i', true))
break; break;
$multiLevel++; $multiLevel++;
@@ -531,8 +531,7 @@ if (!CLI)
while ($multiLevel < 18); // Karazhan has 17 frickin floors while ($multiLevel < 18); // Karazhan has 17 frickin floors
// check if we can create base map anyway // check if we can create base map anyway
$file = $path.'/'.$textureStr.'1.blp'; $hasBaseMap = CLISetup::fileExists($path.'/'.$textureStr.'1.blp') || CLISetup::fileExists($path.'/'.$textureStr.'1.png');
$hasBaseMap = CLISetup::fileExists($file);
CLI::write(' - area has '.($multiLeveled ? $multiLevel . ' levels' : 'only base level')); CLI::write(' - area has '.($multiLeveled ? $multiLevel . ' levels' : 'only base level'));
@@ -684,7 +683,7 @@ if (!CLI)
$files = CLISetup::filesInPath('/'.str_replace('/', '\\/', $paths[0x8][2]).'/i', true); $files = CLISetup::filesInPath('/'.str_replace('/', '\\/', $paths[0x8][2]).'/i', true);
foreach ($files as $f) foreach ($files as $f)
{ {
if (preg_match('/([^\/]+)(\d).blp/i', $f, $m)) if (preg_match('/([^\/]+)(\d).(blp|png)/i', $f, $m))
{ {
if ($m[1] && $m[2]) if ($m[1] && $m[2])
{ {

49
setup/tools/filegen/simpleImg.func.php
View File

@@ -27,7 +27,7 @@ if (!CLI)
$file = $path.'.png'; $file = $path.'.png';
if (CLISetup::fileExists($file)) if (CLISetup::fileExists($file))
{ {
CLI::write('manually converted png file present for '.$path.'.', CLI::LOG_INFO); CLI::write('manually converted png file present for: '.$path, CLI::LOG_INFO);
$result = imagecreatefrompng($file); $result = imagecreatefrompng($file);
} }
@@ -64,19 +64,19 @@ if (!CLI)
['loadingscreens/small/', '.jpg', 0, 244, 0] ['loadingscreens/small/', '.jpg', 0, 244, 0]
); );
$paths = array( // src, [dest, ext, srcSize, destSize, borderOffset], pattern, isIcon, tileSize, resourcePath $paths = array( // src, [dest, ext, srcSize, destSize, borderOffset], pattern, isIcon, tileSize, resourcePath
0 => ['Icons/', $iconDirs, '/.*\.blp$', true, 0, null], 0 => ['Icons/', $iconDirs, '/.*\.(blp|png)$', true, 0, null],
1 => ['Spellbook/', [['Interface/Spellbook/', '.png', 0, 0, 0]], '/UI-Glyph-Rune-?\d+.blp$', true, 0, null], 1 => ['Spellbook/', [['Interface/Spellbook/', '.png', 0, 0, 0]], '/UI-Glyph-Rune-?\d+.(blp|png)$', true, 0, null],
2 => ['PaperDoll/', array_slice($iconDirs, 0, 3), '/UI-(Backpack|PaperDoll)-.*\.blp$', true, 0, null], 2 => ['PaperDoll/', array_slice($iconDirs, 0, 3), '/UI-(Backpack|PaperDoll)-.*\.(blp|png)$', true, 0, null],
3 => ['GLUES/CHARACTERCREATE/UI-CharacterCreate-Races.blp', $iconDirs, '', true, 64, null], 3 => ['GLUES/CHARACTERCREATE/', $iconDirs, '/UI-CharacterCreate-Races.(blp|png)', true, 64, null],
4 => ['GLUES/CHARACTERCREATE/UI-CharacterCreate-CLASSES.blp', $iconDirs, '', true, 64, null], 4 => ['GLUES/CHARACTERCREATE/', $iconDirs, '/UI-CharacterCreate-CLASSES.(blp|png)', true, 64, null],
5 => ['GLUES/CHARACTERCREATE/UI-CharacterCreate-Factions.blp', $iconDirs, '', true, 64, null], 5 => ['GLUES/CHARACTERCREATE/', $iconDirs, '/UI-CharacterCreate-Factions.(blp|png)', true, 64, null],
// 6 => ['Minimap/OBJECTICONS.BLP', [['icons/tiny/', '.gif', 0, 16, 2]], '', true, 32, null], // 6 => ['Minimap/', [['icons/tiny/', '.gif', 0, 16, 2]], '/OBJECTICONS.(BLP|png)', true, 32, null],
7 => ['FlavorImages/', [['Interface/FlavorImages/', '.png', 0, 0, 0]], '/.*\.blp$', false, 0, null], 7 => ['FlavorImages/', [['Interface/FlavorImages/', '.png', 0, 0, 0]], '/.*\.(blp|png)$', false, 0, null],
8 => ['Pictures/', [['Interface/Pictures/', '.png', 0, 0, 0]], '/.*\.blp$', false, 0, null], 8 => ['Pictures/', [['Interface/Pictures/', '.png', 0, 0, 0]], '/.*\.(blp|png)$', false, 0, null],
9 => ['PvPRankBadges/', [['Interface/PvPRankBadges/', '.png', 0, 0, 0]], '/.*\.blp$', false, 0, null], 9 => ['PvPRankBadges/', [['Interface/PvPRankBadges/', '.png', 0, 0, 0]], '/.*\.(blp|png)$', false, 0, null],
10 => ['Calendar/Holidays/', $calendarDirs, '/.*(start|[ayhs])\.blp$', true, 0, null], 10 => ['Calendar/Holidays/', $calendarDirs, '/.*(start|[ayhs])\.(blp|png)$', true, 0, null],
11 => ['GLUES/LOADINGSCREENS/', $loadScreenDirs, '/lo.*\.blp$', false, 0, null], 11 => ['GLUES/LOADINGSCREENS/', $loadScreenDirs, '/lo.*\.(blp|png)$', false, 0, null],
12 => ['PVPFrame/', array_map(function($x) { $x[4] = 2; return $x; }, $iconDirs), '/PVP-(ArenaPoints|Currency).*\.blp$', true, 0, null] 12 => ['PVPFrame/', array_map(function($x) { $x[4] = 2; return $x; }, $iconDirs), '/PVP-(ArenaPoints|Currency).*\.(blp|png)$', true, 0, null]
); );
// textures are composed of 64x64 icons // textures are composed of 64x64 icons
// numeric indexed arrays mimick the position on the texture // numeric indexed arrays mimick the position on the texture
@@ -246,7 +246,7 @@ if (!CLI)
if (count(array_filter(array_column($paths, 5))) != count($paths)) if (count(array_filter(array_column($paths, 5))) != count($paths))
{ {
CLI::write('one or more required directories are missing:', CLI::LOG_ERROR); CLI::write('one or more required directories are missing:', CLI::LOG_ERROR);
return; return false;
} }
else else
sleep(1); sleep(1);
@@ -274,9 +274,11 @@ if (!CLI)
foreach ($siRows as $icon) foreach ($siRows as $icon)
{ {
if (stristr($icon, $paths[0][0])) // Icons/ // Icons/
if (isset($paths[0]) && stristr($icon, $paths[0][0]))
$dbcEntries[] = strtolower($paths[0][5].substr(strrchr($icon, '\\'), 1)); $dbcEntries[] = strtolower($paths[0][5].substr(strrchr($icon, '\\'), 1));
else if (stristr($icon, $paths[1][0])) // Spellbook/ // Spellbook/
else if (isset($paths[1]) && stristr($icon, $paths[1][0]))
$dbcEntries[] = strtolower($paths[1][5].substr(strrchr($icon, '\\'), 1)); $dbcEntries[] = strtolower($paths[1][5].substr(strrchr($icon, '\\'), 1));
} }
} }
@@ -285,11 +287,11 @@ if (!CLI)
{ {
$itemIcons = DB::Aowow()->selectCol('SELECT inventoryIcon1 FROM dbc_itemdisplayinfo WHERE inventoryIcon1 <> ""'); $itemIcons = DB::Aowow()->selectCol('SELECT inventoryIcon1 FROM dbc_itemdisplayinfo WHERE inventoryIcon1 <> ""');
foreach ($itemIcons as $icon) foreach ($itemIcons as $icon)
$dbcEntries[] = strtolower($paths[0][5].'/'.$icon.'.blp'); $dbcEntries[] = strtolower($paths[0][5].'/'.$icon);
$eventIcons = DB::Aowow()->selectCol('SELECT textureString FROM dbc_holidays WHERE textureString <> ""'); $eventIcons = DB::Aowow()->selectCol('SELECT textureString FROM dbc_holidays WHERE textureString <> ""');
foreach ($eventIcons as $icon) foreach ($eventIcons as $icon)
$dbcEntries[] = strtolower($paths[10][5].'/'.$icon.'Start.blp'); $dbcEntries[] = strtolower($paths[10][5].'/'.$icon.'start');
} }
// case-insensitive array_unique *vomits silently into a corner* // case-insensitive array_unique *vomits silently into a corner*
@@ -303,7 +305,14 @@ if (!CLI)
$search = '/'.str_replace('/', '\\/', $search).'/i'; $search = '/'.str_replace('/', '\\/', $search).'/i';
$files = CLISetup::filesInPath($search, !!$pattern); $files = CLISetup::filesInPath($search, !!$pattern);
$allPaths = array_merge($allPaths, $files); $allPaths = array_merge($allPaths, array_map(function ($x) { return substr($x, 0, -4); }, $files));
if (!$files)
{
CLI::write('source directory "'.CLI::bold($search).'" does not contain files matching "'.CLI::bold($pattern), CLI::LOG_ERROR);
$success = false;
continue;
}
CLI::write('processing '.count($files).' files in '.$path.'...'); CLI::write('processing '.count($files).' files in '.$path.'...');