From 57fcc25822ba3b3a58e42b4adfd40deefb802452 Mon Sep 17 00:00:00 2001 From: Graphictoria Date: Fri, 19 Aug 2022 19:48:11 -0400 Subject: [PATCH] A few rendering updates for templating scripts and some admin page stuff. --- web/app/Grid/SoapService.php | 77 +- web/app/Helpers/GridHelper.php | 107 ++- .../Controllers/Api/ThumbnailController.php | 2 +- .../Http/Controllers/Web/AdminController.php | 27 + .../Http/Controllers/Web/TestController.php | 17 +- web/app/Http/Kernel.php | 1 + .../{Administrator.php => Roleset.php} | 9 +- web/app/Jobs/ArbiterRender.php | 74 +- web/app/Models/ArbiterSoapFault.php | 23 + ...64838_create_arbiter_soap_faults_table.php | 35 + .../seeders/WebConfigurationSeeder.php | 10 + web/resources/views/layouts/nav.blade.php | 3 +- web/resources/views/web/admin/diag.blade.php | 35 + .../views/web/admin/diag/picker.blade.php | 9 + web/routes/web.php | 14 + web/storage/app/.gitignore | 1 + web/storage/app/grid/.gitignore | 1 + web/storage/app/grid/RCCService.wsdl | 800 ++++++++++++++++++ web/storage/app/grid/scripts/Avatar.lua | 26 + web/storage/app/grid/scripts/BodyPart.lua | 20 + web/storage/app/grid/scripts/Closeup.lua | 50 ++ web/storage/app/grid/scripts/Decal.lua | 22 + web/storage/app/grid/scripts/Gear.lua | 16 + web/storage/app/grid/scripts/Hat.lua | 16 + web/storage/app/grid/scripts/Head.lua | 31 + web/storage/app/grid/scripts/Mesh.lua | 19 + web/storage/app/grid/scripts/Model.lua | 36 + web/storage/app/grid/scripts/Package.lua | 131 +++ web/storage/app/grid/scripts/Pants.lua | 19 + web/storage/app/grid/scripts/Place.lua | 19 + web/storage/app/grid/scripts/Shirt.lua | 19 + 31 files changed, 1560 insertions(+), 109 deletions(-) create mode 100644 web/app/Http/Controllers/Web/AdminController.php rename web/app/Http/Middleware/{Administrator.php => Roleset.php} (68%) create mode 100644 web/app/Models/ArbiterSoapFault.php create mode 100644 web/database/migrations/2022_08_19_164838_create_arbiter_soap_faults_table.php create mode 100644 web/resources/views/web/admin/diag.blade.php create mode 100644 web/resources/views/web/admin/diag/picker.blade.php create mode 100644 web/storage/app/grid/.gitignore create mode 100644 web/storage/app/grid/RCCService.wsdl create mode 100644 web/storage/app/grid/scripts/Avatar.lua create mode 100644 web/storage/app/grid/scripts/BodyPart.lua create mode 100644 web/storage/app/grid/scripts/Closeup.lua create mode 100644 web/storage/app/grid/scripts/Decal.lua create mode 100644 web/storage/app/grid/scripts/Gear.lua create mode 100644 web/storage/app/grid/scripts/Hat.lua create mode 100644 web/storage/app/grid/scripts/Head.lua create mode 100644 web/storage/app/grid/scripts/Mesh.lua create mode 100644 web/storage/app/grid/scripts/Model.lua create mode 100644 web/storage/app/grid/scripts/Package.lua create mode 100644 web/storage/app/grid/scripts/Pants.lua create mode 100644 web/storage/app/grid/scripts/Place.lua create mode 100644 web/storage/app/grid/scripts/Shirt.lua diff --git a/web/app/Grid/SoapService.php b/web/app/Grid/SoapService.php index 5a678a6..2648707 100644 --- a/web/app/Grid/SoapService.php +++ b/web/app/Grid/SoapService.php @@ -10,6 +10,9 @@ namespace App\Grid; use Illuminate\Support\Facades\Storage; use SoapClient; +use App\Models\ArbiterSoapFault; +use App\Helpers\GridHelper; + class SoapService { /** @@ -27,11 +30,12 @@ class SoapService * @param string $arbiterAddr * @return null */ - public function __construct($arbiterAddr) { + public function __construct($arbiterType) { + $arbiter = GridHelper::{strtolower($arbiterType) . 'Arbiter'}(); $this->Client = new SoapClient( - Storage::path('grid/RCCService.wsdl'), + Storage::path('grid/RCCservice.wsdl'), // Arbiter WCF service WSDL should not be used for RCCService calls. [ - 'location' => $arbiterAddr, + 'location' => $arbiter, 'uri' => 'http://roblox.com/', 'exceptions' => false ] @@ -49,72 +53,17 @@ class SoapService $soapResult = $this->Client->{$name}($args); if(is_soap_fault($soapResult)) { - // TODO: XlXi: log faults + ArbiterSoapFault::create([ + 'function' => $name, + 'code' => $soapResult->getCode(), + 'message' => $soapResult->getMessage(), + 'job_arguments' => json_encode($args) + ]); } return $soapResult; } - /* Job constructors */ - - public static function LuaValue($value) - { - switch ($value) { - case is_bool(json_encode($value)) || $value == 1: - return json_encode($value); - default: - return $value; - } - } - - public static function CastType($value) - { - $luaTypeConversions = [ - 'NULL' => 'LUA_TNIL', - 'boolean' => 'LUA_TBOOLEAN', - 'integer' => 'LUA_TNUMBER', - 'double' => 'LUA_TNUMBER', - 'string' => 'LUA_TSTRING', - 'array' => 'LUA_TTABLE', - 'object' => 'LUA_TNIL' - ]; - return $luaTypeConversions[gettype($value)]; - } - - public static function ToLuaArguments($luaArguments = []) - { - $luaValue = ['LuaValue' => []]; - - foreach ($luaArguments as $argument) { - array_push( - $luaValue['LuaValue'], - [ - 'type' => SoapService::CastType($argument), - 'value' => SoapService::LuaValue($argument) - ] - ); - } - - return $luaValue; - } - - public static function MakeJobJSON($jobID, $expiration, $category, $cores, $scriptName, $script, $scriptArgs = []) - { - return [ - 'job' => [ - 'id' => $jobID, - 'expirationInSeconds' => $expiration, - 'category' => $category, - 'cores' => $cores - ], - 'script' => [ - 'name' => $scriptName, - 'script' => $script, - 'arguments' => SoapService::ToLuaArguments($scriptArgs) - ] - ]; - } - /* Service functions */ public function HelloWorld() diff --git a/web/app/Helpers/GridHelper.php b/web/app/Helpers/GridHelper.php index ac6d2f1..3b9bf30 100644 --- a/web/app/Helpers/GridHelper.php +++ b/web/app/Helpers/GridHelper.php @@ -7,6 +7,7 @@ namespace App\Helpers; +use Illuminate\Support\Facades\Storage; use Illuminate\Http\Request; use App\Models\DynamicWebConfiguration; @@ -31,13 +32,113 @@ class GridHelper public static function hasAllAccess() { if(app()->runningInConsole()) return true; - if(GridHelper::isIpWhitelisted() && GridHelper::isAccessKeyValid()) return true; + if(self::isIpWhitelisted() && self::isAccessKeyValid()) return true; return false; } - public static function createScript($scripts = [], $arguments = []) + public static function LuaValue($value) { - // TODO: XlXi: this when we get the grid working with the site + switch ($value) { + case is_bool(json_encode($value)) || $value == 1: + return json_encode($value); + default: + return $value; + } + } + + public static function CastType($value) + { + $luaTypeConversions = [ + 'NULL' => 'LUA_TNIL', + 'boolean' => 'LUA_TBOOLEAN', + 'integer' => 'LUA_TNUMBER', + 'double' => 'LUA_TNUMBER', + 'string' => 'LUA_TSTRING', + 'array' => 'LUA_TTABLE', + 'object' => 'LUA_TNIL' + ]; + return $luaTypeConversions[gettype($value)]; + } + + public static function ToLuaArguments($luaArguments = []) + { + $luaValue = ['LuaValue' => []]; + + foreach ($luaArguments as $argument) { + array_push( + $luaValue['LuaValue'], + [ + 'type' => self::CastType($argument), + 'value' => self::LuaValue($argument) + ] + ); + } + + return $luaValue; + } + + public static function Job($jobID, $expiration, $category, $cores, $scriptName, $script, $scriptArgs = []) + { + return [ + 'job' => [ + 'id' => $jobID, + 'expirationInSeconds' => $expiration, + 'category' => $category, + 'cores' => $cores + ], + 'script' => [ + 'name' => $scriptName, + 'script' => $script, + 'arguments' => self::ToLuaArguments($scriptArgs) + ] + ]; + } + + public static function JobTemplate($jobID, $expiration, $category, $cores, $scriptName, $templateName, $scriptArgs = []) + { + $disk = Storage::build([ + 'driver' => 'local', + 'root' => storage_path('app/grid/scripts'), + ]); + + $fileName = sprintf('%s.lua', $templateName); + + if(!$disk->exists($fileName)) + throw new Exception('Unable to locate template file.'); + + $job = self::Job($jobID, $expiration, $category, $cores, $scriptName, '', $scriptArgs); + $job['script']['script'] = $disk->get($fileName); + + return $job; + } + + public static function getArbiter($name) + { + $query = DynamicWebConfiguration::where('name', sprintf('%sArbiterIP', $name))->first(); + if(!$query) + throw new Exception('Unknown arbiter.'); + + return $query->value; + } + + public static function gameArbiter() + { + return sprintf('http://%s:64989', self::getArbiter('Game')); + } + + public static function thumbnailArbiter() + { + return sprintf('http://%s:64989', self::getArbiter('Thumbnail')); + } + + public static function gameArbiterMonitor() + { + return sprintf('http://%s:64990', self::getArbiter('Game')); + } + + public static function thumbnailArbiterMonitor() + { + return sprintf('http://%s:64990', self::getArbiter('Thumbnail')); } } diff --git a/web/app/Http/Controllers/Api/ThumbnailController.php b/web/app/Http/Controllers/Api/ThumbnailController.php index 83ff9d1..44bf766 100644 --- a/web/app/Http/Controllers/Api/ThumbnailController.php +++ b/web/app/Http/Controllers/Api/ThumbnailController.php @@ -49,7 +49,7 @@ class ThumbnailController extends Controller $tracker->target = $valid['id']; $tracker->save(); - ArbiterRender::dispatch($tracker, $valid['type'] == '3d'); + ArbiterRender::dispatch($tracker, $valid['type'] == '3d', $asset->typeString(), $asset->id); } return response(['status' => 'loading']); diff --git a/web/app/Http/Controllers/Web/AdminController.php b/web/app/Http/Controllers/Web/AdminController.php new file mode 100644 index 0000000..6de2393 --- /dev/null +++ b/web/app/Http/Controllers/Web/AdminController.php @@ -0,0 +1,27 @@ +with([ + 'title' => sprintf('%s Arbiter Diag', $arbiterType), + 'arbiter' => $arbiterType + ]); + } +} diff --git a/web/app/Http/Controllers/Web/TestController.php b/web/app/Http/Controllers/Web/TestController.php index dcf4be6..e80d0f0 100644 --- a/web/app/Http/Controllers/Web/TestController.php +++ b/web/app/Http/Controllers/Web/TestController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Web; use Illuminate\Http\Request; use Illuminate\Support\Str; +use App\Helpers\GridHelper; use App\Http\Controllers\Controller; use App\Grid\SoapService; @@ -15,20 +16,10 @@ class TestController extends Controller */ public function generateThumbnail() { - $testScript = <<OpenJob(SoapService::MakeJobJSON('test', 10, 0, 0, 'test render', $testScript)); + $test = new SoapService('Thumbnail'); + $result = $test->OpenJob(GridHelper::JobTemplate('test', 10, 0, 0, 'test render', 'place', ['http://www.roblox.com/asset/?id=444204653', 'PNG', 1920, 1080, 'https://www.gtoria.local/', 169618721])); return response(base64_decode($result->OpenJobExResult->LuaValue[0]->value)) ->header('Content-Type', 'image/png'); diff --git a/web/app/Http/Kernel.php b/web/app/Http/Kernel.php index 173ca20..f4a9e92 100644 --- a/web/app/Http/Kernel.php +++ b/web/app/Http/Kernel.php @@ -69,6 +69,7 @@ class Kernel extends HttpKernel 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, + 'roleset' => \App\Http\Middleware\Roleset::class, 'banned' => \App\Http\Middleware\CheckBan::class, ]; } diff --git a/web/app/Http/Middleware/Administrator.php b/web/app/Http/Middleware/Roleset.php similarity index 68% rename from web/app/Http/Middleware/Administrator.php rename to web/app/Http/Middleware/Roleset.php index 7d8c80e..68b8b8e 100644 --- a/web/app/Http/Middleware/Administrator.php +++ b/web/app/Http/Middleware/Roleset.php @@ -4,8 +4,9 @@ namespace App\Http\Middleware; use Closure; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; -class Administrator +class Roleset { /** * Handle an incoming request. @@ -14,11 +15,11 @@ class Administrator * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse */ - public function handle(Request $request, Closure $next) + public function handle(Request $request, Closure $next, $role) { - if (Auth::user()->isAdmin()) + if (Auth::check() && Auth::user()->hasRoleset($role)) return $next($request); - return abort(403); + return abort(404); } } diff --git a/web/app/Jobs/ArbiterRender.php b/web/app/Jobs/ArbiterRender.php index 9e6e24c..afc62b2 100644 --- a/web/app/Jobs/ArbiterRender.php +++ b/web/app/Jobs/ArbiterRender.php @@ -12,6 +12,7 @@ use Illuminate\Support\Str; use App\Grid\SoapService; use App\Helpers\CdnHelper; +use App\Helpers\GridHelper; use App\Models\RenderTracker; class ArbiterRender implements ShouldQueue @@ -45,16 +46,32 @@ class ArbiterRender implements ShouldQueue * @var bool */ public $is3D; + + /** + * Asset type string based on asset's type id + * + * @var string + */ + public $type; + + /** + * Asset ID to render + * + * @var int + */ + public $assetId; /** * Create a new job instance. * * @return void */ - public function __construct(RenderTracker $tracker, bool $is3D) + public function __construct(RenderTracker $tracker, bool $is3D, string $type, int $assetId) { $this->tracker = $tracker; $this->is3D = $is3D; + $this->type = $type; + $this->assetId = $assetId; } /** @@ -64,28 +81,41 @@ class ArbiterRender implements ShouldQueue */ public function handle() { - $testScript = <<assetId)), // TODO: XlXi: Move url() to route once the route actually exists. + ($this->is3D ? 'OBJ' : 'PNG'), + 840, // Width + 840, // Height + url('/') + ]; + switch($this->type) { + case 'Head': + case 'Shirt': + case 'Pants': + case 'BodyPart': + // TODO: XlXi: Move this to config, as it could be different from prod in a testing environment. Also move this to it's own asset (not loading from roblox). + array_push($arguments, 'https://www.roblox.com/asset/?id=1785197'); // Rig + break; + case 'Package': + // TODO: XlXi: Move these to config, as it could be different from prod in a testing environment. Also move these to their own assets (not loading from roblox). + array_push($arguments, 'https://www.roblox.com/asset/?id=1785197'); // Rig + array_push($arguments, '27113661;25251154'); // Custom Texture URLs (shirt and pands) + break; + case 'Place': + array_push($arguments, '0'); // TODO: XlXi: Universe IDs + break; + } - game:Load("http://gtoria.net/asset/?id=3529"); - for _, Object in pairs(game:GetChildren())do - if Object:IsA("Tool") then - Object.Parent = workspace - end - end - - -- format, width, height, sky, crop - return game:GetService("ThumbnailGenerator"):Click("OBJ", 840, 840, true, true) -TestScript; - - $test = new SoapService('http://192.168.0.3:64989'); - $result = $test->OpenJob(SoapService::MakeJobJSON(Str::uuid()->toString(), 120, 0, 0, sprintf('Render %s %d', $this->tracker->type, $this->tracker->target), $testScript)); + $service = new SoapService('Thumbnail'); + $result = $service->OpenJob(GridHelper::JobTemplate( + Str::uuid()->toString(), // Job ID + 120, // Expiration + 0, // Category ID + 0, // Cores + sprintf('Render %s %d', $this->tracker->type, $this->tracker->target), // Script Name + $this->type, // Script + $arguments // Arguments + )); if(is_soap_fault($result)) $this->fail(sprintf('SOAP Fault: (faultcode: %s, faultstring: %s)', $result->faultcode, $result->faultstring)); diff --git a/web/app/Models/ArbiterSoapFault.php b/web/app/Models/ArbiterSoapFault.php new file mode 100644 index 0000000..c1a70b2 --- /dev/null +++ b/web/app/Models/ArbiterSoapFault.php @@ -0,0 +1,23 @@ +id(); + $table->string('function'); + $table->string('code'); + $table->string('message'); + $table->longText('job_arguments'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('arbiter_soap_faults'); + } +}; diff --git a/web/database/seeders/WebConfigurationSeeder.php b/web/database/seeders/WebConfigurationSeeder.php index c540d6e..7eb8f94 100644 --- a/web/database/seeders/WebConfigurationSeeder.php +++ b/web/database/seeders/WebConfigurationSeeder.php @@ -43,5 +43,15 @@ class WebConfigurationSeeder extends Seeder 'name' => 'VersionCompatibilityHashes', 'value' => 'debughash' // hash1;hash2;hash3 ]); + + DynamicWebConfiguration::create([ + 'name' => 'GameArbiterIP', + 'value' => '127.0.0.1' + ]); + + DynamicWebConfiguration::create([ + 'name' => 'ThumbnailArbiterIP', + 'value' => '127.0.0.1' + ]); } } diff --git a/web/resources/views/layouts/nav.blade.php b/web/resources/views/layouts/nav.blade.php index f784a6e..7cfcce8 100644 --- a/web/resources/views/layouts/nav.blade.php +++ b/web/resources/views/layouts/nav.blade.php @@ -64,8 +64,7 @@ @yield('quick-admin') @admin
  • - {{-- TODO: XlXi: Make this use route() --}} - Arbiter Diag + Arbiter Diag
    • @endadmin
  • diff --git a/web/resources/views/web/admin/diag.blade.php b/web/resources/views/web/admin/diag.blade.php new file mode 100644 index 0000000..83a6afb --- /dev/null +++ b/web/resources/views/web/admin/diag.blade.php @@ -0,0 +1,35 @@ +@extends('layouts.app') + +@section('extra-headers') + +@endsection + +@section('content') +
    +

    Arbiter Diag (RccServiceMonitor)

    +
    + + + Active Jobs + + +
    + +
    +     +     +
    +

    Soap Exceptions

    +
    +
    + +
    +
    +
    +@endsection \ No newline at end of file diff --git a/web/resources/views/web/admin/diag/picker.blade.php b/web/resources/views/web/admin/diag/picker.blade.php new file mode 100644 index 0000000..6c36127 --- /dev/null +++ b/web/resources/views/web/admin/diag/picker.blade.php @@ -0,0 +1,9 @@ +@extends('layouts.app') + +@section('title', 'Arbiter Diag') + +@section('content') +
    +

    Arbiter Diag (RccServiceMonitor)

    +
    +@endsection \ No newline at end of file diff --git a/web/routes/web.php b/web/routes/web.php index 4f0894e..944c809 100644 --- a/web/routes/web.php +++ b/web/routes/web.php @@ -23,6 +23,20 @@ Route::middleware('auth')->group(function () { }); }); +Route::group(['as' => 'admin.', 'prefix' => 'admin'], function() { + Route::middleware('roleset:moderator')->group(function () { + Route::get('/', 'AdminController@dashboard')->name('dashboard'); + }); + + Route::middleware('roleset:administrator')->group(function () { + Route::get('/arbiter-diag/{arbiterType?}', 'AdminController@arbiterDiag')->name('diag'); + }); + + Route::middleware('roleset:owner')->group(function () { + + }); +}); + Route::group(['as' => 'auth.', 'namespace' => 'Auth'], function() { Route::group(['as' => 'protection.', 'prefix' => 'request-blocked'], function() { Route::get('/', 'DoubleSessionBlockController@index')->name('index'); diff --git a/web/storage/app/.gitignore b/web/storage/app/.gitignore index 8f4803c..4552473 100644 --- a/web/storage/app/.gitignore +++ b/web/storage/app/.gitignore @@ -1,3 +1,4 @@ * !public/ +!grid/ !.gitignore diff --git a/web/storage/app/grid/.gitignore b/web/storage/app/grid/.gitignore new file mode 100644 index 0000000..74e5b1d --- /dev/null +++ b/web/storage/app/grid/.gitignore @@ -0,0 +1 @@ +!* \ No newline at end of file diff --git a/web/storage/app/grid/RCCService.wsdl b/web/storage/app/grid/RCCService.wsdl new file mode 100644 index 0000000..4fb100d --- /dev/null +++ b/web/storage/app/grid/RCCService.wsdl @@ -0,0 +1,800 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/storage/app/grid/scripts/Avatar.lua b/web/storage/app/grid/scripts/Avatar.lua new file mode 100644 index 0000000..e47fe1d --- /dev/null +++ b/web/storage/app/grid/scripts/Avatar.lua @@ -0,0 +1,26 @@ +local characterAppearanceUrl, baseUrl, fileExtension, x, y = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +local player = game:GetService("Players"):CreateLocalPlayer(0) +player.CharacterAppearance = characterAppearanceUrl +player:LoadCharacter(false) + +-- Raise up the character's arm if they have gear. +if player.Character then + for _, child in pairs(player.Character:GetChildren()) do + if child:IsA("Tool") then + player.Character.Torso["Right Shoulder"].CurrentAngle = math.rad(90) + break + end + end +end + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] true) \ No newline at end of file diff --git a/web/storage/app/grid/scripts/BodyPart.lua b/web/storage/app/grid/scripts/BodyPart.lua new file mode 100644 index 0000000..b73c036 --- /dev/null +++ b/web/storage/app/grid/scripts/BodyPart.lua @@ -0,0 +1,20 @@ +local assetUrl, fileExtension, x, y, baseUrl, rigUrl = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +local mannequin = game:GetObjects(rigUrl)[1] +mannequin.Humanoid.DisplayDistanceType = Enum.HumanoidDisplayDistanceType.None +mannequin.Parent = workspace + +for _, object in pairs(game:GetObjects(assetUrl)) do + object.Parent = mannequin +end + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] true) \ No newline at end of file diff --git a/web/storage/app/grid/scripts/Closeup.lua b/web/storage/app/grid/scripts/Closeup.lua new file mode 100644 index 0000000..aaef846 --- /dev/null +++ b/web/storage/app/grid/scripts/Closeup.lua @@ -0,0 +1,50 @@ +local baseUrl, characterAppearanceUrl, fileExtension, x, y, quadratic, baseHatZoom, maxHatZoom, cameraOffsetX, cameraOffsetY = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +local player = game:GetService("Players"):CreateLocalPlayer(0) +player.CharacterAppearance = characterAppearanceUrl +player:LoadCharacter(false) + +local maxDimension = 0 + +if player.Character then + -- Remove gear + for _, child in pairs(player.Character:GetChildren()) do + if child:IsA("Tool") then + child:Destroy() + elseif child:IsA("Accoutrement") then + local size = child.Handle.Size / 2 + child.Handle.Position - player.Character.Head.Position + local xy = Vector2.new(size.x, size.y) + if xy.magnitude > maxDimension then + maxDimension = xy.magnitude + end + end + end + + -- Setup Camera + local maxHatOffset = 0.5 -- Maximum amount to move camera upward to accomodate large hats + maxDimension = math.min(1, maxDimension / 3) -- Confine maxdimension to specific bounds + + if quadratic then + maxDimension = maxDimension * maxDimension -- Zoom out on quadratic interpolation + end + + local viewOffset = player.Character.Head.CFrame * CFrame.new(cameraOffsetX, cameraOffsetY + maxHatOffset * maxDimension, 0.1) -- View vector offset from head + local positionOffset = player.Character.Head.CFrame + (CFrame.Angles(0, -math.pi / 16, 0).lookVector.unit * 3) -- Position vector offset from head + + local camera = Instance.new("Camera", player.Character) + camera.Name = "ThumbnailCamera" + camera.CameraType = Enum.CameraType.Scriptable + camera.CoordinateFrame = CFrame.new(positionOffset.p, viewOffset.p) + camera.FieldOfView = baseHatZoom + (maxHatZoom - baseHatZoom) * maxDimension +end + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] true) \ No newline at end of file diff --git a/web/storage/app/grid/scripts/Decal.lua b/web/storage/app/grid/scripts/Decal.lua new file mode 100644 index 0000000..5ae05e2 --- /dev/null +++ b/web/storage/app/grid/scripts/Decal.lua @@ -0,0 +1,22 @@ +local assetUrl, fileExtension, x, y, baseUrl = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local decal = game:GetObjects(assetUrl)[1] + +local thumbnailGenerator = game:GetService("ThumbnailGenerator") + +local image, requestedUrls +local success = pcall(function() + image, requestedUrls = thumbnailGenerator:ClickTexture(decal.Texture, fileExtension, x, y) +end) + +if success then + return image, requestedUrls +end + +-- if we fail return the hourglass, since we're probably in moderation. +return "/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wgARCAABAAEDAREAAhEBAxEB/8QAFAABAAAAAAAAAAAAAAAAAAAACf/EABQBAQAAAAAAAAAAAAAAAAAAAAD/2gAMAwEAAhADEAAAAX8P/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/aAAgBAQABBQJ//8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAgBAwEBPwF//8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAgBAgEBPwF//8QAFBABAAAAAAAAAAAAAAAAAAAAAP/aAAgBAQAGPwJ//8QAFBABAAAAAAAAAAAAAAAAAAAAAP/aAAgBAQABPyF//9oADAMBAAIAAwAAABAf/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAgBAwEBPxB//8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAgBAgEBPxB//8QAFBABAAAAAAAAAAAAAAAAAAAAAP/aAAgBAQABPxB//9k=", {decal.Texture} \ No newline at end of file diff --git a/web/storage/app/grid/scripts/Gear.lua b/web/storage/app/grid/scripts/Gear.lua new file mode 100644 index 0000000..40095b4 --- /dev/null +++ b/web/storage/app/grid/scripts/Gear.lua @@ -0,0 +1,16 @@ +local assetUrl, fileExtension, x, y, baseUrl = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +for _, object in pairs(game:GetObjects(assetUrl)) do + object.Parent = workspace +end + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] true, --[[crop = ]] true) diff --git a/web/storage/app/grid/scripts/Hat.lua b/web/storage/app/grid/scripts/Hat.lua new file mode 100644 index 0000000..40095b4 --- /dev/null +++ b/web/storage/app/grid/scripts/Hat.lua @@ -0,0 +1,16 @@ +local assetUrl, fileExtension, x, y, baseUrl = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +for _, object in pairs(game:GetObjects(assetUrl)) do + object.Parent = workspace +end + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] true, --[[crop = ]] true) diff --git a/web/storage/app/grid/scripts/Head.lua b/web/storage/app/grid/scripts/Head.lua new file mode 100644 index 0000000..fb0b72c --- /dev/null +++ b/web/storage/app/grid/scripts/Head.lua @@ -0,0 +1,31 @@ +local assetUrl, fileExtension, x, y, baseUrl, rigUrl = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +local mannequin = game:GetObjects(rigUrl)[1] +mannequin.Humanoid.DisplayDistanceType = Enum.HumanoidDisplayDistanceType.None +mannequin.Parent = workspace + +local object = game:GetObjects(assetUrl)[1] + +mannequin.Head.BrickColor = BrickColor.Gray() +if mannequin.Head:FindFirstChild("Mesh") then + mannequin.Head.Mesh:Destroy() +end +object.Parent = mannequin.Head + +for _, child in pairs(mannequin:GetChildren()) do + if child:IsA("BasePart") and child.Name ~= "Head" then + child:Destroy() + end +end + + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] true) \ No newline at end of file diff --git a/web/storage/app/grid/scripts/Mesh.lua b/web/storage/app/grid/scripts/Mesh.lua new file mode 100644 index 0000000..ec223e8 --- /dev/null +++ b/web/storage/app/grid/scripts/Mesh.lua @@ -0,0 +1,19 @@ +local assetUrl, fileExtension, x, y, baseUrl = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +local part = Instance.new("Part") +part.Parent = workspace + +local specialMesh = Instance.new("SpecialMesh") +specialMesh.MeshId = assetUrl +specialMesh.Parent = part + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] true, --[[crop = ]] true) \ No newline at end of file diff --git a/web/storage/app/grid/scripts/Model.lua b/web/storage/app/grid/scripts/Model.lua new file mode 100644 index 0000000..f685897 --- /dev/null +++ b/web/storage/app/grid/scripts/Model.lua @@ -0,0 +1,36 @@ +local assetUrl, fileExtension, x, y, baseUrl = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +local ThumbnailGenerator = game:GetService("ThumbnailGenerator") + + for _, object in pairs(game:GetObjects(assetUrl)) do + if object:IsA("Sky") then + local resultValues = nil + local success = pcall(function() resultValues = {ThumbnailGenerator:ClickTexture(object.SkyboxFt, fileExtension, x, y)} end) + if success then + return unpack(resultValues) + else + object.Parent = game:GetService("Lighting") + return ThumbnailGenerator:Click(fileExtension, x, y, --[[hideSky = ]] false) + end + elseif object:IsA("LuaSourceContainer") then + return ThumbnailGenerator:ClickTexture(baseUrl.. "Thumbs/Script.png", fileExtension, x, y) + elseif object:IsA("SpecialMesh") then + local part = Instance.new("Part") + part.Parent = workspace + object.Parent = part + return ThumbnailGenerator:Click(fileExtension, x, y, --[[hideSky = ]] true) + else + pcall(function() object.Parent = workspace end) + end + end + + return ThumbnailGenerator:Click(fileExtension, x, y, --[[hideSky = ]] true) diff --git a/web/storage/app/grid/scripts/Package.lua b/web/storage/app/grid/scripts/Package.lua new file mode 100644 index 0000000..316d2f2 --- /dev/null +++ b/web/storage/app/grid/scripts/Package.lua @@ -0,0 +1,131 @@ +local assetUrls, fileExtension, x, y, baseUrl, rigUrl, customTextureUrls = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +function split(str, delim) + local results = {} + local lastMatchEnd = 0 + + local matchStart, matchEnd = string.find(str, delim, --[[init = ]] 1, --[[plain = ]] true) + while matchStart and matchEnd do + if matchStart - lastMatchEnd > 1 then + table.insert(results, string.sub(str, lastMatchEnd + 1, matchStart - 1)) + end + + lastMatchEnd = matchEnd + matchStart, matchEnd = string.find(str, delim, --[[init = ]] lastMatchEnd + 1, --[[plain = ]] true) + end + + if string.len(str) - lastMatchEnd > 1 then + table.insert(results, string.sub(str, lastMatchEnd + 1)) + end + return results +end + +local mannequin = game:GetObjects(rigUrl)[1] +mannequin.Humanoid.DisplayDistanceType = Enum.HumanoidDisplayDistanceType.None +mannequin.Parent = workspace + +local accoutrements = {} + +local assetUrlsList = split(assetUrls, ";") +for _, assetUrl in pairs(assetUrlsList) do + local currObject = game:GetObjects(assetUrl)[1] + + if currObject:IsA("Tool") then + annequin.Torso["Right Shoulder"].CurrentAngle = math.rad(90) + currObject.Parent = mannequin + elseif currObject:IsA("DataModelMesh") then + local headMesh = mannequin.Head:FindFirstChild("Mesh") + if headMesh then + headMesh:Destroy() + end + currObject.Parent = mannequin.Head + elseif currObject:IsA("Decal") then + local face = mannequin.Head:FindFirstChild("face") + if face then + face:Destroy() + end + currObject.Parent = mannequin.Head + elseif currObject:IsA("Accoutrement") then + table.insert(accoutrements, currObject) + else + currObject.Parent = mannequin + end +end + +local textureUrls = split(customTextureUrls, ";") +for _, url in pairs(textureUrls) do + local obj = game:GetObjects(url)[1] + if obj:IsA("Shirt") then + -- Don't add a texture Shirt if package already has a Shirt + if not mannequin:FindFirstChildOfClass("Shirt") then + obj.Parent = mannequin + end + elseif obj:IsA("Pants") then + -- Don't add a texture Pants if package already has a Pants + if not mannequin:FindFirstChildOfClass("Pants") then + obj.Parent = mannequin + end + else + obj.Parent = mannequin + end +end + +function findFirstMatchingAttachment(model, name) + for _, child in pairs(model:GetChildren()) do + if child:IsA("Attachment") and child.Name == name then + return child + elseif not child:IsA("Accoutrement") and not child:IsA("Tool") then + local foundAttachment = findFirstMatchingAttachment(child, name) + if foundAttachment then + return foundAttachment + end + end + end +end + +for _, accoutrement in pairs(accoutrements) do + local handle = accoutrement:FindFirstChild("Handle") + if handle then + local accoutrementAttachment = handle:FindFirstChildOfClass("Attachment") + local characterAttachment = nil + if accoutrementAttachment then + characterAttachment = findFirstMatchingAttachment(mannequin, accoutrementAttachment.Name) + end + + local attachmentPart = nil + if characterAttachment then + attachmentPart = characterAttachment.Parent + else + attachmentPart = mannequin:FindFirstChild("Head") + end + + local attachmentCFrame = nil + if characterAttachment then + attachmentCFrame = characterAttachment.CFrame + else + attachmentCFrame = CFrame.new(0, 0.5, 0) + end + + local hatCFrame = nil + if accoutrementAttachment then + hatCFrame = accoutrementAttachment.CFrame + else + hatCFrame = accoutrement.AttachmentPoint + end + + handle.CFrame = attachmentPart.CFrame * attachmentCFrame * hatCFrame:inverse() + handle.Anchored = true + handle.Parent = mannequin + end +end + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] true) \ No newline at end of file diff --git a/web/storage/app/grid/scripts/Pants.lua b/web/storage/app/grid/scripts/Pants.lua new file mode 100644 index 0000000..0c69f64 --- /dev/null +++ b/web/storage/app/grid/scripts/Pants.lua @@ -0,0 +1,19 @@ +local assetUrl, fileExtension, x, y, baseUrl, rigUrl = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +local mannequin = game:GetObjects(rigUrl)[1] +mannequin.Humanoid.DisplayDistanceType = Enum.HumanoidDisplayDistanceType.None +mannequin.Parent = workspace + +local pants = game:GetObjects(assetUrl)[1] +pants.Parent = mannequin + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] true) \ No newline at end of file diff --git a/web/storage/app/grid/scripts/Place.lua b/web/storage/app/grid/scripts/Place.lua new file mode 100644 index 0000000..7c59244 --- /dev/null +++ b/web/storage/app/grid/scripts/Place.lua @@ -0,0 +1,19 @@ +local assetUrl, fileExtension, x, y, baseUrl, universeId = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; +if universeId ~= nil then + pcall(function() game:SetUniverseId(universeId) end) +end + +game:GetService("ScriptContext").ScriptsDisabled = true +game:GetService("StarterGui").ShowDevelopmentGui = false + +game:Load(assetUrl) + +-- Do this after again loading the place file to ensure that these values aren't changed when the place file is loaded. +game:GetService("ScriptContext").ScriptsDisabled = true +game:GetService("StarterGui").ShowDevelopmentGui = false + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] false) \ No newline at end of file diff --git a/web/storage/app/grid/scripts/Shirt.lua b/web/storage/app/grid/scripts/Shirt.lua new file mode 100644 index 0000000..7a35c9d --- /dev/null +++ b/web/storage/app/grid/scripts/Shirt.lua @@ -0,0 +1,19 @@ +local assetUrl, fileExtension, x, y, baseUrl, rigUrl = ... + +pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl) end) +game:GetService("ContentProvider"):SetThreadPool(16) +game:GetService("ScriptContext").ScriptsDisabled = true +settings()["Task Scheduler"].ThreadPoolConfig = Enum.ThreadPoolConfig.PerCore4; + +local Lighting = game:GetService("Lighting") +Lighting.ClockTime = 13 +Lighting.GeographicLatitude = -5 + +local mannequin = game:GetObjects(rigUrl)[1] +mannequin.Humanoid.DisplayDistanceType = Enum.HumanoidDisplayDistanceType.None +mannequin.Parent = workspace + +local shirt = game:GetObjects(assetUrl)[1] +shirt.Parent = mannequin + +return game:GetService("ThumbnailGenerator"):Click(fileExtension, x, y, --[[hideSky = ]] true) \ No newline at end of file