Explorar el Código

More resolution fixes for haxe nightlies (#230)

* More resolution fixes

* [ci] need git version of format too
Rudy Ges hace 1 año
padre
commit
067c6c1517

+ 1 - 0
.github/workflows/main.yml

@@ -17,6 +17,7 @@ jobs:
     - uses: krdlab/setup-haxe@v1
     - name: Build
       run: |
+        haxelib git format https://github.com/HaxeFoundation/format
         haxelib git heaps https://github.com/HeapsIO/heaps
         haxelib git castle https://github.com/ncannasse/castle
         haxelib git hxbit https://github.com/ncannasse/hxbit

+ 3 - 3
hrt/shgraph/ShaderGraph.hx

@@ -842,7 +842,7 @@ class Graph {
 				var node = sortedNodes[sortedNodes.length - i - 1];
 				var data = nodeData[node.generateId];
 
-				var className = Type.getClassName(Type.getClass(node.instance));
+				var className = std.Type.getClassName(std.Type.getClass(node.instance));
 				trace("node " +  className + ":" + node.generateId);
 				var def = getDef(node);
 				trace("inVars:");
@@ -851,7 +851,7 @@ class Graph {
 						continue;
 					var from = node.instance.connections.get(v.v.name);
 					var className = if (from != null) {
-						Type.getClassName(Type.getClass(from.from.instance)) + ':${from.from.generateId}:${from.fromName}';
+						std.Type.getClassName(std.Type.getClass(from.from.instance)) + ':${from.from.generateId}:${from.fromName}';
 					} else {
 						"not connected";
 					}
@@ -870,7 +870,7 @@ class Graph {
 						for (to in targets) {
 							if (targetString.length > 0)
 								targetString += ", ";
-							targetString +=	Type.getClassName(Type.getClass(to.node.instance)) + ':${to.node.generateId}:${to.inputName}';
+							targetString +=	std.Type.getClassName(std.Type.getClass(to.node.instance)) + ':${to.node.generateId}:${to.inputName}';
 						}
 					}
 					else {

+ 1 - 1
hrt/shgraph/ShaderNode.hx

@@ -21,7 +21,7 @@ class ShaderNode {
 
 
 	public function getShaderDef(domain: ShaderGraph.Domain, getNewIdFn : () -> Int, ?inputTypes: Array<Type>) : ShaderGraph.ShaderNodeDef {
-		throw "getShaderDef is not defined for class " + Type.getClassName(Type.getClass(this));
+		throw "getShaderDef is not defined for class " + std.Type.getClassName(std.Type.getClass(this));
 		return {expr: null, inVars: [], outVars: [], inits: [], externVars: []};
 	}
 

+ 2 - 2
hrt/shgraph/ShaderNodeHxsl.hx

@@ -11,8 +11,8 @@ class ShaderNodeHxsl extends ShaderNode {
 	static var nodeCache : Map<String, ShaderGraph.ShaderNodeDef> = [];
 
 	override public function getShaderDef(domain: ShaderGraph.Domain, getNewIdFn : () -> Int, ?inputTypes: Array<Type>) : ShaderGraph.ShaderNodeDef {
-		var cl = Type.getClass(this);
-		var className = Type.getClassName(cl);
+		var cl = std.Type.getClass(this);
+		var className = std.Type.getClassName(cl);
 		var def = null;//nodeCache.get(className);
 		if (def == null) {
 			var unser = new hxsl.Serializer();