archive: fix color parsing

(cherry picked from commit 59249e2)

Author: lmichaelis

source/archive/archive_ascii.cc

@@ -104,9 +104,8 @@ namespace phoenix {
 	glm::u8vec4 archive_reader_ascii::read_color() {
 		std::stringstream in {read_entry("color")};
 
-		// in ASCII archives colors are saved as BGRA unlike everywhere else.
 		std::uint16_t r, g, b, a;
-		in >> b >> g >> r >> a;
+		in >> r >> g >> b >> a;
 		return glm::u8vec4 {(std::uint8_t) r, (std::uint8_t) g, (std::uint8_t) b, (std::uint8_t) a};
 	}
 

source/archive/archive_binary.cc

@@ -71,7 +71,12 @@ namespace phoenix {
 	}
 
 	glm::u8vec4 archive_reader_binary::read_color() {
-		return glm::u8vec4 {input.get(), input.get(), input.get(), input.get()};
+		auto b = input.get();
+		auto g = input.get();
+		auto r = input.get();
+		auto a = input.get();
+
+		return {r, g, b, a};
 	}
 
 	glm::vec3 archive_reader_binary::read_vec3() {

source/archive/archive_binsafe.cc

@@ -138,13 +138,13 @@ namespace phoenix {
 
 	glm::u8vec4 archive_reader_binsafe::read_color() {
 		ensure_entry_meta(bs_color);
-		glm::u8vec4 c {
-		    input.get(),
-		    input.get(),
-		    input.get(),
-		    input.get(),
-		};
-		return c;
+
+		auto b = input.get();
+		auto g = input.get();
+		auto r = input.get();
+		auto a = input.get();
+
+		return {r, g, b, a};
 	}
 
 	glm::vec3 archive_reader_binsafe::read_vec3() {

tests/samples/ascii.zen

@@ -23,7 +23,7 @@ END
 	someField4=int:32621
 	someField5=enum:6
 	someField6=bool:1
-	someField7=color:255 1 2 3
+	someField7=color:1 2 3 255
 	someField8=vec3:50 100.123 -150
 	someField9=rawFloat:111.11 -12.99
 	someField10=rawFloat:12 34 56 78 89 0

tests/test_archive.cc

@@ -35,10 +35,10 @@ TEST_SUITE("archive") {
 		CHECK(reader->read_bool());
 
 		auto color = reader->read_color();
-		CHECK(color.r == 2);
-		CHECK(color.b == 255);
-		CHECK(color.g == 1);
-		CHECK(color.a == 3);
+		CHECK(color.r == 1);
+		CHECK(color.g == 2);
+		CHECK(color.b == 3);
+		CHECK(color.a == 255);
 
 		auto vec3 = reader->read_vec3();
 		CHECK(vec3.x == 50);
@@ -104,9 +104,9 @@ TEST_SUITE("archive") {
 		CHECK(reader->read_byte() == 0);
 
 		auto color = reader->read_color();
-		CHECK(color.r == 0x19);
+		CHECK(color.r == 0x2A);
 		CHECK(color.g == 0x23);
-		CHECK(color.b == 0x2A);
+		CHECK(color.b == 0x19);
 		CHECK(color.a == 0xFF);
 
 		CHECK(reader->read_float() == 60.0f);

tests/test_material.cc

@@ -17,7 +17,7 @@ TEST_SUITE("material") {
 
 			CHECK(m1.name == "DT_BOOKSHELF_V1_1");
 			CHECK(m1.group == material_group::undefined);
-			CHECK(m1.color == glm::u8vec4 {0x19, 0x23, 0x2A, 0xFF});
+			CHECK(m1.color == glm::u8vec4 {0x2A, 0x23, 0x19, 0xFF});
 			CHECK(m1.smooth_angle == 60.0f);
 			CHECK(m1.texture == "MODIBOOKS01.TGA");
 			CHECK(m1.texture_scale == glm::vec2 {256.0f, 256.0f});
@@ -34,7 +34,7 @@ TEST_SUITE("material") {
 			auto m2 = material::parse(*archive);
 			CHECK(m2.name == "DT_BOOKSHELF_V1_2");
 			CHECK(m2.group == material_group::undefined);
-			CHECK(m2.color == glm::u8vec4 {0x19, 0x2A, 0x39, 0xFF});
+			CHECK(m2.color == glm::u8vec4 {0x39, 0x2A, 0x19, 0xFF});
 			CHECK(m2.smooth_angle == 60.0f);
 			CHECK(m2.texture == "MOWOPLANKS05.TGA");
 			CHECK(m2.texture_scale == glm::vec2 {128.0f, 128.0f});
@@ -56,7 +56,7 @@ TEST_SUITE("material") {
 
 			CHECK(m1.name == "MATERIAL #356");
 			CHECK(m1.group == material_group::undefined);
-			CHECK(m1.color == glm::u8vec4 {0x3B, 0x46, 0x75, 0xFF});
+			CHECK(m1.color == glm::u8vec4 {0x75, 0x46, 0x3B, 0xFF});
 			CHECK(m1.smooth_angle == 60.0f);
 			CHECK(m1.texture == "HUM_EBRM2_ARMOR_V0.TGA");
 			CHECK(m1.texture_scale == glm::vec2 {512.0f, 512.0f});
@@ -73,7 +73,7 @@ TEST_SUITE("material") {
 			auto m2 = material::parse(*archive);
 			CHECK(m2.name == "ERZZB1_TL");
 			CHECK(m2.group == material_group::undefined);
-			CHECK(m2.color == glm::u8vec4 {0x17, 0x1A, 0x21, 0xFF});
+			CHECK(m2.color == glm::u8vec4 {0x21, 0x1A, 0x17, 0xFF});
 			CHECK(m2.smooth_angle == 60.0f);
 			CHECK(m2.texture == "HUM_EBRM1_ARMOR_V0.TGA");
 			CHECK(m2.texture_scale == glm::vec2 {256.0f, 512.0f});