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}

all.hxml

@@ -19,15 +19,13 @@
 -lib hlopenal
 -xml heaps_hl.xml
 hxsl.CacheFileBuilder
--D hl-ver=1.15.0
 
 --next
 
 -hl heaps.hl
 -lib hldx
 -lib hlopenal
 -xml heaps_hldx.xml
--D hl-ver=1.15.0
 
 --next
 
@@ -36,4 +34,4 @@ hxsl.CacheFileBuilder
 -lib hlopenal
 -D dx12
 -xml heaps_hldx12.xml
--D hl-ver=1.15.0
+-D hl-ver=1.14.0

bunfig.toml

@@ -0,0 +1,2 @@
+[install]
+registry = { url = "https://hacksawgaming-281033247142.d.codeartifact.eu-west-1.amazonaws.com/npm/hacksaw-client-artifacts/:_authToken=$CODEARTIFACT_AUTH_TOKEN" }

h2d/Font.hx

@@ -185,6 +185,14 @@ class Font {
 		Defaults to `hxd.Charset.getDefault()`.
 	**/
 	public var charset : hxd.Charset;
+	/**
+		Distance range used to generate SDF Font and usefull for some implementations of SDF Font rendering.
+	**/
+	public var distanceRange:Int;
+	/**
+		SDF Field type used when generating.
+	**/
+	public var fieldType:String;
 	var glyphs : Map<Int,FontChar>;
 	var nullChar : FontChar;
 	var defaultChar : FontChar;
@@ -279,7 +287,7 @@ class Font {
 		@param size The new font size.
 	**/
 	public function resizeTo( size : Int ) {
-		var ratio = size / this.size;
+		var ratio = size / initSize;
 		for( c in glyphs ) {
 			c.width *= ratio;
 			c.t.scaleToSize(c.t.width * ratio, c.t.height * ratio);

h2d/Graphics.hx

@@ -36,12 +36,16 @@ private class GraphicsContent extends h3d.prim.Primitive {
 	var buffers : Array<{ buf : hxd.FloatBuffer, vbuf : h3d.Buffer, idx : hxd.IndexBuffer, ibuf : h3d.Indexes, state : BatchDrawState }>;
 	var bufferDirty : Bool;
 	var indexDirty : Bool;
+	#if track_alloc
 	var allocPos : hxd.impl.AllocPos;
+	#end
 
 	public function new() {
 		buffers = [];
 		state = new BatchDrawState();
-		this.allocPos = hxd.impl.AllocPos.make();
+		#if track_alloc
+		this.allocPos = new hxd.impl.AllocPos();
+		#end
 	}
 
 	public inline function addIndex(i) {
@@ -84,7 +88,9 @@ private class GraphicsContent extends h3d.prim.Primitive {
 		if (index.length <= 0) return ;
 		var alloc = Allocator.get();
 		buffer = alloc.ofFloats(tmp, hxd.BufferFormat.H2D);
+		#if track_alloc
 		@:privateAccess buffer.allocPos = allocPos;
+		#end
 		indexes = alloc.ofIndexes(index);
 		for( b in buffers ) {
 			if( b.vbuf == null || b.vbuf.isDisposed() ) b.vbuf = alloc.ofFloats(b.buf, hxd.BufferFormat.H2D);
@@ -460,7 +466,7 @@ class Graphics extends Drawable {
 		Position a virtual tile at the given position and scale. Every draw will display a part of this tile relative
 		to these coordinates.
 
-		Note that in by default, Tile is not wrapped, and in order to render a tiling texture, `Drawable.tileWrap` has to be set.
+		Note that in by default, Tile is not wrapped, and in order to render tiling texture, `Drawable.tileWrap` have to be set.
 		Additionally, both `Tile.dx` and `Tile.dy` are ignored (use `dx`/`dy` arguments instead)
 		as well as tile defined size of the tile through `Tile.width` and `Tile.height` (use `scaleX`/`scaleY` relative to texture size).
 

h2d/HtmlText.hx

@@ -298,7 +298,7 @@ class HtmlText extends Text {
 			var str = splitNode.node.nodeValue;
 			var info = metrics[metrics.length - 1];
 			var w = info.width;
-			var cc = StringTools.fastCodeAt(str, splitNode.pos);
+			var cc = str.charCodeAt(splitNode.pos);
 			// Restore line metrics to ones before split.
 			// Potential bug: `Text<split> [Image] text<split>text` - third line will use metrics as if image is present in the line.
 			info.width = splitNode.width;
@@ -421,12 +421,12 @@ class HtmlText extends Text {
 			var x = leftMargin;
 			var breakChars = 0;
 			for ( i in 0...text.length ) {
-				var cc = StringTools.fastCodeAt(text, i);
+				var cc = text.charCodeAt(i);
 				var g = font.getChar(cc);
 				var newline = cc == '\n'.code;
 				var esize = g.width + g.getKerningOffset(prevChar);
-				var isComplement = (i < text.length - 1 && font.charset.isComplementChar(StringTools.fastCodeAt(text, i + 1)));
-				if ( font.charset.isBreakChar(cc) && !isComplement) {
+				var nc = text.charCodeAt(i+1);
+				if ( font.charset.isBreakChar(cc) && (nc == null || !font.charset.isComplementChar(nc) )) {
 					// Case: Very first word in text makes the line too long hence we want to start it off on a new line.
 					if (x > maxWidth && textSplit.length == 0 && splitNode.node != null) {
 						metrics.push(makeLineInfo(x, info.height, info.baseLine));
@@ -437,17 +437,13 @@ class HtmlText extends Text {
 					var k = i + 1, max = text.length;
 					var prevChar = cc;
 					while ( size <= maxWidth && k < max ) {
-						var cc = StringTools.fastCodeAt(text, k++);
+						var cc = text.charCodeAt(k++);
 						if ( lineBreak && (font.charset.isSpace(cc) || cc == '\n'.code ) ) break;
 						var e = font.getChar(cc);
 						size += e.width + letterSpacing + e.getKerningOffset(prevChar);
 						prevChar = cc;
-						if ( font.charset.isBreakChar(cc) ) {
-							if ( k >= text.length )
-								break;
-							var nc = StringTools.fastCodeAt(text, k);
-							if ( !font.charset.isComplementChar(nc) ) break;
-						}
+						var nc = text.charCodeAt(k);
+						if ( font.charset.isBreakChar(cc) && (nc == null || !font.charset.isComplementChar(nc)) ) break;
 					}
 					// Avoid empty line when last char causes line-break while being CJK
 					if ( lineBreak && size > maxWidth && i != max - 1 ) {
@@ -561,7 +557,7 @@ class HtmlText extends Text {
 				var startI = 0;
 				var index = Lambda.indexOf(e.parent, e);
 				for (i in 0...text.length) {
-					if (StringTools.fastCodeAt(text, i) == '\n'.code) {
+					if (text.charCodeAt(i) == '\n'.code) {
 						var pre = text.substring(startI, i);
 						if (pre != "") e.parent.insertChild(Xml.createPCData(pre), index++);
 						e.parent.insertChild(Xml.createElement("br"),index++);
@@ -675,7 +671,7 @@ class HtmlText extends Text {
 					switch( a.toLowerCase() ) {
 					case "color":
 						if( prevColor == null ) prevColor = @:privateAccess glyphs.curColor.clone();
-						if( v.length == 4 && StringTools.fastCodeAt(v, 0) == '#'.code )
+						if( v.charCodeAt(0) == '#'.code && v.length == 4 )
 							v = "#" + v.charAt(1) + v.charAt(1) + v.charAt(2) + v.charAt(2) + v.charAt(3) + v.charAt(3);
 						glyphs.setDefaultColor(Std.parseInt("0x" + v.substr(1)));
 					case "opacity":
@@ -785,7 +781,7 @@ class HtmlText extends Text {
 			var t = e.nodeValue;
 			var dy = metrics[sizePos].baseLine - font.baseLine;
 			for( i in 0...t.length ) {
-				var cc = StringTools.fastCodeAt(t, i);
+				var cc = t.charCodeAt(i);
 				if( cc == "\n".code ) {
 					makeLineBreak();
 					dy = metrics[sizePos].baseLine - font.baseLine;

h2d/LoadingScene.hx

@@ -1,44 +1,22 @@
 package h2d;
 
 class LoadingScene extends h2d.Scene {
-	var renderTarget : h3d.mat.Texture;
+
 	var presentCooldown : Float;
 	public function new(presentCooldown : Float) {
 		super();
 		this.presentCooldown = presentCooldown;
-		renderTarget = new h3d.mat.Texture(width, height, [Target]);
 	}
 
-	var lastPresentTime : Float = 0.0;
-	public override function render( engine : h3d.Engine ) {
-		var time = haxe.Timer.stamp();
-		if ( time - lastPresentTime < presentCooldown)
+	override function render( engine : h3d.Engine ) {
+		hxd.Timer.update();
+		var dt = hxd.Timer.dt;
+		ctx.elapsedTime += dt;
+		if ( ctx.elapsedTime < presentCooldown )
 			return;
-		lastPresentTime = time;
-
-	#if usesys
-		haxe.System.emitEvents(@:privateAccess hxd.Window.inst.event);
-	#elseif hldx
-		dx.Loop.processEvents(@:privateAccess hxd.Window.inst.onEvent);
-	#elseif hlsdl
-		sdl.Sdl.processEvents(@:privateAccess hxd.Window.inst.onEvent);
-	#end
-
-		if ( renderTarget.width != engine.width || renderTarget.height != engine.height) {
-			renderTarget.dispose();
-			renderTarget = new h3d.mat.Texture(engine.width, engine.height, [Target]);
-		}
-
-		engine.pushTarget(renderTarget);
+		ctx.elapsedTime = 0.0;
+		hxd.System.timeoutTick();
 		super.render(engine);
-		engine.popTarget();
-		h3d.pass.Copy.run(renderTarget, null);
 		engine.driver.present();
 	}
-
-	override function onRemove() {
-		super.onRemove();
-		if ( renderTarget != null )
-			renderTarget.dispose();
-	} 
 }

h2d/ObjectFollower.hx

@@ -55,11 +55,6 @@ class ObjectFollower extends Object {
 	**/
 	public var cameraRelative : Bool = false;
 
-	/**
-		If enabled, the ObjectFollower will remove itself if the object followed is null or removed.
-	**/
-	public var autoRemove : Bool = false;
-
 	var zValue : Float = 0.;
 	var outputScale : Float = 1.;
 	var tmpPos = new h3d.Vector();
@@ -76,17 +71,11 @@ class ObjectFollower extends Object {
 	}
 
 	function followObject() {
-		if( follow == null ) {
-			if ( autoRemove )
-				remove();		
+		if( follow == null )
 			return;
-		}
 		var scene = @:privateAccess follow.getScene();
-		if( scene == null ) {
-			if ( autoRemove )
-				remove();
+		if( scene == null )
 			return;
-		}
 		var s2d = getScene();
 		var width = s2d == null ? h3d.Engine.getCurrent().width : s2d.width;
 		var height = s2d == null ? h3d.Engine.getCurrent().height : s2d.height;

h2d/RenderContext.hx

@@ -1,12 +1,9 @@
 package h2d;
 
-private typedef ViewportStackEntry = {
+private typedef CameraStackEntry = {
 	va : Float, vb : Float, vc : Float, vd : Float, vx : Float, vy : Float
 };
-private typedef CameraStackEntry = ViewportStackEntry & {
-	camera: h2d.Camera
-};
-private typedef TargetStackEntry = ViewportStackEntry & {
+private typedef TargetStackEntry = CameraStackEntry & {
 	t : h3d.mat.Texture, hasRZ : Bool, rzX:Float, rzY:Float, rzW:Float, rzH:Float
 };
 
@@ -81,12 +78,6 @@ class RenderContext extends h3d.impl.RenderContext {
 	**/
 	@:dox(hide)
 	public var tmpBounds = new h2d.col.Bounds();
-
-	/**
-		The camera instance that is currently being rendered, if present, `null` otherwise.
-	**/
-	public var currentCamera(default, null): Null<h2d.Camera> = null;
-
 	var texture : h3d.mat.Texture;
 	var baseShader : h3d.shader.Base2d;
 	var output : h3d.pass.OutputShader;
@@ -95,7 +86,6 @@ class RenderContext extends h3d.impl.RenderContext {
 	var pass : h3d.mat.Pass;
 	var currentShaders : hxsl.ShaderList;
 	var baseShaderList : hxsl.ShaderList;
-	var needInitShaders : Bool;
 	var currentObj : Drawable;
 	var stride : Int;
 	var targetsStack : Array<TargetStackEntry>;
@@ -218,7 +208,6 @@ class RenderContext extends h3d.impl.RenderContext {
 	}
 
 	function initShaders( shaders ) {
-		needInitShaders = false;
 		currentShaders = shaders;
 		compiledShader = output.compileShaders(globals, shaders);
 		var buffers = shaderBuffers;
@@ -253,7 +242,7 @@ class RenderContext extends h3d.impl.RenderContext {
 	public function pushCamera( cam : h2d.Camera ) {
 		var entry = cameraStack[cameraStackIndex++];
 		if ( entry == null ) {
-			entry = { va: 0, vb: 0, vc: 0, vd: 0, vx: 0, vy: 0, camera: null };
+			entry = { va: 0, vb: 0, vc: 0, vd: 0, vx: 0, vy: 0 };
 			cameraStack.push(entry);
 		}
 		var tmpA = viewA;
@@ -268,9 +257,6 @@ class RenderContext extends h3d.impl.RenderContext {
 		entry.vx = viewX;
 		entry.vy = viewY;
 
-		entry.camera = currentCamera;
-		currentCamera = cam;
-
 		viewA = cam.matA * tmpA + cam.matB * tmpC;
 		viewB = cam.matA * tmpB + cam.matB * tmpD;
 		viewC = cam.matC * tmpA + cam.matD * tmpC;
@@ -296,10 +282,6 @@ class RenderContext extends h3d.impl.RenderContext {
 		viewD = inf.vd;
 		viewX = inf.vx;
 		viewY = inf.vy;
-
-		currentCamera = inf.camera;
-		inf.camera = null;
-
 		var flipY = curTarget != null ? -targetFlipY : -baseFlipY;
 		baseShader.viewportA.set(viewA, viewC, viewX);
 		baseShader.viewportB.set(viewB * flipY, viewD * flipY, viewY * flipY);
@@ -779,7 +761,7 @@ class RenderContext extends h3d.impl.RenderContext {
 		var stride = 8;
 		if( hasBuffering() && currentObj != null && (texture != this.texture || stride != this.stride || obj.blendMode != currentObj.blendMode || obj.filter != currentObj.filter) )
 			flush();
-		var shaderChanged = needInitShaders, paramsChanged = false;
+		var shaderChanged = false, paramsChanged = false;
 		var objShaders = obj.shaders;
 		var curShaders = currentShaders.next;
 		while( objShaders != null && curShaders != null ) {
@@ -818,8 +800,4 @@ class RenderContext extends h3d.impl.RenderContext {
 		return true;
 	}
 
-	override function setCurrent() {
-		super.setCurrent();
-		needInitShaders = true;
-	}
 }