VboMesh::copyAttrib() respecting strideBytes

andrewfb · andrewfb · commit 7fcdaebfaad3 · 2023-08-20T15:58:35.000-04:00
diff --git a/src/cinder/gl/VboMesh.cpp b/src/cinder/gl/VboMesh.cpp
@@ -107,7 +107,7 @@ uint8_t	VboMeshGeomTarget::getAttribDims( geom::Attrib attr ) const
 	return mVboMesh->getAttribDims( attr );
 }
 
-void VboMeshGeomTarget::copyAttrib( geom::Attrib attr, uint8_t dims, size_t /*strideBytes*/, const float *srcData, size_t count )
+void VboMeshGeomTarget::copyAttrib( geom::Attrib attr, uint8_t dims, size_t strideBytes, const float *srcData, size_t count )
 {
 	// if we don't have it we don't want it
 	if( getAttribDims( attr ) == 0 )
@@ -143,7 +143,7 @@ void VboMeshGeomTarget::copyAttrib( geom::Attrib attr, uint8_t dims, size_t /*st
 	}
 	
 	if( dstData )
-		geom::copyData( dims, srcData, count, dstDims, dstStride, reinterpret_cast<float*>( dstData ) );
+		geom::copyData( dims, strideBytes, srcData, count, dstDims, dstStride, reinterpret_cast<float*>( dstData ) );
 }
 
 void VboMeshGeomTarget::copyIndices( geom::Primitive /*primitive*/, const uint32_t *source, size_t numIndices, uint8_t requiredBytesPerIndex )

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ uint8_t VboMeshGeomTarget::getAttribDims( geom::Attrib attr ) const`
`107`	`107`	`return mVboMesh->getAttribDims( attr );`
`108`	`108`	`}`
`109`	`109`
`110`		`-void VboMeshGeomTarget::copyAttrib( geom::Attrib attr, uint8_t dims, size_t /strideBytes/, const float *srcData, size_t count )`
	`110`	`+void VboMeshGeomTarget::copyAttrib( geom::Attrib attr, uint8_t dims, size_t strideBytes, const float *srcData, size_t count )`
`111`	`111`	`{`
`112`	`112`	`// if we don't have it we don't want it`
`113`	`113`	`if( getAttribDims( attr ) == 0 )`
`@@ -143,7 +143,7 @@ void VboMeshGeomTarget::copyAttrib( geom::Attrib attr, uint8_t dims, size_t /*st`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`if( dstData )`
`146`		`- geom::copyData( dims, srcData, count, dstDims, dstStride, reinterpret_cast<float*>( dstData ) );`
	`146`	`+ geom::copyData( dims, strideBytes, srcData, count, dstDims, dstStride, reinterpret_cast<float*>( dstData ) );`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`void VboMeshGeomTarget::copyIndices( geom::Primitive /primitive/, const uint32_t *source, size_t numIndices, uint8_t requiredBytesPerIndex )`