gltfpack: Assorted gltfpack correctness fixes

- Fix getBaseTransform layout for morph targets; we allocate Attr per
  weight and put the weight in [0] instead of... whatever we were doing
  before
- Fix texture mask argument comparisons; they were off by one and did
  not respect the segment length properly
- Fix max joint index determination; we were previously ignoring [1-3]
  so it was possible for a mesh with >256 joints to be accidentally
  encoded using 8-bit indices
- Fix clearcoatRoughnessFactor serialization which had a typo in the
  redundancy check

Author: zeux

gltf/animation.cpp

@@ -46,7 +46,7 @@ static float getDeltaTolerance(cgltf_animation_path_type type)
 		return 0.001f; // 0.1% linear
 
 	default:
-		assert(!"Uknown animation path");
+		assert(!"Unknown animation path");
 		return 0;
 	}
 }
@@ -246,12 +246,14 @@ static void getBaseTransform(Attr* result, size_t components, cgltf_animation_pa
 		if (node->weights_count)
 		{
 			assert(node->weights_count == components);
-			memcpy(result->f, node->weights, components * sizeof(float));
+			for (size_t k = 0; k < components; ++k)
+				result[k].f[0] = node->weights[k];
 		}
 		else if (node->mesh && node->mesh->weights_count)
 		{
 			assert(node->mesh->weights_count == components);
-			memcpy(result->f, node->mesh->weights, components * sizeof(float));
+			for (size_t k = 0; k < components; ++k)
+				result[k].f[0] = node->mesh->weights[k];
 		}
 		break;
 

gltf/gltfpack.cpp

@@ -1258,13 +1258,13 @@ unsigned int textureMask(const char* arg)
 	while (arg)
 	{
 		const char* comma = strchr(arg, ',');
-		size_t seg = comma ? comma - arg - 1 : strlen(arg);
+		size_t seg = comma ? comma - arg : strlen(arg);
 
-		if (strncmp(arg, "color", seg) == 0)
+		if (seg == 5 && strncmp(arg, "color", seg) == 0)
 			result |= 1 << TextureKind_Color;
-		else if (strncmp(arg, "normal", seg) == 0)
+		else if (seg == 6 && strncmp(arg, "normal", seg) == 0)
 			result |= 1 << TextureKind_Normal;
-		else if (strncmp(arg, "attrib", seg) == 0)
+		else if (seg == 6 && strncmp(arg, "attrib", seg) == 0)
 			result |= 1 << TextureKind_Attrib;
 		else
 			fprintf(stderr, "Warning: unrecognized texture class %.*s\n", int(seg), arg);

gltf/stream.cpp

@@ -683,7 +683,8 @@ StreamFormat writeVertexStream(std::string& bin, const Stream& stream, const Qua
 		unsigned int maxj = 0;
 
 		for (size_t i = 0; i < stream.data.size(); ++i)
-			maxj = std::max(maxj, unsigned(stream.data[i].f[0]));
+			for (int k = 0; k < 4; ++k)
+				maxj = std::max(maxj, unsigned(int(stream.data[i].f[k])));
 
 		assert(maxj <= 65535);
 
@@ -731,7 +732,7 @@ StreamFormat writeVertexStream(std::string& bin, const Stream& stream, const Qua
 		unsigned int maxv = 0;
 
 		for (size_t i = 0; i < stream.data.size(); ++i)
-			maxv = std::max(maxv, unsigned(stream.data[i].f[0]));
+			maxv = std::max(maxv, unsigned(int(stream.data[i].f[0])));
 
 		// exp encoding uses a signed mantissa with only 23 significant bits; input glTF encoding may encode indices losslessly up to 2^24
 		if (maxv >= (1 << 23))

gltf/write.cpp

@@ -338,7 +338,7 @@ static void writeMaterialComponent(std::string& json, const cgltf_data* data, co
 		append(json, "\"clearcoatFactor\":");
 		append(json, cc.clearcoat_factor);
 	}
-	if (cc.clearcoat_factor != 0)
+	if (cc.clearcoat_roughness_factor != 0)
 	{
 		comma(json);
 		append(json, "\"clearcoatRoughnessFactor\":");