From 52a8be910a2d1b58746c253e4499015b60383df8 Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Fri, 27 Jan 2023 22:11:17 -0500 Subject: [PATCH] Commit Changed --- .env.example | 14 +++++++------- src/lua/bodyshot.lua | 10 +++++----- src/lua/clothing.lua | 6 ++++-- src/lua/headshot.lua | 2 +- src/lua/place.lua | 2 +- src/lua/xml.lua | 18 ++++++------------ 6 files changed, 24 insertions(+), 28 deletions(-) diff --git a/.env.example b/.env.example index 904b29b..a1bb39f 100644 --- a/.env.example +++ b/.env.example @@ -1,16 +1,16 @@ RCCSERVICE= ARBITER_TOKEN= -BASE_URL=https://crapblox.cf +BASE_URL=https://sitetest.unexp.xyz RENDER_FORMAT=PNG -RENDER_BASE64=true +RENDER_BASE64= -RENDER_USER_WIDTH=420 -RENDER_USER_HEIGHT=420 +RENDER_USER_WIDTH=720 +RENDER_USER_HEIGHT=720 -RENDER_ASSET_WIDTH=420 -RENDER_ASSET_HEIGHT=420 +RENDER_ASSET_WIDTH=720 +RENDER_ASSET_HEIGHT=720 -RENDER_PLACE_WIDTH=720 +RENDER_PLACE_WIDTH=854 RENDER_PLACE_HEIGHT=480 diff --git a/src/lua/bodyshot.lua b/src/lua/bodyshot.lua index 24ba552..cfdf5f1 100644 --- a/src/lua/bodyshot.lua +++ b/src/lua/bodyshot.lua @@ -8,17 +8,17 @@ game:GetService("ContentProvider"):SetBaseUrl(baseUrl) game:GetService("ScriptContext").ScriptsDisabled = true local Player = game.Players:CreateLocalPlayer(0) -Player.CharacterAppearance = ("%s/v1.1/avatar-fetch/%d"):format(baseUrl, assetId) +Player.CharacterAppearance = ("%s/Character?id=%d"):format(baseUrl, assetId) Player:LoadCharacter(false) game:GetService("RunService"):Run() -Player.Character.Animate.Disabled = true +Player.Character.Animate.Disabled = true Player.Character.Torso.Anchored = true -local gear = Player.Backpack:GetChildren()[1] -if gear then - gear.Parent = Player.Character +local gear = Player.Backpack:GetChildren()[1] +if gear then + gear.Parent = Player.Character Player.Character.Torso["Right Shoulder"].CurrentAngle = math.rad(90) end diff --git a/src/lua/clothing.lua b/src/lua/clothing.lua index 5822030..095178e 100644 --- a/src/lua/clothing.lua +++ b/src/lua/clothing.lua @@ -9,12 +9,14 @@ game:GetService("ContentProvider"):SetBaseUrl(baseUrl) game:GetService("ScriptContext").ScriptsDisabled = true local Player = game.Players:CreateLocalPlayer(0) -Player.CharacterAppearance = ("%s/thumbnail/clothingcharapp/%d"):format(baseUrl, assetId) Player:LoadCharacter(false) +local asset = game:GetObjects(("%s/asset/?id=%d"):format(baseUrl, assetId))[1] +asset.Parent = Player.Character + game:GetService("RunService"):Run() -Player.Character.Animate.Disabled = true +Player.Character.Animate.Disabled = true Player.Character.Torso.Anchored = true print(("[%s] Rendering ..."):format(jobId)) diff --git a/src/lua/headshot.lua b/src/lua/headshot.lua index b2dd1ca..c6dbf7f 100644 --- a/src/lua/headshot.lua +++ b/src/lua/headshot.lua @@ -9,7 +9,7 @@ game:GetService("ContentProvider"):SetBaseUrl(baseUrl) game:GetService("ScriptContext").ScriptsDisabled = true local Player = game.Players:CreateLocalPlayer(0) -Player.CharacterAppearance = ("%s/v1.1/avatar-fetch/%d"):format(baseUrl, assetId) +Player.CharacterAppearance = ("%s/Character?id=%d"):format(baseUrl, assetId) Player:LoadCharacter(false) game:GetService("RunService"):Run() diff --git a/src/lua/place.lua b/src/lua/place.lua index 65f266b..5dee862 100644 --- a/src/lua/place.lua +++ b/src/lua/place.lua @@ -11,7 +11,7 @@ game:GetService("ContentProvider"):SetBaseUrl(baseUrl) game:GetService("ScriptContext").ScriptsDisabled = true game:GetService("StarterGui").ShowDevelopmentGui = false -game:Load(baseUrl .. "/thumbs/staticimage?r=" .. jobId) +game:Load(("%s/asset/?id=%d"):format(baseUrl, assetId)) game:GetService("ScriptContext").ScriptsDisabled = true game:GetService("StarterGui").ShowDevelopmentGui = false diff --git a/src/lua/xml.lua b/src/lua/xml.lua index 08ae56c..e9a960d 100644 --- a/src/lua/xml.lua +++ b/src/lua/xml.lua @@ -1,4 +1,4 @@ -local jobId, type, format, x, y, baseUrl, assetId, mannequin = ... +local jobId, type, format, x, y, baseUrl, assetId = ... print(("[%s] Started RenderJob for type '%s' with assetId %d ..."):format(jobId, type, assetId)) @@ -8,18 +8,12 @@ game:GetService("InsertService"):SetAssetVersionUrl(baseUrl .. "/Asset/?assetver game:GetService("ContentProvider"):SetBaseUrl(baseUrl) game:GetService("ScriptContext").ScriptsDisabled = true -if mannequin then - local Player = game.Players:CreateLocalPlayer(0) - Player.CharacterAppearance = ("%s/v1.1/asset-render/%d"):format(baseUrl, assetId) - Player:LoadCharacter(false) -else - local asset = game:GetObjects(("%s/Asset/?id=%d"):format(baseUrl, assetId))[1] - asset.Parent = workspace +local asset = game:GetObjects(("%s/asset/?id=%d"):format(baseUrl, assetId))[1] +asset.Parent = workspace - local thumbnailCamera = asset:FindFirstChild("ThumbnailCamera") - if thumbnailCamera ~= nil and thumbnailCamera.ClassName == "Camera" then - workspace.CurrentCamera = thumbnailCamera - end +local thumbnailCamera = asset:FindFirstChild("ThumbnailCamera") +if thumbnailCamera ~= nil and thumbnailCamera.ClassName == "Camera" then + workspace.CurrentCamera = thumbnailCamera end print(("[%s] Rendering ..."):format(jobId))