Merge Tony's changes.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/mesh.h b/src/mesh.h
index ec5a508..e0170ff 100644
--- a/src/mesh.h
+++ b/src/mesh.h
@@ -148,6 +148,23 @@ __global__ void set_colors(unsigned int *colors)
 	g_colors = colors;
 }
 
+__global__ void color_solids(int nthreads, unsigned int ntriangles, int *solid_id_map, int *solid_ids, unsigned int *solid_colors)
+{
+	int id = blockIdx.x*blockDim.x + threadIdx.x;
+
+	if (id >= nthreads)
+		return;
+
+	int solid_id = solid_ids[id];
+	unsigned int color = solid_colors[id];
+
+	for (int i=0; i < ntriangles; i++)
+	{
+		if (solid_id_map[i] == solid_id)
+			g_colors[i] = color;
+	}
+}
+
 } // extern "c"
 
 #endif