Ktx2 sync

.gitignore

@@ -8,7 +8,9 @@ bin
 /hxd/net/inspect.min.css
 /hxd/inspect/inspect.min.css
 /samples/build
+/node_modules
 /*.xml
 .vscode
 /tools/mikktspace/out
 *.exe
+.history

.npmignore

@@ -0,0 +1,7 @@
+node_modules
+.gitlab-ci.yml
+.idea
+*.iml
+bin
+.history
+.haxelib

.npmrc

@@ -0,0 +1,3 @@
+registry=https://hacksawgaming-281033247142.d.codeartifact.eu-west-1.amazonaws.com/npm/hacksaw-client-artifacts/ 
+//hacksawgaming-281033247142.d.codeartifact.eu-west-1.amazonaws.com/npm/hacksaw-client-artifacts/:always-auth=true 
+//hacksawgaming-281033247142.d.codeartifact.eu-west-1.amazonaws.com/npm/hacksaw-client-artifacts/:_authToken=${CODEARTIFACT_AUTH_TOKEN}

h3d/Engine.hx

@@ -278,7 +278,7 @@ class Engine {
 		if( !driver.isDisposed() ) driver.resize(width, height);
 	}
 
-	public function begin() {
+	public function begin(preventClear = false) {
 		if( driver.isDisposed() )
 			return false;
 		// init
@@ -292,7 +292,8 @@ class Engine {
 		haxe.System.beginFrame();
 		#end
 		driver.begin(hxd.Timer.frameCount);
-		if( backgroundColor != null ) clear(backgroundColor, 1, 0);
+		if( backgroundColor != null && !preventClear )
+			clear(backgroundColor, 1, 0);
 		return true;
 	}
 

h3d/impl/GlDriver.hx

@@ -1,13 +1,15 @@
 package h3d.impl;
 import h3d.impl.Driver;
+import h3d.mat.Data;
 import h3d.mat.Pass;
 import h3d.mat.Stencil;
-import h3d.mat.Data;
 
 #if (js||hlsdl||usegl)
 
 #if js
 import hxd.impl.TypedArray;
+import js.html.webgl.RenderingContext;
+
 private typedef GL = js.html.webgl.GL2;
 private typedef Uniform = js.html.webgl.UniformLocation;
 private typedef Program = js.html.webgl.Program;
@@ -87,6 +89,9 @@ class GlDriver extends Driver {
 	static var UID = 0;
 	public var gl : GL;
 	public static var ALLOW_WEBGL2 = true;
+	// Set to 'mediump' to avoid high precision. Can give better performance, but will can mess up shadows for example.
+	public static var MAX_PRECISION = 'highp';
+	public var textureSupport:hxd.PixelFormat;
 	#end
 
 	#if (hlsdl||usegl)
@@ -893,7 +898,10 @@ class GlDriver extends Driver {
 		case GL.RED, GL.R8, GL.R16F, GL.R32F, 0x822A: GL.RED;
 		case GL.RG, GL.RG8, GL.RG16F, GL.RG32F, 0x822C: GL.RG;
 		case GL.RGB16F, GL.RGB32F, 0x8054, 0x8E8F: GL.RGB;
-		case 0x83F1, 0x83F2, 0x83F3, 0x805B, 0x8E8C: GL.RGBA;
+		case hxd.PixelFormat.DXT_FORMAT.RGBA_DXT1,hxd.PixelFormat.DXT_FORMAT.RGBA_DXT3,
+		hxd.PixelFormat.DXT_FORMAT.RGBA_DXT5,hxd.PixelFormat.ASTC_FORMAT.RGBA_4x4,
+		hxd.PixelFormat.PVRTC_FORMAT.RGBA_4BPPV1, 0x805B, 0x8E8C : GL.RGBA;
+		case hxd.PixelFormat.PVRTC_FORMAT.RGB_4BPPV1, hxd.PixelFormat.ETC_FORMAT.RGB_ETC1: GL.RGB;
 		default: throw "Invalid format " + t.internalFmt;
 		}
 	}
@@ -905,6 +913,7 @@ class GlDriver extends Driver {
 		case SRGB, SRGB_ALPHA: hasFeature(SRGBTextures);
 		case R8, RG8, RGB8, R16F, RG16F, RGB16F, R32F, RG32F, RGB32F, RG11B10UF, RGB10A2: #if js glES >= 3 #else true #end;
 		case S3TC(n): n <= maxCompressedTexturesSupport;
+		case ASTC(_), ETC(_), PVRTC(_): #if js true #else false #end;
 		default: false;
 		}
 	}
@@ -980,16 +989,34 @@ class GlDriver extends Driver {
 			tt.internalFmt = GL.R11F_G11F_B10F;
 			tt.pixelFmt = GL.UNSIGNED_INT_10F_11F_11F_REV;
 		case S3TC(n) if( n <= maxCompressedTexturesSupport ):
-			if( t.width&3 != 0 || t.height&3 != 0 )
-				throw "Compressed texture "+t+" has size "+t.width+"x"+t.height+" - must be a multiple of 4";
+			checkMult4(t);
 			switch( n ) {
-			case 1: tt.internalFmt = 0x83F1; // COMPRESSED_RGBA_S3TC_DXT1_EXT
-			case 2:	tt.internalFmt = 0x83F2; // COMPRESSED_RGBA_S3TC_DXT3_EXT
-			case 3: tt.internalFmt = 0x83F3; // COMPRESSED_RGBA_S3TC_DXT5_EXT
+			case 1: tt.internalFmt = hxd.PixelFormat.DXT_FORMAT.RGBA_DXT1;
+			case 2:	tt.internalFmt = hxd.PixelFormat.DXT_FORMAT.RGBA_DXT3;
+			case 3: tt.internalFmt = hxd.PixelFormat.DXT_FORMAT.RGBA_DXT5;
 			case 6: tt.internalFmt = 0x8E8F; // COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT
 			case 7: tt.internalFmt = 0x8E8C; // COMPRESSED_RGBA_BPTC_UNORM
 			default: throw "Unsupported texture format "+t.format;
 			}
+		case ASTC(n):
+			checkMult4(t);
+			switch( n ) {
+			case 10: tt.internalFmt = hxd.PixelFormat.ASTC_FORMAT.RGBA_4x4;
+			default: throw "Unsupported texture format "+t.format;
+			}
+		case ETC(n):
+			checkMult4(t);
+			switch( n ) {
+			case 0: tt.internalFmt = hxd.PixelFormat.ETC_FORMAT.RGB_ETC1;
+			default: throw "Unsupported texture format "+t.format;
+			}
+		case PVRTC(n):
+			checkMult4(t);
+			switch(n) {
+			case 8: tt.internalFmt = hxd.PixelFormat.PVRTC_FORMAT.RGB_4BPPV1;
+			case 9: tt.internalFmt = hxd.PixelFormat.PVRTC_FORMAT.RGBA_4BPPV1;
+			default: throw "Unsupported texture format "+t.format;
+			}
 		default:
 			throw "Unsupported texture format "+t.format;
 		}
@@ -1046,6 +1073,9 @@ class GlDriver extends Driver {
 				gl.texImage3D(bind, mip, tt.internalFmt, w, h, t.layerCount, 0, getChannels(tt), tt.pixelFmt, null);
 				checkError();
 			} else {
+				#if js
+				if( !t.format.match(S3TC(_)) && !t.format.match(ETC(_)) && !t.format.match(ASTC(_)) && !t.format.match(PVRTC(_))) 
+				#end
 				gl.texImage2D(bind, mip, tt.internalFmt, w, h, 0, getChannels(tt), tt.pixelFmt, null);
 				checkError();
 			}
@@ -1062,6 +1092,11 @@ class GlDriver extends Driver {
 		return tt;
 	}
 
+	inline function checkMult4(t:h3d.mat.Texture) {
+		if( t.width&3 != 0 || t.height&3 != 0 )
+			throw "Compressed texture "+t+" has size "+t.width+"x"+t.height+" - must be a multiple of 4";
+	}
+
 	function restoreBind() {
 		var t = boundTextures[lastActiveIndex];
 		if( t == null )
@@ -1294,16 +1329,17 @@ class GlDriver extends Driver {
 		case RGB10A2, RG11B10UF: new Uint32Array(@:privateAccess pixels.bytes.b.buffer, pixels.offset, dataLen>>2);
 		default: new Uint8Array(@:privateAccess pixels.bytes.b.buffer, pixels.offset, dataLen);
 		}
-		if( t.format.match(S3TC(_)) ) {
-			if( t.flags.has(IsArray) )
-				gl.compressedTexSubImage3D(face, mipLevel, 0, 0, side, pixels.width, pixels.height, 1, t.t.internalFmt, buffer);
-			else
-				gl.compressedTexSubImage2D(face, mipLevel, 0, 0, pixels.width, pixels.height, t.t.internalFmt, buffer);
-		} else {
-			if( t.flags.has(IsArray) )
-				gl.texSubImage3D(face, mipLevel, 0, 0, side, pixels.width, pixels.height, 1, getChannels(t.t), t.t.pixelFmt, buffer);
-			else
-				gl.texSubImage2D(face, mipLevel, 0, 0, pixels.width, pixels.height, getChannels(t.t), t.t.pixelFmt, buffer);
+		switch (t.format) {
+			case S3TC(_), ASTC(_), PVRTC(_), ETC(_):
+				if( t.flags.has(IsArray) )
+					gl.compressedTexSubImage3D(face, mipLevel, 0, 0, side, pixels.width, pixels.height, 1, t.t.internalFmt, buffer);
+				else
+					gl.compressedTexSubImage2D(face, mipLevel, 0, 0, pixels.width, pixels.height, t.t.internalFmt, buffer);
+			default:
+				if( t.flags.has(IsArray) )
+					gl.texSubImage3D(face, mipLevel, 0, 0, side, pixels.width, pixels.height, 1, getChannels(t.t), t.t.pixelFmt, buffer);
+				else
+					gl.texSubImage2D(face, mipLevel, 0, 0, pixels.width, pixels.height, getChannels(t.t), t.t.pixelFmt, buffer);
 		}
 		#else
 		throw "Not implemented";
@@ -1749,15 +1785,51 @@ class GlDriver extends Driver {
 	}
 
 	#if js
+	/**
+		Get the max supported precision to use for shaders
+		Limited by MAX_PRECISION value.
+	**/
+	public function getMaxPrecision() {
+		if ( gl.getShaderPrecisionFormat( RenderingContext.VERTEX_SHADER, RenderingContext.HIGH_FLOAT ).precision > 0 &&
+			gl.getShaderPrecisionFormat( RenderingContext.FRAGMENT_SHADER, RenderingContext.HIGH_FLOAT ).precision > 0 ) {
+			return MAX_PRECISION;
+		}
+		return 'mediump';
+	}
+
+	public function checkTextureSupport():hxd.PixelFormat {
+		var astcSupported = gl.getExtension('WEBGL_compressed_texture_astc') != null;
+		var dxtSupported = gl.getExtension('WEBGL_compressed_texture_s3tc') != null;
+		var pvrtcSupported = gl.getExtension('WEBGL_compressed_texture_pvrtc') != null
+			|| gl.getExtension('WEBKIT_WEBGL_compressed_texture_pvrtc') != null;
+		var etcSupported = gl.getExtension('WEBGL_compressed_texture_etc1') != null;
+		return if(astcSupported) {
+			hxd.PixelFormat.ASTC();
+		} else if(dxtSupported){
+			hxd.PixelFormat.S3TC();
+		} else  if(pvrtcSupported){
+			hxd.PixelFormat.PVRTC();
+		} else if(etcSupported){
+			hxd.PixelFormat.ETC();
+		} else {
+			null;
+		}
+	}
 	var features : Map<Feature,Bool> = new Map();
 	var has16Bits : Bool;
 	function makeFeatures() {
 		for( f in Type.allEnums(Feature) )
 			features.set(f,checkFeature(f));
-		if( gl.getExtension("WEBGL_compressed_texture_s3tc") != null ) {
-			maxCompressedTexturesSupport = 3;
-			if( gl.getExtension("EXT_texture_compression_bptc") != null )
-				maxCompressedTexturesSupport = 7;
+		textureSupport = checkTextureSupport();
+		maxCompressedTexturesSupport = switch (textureSupport) {
+			case hxd.PixelFormat.ASTC(_), hxd.PixelFormat.ETC(_), hxd.PixelFormat.PVRTC(_): 3;
+			case hxd.PixelFormat.S3TC(_) : 
+				if( gl.getExtension("EXT_texture_compression_bptc") != null ) {
+					7;
+				} else {
+					3;
+				}
+			default: 0;
 		}
 		if( glES < 3 )
 			gl.getExtension("WEBGL_depth_texture");

haxelib.json

@@ -1,10 +1,14 @@
 {
-	"name" : "heaps",
-	"url" : "http://heaps.io",
-	"license" : "BSD",
-    "description" : "The GPU Game Framework",
-    "version" : "2.0.0",
-	"releasenote" : "See CHANGELOG.md",
-	"contributors" : ["ncannasse"],
-	"dependencies" : { "format" : "" }
+	"name": "heaps",
+	"url": "http://heaps.io",
+	"license": "BSD",
+	"description": "The GPU Game Framework",
+	"version": "2.0.0",
+	"releasenote": "See CHANGELOG.md",
+	"contributors": [
+		"ncannasse"
+	],
+	"dependencies": {
+		"format": ""
+	}
 }

hxd/PixelFormat.hx

@@ -23,8 +23,30 @@ enum PixelFormat {
 	RG16U;
 	RGB16U;
 	RGBA16U;
-	S3TC( v : Int );
+	PVRTC( ?v : Int);
+	ASTC( ?v : Int );
+	ETC( ?v : Int );
+	S3TC( ?v : Int );
 	Depth16;
 	Depth24;
 	Depth24Stencil8;
+}
+
+enum abstract ASTC_FORMAT(Int) from Int to Int {
+	final RGBA_4x4 = 0x93B0;
+}
+
+enum abstract DXT_FORMAT(Int) from Int to Int {
+	final RGBA_DXT1 = 0x83F1;
+	final RGBA_DXT3 = 0x83F2;
+	final RGBA_DXT5 = 0x83F3;
+}
+
+enum abstract ETC_FORMAT(Int) from Int to Int {
+	final RGB_ETC1 = 0x8D64;
+}
+
+enum abstract PVRTC_FORMAT(Int) from Int to Int {
+	final RGB_4BPPV1 = 0x8C00;
+	final RGBA_4BPPV1 = 0x8C02;
 }

hxd/Pixels.hx

@@ -391,6 +391,9 @@ class Pixels {
 			this.bytes = nbytes;
 
 		case [S3TC(a),S3TC(b)] if( a == b ):
+		case [ASTC(a),ASTC(b)] if( a == b ):
+		case [ETC(a),ETC(b)] if( a == b ):
+		case [PVRTC(a),PVRTC(b)] if( a == b ):
 			// nothing
 
 		#if (hl && hl_ver >= "1.10")
@@ -559,6 +562,7 @@ class Pixels {
 		case RGB32F: 12;
 		case RGB10A2: 4;
 		case RG11B10UF: 4;
+		case ASTC(n), ETC(n), PVRTC(n): 1;
 		case S3TC(n):
 			var blocks = (width + 3) >> 2;
 			if( n == 1 || n == 4 )
@@ -604,7 +608,7 @@ class Pixels {
 			channel.toInt() * 4;
 		case RGB10A2, RG11B10UF:
 			throw "Bit packed format";
-		case S3TC(_), Depth16, Depth24, Depth24Stencil8:
+		case S3TC(_), ASTC(_), ETC(_), PVRTC(_), Depth16, Depth24, Depth24Stencil8:
 			throw "Not supported";
 		}
 	}

hxd/net/BinaryLoader.hx

@@ -18,7 +18,7 @@ class BinaryLoader {
 		throw msg;
 	}
 
-	public function load() {
+	public function load(raw = false) {
 		#if js
 
 		var xhr = new js.html.XMLHttpRequest();
@@ -32,7 +32,7 @@ class BinaryLoader {
 				onError(xhr.statusText);
 				return;
 			}
-			onLoaded(haxe.io.Bytes.ofData(xhr.response));
+			onLoaded(raw ? xhr.response : haxe.io.Bytes.ofData(xhr.response));
 		}
 
 		xhr.onprogress = function(e) {