everything is in the right place

Author: devshgraphicsprogramming

include/nbl/asset/utils/IMeshManipulator.h

@@ -403,12 +403,13 @@ class IMeshManipulator : public virtual core::IReferenceCounted
 						float weightRemainder = 1.f;
 						for (auto i=0u; i<maxInfluences; i++)
 						{
-							if (jointIDs[i]<jointCount)
+							const auto jointID = jointIDs[i];
+							if (jointID<jointCount)
 							if ((i<maxWeights ? weights[i]:weightRemainder)>FLT_MIN)
 							{
 								core::vectorSIMDf boneSpacePos;
-								inverseBindPoses[i].transformVect(boneSpacePos,pos);
-								jointAABBs[jointIDs[i]].addInternalPoint(boneSpacePos.getAsVector3df());
+								inverseBindPoses[jointID].transformVect(boneSpacePos,pos);
+								jointAABBs[jointID].addInternalPoint(boneSpacePos.getAsVector3df());
 								noJointInfluence = false;
 							}
 							weightRemainder -= weights[i];

include/nbl/builtin/glsl/skinning/debug.vert

@@ -114,8 +114,7 @@ void main()
 		const nbl_glsl_shapes_AABB_t aabb = nbl_glsl_shapes_CompressedAABB_t_decompress(debugAABB.data[dd.aabbOffset+jointID]);
 
 		const bvec3 mask = bvec3(gl_VertexIndex&0x1u,gl_VertexIndex&0x2u,gl_VertexIndex&0x4u);
-		//pos = nbl_glsl_pseudoMul3x4with3x1(nodeGlobalTransforms.data[skeletonNode],mix(aabb.minVx,aabb.maxVx,mask));
-		pos = nbl_glsl_pseudoMul3x4with3x1(skinningTransforms.data[dd.skinOffset+jointID],mix(aabb.minVx,aabb.maxVx,mask));
+		pos = nbl_glsl_pseudoMul3x4with3x1(nodeGlobalTransforms.data[skeletonNode],mix(aabb.minVx,aabb.maxVx,mask));
 
 		outColor = pc.aabbColor.rgb;
 	}

src/nbl/asset/interchange/CGLTFLoader.cpp

@@ -654,9 +654,9 @@ namespace nbl
 							return bufferViewOffset + relativeAccessorOffset;
 						}();
 
-						auto* inData = reinterpret_cast<core::matrix4SIMD*>(reinterpret_cast<uint8_t*>(cpuBuffer->getPointer()) + globalIBPOffset); //! glTF stores 4x4 IBP matrices
+						auto* inData = reinterpret_cast<core::matrix4SIMD*>(reinterpret_cast<uint8_t*>(cpuBuffer->getPointer()) + globalIBPOffset); //! glTF stores 4x4 IBP column_major matrices
 						for (uint32_t j=0u; j<jointCount; ++j)
-							inverseBindPoseIt[j] = inData[j].extractSub3x4();
+							inverseBindPoseIt[j] = core::transpose(inData[j]).extractSub3x4();
 					}
 					else
 						std::fill_n(inverseBindPoseIt,jointCount,core::matrix3x4SIMD());
@@ -2365,9 +2365,7 @@ namespace nbl
 							for (uint32_t i = 0; i < matrixArray.size(); ++i)
 								*(tmpMatrix.pointer() + i) = matrixArray.at(i).get_double().value();
 
-							// TODO tmpMatrix (coulmn major) to row major (currentNode.matrix)
-
-							glTFnode.transformation.matrix = tmpMatrix.extractSub3x4();
+							glTFnode.transformation.matrix = core::transpose(tmpMatrix).extractSub3x4();
 						}
 						else
 						{