Refactor renderscripts, begin rendering for meshes, models, and hats

Modules/Render.luau

@@ -1,75 +0,0 @@
-local HttpService = game:GetService "HttpService"
-local ScriptContext = game:GetService "ScriptContext"
-local Players = game:GetService "Players"
-local ContentProvider = game:GetService "ContentProvider"
-local InsertService = game:GetService "InsertService"
-
-local function post(url: string, body: string)
-	-- We have to lie about the contentType to avoid being nuked by CORS from the website
-	game:HttpPost(url, body, true, "text/json")
-end
-
-return function(baseUrl: string, pingUrl: string, thumbnailKey: string)
-	local Render = {}
-
-	function Render.SetupAvatar(
-		renderType: string,
-		assetId: string,
-		characterAppearance: string
-	)
-		pcall(function()
-			ContentProvider:SetBaseUrl(baseUrl)
-			InsertService:SetAssetUrl(`{baseUrl}/asset?id=%d`)
-			InsertService:SetAssetVersionUrl(
-				`{baseUrl}/asset?assetversionid=%d`
-			)
-		end)
-
-		HttpService.HttpEnabled = true
-		ScriptContext.ScriptsDisabled = true
-
-		print(
-			`[{game.JobId}] Starting new render for {renderType} ID {assetId}`
-		)
-		post(
-			`{pingUrl}/{game.JobId}?apiKey={thumbnailKey}`,
-			"Rendering"
-		)
-
-		local player = Players:CreateLocalPlayer(0)
-		player.CharacterAppearance = baseUrl .. characterAppearance .. assetId
-		player:LoadCharacter(false)
-
-		-- Raise up the character's arm if they have gear.
-		local gear = player.Backpack:GetChildren()[1]
-		if gear then
-			gear.Parent = player.Character
-			player.Character.Torso["Right Shoulder"].CurrentAngle = math.rad(90)
-		end
-
-		return player
-	end
-
-	function Render.Upload(result: string)
-		for i = 1, 3 do
-			local ok, err = pcall(function()
-				post(
-					`{pingUrl}/{game.JobId}?apiKey={thumbnailKey}`,
-					result
-				)
-			end)
-			if ok then
-				print(`[{game.JobId}] Upload successful! Moving on...`)
-				break
-			elseif i == 3 then
-				print(`[{game.JobId}] An error occurred! ({err}). Giving up...`)
-				break
-			end
-			print(
-				`[{game.JobId}] An error occurred! ({err}). Uploading again...`
-			)
-		end
-	end
-
-	return Render
-end

Modules/Render/SetupAvatar.luau

@@ -0,0 +1,24 @@
+--!strict
+
+local Players = game:GetService "Players"
+
+return function(
+	baseUrl: string,
+	renderType: string,
+	assetId: number,
+	characterAppearance: string
+)
+	print(`[{game.JobId}] Starting new render for {renderType} Id {assetId}`)
+	local player = Players:CreateLocalPlayer(0)
+	player.CharacterAppearance = baseUrl .. characterAppearance .. assetId
+	player:LoadCharacter(false)
+
+	-- Raise up the character's arm if they have gear.
+	local gear = player.Backpack:GetChildren()[1]
+	if gear then
+		gear.Parent = player.Character
+		player.Character.Torso["Right Shoulder"].CurrentAngle = math.rad(90)
+	end
+
+	return player
+end

Modules/Render/init.luau

@@ -0,0 +1,46 @@
+--!strict
+
+local HttpService = game:GetService "HttpService"
+local ScriptContext = game:GetService "ScriptContext"
+local ContentProvider = game:GetService "ContentProvider"
+local InsertService = game:GetService "InsertService"
+
+local function post(url: string, body: string)
+	-- We have to lie about the contentType to avoid being nuked by CORS from the website
+	game:HttpPost(url, body, true, "text/json")
+end
+
+return function(baseUrl: string, pingUrl: string, thumbnailKey: string)
+	local Render = {}
+
+	pcall(function()
+		ContentProvider:SetBaseUrl(baseUrl)
+		InsertService:SetAssetUrl(`{baseUrl}/asset?id=%d`)
+		InsertService:SetAssetVersionUrl(`{baseUrl}/asset?assetversionid=%d`)
+	end)
+
+	HttpService.HttpEnabled = true
+	ScriptContext.ScriptsDisabled = true
+
+	post(`{pingUrl}/{game.JobId}?apiKey={thumbnailKey}`, "Rendering")
+
+	function Render.Upload(result: string)
+		for i = 1, 3 do
+			local ok, err = pcall(function()
+				post(`{pingUrl}/{game.JobId}?apiKey={thumbnailKey}`, result)
+			end)
+			if ok then
+				print(`[{game.JobId}] Upload successful! Moving on...`)
+				break
+			elseif i == 3 then
+				print(`[{game.JobId}] An error occurred! ({err}). Giving up...`)
+				break
+			end
+			print(
+				`[{game.JobId}] An error occurred! ({err}). Uploading again...`
+			)
+		end
+	end
+
+	return Render
+end

defs.d.lua

@@ -6551,6 +6551,7 @@ declare class Player extends Instance
 	CanLoadCharacterAppearance: boolean
 	Character: Model?
 	CharacterAdded: RBXScriptSignal<Model>
+	CharacterAppearance: string
 	CharacterAppearanceId: number
 	CharacterAppearanceLoaded: RBXScriptSignal<Model>
 	CharacterRemoving: RBXScriptSignal<Model>
@@ -6611,7 +6612,7 @@ declare class Player extends Instance
 	function IsInGroup(self, groupId: number): boolean
 	function IsVerified(self): boolean
 	function Kick(self, message: string?): nil
-	function LoadCharacter(self): nil
+	function LoadCharacter(self, inGame: boolean): nil
 	function LoadCharacterBlocking(self): nil
 	function Move(self, walkDirection: Vector3, relativeToCamera: boolean?): nil
 	function RemoveCharacter(self): nil
@@ -7131,7 +7132,7 @@ declare class ServerStorage extends Instance
 end
 
 declare class ThumbnailGenerator extends Instance
-	function Click(self, format: string, x: number, y: number, hideSky: boolean): string
+	function Click(self, format: "PNG" | "OBJ", x: number, y: number, hideSky: boolean, crop: boolean?): string
 end
 
 declare class ServiceProvider extends Instance

luau/join.luau

@@ -265,7 +265,7 @@ if not success then
 end
 
 -- TODO: Async get?
-loadfile ""("", -1, 0)
+-- loadfile ""("", -1, 0) -- wtf
 
 pcall(function()
 	game:SetScreenshotInfo ""

luau/renderAvatar.luau

@@ -1,12 +1,18 @@
+--!strict
 -- Render script for R6 avatars
 
 local ThumbnailGenerator = game:GetService "ThumbnailGenerator"
-local RenderModule = require "../Modules/Render.luau"
+local RenderModule = require "../Modules/Render"
-local New = (require "../Modules/New").New
+local SetupAvatar = require "../Modules/Render/SetupAvatar"
 local Render = RenderModule(_BASE_URL, _PING_URL, _THUMBNAIL_KEY) -- avoid ambiguous syntax after compilation
+local New = (require "../Modules/New").New
 
-local player =
+local player = SetupAvatar(
-	Render.SetupAvatar(_RENDER_TYPE, _ASSET_ID, `/asset/characterfetch?userID=`)
+	_BASE_URL,
+	_RENDER_TYPE,
+	_ASSET_ID,
+	"/asset/characterfetch?userID="
+)
 
 local clickBody = ThumbnailGenerator:Click("PNG", 1680, 1680, true)
 
@@ -19,14 +25,13 @@ local CameraAngle = player.Character.Head.CFrame
 local CameraPosition = CameraAngle
 	+ CFrame.Angles(0, math.pi, 0).lookVector.unit * 2.75
 
-local Camera = New "Camera" {
+workspace.CurrentCamera = New "Camera" {
 	Name = "ThumbnailCamera",
 	CameraType = Enum.CameraType.Scriptable,
 	CoordinateFrame = CFrame.new(CameraPosition.p, CameraAngle.p),
 	FieldOfView = 52.5,
 	Parent = player.Character,
 }
-workspace.CurrentCamera = Camera
 
 local clickHead = ThumbnailGenerator:Click("PNG", 300, 300, true)
 

luau/renderClothing.luau

@@ -1,13 +1,20 @@
+--!strict
 -- Render script for R6 clothing
 
 local ThumbnailGenerator = game:GetService "ThumbnailGenerator"
-local RenderModule = require "../Modules/Render.luau"
+local RenderModule = require "../Modules/Render"
+local SetupAvatar = require "../Modules/Render/SetupAvatar"
 local Render = RenderModule(_BASE_URL, _PING_URL, _THUMBNAIL_KEY) -- avoid ambiguous syntax after compilation
 
-Render.SetupAvatar(_RENDER_TYPE, _ASSET_ID, `/api/render/characterasset?id=`)
+SetupAvatar(
+	_BASE_URL,
+	_RENDER_TYPE,
+	_ASSET_ID,
+	"/api/render/characterasset?id="
+)
 
 local click = ThumbnailGenerator:Click("PNG", 1680, 1680, true)
 
-print(`[{game.JobId}] Successfully rendered, moving on...`)
+print(`[{game.JobId}] Successfully rendered clothing`)
 
 Render.Upload(`Completed\n{click}`)

luau/renderMesh.luau

@@ -0,0 +1,22 @@
+--!strict
+-- Render script for meshes
+
+local ThumbnailGenerator = game:GetService "ThumbnailGenerator"
+local RenderModule = require "../Modules/Render"
+local Render = RenderModule(_BASE_URL, _PING_URL, _THUMBNAIL_KEY) -- avoid ambiguous syntax after compilation
+local New = (require "../Modules/New").New
+
+print(`[{game.JobId}] Starting new render for {_RENDER_TYPE} Id {_ASSET_ID}`)
+
+New "Part" {
+	Parent = workspace,
+	New "SpecialMesh" {
+		MeshId = `{_BASE_URL}/asset?id={_ASSET_ID}`,
+	},
+}
+
+local click = ThumbnailGenerator:Click("PNG", 1024, 1024, true)
+
+print(`[{game.JobId}] Successfully rendered mesh`)
+
+Render.Upload(`Completed\n{click}`)

luau/renderModel.luau

@@ -0,0 +1,20 @@
+--!strict
+-- Render script for models (and hats)
+
+local ThumbnailGenerator = game:GetService "ThumbnailGenerator"
+local RenderModule = require "../Modules/Render"
+local Render = RenderModule(_BASE_URL, _PING_URL, _THUMBNAIL_KEY) -- avoid ambiguous syntax after compilation
+
+print(`[{game.JobId}] Starting new render for {_RENDER_TYPE} Id {_ASSET_ID}`)
+
+for _, object in pairs(game:GetObjects(`{_BASE_URL}/asset?id={_ASSET_ID}`)) do
+	pcall(function()
+		object.Parent = workspace
+	end)
+end
+
+local click = ThumbnailGenerator:Click("PNG", 1024, 1024, true)
+
+print(`[{game.JobId}] Rendered model`)
+
+Render.Upload(`Completed\n{click}`)