FineTune HDR and Other Stuff

-=-=-=-=-=-=-=-=-=-=-=-=-=-

-More parameters to ESM shadows
-LightMap Octree now can bake to "hdr" (use HDR8 for now)
-New resource PolygonPathFinder, polygon based pathfinder using A-star algorithm. (will add nodes to use it more easily soon)

3 files changed, 341 insertions, 2 deletions

diff --git a/core/image.cpp b/core/image.cpp
index e5489c06fa..d9ba6c1594 100644
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -1399,10 +1399,344 @@ int Image::get_format_pallete_size(Format p_format) {
 }
 
 
+
+
+Error Image::_decompress_bc() {
+
+	print_line("decompressing bc");
+
+	int mm;
+	int size = _get_dst_image_size(width,height,FORMAT_RGBA,mm,mipmaps);
+
+	DVector<uint8_t> newdata;
+	newdata.resize(size);
+
+	DVector<uint8_t>::Write w = newdata.write();
+	DVector<uint8_t>::Read r = data.read();
+
+	int rofs=0;
+	int wofs=0;
+	int wd=width,ht=height;
+
+	for(int i=0;i<=mm;i++) {
+
+		switch(format) {
+
+			case FORMAT_BC1: {
+
+				int len = (wd*ht)/16;
+				uint8_t* dst=&w[wofs];
+
+				uint32_t ofs_table[16];
+				for(int x=0;x<4;x++) {
+
+					for(int y=0;y<4;y++) {
+
+						ofs_table[15-(y*4+(3-x))]=(x+y*wd)*4;
+					}
+				}
+
+
+				for(int j=0;j<len;j++) {
+
+					const uint8_t* src=&r[rofs+j*8];
+					uint16_t col_a=src[1];
+					col_a<<=8;
+					col_a|=src[0];
+					uint16_t col_b=src[3];
+					col_b<<=8;
+					col_b|=src[2];
+
+					uint8_t table[4][4]={
+						{ (col_a>>11)<<3, ((col_a>>5)&0x3f)<<2,	((col_a)&0x1f)<<3, 255 },
+						{ (col_b>>11)<<3, ((col_b>>5)&0x3f)<<2,	((col_b)&0x1f)<<3, 255 },
+						{0,0,0,255},
+						{0,0,0,255}
+					};
+
+					if (col_a<col_b) {
+						//punchrough
+						table[2][0]=(int(table[0][0])+int(table[1][0]))>>1;
+						table[2][1]=(int(table[0][1])+int(table[1][1]))>>1;
+						table[2][2]=(int(table[0][2])+int(table[1][2]))>>1;
+						table[3][3]=0; //premul alpha black
+					} else {
+						//gradient
+						table[2][0]=(int(table[0][0])*2+int(table[1][0]))/3;
+						table[2][1]=(int(table[0][1])*2+int(table[1][1]))/3;
+						table[2][2]=(int(table[0][2])*2+int(table[1][2]))/3;
+						table[3][0]=(int(table[0][0])+int(table[1][0])*2)/3;
+						table[3][1]=(int(table[0][1])+int(table[1][1])*2)/3;
+						table[3][2]=(int(table[0][2])+int(table[1][2])*2)/3;
+					}
+
+					uint32_t block=src[4];
+					block<<=8;
+					block|=src[5];
+					block<<=8;
+					block|=src[6];
+					block<<=8;
+					block|=src[7];
+
+					int y = (j/(wd/4))*4;
+					int x = (j%(wd/4))*4;
+					int pixofs = (y*wd+x)*4;
+
+					for(int k=0;k<16;k++) {
+						int idx = pixofs+ofs_table[k];
+						dst[idx+0]=table[block&0x3][0];
+						dst[idx+1]=table[block&0x3][1];
+						dst[idx+2]=table[block&0x3][2];
+						dst[idx+3]=table[block&0x3][3];
+						block>>=2;
+					}
+
+				}
+
+				rofs+=len*8;
+				wofs+=wd*ht*4;
+
+
+				wd/=2;
+				ht/=2;
+
+			} break;
+			case FORMAT_BC2: {
+
+				int len = (wd*ht)/16;
+				uint8_t* dst=&w[wofs];
+
+				uint32_t ofs_table[16];
+				for(int x=0;x<4;x++) {
+
+					for(int y=0;y<4;y++) {
+
+						ofs_table[15-(y*4+(3-x))]=(x+y*wd)*4;
+					}
+				}
+
+
+				for(int j=0;j<len;j++) {
+
+					const uint8_t* src=&r[rofs+j*16];
+
+					uint64_t ablock=src[1];
+					ablock<<=8;
+					ablock|=src[0];
+					ablock<<=8;
+					ablock|=src[3];
+					ablock<<=8;
+					ablock|=src[2];
+					ablock<<=8;
+					ablock|=src[5];
+					ablock<<=8;
+					ablock|=src[4];
+					ablock<<=8;
+					ablock|=src[7];
+					ablock<<=8;
+					ablock|=src[6];
+
+
+					uint16_t col_a=src[8+1];
+					col_a<<=8;
+					col_a|=src[8+0];
+					uint16_t col_b=src[8+3];
+					col_b<<=8;
+					col_b|=src[8+2];
+
+					uint8_t table[4][4]={
+						{ (col_a>>11)<<3, ((col_a>>5)&0x3f)<<2,	((col_a)&0x1f)<<3, 255 },
+						{ (col_b>>11)<<3, ((col_b>>5)&0x3f)<<2,	((col_b)&0x1f)<<3, 255 },
+						{0,0,0,255},
+						{0,0,0,255}
+					};
+
+					//always gradient
+					table[2][0]=(int(table[0][0])*2+int(table[1][0]))/3;
+					table[2][1]=(int(table[0][1])*2+int(table[1][1]))/3;
+					table[2][2]=(int(table[0][2])*2+int(table[1][2]))/3;
+					table[3][0]=(int(table[0][0])+int(table[1][0])*2)/3;
+					table[3][1]=(int(table[0][1])+int(table[1][1])*2)/3;
+					table[3][2]=(int(table[0][2])+int(table[1][2])*2)/3;
+
+					uint32_t block=src[4+8];
+					block<<=8;
+					block|=src[5+8];
+					block<<=8;
+					block|=src[6+8];
+					block<<=8;
+					block|=src[7+8];
+
+					int y = (j/(wd/4))*4;
+					int x = (j%(wd/4))*4;
+					int pixofs = (y*wd+x)*4;
+
+					for(int k=0;k<16;k++) {
+						uint8_t alpha = ablock&0xf;
+						alpha=int(alpha)*255/15; //right way for alpha
+						int idx = pixofs+ofs_table[k];
+						dst[idx+0]=table[block&0x3][0];
+						dst[idx+1]=table[block&0x3][1];
+						dst[idx+2]=table[block&0x3][2];
+						dst[idx+3]=alpha;
+						block>>=2;
+						ablock>>=4;
+					}
+
+				}
+
+				rofs+=len*16;
+				wofs+=wd*ht*4;
+
+
+				wd/=2;
+				ht/=2;
+
+			} break;
+			case FORMAT_BC3: {
+
+				int len = (wd*ht)/16;
+				uint8_t* dst=&w[wofs];
+
+				uint32_t ofs_table[16];
+				for(int x=0;x<4;x++) {
+
+					for(int y=0;y<4;y++) {
+
+						ofs_table[15-(y*4+(3-x))]=(x+y*wd)*4;
+					}
+				}
+
+
+
+				for(int j=0;j<len;j++) {
+
+					const uint8_t* src=&r[rofs+j*16];
+
+					uint8_t a_start=src[1];
+					uint8_t a_end=src[0];
+
+					uint64_t ablock=src[3];
+					ablock<<=8;
+					ablock|=src[2];
+					ablock<<=8;
+					ablock|=src[5];
+					ablock<<=8;
+					ablock|=src[4];
+					ablock<<=8;
+					ablock|=src[7];
+					ablock<<=8;
+					ablock|=src[6];
+
+					uint8_t atable[8];
+
+					if (a_start>a_end) {
+
+						atable[0]=(int(a_start)*7+int(a_end)*0)/7;
+						atable[1]=(int(a_start)*6+int(a_end)*1)/7;
+						atable[2]=(int(a_start)*5+int(a_end)*2)/7;
+						atable[3]=(int(a_start)*4+int(a_end)*3)/7;
+						atable[4]=(int(a_start)*3+int(a_end)*4)/7;
+						atable[5]=(int(a_start)*2+int(a_end)*5)/7;
+						atable[6]=(int(a_start)*1+int(a_end)*6)/7;
+						atable[7]=(int(a_start)*0+int(a_end)*7)/7;
+					} else {
+
+						atable[0]=(int(a_start)*5+int(a_end)*0)/5;
+						atable[1]=(int(a_start)*4+int(a_end)*1)/5;
+						atable[2]=(int(a_start)*3+int(a_end)*2)/5;
+						atable[3]=(int(a_start)*2+int(a_end)*3)/5;
+						atable[4]=(int(a_start)*1+int(a_end)*4)/5;
+						atable[5]=(int(a_start)*0+int(a_end)*5)/5;
+						atable[6]=0;
+						atable[7]=255;
+
+					}
+
+
+					uint16_t col_a=src[8+1];
+					col_a<<=8;
+					col_a|=src[8+0];
+					uint16_t col_b=src[8+3];
+					col_b<<=8;
+					col_b|=src[8+2];
+
+					uint8_t table[4][4]={
+						{ (col_a>>11)<<3, ((col_a>>5)&0x3f)<<2,	((col_a)&0x1f)<<3, 255 },
+						{ (col_b>>11)<<3, ((col_b>>5)&0x3f)<<2,	((col_b)&0x1f)<<3, 255 },
+						{0,0,0,255},
+						{0,0,0,255}
+					};
+
+					//always gradient
+					table[2][0]=(int(table[0][0])*2+int(table[1][0]))/3;
+					table[2][1]=(int(table[0][1])*2+int(table[1][1]))/3;
+					table[2][2]=(int(table[0][2])*2+int(table[1][2]))/3;
+					table[3][0]=(int(table[0][0])+int(table[1][0])*2)/3;
+					table[3][1]=(int(table[0][1])+int(table[1][1])*2)/3;
+					table[3][2]=(int(table[0][2])+int(table[1][2])*2)/3;
+
+
+					uint32_t block=src[4+8];
+					block<<=8;
+					block|=src[5+8];
+					block<<=8;
+					block|=src[6+8];
+					block<<=8;
+					block|=src[7+8];
+
+					int y = (j/(wd/4))*4;
+					int x = (j%(wd/4))*4;
+					int pixofs = (y*wd+x)*4;
+
+
+
+					for(int k=0;k<16;k++) {
+						uint8_t alpha = ablock&0x7;
+						int idx = pixofs+ofs_table[k];
+						dst[idx+0]=table[block&0x3][0];
+						dst[idx+1]=table[block&0x3][1];
+						dst[idx+2]=table[block&0x3][2];
+						dst[idx+3]=atable[alpha];
+						block>>=2;
+						ablock>>=3;
+					}
+
+				}
+
+				rofs+=len*16;
+				wofs+=wd*ht*4;
+
+
+				wd/=2;
+				ht/=2;
+
+			} break;
+		}
+
+	}
+
+	w=DVector<uint8_t>::Write();
+	r=DVector<uint8_t>::Read();
+
+	data=newdata;
+	format=FORMAT_RGBA;
+
+	return OK;
+}
+
+
+Image Image::decompressed() const {
+
+	Image img=*this;
+	img.decompress();
+	return img;
+}
+
 Error Image::decompress() {
 
-	if (format>=FORMAT_BC1 && format<=FORMAT_BC5 && _image_decompress_bc)
-		_image_decompress_bc(this);
+	if (format>=FORMAT_BC1 && format<=FORMAT_BC5 )
+		_decompress_bc();//_image_decompress_bc(this);
 	else if (format>=FORMAT_PVRTC2 && format<=FORMAT_PVRTC4_ALPHA && _image_decompress_pvrtc)
 		_image_decompress_pvrtc(this);
 	else if (format==FORMAT_ETC && _image_decompress_etc)
diff --git a/core/image.h b/core/image.h
index ce189f330d..7a6ee1e4b0 100644
--- a/core/image.h
+++ b/core/image.h
@@ -99,6 +99,8 @@ public:
 	static void (*_image_decompress_bc)(Image *);
 	static void (*_image_decompress_etc)(Image *);
 
+	Error _decompress_bc();
+
 	static DVector<uint8_t> (*lossy_packer)(const Image& p_image,float p_quality);
 	static Image (*lossy_unpacker)(const DVector<uint8_t>& p_buffer);
 	static DVector<uint8_t> (*lossless_packer)(const Image& p_image);
@@ -318,6 +320,7 @@ public:
 	Error compress(CompressMode p_mode=COMPRESS_BC);
 	Image compressed(int p_mode); /* from the Image::CompressMode enum */
 	Error decompress();
+	Image decompressed() const;
 
 	void fix_alpha_edges();
 	void premultiply_alpha();
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index c245e01ee0..8cdfce1b0a 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -539,6 +539,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
 	VCALL_PTR3(Image,brush_transfer);
 	VCALL_PTR1R(Image,get_rect);
 	VCALL_PTR1R(Image,compressed);
+	VCALL_PTR0R(Image,decompressed);
 	VCALL_PTR3R(Image, resized);
 	VCALL_PTR0R(Image, get_data);
 	VCALL_PTR3(Image, blit_rect);
@@ -1266,6 +1267,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
 	ADDFUNC0(IMAGE, RECT2, Image, get_used_rect, varray(0));
 	ADDFUNC1(IMAGE, IMAGE, Image, get_rect, RECT2, "area", varray(0));
 	ADDFUNC1(IMAGE, IMAGE, Image, compressed, INT, "format", varray(0));
+	ADDFUNC0(IMAGE, IMAGE, Image, decompressed, varray(0));
 	ADDFUNC3(IMAGE, IMAGE, Image, resized, INT, "x", INT, "y", INT, "interpolation", varray(((int)Image::INTERPOLATE_BILINEAR)));
 	ADDFUNC0(IMAGE, RAW_ARRAY, Image, get_data, varray());
 	ADDFUNC3(IMAGE, NIL, Image, blit_rect, IMAGE, "src", RECT2, "src_rect", VECTOR2, "dest", varray(0));