# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1350867300 -10800
# Node ID b05ab29cd17d4d1e7bd123ce57d76163af22edbf
# Parent  5981917093ff685dfdc12f5d42d497047f1858a7
color grading done

diff -r 5981917093ff -r b05ab29cd17d prototype/src/colgrade.cc
--- a/prototype/src/colgrade.cc	Sun Oct 21 15:56:47 2012 +0300
+++ b/prototype/src/colgrade.cc	Mon Oct 22 03:55:00 2012 +0300
@@ -117,7 +117,28 @@
 
 bool GradePalette::load_shot(const char *fname)
 {
-	return false;	// TODO
+	int xsz, ysz;
+	unsigned char *img = (unsigned char*)img_load_pixels(fname, &xsz, &ysz, IMG_FMT_RGB24);
+	if(!img) {
+		fprintf(stderr, "failed to open image: %s\n", fname);
+		return false;
+	}
+
+	int nslices = size;
+	int slice_sz = size * size * 3;
+	unsigned char *pal = img + xsz * (ysz - nslices) * 3;
+
+	for(int i=0; i<nslices; i++) {
+		memcpy(palette + i * slice_sz, pal, slice_sz);
+		pal += xsz * 3;
+	}
+	img_free_pixels(img);
+
+	glBindTexture(GL_TEXTURE_3D, tex);
+	glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB, size, size, size, 0, GL_RGB,
+			GL_UNSIGNED_BYTE, palette);
+
+	return true;
 }
 
 unsigned int GradePalette::get_texture() const
diff -r 5981917093ff -r b05ab29cd17d prototype/src/main.cc
--- a/prototype/src/main.cc	Sun Oct 21 15:56:47 2012 +0300
+++ b/prototype/src/main.cc	Mon Oct 22 03:55:00 2012 +0300
@@ -405,8 +405,22 @@
 		}
 		break;
 
+	case 'G':
+		save_grade_shot = true;
+		break;
+
 	case 'g':
-		save_grade_shot = true;
+		{
+			static bool do_grade;
+			do_grade = !do_grade;
+
+			GradePalette *gpal = rend->get_grade_palette();
+			if(do_grade) {
+				gpal->load_shot("gradeshot-proc.ppm");
+			} else {
+				gpal->create();
+			}
+		}
 		break;
 
 	default: