diff --git a/WebserviceTools/RenderTools/backgroundRenderJob.php b/WebserviceTools/RenderTools/backgroundRenderJob.php index 05d2341..0f3a9b4 100644 --- a/WebserviceTools/RenderTools/backgroundRenderJob.php +++ b/WebserviceTools/RenderTools/backgroundRenderJob.php @@ -5,48 +5,51 @@ kinda shit but its meant for background render processes so not really a concern */ +use Alphaland\Assets\Render as AssetRender; +use Alphaland\Users\Render as UserRender; + $assetid = $argv[1]; $type = $argv[2]; switch ($type) { case "avatar": - RenderPlayer($assetid); + UserRender::RenderPlayer($assetid); break; case "avatarcloseup": - RenderPlayerCloseup($assetid); + UserRender::RenderPlayerCloseup($assetid); break; case "hat": - RenderHat($assetid); + AssetRender::RenderHat($assetid); break; case "tshirt": - RenderTShirt($assetid); + AssetRender::RenderTShirt($assetid); break; case "shirt": - RenderShirt($assetid); + AssetRender::RenderShirt($assetid); break; case "pants": - RenderPants($assetid); + AssetRender::RenderPants($assetid); break; case "face": - RenderFace($assetid); + AssetRender::RenderFace($assetid); break; case "gear": - RenderGear($assetid); + AssetRender::RenderGear($assetid); break; case "head": - RenderHead($assetid); + AssetRender::RenderHead($assetid); break; case "place": RenderPlace($assetid); break; case "package": - RenderPackage($assetid); + AssetRender::RenderPackage($assetid); break; case "model": - RenderModel($assetid); + AssetRender::RenderModel($assetid); case "mesh": - RenderMesh($assetid); + AssetRender::RenderMesh($assetid); break; default: break; diff --git a/globals/Dependencies/Assets/Render.php b/globals/Dependencies/Assets/Render.php new file mode 100644 index 0000000..b5396c7 --- /dev/null +++ b/globals/Dependencies/Assets/Render.php @@ -0,0 +1,374 @@ +BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Hat ".$assetid, $thumbnailScript, array( + $assetid, + "https://www.alphaland.cc/asset/?id=".$assetid, + "https://www.alphaland.cc/", + "png", + "750", + "750" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($assetid, $soap); + return true; + } + logSoapFault($soap, "Render Hat ".$assetid." Job", $thumbnailScript); + return false; + } + } + + public static function RenderTShirt(int $assetid, bool $fork=false) + { + if ($fork) { + $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." tshirt", "r"); //throwaway background process + if ($job !== FALSE); { + pclose($job); + return true; + } + return false; + } else { + $thumbnailScript = file_get_contents($GLOBALS['tshirtthumbnailscript']); + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render TShirt ".$assetid, $thumbnailScript, array( + $assetid, + "https://www.alphaland.cc/asset/?id=".$assetid, + "https://www.alphaland.cc/asset/?id=38", + "https://www.alphaland.cc/", + "png", + "750", + "750" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($assetid, $soap); + return true; + } + logSoapFault($soap, "Render TShirt ".$assetid." Job", $thumbnailScript); + return false; + } + } + + public static function RenderShirt(int $assetid, bool $fork=false) + { + if ($fork) { + $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." shirt", "r"); //throwaway background process + if ($job !== FALSE); { + pclose($job); + return true; + } + return false; + } else { + $thumbnailScript = file_get_contents($GLOBALS['shirtthumbnailscript']); + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Shirt ".$assetid, $thumbnailScript, array( + $assetid, + "https://www.alphaland.cc/asset/?id=".$assetid, + "https://www.alphaland.cc/asset/?id=38", + "https://www.alphaland.cc/", + "png", + "750", + "750" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($assetid, $soap); + return true; + } + logSoapFault($soap, "Render Shirt ".$assetid." Job", $thumbnailScript); + return false; + } + } + + public static function RenderPants(int $assetid, bool $fork=false) + { + if ($fork) { + $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." pants", "r"); //throwaway background process + if ($job !== FALSE); { + pclose($job); + return true; + } + return false; + } else { + $thumbnailScript = file_get_contents($GLOBALS['pantsthumbnailscript']); + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Pants ".$assetid, $thumbnailScript, array( + $assetid, + "https://www.alphaland.cc/asset/?id=".$assetid, + "https://www.alphaland.cc/asset/?id=38", + "https://www.alphaland.cc/", + "png", + "750", + "750" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($assetid, $soap); + return true; + } + logSoapFault($soap, "Render Pants ".$assetid." Job", $thumbnailScript); + return false; + } + } + + public static function RenderFace(int $assetid, bool $fork=false) + { + if ($fork) { + $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." face", "r"); //throwaway background process + if ($job !== FALSE); { + pclose($job); + return true; + } + return false; + } else { + $thumbnailScript = file_get_contents($GLOBALS['facethumbnailscript']); + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Face ".$assetid, $thumbnailScript, array( + $assetid, + "https://www.alphaland.cc/asset/?id=".$assetid, + "https://www.alphaland.cc/", + "png", + "750", + "750" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($assetid, $soap); + return true; + } + logSoapFault($soap, "Render Face ".$assetid." Job", $thumbnailScript); + return false; + } + } + + public static function RenderHead(int $assetid, bool $fork=false) + { + if ($fork) { + $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." head", "r"); //throwaway background process + if ($job !== FALSE); { + pclose($job); + return true; + } + return false; + } else { + $thumbnailScript = file_get_contents($GLOBALS['headthumbnailscript']); + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Head ".$assetid, $thumbnailScript, array( + $assetid, + "https://www.alphaland.cc/asset/?id=".$assetid, + "https://www.alphaland.cc/asset/?id=38", + "https://www.alphaland.cc/", + "png", + "750", + "750" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($assetid, $soap); + return true; + } + logSoapFault($soap, "Render Head ".$assetid." Job", $thumbnailScript); + return false; + } + } + + public static function RenderGear(int $assetid, bool $fork=false) + { + if ($fork) { + $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." gear", "r"); //throwaway background process + if ($job !== FALSE); { + pclose($job); + return true; + } + return false; + } else { + $thumbnailScript = file_get_contents($GLOBALS['gearthumbnailscript']); + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Gear ".$assetid, $thumbnailScript, array( + $assetid, + "https://www.alphaland.cc/asset/?id=".$assetid, + "png", + "750", + "750", + "https://www.alphaland.cc/" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($assetid, $soap); + return true; + } + logSoapFault($soap, "Render Gear ".$assetid." Job", $thumbnailScript); + return false; + } + } + + public static function RenderPackage(int $assetid, bool $fork=false) + { + if ($fork) { + $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." package", "r"); //throwaway background process + if ($job !== FALSE); { + pclose($job); + return true; + } + return false; + } else { + $thumbnailScript = file_get_contents($GLOBALS['packagescript']); + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Package ".$assetid, $thumbnailScript, array( + $assetid, + "https://www.alphaland.cc/asset/?id=27112025;https://www.alphaland.cc/asset/?id=27112039;https://www.alphaland.cc/asset/?id=27112052", + "https://www.alphaland.cc/", + "https://www.alphaland.cc/asset/?id=38", + "https://www.alphaland.cc/", + "png", + "768", + "432" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($assetid, $soap); + return true; + } + logSoapFault($soap, "Render Package ".$assetid." Job", $thumbnailScript); + return false; + } + } + + public static function RenderModel(int $assetid, bool $fork=false) + { + if ($fork) { + $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." model", "r"); //throwaway background process + if ($job !== FALSE); { + pclose($job); + return true; + } + return false; + } else { + $thumbnailScript = file_get_contents($GLOBALS['modelthumbnailscript']); + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Model ".$assetid, $thumbnailScript, array( + $assetid, + "https://www.alphaland.cc/asset/?id=".$assetid, + "https://www.alphaland.cc/", + "png", + "768", + "432" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($assetid, $soap); + return true; + } + logSoapFault($soap, "Render Model ".$assetid." Job", $thumbnailScript); + return false; + } + } + + public static function RenderMesh(int $assetid, bool $fork=false) + { + if ($fork) { + $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." mesh", "r"); //throwaway background process + if ($job !== FALSE); { + pclose($job); + return true; + } + return false; + } else { + $thumbnailScript = file_get_contents($GLOBALS['meshthumbnailscript']); + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Mesh ".$assetid, $thumbnailScript, array( + $assetid, + "https://www.alphaland.cc/asset/?id=".$assetid, + "https://www.alphaland.cc/", + "png", + "768", + "432" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($assetid, $soap); + return true; + } + logSoapFault($soap, "Render Mesh ".$assetid." Job", $thumbnailScript); + return false; + } + } + + public static function Update(int $assetid, $soapobject) + { + $render = base64_decode($soapobject->BatchJobExResult->LuaValue[0]->value); + + if (ImageHelper::IsBase64PNGImage($render)) //PNG + { + $newhash = HashingUtiltity::VerifyMD5(md5($render)); + if (!file_get_contents($GLOBALS['renderCDNPath'] . $newhash)) + { + if (file_put_contents($GLOBALS['renderCDNPath'] . $newhash, $render)) + { + //delete old hash + $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); + $prevhash->bindParam(":i", $assetid, PDO::PARAM_INT); + $prevhash->execute(); + $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); + $oldhash = $prevhash->ThumbHash; + unlink($GLOBALS['renderCDNPath'] . $oldhash); + + //set new hash + $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); + $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); + $newthumbhash->bindParam(":i", $assetid, PDO::PARAM_INT); + $newthumbhash->execute(); + + return true; + } + } + } + return false; + } + } +} diff --git a/globals/Dependencies/Common/HashingUtiltity.php b/globals/Dependencies/Common/HashingUtiltity.php index d82de1e..4963d71 100644 --- a/globals/Dependencies/Common/HashingUtiltity.php +++ b/globals/Dependencies/Common/HashingUtiltity.php @@ -1,11 +1,35 @@ prepare("SELECT COUNT(*) FROM assets WHERE Hash = :t"); + $tokencheck->bindParam(":t", $hash, PDO::PARAM_STR); + $tokencheck->execute(); + } while ($tokencheck->fetchColumn() != 0); + return $hash; + } + + public static function VerifyMD5(string $md5) + { + $hashcheck = $GLOBALS['pdo']->prepare("SELECT COUNT(*) FROM assets WHERE Hash = :t"); + $hashcheck->bindParam(":t", $md5, PDO::PARAM_STR); + $hashcheck->execute(); + if ($hashcheck->fetchColumn() != 0) { + $md5 = HashingUtiltity::GenRandomAssetHash(16); //fallback to random gen hash (this sshouldnt happen often) + } + return $md5; + } } } diff --git a/globals/Dependencies/UI/ImageHelper.php b/globals/Dependencies/UI/ImageHelper.php new file mode 100644 index 0000000..bceca6a --- /dev/null +++ b/globals/Dependencies/UI/ImageHelper.php @@ -0,0 +1,44 @@ +headshotAngleRight; + $angleleft = userInfo($userid)->headshotAngleLeft; + + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Player Closeup ".$userid, $script, array( + $userid, + "https://www.alphaland.cc/", + "https://api.alphaland.cc/users/avatar-accoutrements?userId=".$userid, + "png", + "840", + "840", + (bool)$angleright, //angleRight + (bool)$angleleft //angleLeft + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($userid, $soap, true); + return true; + } else { + die(print_r($soap)); + } + logSoapFault($soap, "Render Player Closeup ".$userid." Job", $script); + return false; + } + } + + public static function RenderPlayer(int $userid, bool $fork=false) + { + if ($fork) + { + $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$userid." avatar", "r"); //throwaway background process + if ($job !== FALSE); + { + pclose($job); + return true; + } + return false; + } + else + { + Render::RenderPlayerCloseup($userid, true); //run in the background so it will *hopefully* finish with this + $script = file_get_contents($GLOBALS['avatarthumbnailscript']); + + $soap = new RccServiceHelper($GLOBALS['thumbnailArbiter']); + $soap = $soap->BatchJobEx( + $soap->ConstructGenericJob(gen_uuid(), 25, 0, 3, "Render Player ".$userid, $script, array( + $userid, + "https://api.alphaland.cc/users/avatar-accoutrements?userId=".$userid, + "https://www.alphaland.cc/", + "png", + "840", + "840" + )) + ); + + if (!is_soap_fault($soap)) { + Render::Update($userid, $soap); + return true; + } + logSoapFault($soap, "Render Player ".$userid." Job", $script); + return false; + } + } + + public static function Update(int $userid, $soapobject, $headshot=false) + { + $path = $GLOBALS['renderCDNPath']; + $render = base64_decode($soapobject->BatchJobExResult->LuaValue[0]->value); //returned by rcc + + if (ImageHelper::IsBase64PNGImage($render)) //PNG + { + $newhash = HashingUtiltity::VerifyMD5(md5($render)); + if (ImageHelper::ResizeImageFromString(352 , 352 , $path . $newhash, $render)) //scale down for a SLIGHT AA effect + { + $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM users WHERE id = :i"); + $prevhash->bindParam(":i", $userid, PDO::PARAM_INT); + $prevhash->execute(); + $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); + + if ($headshot) { + $oldhash = $prevhash->HeadshotThumbHash; + if ($oldhash != $newhash && !isHeadshotThumbHashInOutfit($oldhash)) { + unlink($path . $oldhash); + } + $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE users SET HeadshotThumbHash = :h, pendingHeadshotRender = 0, renderCount = renderCount-1 WHERE id = :i"); + $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); + $newthumbhash->bindParam(":i", $userid, PDO::PARAM_INT); + $newthumbhash->execute(); + } else { + $oldhash = $prevhash->ThumbHash; + if ($oldhash != $newhash && !isThumbHashInOutfit($oldhash)) { + unlink($path . $oldhash); + } + $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE users SET ThumbHash = :h, pendingRender = 0, renderCount = renderCount-1 WHERE id = :i"); + $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); + $newthumbhash->bindParam(":i", $userid, PDO::PARAM_INT); + $newthumbhash->execute(); + } + return true; + } + } + } + } +} diff --git a/globals/config.php b/globals/config.php index 06a4597..df135c1 100644 --- a/globals/config.php +++ b/globals/config.php @@ -107,6 +107,9 @@ try include "C:/Webserver/nginx/Alphaland/globals/Dependencies/Common/System.php"; include "C:/Webserver/nginx/Alphaland/globals/Dependencies/Games/Game.php"; include "C:/Webserver/nginx/Alphaland/globals/Dependencies/Grid/RccServiceHelper.php"; + include "C:/Webserver/nginx/Alphaland/globals/Dependencies/Assets/Render.php"; + include "C:/Webserver/nginx/Alphaland/globals/Dependencies/UI/ImageHelper.php"; + include "C:/Webserver/nginx/Alphaland/globals/Dependencies/Users/Render.php"; //authenticator $authenticator = new PHPGangsta_GoogleAuthenticator(); diff --git a/globals/functions.php b/globals/functions.php index 3104e83..332d9ef 100644 --- a/globals/functions.php +++ b/globals/functions.php @@ -8,6 +8,8 @@ //img tools (potentially high resource usage) (probably blocking) +use Alphaland\Assets\Render; +use Alphaland\Users\Render as UsersRender; use Alphaland\Web\WebContextManager; function imagecopymerge_alpha($dst_im, $src_im, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h, $pct) { @@ -230,34 +232,6 @@ function genGameLaunchTokenHash($len) return $hash; } -function genThumbHash($len) -{ - $hash = ""; - $alloc = true; - while ($alloc) { - $hash = genHash($len); - - $usercheck = $GLOBALS['pdo']->prepare("SELECT * FROM users WHERE ThumbHash = :t"); - $usercheck->bindParam(":t", $hash, PDO::PARAM_STR); - $usercheck->execute(); - - $headshotusercheck = $GLOBALS['pdo']->prepare("SELECT * FROM users WHERE HeadshotThumbHash = :t"); - $headshotusercheck->bindParam(":t", $hash, PDO::PARAM_STR); - $headshotusercheck->execute(); - - $assetscheck = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE ThumbHash = :t"); - $assetscheck->bindParam(":t", $hash, PDO::PARAM_STR); - $assetscheck->execute(); - - if ($usercheck->rowCount() > 0 || $assetscheck->rowCount() > 0 || $headshotusercheck->rowCount() > 0) { - continue; - } else { - $alloc = false; - } - } - return $hash; -} - //gen uuid function gen_uuid() { return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x', @@ -611,7 +585,7 @@ function applyOutfit($userid, $outfitid) if ($headshothash == NULL) //outfit was created before headshots release (probably?) { - RenderPlayerCloseup($userid); + UsersRender::RenderPlayerCloseup($userid); $headshothash = userInfo($userid)->HeadshotThumbHash; @@ -2206,72 +2180,6 @@ function isJobMarkedClosed($jobid) //render utility functions -function RenderPlayer($userid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$userid." avatar", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - RenderPlayerCloseup($userid, true); //run in the background so it will *hopefully* finish with this - - $script = $GLOBALS['avatarthumbnailscript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render player ".$userid, file_get_contents($script), array( - $userid, - "https://api.alphaland.cc/users/avatar-accoutrements?userId=".$userid, - "https://www.alphaland.cc/", - "png", - "840", - "840", - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (resizebase64img(352 , 352 , $path . $newhash, $render)) //scale down for a SLIGHT AA effect - { - //delete old render - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM users WHERE id = :i"); - $prevhash->bindParam(":i", $userid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - if ($oldhash != $newhash && !isThumbHashInOutfit($oldhash)) //dont delete hash if its part of an outfit - { - unlink($path . $oldhash); - } - - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE users SET ThumbHash = :h, pendingRender = 0, renderCount = renderCount-1 WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $userid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Player ".$userid." Job", $script); - } - return false; - } -} - function setHeadshotAngleRight($userid) { $right = $GLOBALS['pdo']->prepare('UPDATE users SET headshotAngleRight = 1, headshotAngleLeft = 0 WHERE id = :uid'); @@ -2308,520 +2216,6 @@ function setHeadshotAngleCenter($userid) return false; } -function RenderPlayerCloseup($userid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$userid." avatarcloseup", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['avatarcloseupthumbnailscript']; - - $angleright = userInfo($userid)->headshotAngleRight; - $angleleft = userInfo($userid)->headshotAngleLeft; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render Player Closeup ".$userid, file_get_contents($script), array( - $userid, - "https://www.alphaland.cc/", - "https://api.alphaland.cc/users/avatar-accoutrements?userId=".$userid, - "png", - "840", - "840", - false, //quadratic - false, //OnlyCheckHeadAccessoryInHeadShot - (bool)$angleright, //angleRight - (bool)$angleleft, //angleLeft - 0, //baseHatZoom - 90, //maxHatZoom (100 for little farther out) - 0, //cameraOffsetX - -0.1 //cameraOffsetY - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (resizebase64img(352 , 352 , $path . $newhash, $render)) //scale down for a SLIGHT AA effect - { - //delete old render - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM users WHERE id = :i"); - $prevhash->bindParam(":i", $userid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->HeadshotThumbHash; - if ($oldhash != $newhash && !isHeadshotThumbHashInOutfit($oldhash)) //dont delete hash if its part of an outfit - { - unlink($path . $oldhash); - } - - //$newthumbhash = $GLOBALS['pdo']->prepare("UPDATE users SET ThumbHash = :h, pendingRender = 0, renderCount = renderCount-1 WHERE id = :i"); - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE users SET HeadshotThumbHash = :h, pendingHeadshotRender = 0, renderCount = renderCount-1 WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $userid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Player Closeup ".$userid." Job", $script); - } - return false; - } -} - -function RenderHat($itemid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$itemid." hat", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['hatthumbnailscript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render Hat ".$itemid, file_get_contents($script), array( - $itemid, - "https://www.alphaland.cc/asset/?id=".$itemid, - "https://www.alphaland.cc/", - "png", - "750", - "750" - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (file_put_contents($path . $newhash, $render)) - { - //delete old hash - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); - $prevhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - unlink($path . $oldhash); - - //set new hash - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Hat ".$itemid." Job", $script); - } - return false; - } -} - -function RenderTShirt($itemid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$itemid." tshirt", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['tshirtthumbnailscript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render TShirt ".$itemid, file_get_contents($script), array( - $itemid, - "https://www.alphaland.cc/asset/?id=".$itemid, - "https://www.alphaland.cc/asset/?id=38", - "https://www.alphaland.cc/", - "png", - "750", - "750" - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (file_put_contents($path . $newhash, $render)) - { - //delete old hash - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); - $prevhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - unlink($path . $oldhash); - - //set new hash - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render TShirt ".$itemid." Job", $script); - } - return false; - } -} - -function RenderShirt($itemid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$itemid." shirt", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['shirtthumbnailscript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render Shirt ".$itemid, file_get_contents($script), array( - $itemid, - "https://www.alphaland.cc/asset/?id=".$itemid, - "https://www.alphaland.cc/asset/?id=38", - "https://www.alphaland.cc/", - "png", - "750", - "750" - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (file_put_contents($path . $newhash, $render)) - { - //delete old hash - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); - $prevhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - unlink($path . $oldhash); - - //set new hash - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Shirt ".$itemid." Job", $script); - } - return false; - } -} - -function RenderPants($itemid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$itemid." pants", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['pantsthumbnailscript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render Pants ".$itemid, file_get_contents($script), array( - $itemid, - "https://www.alphaland.cc/asset/?id=".$itemid, - "https://www.alphaland.cc/asset/?id=38", - "https://www.alphaland.cc/", - "png", - "750", - "750" - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (file_put_contents($path . $newhash, $render)) - { - //delete old hash - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); - $prevhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - unlink($path . $oldhash); - - //set new hash - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Pants ".$itemid." Job", $script); - } - return false; - } -} - -function RenderFace($itemid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$itemid." face", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['facethumbnailscript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render Face ".$itemid, file_get_contents($script), array( - $itemid, - "https://www.alphaland.cc/asset/?id=".$itemid, - "https://www.alphaland.cc/", - "png", - "750", - "750" - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (file_put_contents($path . $newhash, $render)) - { - //delete old hash - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); - $prevhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - unlink($path . $oldhash); - - //set new hash - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Face ".$itemid." Job", $script); - } - return false; - } -} - -function RenderGear($itemid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$itemid." gear", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['gearthumbnailscript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render Gear ".$itemid, file_get_contents($script), array( - $itemid, - "https://www.alphaland.cc/asset/?id=".$itemid, - "png", - "750", - "750", - "https://www.alphaland.cc/" - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (file_put_contents($path . $newhash, $render)) - { - //delete old hash - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); - $prevhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - unlink($path . $oldhash); - - //set new hash - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Gear ".$itemid." Job", $script); - } - return false; - } -} - -function RenderHead($itemid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$itemid." head", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['headthumbnailscript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render Head ".$itemid, file_get_contents($script), array( - $itemid, - "https://www.alphaland.cc/asset/?id=".$itemid, - "https://www.alphaland.cc/asset/?id=38", - "https://www.alphaland.cc/", - "png", - "750", - "750" - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (file_put_contents($path . $newhash, $render)) - { - //delete old hash - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); - $prevhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - unlink($path . $oldhash); - - //set new hash - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Head ".$itemid." Job", $script); - } - return false; - } -} - function RenderPlace($placeid, $fork=false) { if ($fork) @@ -2898,194 +2292,6 @@ function RenderPlace($placeid, $fork=false) } } -function RenderPackage($itemid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$itemid." package", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['packagescript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render Package ".$itemid, file_get_contents($script), array( - $itemid, - "https://www.alphaland.cc/asset/?id=27112025;https://www.alphaland.cc/asset/?id=27112039;https://www.alphaland.cc/asset/?id=27112052", - "https://www.alphaland.cc/", - "https://www.alphaland.cc/asset/?id=38", - "https://www.alphaland.cc/", - "png", - "768", - "432" - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (file_put_contents($path . $newhash, $render)) - { - //delete old hash - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); - $prevhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - unlink($path . $oldhash); - - //set new hash - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Package ".$itemid." Job", $script); - } - return false; - } -} - -function RenderModel($itemid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$itemid." model", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['modelthumbnailscript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render Model ".$itemid, file_get_contents($script), array( - $itemid, - "https://www.alphaland.cc/asset/?id=".$itemid, - "https://www.alphaland.cc/", - "png", - "768", - "432" - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (file_put_contents($path . $newhash, $render)) - { - //delete old hash - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); - $prevhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - unlink($path . $oldhash); - - //set new hash - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Model ".$itemid." Job", $script); - } - return false; - } -} - -function RenderMesh($itemid, $fork=false) -{ - if ($fork) - { - $job = popen("cd C:/Webserver/nginx/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$itemid." mesh", "r"); //throwaway background process - if ($job !== FALSE); - { - pclose($job); - return true; - } - return false; - } - else - { - $script = $GLOBALS['meshthumbnailscript']; - - $result = soapBatchJobEx($GLOBALS['thumbnailArbiter'], gen_uuid(), 25, "Render Mesh ".$itemid, file_get_contents($script), array( - $itemid, - "https://www.alphaland.cc/asset/?id=".$itemid, - "https://www.alphaland.cc/", - "png", - "768", - "432" - ) - ); - - if (!is_soap_fault($result)) - { - $render = base64_decode($result->BatchJobExResult->LuaValue[0]->value); //returned by rcc - $path = $GLOBALS['renderCDNPath']; - - if (isbase64png($render)) //PNG - { - $newhash = safeAssetMD5(md5($render)); - if (file_put_contents($path . $newhash, $render)) - { - //delete old hash - $prevhash = $GLOBALS['pdo']->prepare("SELECT * FROM assets WHERE id = :i"); - $prevhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $prevhash->execute(); - $prevhash = $prevhash->fetch(PDO::FETCH_OBJ); - $oldhash = $prevhash->ThumbHash; - unlink($path . $oldhash); - - //set new hash - $newthumbhash = $GLOBALS['pdo']->prepare("UPDATE assets SET ThumbHash = :h WHERE id = :i"); - $newthumbhash->bindParam(":h", $newhash, PDO::PARAM_STR); - $newthumbhash->bindParam(":i", $itemid, PDO::PARAM_INT); - $newthumbhash->execute(); - - return true; - } - } - } - else - { - logSoapFault($result, "Render Mesh ".$itemid." Job", $script); - } - return false; - } -} - function wearingAssets($userid) //returns wearing asset list separated by ; { $wearingitems = $GLOBALS['pdo']->prepare('SELECT * FROM wearing_items WHERE uid = :uid ORDER BY aid ASC'); //wearing items from lowest to highest (EZ) @@ -3109,31 +2315,7 @@ function rerenderutility() $setrenderstat = $GLOBALS['pdo']->prepare("UPDATE users SET pendingRender = 1, pendingHeadshotRender = 1, renderCount = renderCount+1, lastRender = UNIX_TIMESTAMP(), lastHeadshotRender = UNIX_TIMESTAMP() WHERE id = :u"); $setrenderstat->bindParam(":u", $localplayer, PDO::PARAM_INT); $setrenderstat->execute(); - RenderPlayer($localplayer); -} - -function isPendingRender() -{ - $localplayer = $GLOBALS['user']->id; - $check = $GLOBALS['pdo']->prepare("SELECT * FROM users WHERE id = :u"); - $check->bindParam(":u", $localplayer, PDO::PARAM_INT); - $check->execute(); - $checkdata = $check->fetch(PDO::FETCH_OBJ); - - if ($checkdata->pendingRender == true) //render pending - { - if (($checkdata->lastRender + 30) < time()) //last render still pending after 30 seconds - { - $update = $GLOBALS['pdo']->prepare("UPDATE users SET pendingRender = 0 WHERE id = :u"); - $update->bindParam(":u", $localplayer, PDO::PARAM_INT); - $update->execute(); - } - else - { - return true; - } - } - return false; + UsersRender::RenderPlayer($localplayer); } function checkUserPendingRender($player) @@ -3339,7 +2521,7 @@ function submitRobloxAssetWorker($requestedassetid, $assettypeid, $assetname, $a $assetid = uploadRobloxMesh($assetname, $assetid, 1); if ($assetid !== FALSE) { $xml=str_replace($mesh, $GLOBALS['url'] . "/asset/?id=" . $assetid, $xml); - RenderMesh($assetid); + Render::RenderMesh($assetid); } else { $meshuploadsuccess = false; break; @@ -3377,13 +2559,13 @@ function submitRobloxAssetWorker($requestedassetid, $assettypeid, $assetname, $a switch ($assettypeid) { case 8: - RenderHat($newassetid); + Render::RenderHat($newassetid); break; case 18: - RenderFace($newassetid); + Render::RenderFace($newassetid); break; case 19: - RenderGear($newassetid); + Render::RenderGear($newassetid); break; default: break; @@ -3546,13 +2728,13 @@ function approveAsset($id) //currently supports t-shirts, shirts and pants switch ($assettype) { case 2: //TShirt - RenderTShirt($id, true); + Render::RenderTShirt($id, true); break; case 11: //Shirt - RenderShirt($id, true); + Render::RenderShirt($id, true); break; case 12: //Pants - RenderPants($id, true); + Render::RenderPants($id, true); break; default: break; @@ -3673,7 +2855,7 @@ function moderateAsset($id) //currently supports t-shirts, shirts and pants foreach($assetowners as $owner) { - RenderPlayer($owner['uid']); + UsersRender::RenderPlayer($owner['uid']); Sleep(2); } } diff --git a/html/Studio/Data/UploadData.php b/html/Studio/Data/UploadData.php index 9cadb88..c182fd6 100644 --- a/html/Studio/Data/UploadData.php +++ b/html/Studio/Data/UploadData.php @@ -5,6 +5,8 @@ Alphaland 2021 This is for uploading data from studio, this requires the user to have access to the asset. */ +use Alphaland\Assets\Render; + $id = (int)$_GET['id']; $iteminfo = getAssetInfo($id); @@ -96,8 +98,7 @@ if($iteminfo !== FALSE) //asset id exists in alphaland db //unlock asset db $pdo->exec("UNLOCK TABLES"); //unlock since we are done with sensitive asset stuff - RenderModel($iteminfo->id); - + Render::RenderModel($iteminfo->id); } } else diff --git a/html/Studio/IDE/Publish/uploadnewasset.php b/html/Studio/IDE/Publish/uploadnewasset.php index 4520971..d9a2d61 100644 --- a/html/Studio/IDE/Publish/uploadnewasset.php +++ b/html/Studio/IDE/Publish/uploadnewasset.php @@ -3,8 +3,9 @@ /* Alphaland 2021 The purpose of this is to upload SolidModels (Unions) from studio, since studio does not serialize the actual Union -*/; +*/ +use Alphaland\Assets\Render; $assetTypeName = $_GET['assetTypeName']; $name = $_GET['name']; @@ -134,9 +135,9 @@ if ($assetTypeName && $name && $isPublic && $allowComments) NULL //ThumbHash ); // ... - if (!RenderModel($newitem)) + if (!Render::RenderModel($newitem)) { - RenderModel($newitem); //if first fail do it again + Render::RenderModel($newitem); //if first fail do it again } giveItem($user->id, $newitem); } diff --git a/html/catalog/config.php b/html/catalog/config.php index b6e45bf..1436cb6 100644 --- a/html/catalog/config.php +++ b/html/catalog/config.php @@ -1,5 +1,6 @@ Render Hat Failed"; } @@ -184,7 +185,7 @@ if(isset($_GET['id'])) elseif ($itemtypeint == 2) { //T Shirt - if (!RenderTShirt($id)) + if (!Render::RenderTShirt($id)) { $alert = ""; } @@ -196,7 +197,7 @@ if(isset($_GET['id'])) elseif ($itemtypeint == 4) { //Mesh - if (!RenderMesh($id)) + if (!Render::RenderMesh($id)) { $alert = ""; } @@ -208,7 +209,7 @@ if(isset($_GET['id'])) elseif ($itemtypeint == 11) { //Shirt - if (!RenderShirt($id)) + if (!Render::RenderShirt($id)) { $alert = ""; } @@ -220,7 +221,7 @@ if(isset($_GET['id'])) elseif ($itemtypeint == 12) { //Pants - if (!RenderPants($id)) + if (!Render::RenderPants($id)) { $alert = ""; } @@ -232,7 +233,7 @@ if(isset($_GET['id'])) elseif ($itemtypeint == 18) { //Faces - if (!RenderFace($id)) + if (!Render::RenderFace($id)) { $alert = ""; } @@ -244,7 +245,7 @@ if(isset($_GET['id'])) elseif ($itemtypeint == 19) { //Gears - if (!RenderGear($id)) + if (!Render::RenderGear($id)) { $alert = ""; } @@ -256,7 +257,7 @@ if(isset($_GET['id'])) elseif ($itemtypeint == 17) { //Heads - if (!RenderHead($id)) + if (!Render::RenderHead($id)) { $alert = ""; } @@ -268,7 +269,7 @@ if(isset($_GET['id'])) elseif ($itemtypeint == 32) { //Packages - if (!RenderPackage($id)) + if (!Render::RenderPackage($id)) { $alert = ""; } @@ -280,7 +281,7 @@ if(isset($_GET['id'])) elseif ($itemtypeint == 10) { //Models - if (!RenderModel($id)) + if (!Render::RenderModel($id)) { $alert = ""; } diff --git a/html_admin/create-asset.php b/html_admin/create-asset.php index 3d4db94..e9da000 100644 --- a/html_admin/create-asset.php +++ b/html_admin/create-asset.php @@ -1,5 +1,6 @@ Error Rendering Hat, it's been uploaded but not Rendered"; } @@ -272,7 +273,7 @@ $alert = ''; //render - if (!RenderFace($autoincrement)) + if (!Render::RenderFace($autoincrement)) { $alert = ""; } @@ -433,7 +434,7 @@ $alert = ''; } // ... - if (!RenderHead($autoincrement)) + if (!Render::RenderHead($autoincrement)) { $alert = ""; } diff --git a/html_admin/rendermanagement.php b/html_admin/rendermanagement.php index f267651..0afbab9 100644 --- a/html_admin/rendermanagement.php +++ b/html_admin/rendermanagement.php @@ -1,5 +1,6 @@