Diff: Block.cpp

Revision:

20:4e0f0944f28f

Parent:

7:b6e31bfdb2af

Child:

26:bbcc25418ffa

--- a/Block.cpp	Tue Nov 24 01:38:46 2015 +0000
+++ b/Block.cpp	Tue Nov 24 20:53:51 2015 +0000
@@ -18,6 +18,12 @@
 
 }
 
+Colour::Colour(float components[4]){
+	for (int i = 0; i < sizeof(components)/sizeof(*components); i++){
+		this->components[i] = components[i];
+	}
+}
+
 Colour::Colour(const Colour& rhs){
 	setRed(rhs.getRed());
 	setBlue(rhs.getBlue());
@@ -28,6 +34,7 @@
 Block::Block(){
 	this->size = Small;
 	this->minColour = Colour();
+	this->averageColour = Colour();
 	this->maxColour = Colour();
 }
 Block::Block(Size size) {
@@ -35,11 +42,20 @@
 	this->size = size;
 	this->minColour = Colour();
 	this->maxColour = Colour();
+	this->averageColour = Colour();
+}
+
+Block::Block(Size size, Colour minColour, Colour maxColour, Colour averageColour){
+	this->size = size;
+	this->minColour = Colour(minColour);
+	this->maxColour = Colour(maxColour);
+	this->averageColour = Colour(averageColour);
 }
 
 Block::Block(const Block& rhs){
 	minColour = Colour(rhs.minColour);
 	maxColour = Colour(rhs.maxColour);
+	averageColour = Colour(rhs.averageColour);
 	size = rhs.size;
 }