bones in skins are being loaded in the right order now. I think it's working :D. Also fixed a ton of shader issues that cause GL to crash.

Author: granolaboy

data/effects/color_conversion.effect

@@ -34,19 +34,14 @@ float4 RGBtoYUV(float4 rgba, float3x3 yuv) {
 }
 
 float4 RGBToYUVAPass(VertDataOut v_in) : TARGET {
-	const float3x3 mYUV709n = { // Normalized
+	const float3x3 mYUV709n = float3x3( // Normalized
 		0.2126, 0.7152, 0.0722,
 		-0.1145721060573399, -0.3854278939426601, 0.5,
 		0.5, -0.4541529083058166, -0.0458470916941834
-	};
+	);
 	return RGBtoYUV(image.Sample(primarySampler, v_in.uv), mYUV709n);
 }
-/*
-float4 RGBToYPass(VertDataOut v_in) : TARGET {
-	float ycbcr = YUV709fromRGB(image.Sample(primarySampler, v_in.uv)); // <--- we seem to be missing this
-	return float4(ycbcr.r, 0, 0, 0);
-}
-*/
+
 
 technique RGBToYUV {
 	pass {
@@ -59,6 +54,5 @@ technique RGBToLuma {
 	pass {
 		vertex_shader = VSDefault(v_in);
 		pixel_shader = RGBToYUVAPass(v_in);
-//		pixel_shader = RGBToYPass(v_in);
 	}
 }

data/effects/phong.effect

@@ -233,63 +233,63 @@ VertDataOut VSPhong(VertDataIn v_in)
 
 	int i, bi, nvb;
 	float w;
-	float3 r = {0.0, 0.0, 0.0};
+	float3 r = float3(0.0, 0.0, 0.0);
 	float4 vinpos = float4(v_in.pos.xyz, 1.0);	
 
 	if (numBones > 0) {
-		nvb = v_in.boneinfo1.x;
+		nvb = int(v_in.boneinfo1.x);
 		for(i = 0; i < nvb; i++) {
 			switch(i) {
 				case 0:
-					bi = v_in.boneinfo1.z;
+					bi = int(v_in.boneinfo1.z);
 					w = v_in.boneinfo1.w;
 					break;
 				case 1:
-					bi = v_in.boneinfo2.x;
+					bi = int(v_in.boneinfo2.x);
 					w = v_in.boneinfo2.y;
 					break;
 				case 2:
-					bi = v_in.boneinfo2.z;
+					bi = int(v_in.boneinfo2.z);
 					w = v_in.boneinfo2.w;
 					break;
 				case 3:
-					bi = v_in.boneinfo3.x;
+					bi = int(v_in.boneinfo3.x);
 					w = v_in.boneinfo3.y;
 					break;
 				case 4:
-					bi = v_in.boneinfo3.z;
+					bi = int(v_in.boneinfo3.z);
 					w = v_in.boneinfo3.w;
 					break;
 				case 5:
-					bi = v_in.boneinfo4.x;
+					bi = int(v_in.boneinfo4.x);
 					w = v_in.boneinfo4.y;
 					break;
 				case 6:
-					bi = v_in.boneinfo4.z;
+					bi = int(v_in.boneinfo4.z);
 					w = v_in.boneinfo4.w;
 					break;
 				case 7:
-					bi = v_in.boneinfo5.x;
+					bi = int(v_in.boneinfo5.x);
 					w = v_in.boneinfo5.y;
 					break;
 				case 8:
-					bi = v_in.boneinfo5.z;
+					bi = int(v_in.boneinfo5.z);
 					w = v_in.boneinfo5.w;
 					break;
 				case 9:
-					bi = v_in.boneinfo6.x;
+					bi = int(v_in.boneinfo6.x);
 					w = v_in.boneinfo6.y;
 					break;
 				case 10:
-					bi = v_in.boneinfo6.z;
+					bi = int(v_in.boneinfo6.z);
 					w = v_in.boneinfo6.w;
 					break;
 				case 11:
-					bi = v_in.boneinfo7.x;
+					bi = int(v_in.boneinfo7.x);
 					w = v_in.boneinfo7.y;
 					break;
 				case 12:
-					bi = v_in.boneinfo7.z;
+					bi = int(v_in.boneinfo7.z);
 					w = v_in.boneinfo7.w;
 					break;
 			}
@@ -350,10 +350,10 @@ float4 PSPhong(VertDataOut v_in) : TARGET
 
 	// normal
 	float3 normal = normalize(v_in.norm);
-	if (normalMap) {
+	if (normalMap != 0) {
 		float3 tangent = normalize(v_in.tangent);
 		float3 bitangent = normalize(v_in.bitangent);
-		float3x3 TBN = { tangent, bitangent, normal };
+		float3x3 TBN = float3x3( tangent, bitangent, normal );
 
 		normal = normalTex.Sample(textureSampler, v_in.uv).xyz * 2.0 - 1.0;
 		normal = normalize(mul(normal, TBN));
@@ -366,17 +366,17 @@ float4 PSPhong(VertDataOut v_in) : TARGET
 	float4 emmColor = emissiveColor;
 
 	// texture maps
-	if (ambientMap)
+	if (ambientMap != 0)
 		ambColor = ambientTex.Sample(textureSampler, v_in.uv);
-	if (diffuseMap)
+	if (diffuseMap != 0)
 		dffColor = diffuseTex.Sample(textureSampler, v_in.uv);
-	if (specularMap)
+	if (specularMap != 0)
 		spcColor = specularTex.Sample(textureSampler, v_in.uv);
-	if (emissiveMap)
+	if (emissiveMap != 0)
 		emmColor = emissiveTex.Sample(textureSampler, v_in.uv);
 
 	// reflection map trumps diffuse
-	if (reflectMap) {
+	if (reflectMap != 0) {
 		float3 r = reflect(normalize(-vpos), normal);
 		float m = 2.0 * sqrt( pow( r.x, 2.0 ) + pow( r.y, 2.0 ) + pow( r.z + 1.0, 2.0 ) );
 		float2 vN = r.xy / m + 0.5;

gs-effect.cpp

@@ -30,12 +30,12 @@ GS::Effect::Effect(std::string file) {
 	obs_enter_graphics();
 	char* errorMessage = nullptr;
 	m_effect = gs_effect_create_from_file(file.c_str(), &errorMessage);
-	if (!m_effect || errorMessage) {
+	if (!m_effect || errorMessage) { 
 		std::string error(errorMessage);
 		bfree((void*)errorMessage);
-		obs_leave_graphics();
-		throw std::runtime_error(error);
-	}
+		obs_leave_graphics(); 
+		throw std::runtime_error(error); 
+	} 
 	obs_leave_graphics();
 }
 

mask-resource-skinned-model.cpp

@@ -86,14 +86,24 @@ Mask::Resource::SkinnedModel::SkinnedModel(Mask::MaskData* parent, std::string n
 		PLOG_ERROR("Bad bones section in '%s'.", name.c_str());
 		throw std::logic_error("Skinned Model has bad bones section.");
 	}
+	int numBones = 0;
+	for (obs_data_item_t* itm = obs_data_first(bonesData); itm; obs_data_item_next(&itm)) {
+		numBones++;
+	}
+
+	m_bones.resize(numBones);
 	for (obs_data_item_t* itm = obs_data_first(bonesData); itm; obs_data_item_next(&itm)) {
 		obs_data_t* boneData = obs_data_item_get_obj(itm);
 
+		// use string key as index into array
+		std::string nn = obs_data_item_get_name(itm);
+		int boneIndex = atoi(nn.c_str());
+		Bone& bone = m_bones[boneIndex];
+
 		if (!obs_data_has_user_value(boneData, S_NAME)) {
 			PLOG_ERROR("Skinned Model '%s' bone has no name.", name.c_str());
 			throw std::logic_error("Skinned Model has a bone with no name.");
 		}
-		Mask::Resource::SkinnedModel::SkinnedModel::Bone bone;
 
 		std::string partName = obs_data_get_string(boneData, S_NAME);
 		bone.part = parent->GetPart(partName);
@@ -122,8 +132,6 @@ Mask::Resource::SkinnedModel::SkinnedModel(Mask::MaskData* parent, std::string n
 			position.x, position.y, position.z);
 
 		matrix4_identity(&bone.global);
-
-		m_bones.emplace_back(bone);
 	}
 
 	// Skins list

tools/MaskMaker/args.cpp

@@ -20,12 +20,20 @@
 #include "stdafx.h"
 #include "args.h"
 
+// STB : single-file public domain (or MIT licensed) libraries for C/C++ 
+// https://github.com/nothings/stb
 // you must define these for stb calls to work
+// - enable image library and resizing library
 #define STB_IMAGE_IMPLEMENTATION 
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
 #include "stb_image.h"
 #include "stb_image_resize.h"
 
+// AVIR : Advanced image resizer library
+// https://github.com/avaneev/avir
+// (in stdafx.h)
+// - used to generate nice color-corrected super-sampled mipmaps
+
 using namespace std;
 
 Args::Args(int argc, char** argv) 

tools/MaskMaker/command_import.cpp

@@ -281,7 +281,6 @@ struct VtxToBone {
 struct Vtx {
 	int						index;
 	std::vector<VtxToBone>	bones;
-	std::vector<int>		tris;	// indices into mesh faces list
 };
 
 struct Tri {