Prepare iron to c port

armorsculpt/Sources/ExportObj.ts

@@ -60,7 +60,7 @@ class ExportObj {
 				}
 			}
 
-			ExportObj.writeString(o, "o " + p.name + "\n");
+			ExportObj.writeString(o, "o " + p.base.name + "\n");
 			for (let i = 0; i < pi; ++i) {
 				ExportObj.writeString(o, "v ");
 				let vx = posa2[i * 3] * sc + "";

armorsculpt/Sources/ImportMesh.ts

@@ -44,21 +44,21 @@ class ImportMesh {
 		if (Project.paintObjects.length > 1) {
 			// Sort by name
 			Project.paintObjects.sort((a, b): i32 => {
-				if (a.name < b.name) return -1;
-				else if (a.name > b.name) return 1;
+				if (a.base.name < b.base.name) return -1;
+				else if (a.base.name > b.base.name) return 1;
 				return 0;
 			});
 
 			// No mask by default
-			for (let p of Project.paintObjects) p.visible = true;
+			for (let p of Project.paintObjects) p.base.visible = true;
 			if (Context.raw.mergedObject == null) UtilMesh.mergeMesh();
 			Context.raw.paintObject.skip_context = "paint";
-			Context.raw.mergedObject.visible = true;
+			Context.raw.mergedObject.base.visible = true;
 		}
 
 		Viewport.scaleToBounds();
 
-		if (Context.raw.paintObject.name == "") Context.raw.paintObject.name = "Object";
+		if (Context.raw.paintObject.base.name == "") Context.raw.paintObject.base.name = "Object";
 		MakeMaterial.parsePaintMaterial();
 		MakeMaterial.parseMeshMaterial();
 
@@ -105,7 +105,7 @@ class ImportMesh {
 				}
 
 				Context.raw.paintObject.setData(md);
-				Context.raw.paintObject.name = mesh.name;
+				Context.raw.paintObject.base.name = mesh.name;
 				Project.paintObjects = [Context.raw.paintObject];
 
 				md._handle = raw.name;
@@ -149,14 +149,14 @@ class ImportMesh {
 
 			MeshData.create(raw, (md: TMeshData) => {
 
-				let object = Scene.addMeshObject(md, Context.raw.paintObject.materials, Context.raw.paintObject);
-				object.name = mesh.name;
+				let object = Scene.addMeshObject(md, Context.raw.paintObject.materials, Context.raw.paintObject.base);
+				object.base.name = mesh.base.name;
 				object.skip_context = "paint";
 
 				// Ensure unique names
 				for (let p of Project.paintObjects) {
-					if (p.name == object.name) {
-						p.name += ".001";
+					if (p.base.name == object.base.name) {
+						p.base.name += ".001";
 						p.data._handle += ".001";
 						Data.cachedMeshes.set(p.data._handle, p.data);
 					}

armorsculpt/Sources/MakeMaterial.ts

@@ -313,7 +313,7 @@ class MakeMaterial {
 	}
 
 	static getDisplaceStrength = (): f32 => {
-		let sc = Context.mainObject().transform.scale.x;
+		let sc = Context.mainObject().base.transform.scale.x;
 		return Config.raw.displace_strength * 0.02 * sc;
 	}
 

armorsculpt/Sources/MakeMesh.ts

@@ -141,12 +141,12 @@ class MakeMesh {
 					NodeShader.write(frag, 'if (');
 					for (let i = 0; i < visibles.length; ++i) {
 						if (i > 0) NodeShader.write(frag, ' || ');
-						NodeShader.write(frag, `${visibles[i].uid} == uid`);
+						NodeShader.write(frag, `${visibles[i].base.uid} == uid`);
 					}
 					NodeShader.write(frag, ') {');
 				}
 				else { // Object mask
-					let uid = Project.paintObjects[SlotLayer.getObjectMask(l) - 1].uid;
+					let uid = Project.paintObjects[SlotLayer.getObjectMask(l) - 1].base.uid;
 					NodeShader.write(frag, `if (${uid} == uid) {`);
 				}
 			}