@quenty/rigbuilderutils 3.1.2 → 3.2.1-canary.8533eea.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.2.1-canary.8533eea.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rigbuilderutils@3.2.0...@quenty/rigbuilderutils@3.2.1-canary.8533eea.0) (2021-12-18)
+
+
+### Features
+
+* Add RigBuilderUtils.promiseR15Rig() and  RigBuilderUtils.promisePlayerRig(userId) ([accf109](https://github.com/Quenty/NevermoreEngine/commit/accf10919ad4484aefa40a1f296ad928c8cb02d9))
+
+
+
+
+
+# [3.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rigbuilderutils@3.1.2...@quenty/rigbuilderutils@3.2.0) (2021-11-20)
+
+
+### Bug Fixes
+
+* Support MacOS syncing ([#225](https://github.com/Quenty/NevermoreEngine/issues/225)) ([03f9183](https://github.com/Quenty/NevermoreEngine/commit/03f918392c6a5bdd33f8a17c38de371d1e06c67a))
+
+
+
+
+
 ## [3.1.2](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rigbuilderutils@3.1.1...@quenty/rigbuilderutils@3.1.2) (2021-10-30)
 
 **Note:** Version bump only for package @quenty/rigbuilderutils

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014 Quenty
+Copyright (c) 2014-2021 Quenty
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/rigbuilderutils",
-  "version": "3.1.2",
+  "version": "3.2.1-canary.8533eea.0",
   "description": "Utility functions for debugging, builds a Roblox character rig",
   "keywords": [
     "Roblox",
@@ -26,16 +26,17 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/insertserviceutils": "^3.1.2",
-    "@quenty/loader": "^3.1.1",
-    "@quenty/promise": "^3.1.2"
+    "@quenty/humanoiddescriptionutils": "3.2.1-canary.8533eea.0",
+    "@quenty/insertserviceutils": "3.2.1-canary.8533eea.0",
+    "@quenty/loader": "3.1.1",
+    "@quenty/promise": "3.2.1-canary.8533eea.0"
   },
   "devDependencies": {
-    "@quenty/camerastoryutils": "^3.1.2",
-    "@quenty/maid": "^2.0.1"
+    "@quenty/camerastoryutils": "3.2.1-canary.8533eea.0",
+    "@quenty/maid": "2.0.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e9cd4223c7fda7c852db9743ef844baa19cacb13"
+  "gitHead": "8533eeade3bf6835c0295785c1c326b9abee3222"
 }

package/src/Shared/RigBuilderUtils.lua

@@ -1,11 +1,16 @@
----
+--- Helps build player characters
 -- @module RigBuilderUtils
 
 local require = require(script.Parent.loader).load(script)
 
+local ServerScriptService = game:GetService("ServerScriptService")
+local HttpService = game:GetService("HttpService")
+
 local InsertServiceUtils = require("InsertServiceUtils")
 local PromiseUtils = require("PromiseUtils")
 local AssetServiceUtils = require("AssetServiceUtils")
+local Promise = require("Promise")
+local HumanoidDescriptionUtils = require("HumanoidDescriptionUtils")
 
 local RigBuilderUtils = {}
 
@@ -367,6 +372,33 @@ function RigBuilderUtils.promiseR15PackageRig(packageAssetId)
 		end)
 end
 
+function RigBuilderUtils.promiseR15Rig()
+	return InsertServiceUtils.promiseAsset(1664543044)
+		:Then(function(inserted)
+			local character = inserted:GetChildren()[1]
+			if not character then
+				return Promise.rejected("No character from model")
+			end
+
+			local humanoid = character:FindFirstChildOfClass("Humanoid")
+			if humanoid then
+				humanoid:BuildRigFromAttachments()
+			end
+
+			local r15Head = character:FindFirstChild("Head")
+
+			local existingFace = r15Head:FindFirstChild("face") or r15Head:FindFirstChild("Face")
+			if existingFace == nil then
+				local face = Instance.new("Decal")
+				face.Name = "face"
+				face.Texture = "rbxasset://textures/face.png"
+				face.Parent = r15Head
+			end
+
+			return character
+		end)
+end
+
 function RigBuilderUtils.promiseR15ManRig()
 	return RigBuilderUtils.promiseR15PackageRig(86500185)
 end
@@ -379,4 +411,38 @@ function RigBuilderUtils.promiseR15MeshRig()
 	return RigBuilderUtils.promiseR15PackageRig(27112438)
 end
 
+function RigBuilderUtils.promisePlayerRig(userId)
+	assert(type(userId) == "number", "Bad userId")
+
+	return PromiseUtils.all({
+		RigBuilderUtils.promiseR15Rig(),
+		HumanoidDescriptionUtils.promiseFromUserId(userId)
+	}):Then(function(meshRig, humanoidDescription)
+		local humanoid = meshRig:FindFirstChildWhichIsA("Humanoid")
+		if not humanoid then
+			return Promise.rejected("No humanoid from rig builder")
+		end
+
+		meshRig.Archivable = false
+		local originalName = meshRig.Name
+
+		-- Hack! Apparently we need to parent this to the datamodel to apply the description
+		meshRig.Name = "RigBuilderUtils_LoadingHumanoid_" .. HttpService:GenerateGUID(false)
+		meshRig.Parent = ServerScriptService -- somewhere that does not replicate
+
+		return HumanoidDescriptionUtils.promiseApplyDescription(humanoid, humanoidDescription)
+			:Then(function()
+				meshRig.Parent = nil
+				meshRig.Archivable = true
+				meshRig.Name = originalName
+
+				return meshRig
+			end, function(...)
+				-- cleanup
+				meshRig:Destroy()
+				return Promise.rejected(...)
+			end)
+	end)
+end
+
 return RigBuilderUtils

package/src/Shared/RigBuilderUtils.story.lua

@@ -4,6 +4,8 @@
 
 local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).load(script)
 
+local Workspace = game:GetService("Workspace")
+
 local Maid = require("Maid")
 local RigBuilderUtils = require("RigBuilderUtils")
 local CameraStoryUtils = require("CameraStoryUtils")
@@ -13,12 +15,12 @@ local function spawnRig(offset, maid, viewportFrame, rig)
 	maid:GiveTask(rig)
 
 	-- Is Roblox being weird about this? Yes.
-	rig.Parent = workspace
+	rig.Parent = Workspace
 	spawn(function()
 		rig.Parent = viewportFrame
 	end)
 
-	rig:SetPrimaryPartCFrame(workspace.CurrentCamera.CFrame
+	rig:SetPrimaryPartCFrame(Workspace.CurrentCamera.CFrame
 		* CFrame.new(0, 0, -15)
 		* CFrame.new(offset, 0, 0)
 		* CFrame.Angles(0, math.pi, 0))
@@ -37,6 +39,10 @@ return function(target)
 		RigBuilderUtils.promiseR15ManRig(),
 		RigBuilderUtils.promiseR15WomanRig(),
 		RigBuilderUtils.promiseR15MeshRig(),
+		RigBuilderUtils.promiseR15Rig(),
+		RigBuilderUtils.promisePlayerRig(4397833),
+		RigBuilderUtils.promisePlayerRig(9360463),
+		RigBuilderUtils.promisePlayerRig(676056)
 	}
 
 	for index, rig in pairs(rigs) do

package/src/node_modules.project.json

@@ -2,6 +2,6 @@
   "name": "node_modules",
   "globIgnorePaths": [ "**/.package-lock.json" ],
   "tree": {
-    "$path": { "optional": "..\\node_modules" }
+    "$path": { "optional": "../node_modules" }
   }
 }