Browse Source

minor fixes

Nicolas Cannnasse 8 years ago
parent
commit
147ec388df
5 changed files with 12 additions and 10 deletions
  1. 1 1
      all.hxml
  2. 3 3
      h2d/CachedBitmap.hx
  3. 3 3
      h2d/comp/ItemList.hx
  4. 2 2
      h3d/impl/LogDriver.hx
  5. 3 1
      hxd/fs/Convert.hx

+ 1 - 1
all.hxml

@@ -5,7 +5,7 @@
 --macro include('h3d')
 --macro include('h2d')
 --macro include('hxsl',true,['hxsl.Macros'])
---macro include('hxd',true,['hxd.res.FileTree','hxd.Res','hxd.impl.BitsBuilder','hxd.impl.Air3File','hxd.fmt.pak.Build','hxd.fmt.hmd.MakeAll','hxd.impl.LimeStage','hxd.fs.LimeFileSystem','hxd.net.SteamHost'])
+--macro include('hxd',true,['hxd.res.FileTree','hxd.Res','hxd.impl.BitsBuilder','hxd.impl.Air3File','hxd.fmt.pak.Build','hxd.fmt.hmd.MakeAll','hxd.impl.LimeStage','hxd.fs.LimeFileSystem','hxd.net.SteamHost','hxd.snd.efx'])
 --no-output
 --each
 

+ 3 - 3
h2d/CachedBitmap.hx

@@ -55,7 +55,7 @@ class CachedBitmap extends Drawable {
 	function syncPosRec( s : Sprite ) {
 		s.calcAbsPos();
 		s.posChanged = true;
-		for( c in s.childs )
+		for( c in s.children )
 			syncPosRec(c);
 	}
 
@@ -80,14 +80,14 @@ class CachedBitmap extends Drawable {
 			absY = 0;
 
 			// force full resync
-			for( c in childs )
+			for( c in children )
 				syncPosRec(c);
 
 			ctx.pushTarget(tile.getTexture());
 			ctx.engine.clear(0);
 			var old = ctx.globalAlpha;
 			ctx.globalAlpha = 1;
-			for( c in childs )
+			for( c in children )
 				c.drawRec(ctx);
 			ctx.globalAlpha = old;
 			ctx.popTarget();

+ 3 - 3
h2d/comp/ItemList.hx

@@ -74,9 +74,9 @@ class ItemList extends Box {
 					}
 				}
 				int.onWheel = onWheel;
-				if( Lambda.indexOf(childs,int) != 1 + i ) {
-					childs.remove(int);
-					childs.insert(1 + i, int); // insert over bg
+				if( Lambda.indexOf(children,int) != 1 + i ) {
+					children.remove(int);
+					children.insert(1 + i, int); // insert over bg
 					int.onParentChanged();
 				}
 			}

+ 2 - 2
h3d/impl/LogDriver.hx

@@ -195,7 +195,7 @@ class LogDriver extends Driver {
 				log('Upload ' + (s.vertex?"vertex":"fragment") + " globals");
 				var g = s.globals;
 				while( g != null ) {
-					log('\t@${g.pos} ' + g.path + '=' + [for( i in 0...sizeOf(g.type) ) hxd.Math.fmt(buf.globals.toData()[g.pos + i])]);
+					log('\t@${g.pos} ' + g.path + '=' + [for( i in 0...sizeOf(g.type) ) hxd.Math.fmt(buf.globals #if hl .toData() #end[g.pos + i])]);
 					g = g.next;
 				}
 			}
@@ -211,7 +211,7 @@ class LogDriver extends Driver {
 					#if flash
 					pos += s.globalsSize * 4;
 					#end
-					log('\t@$pos ' + p.name + '=' + [for( i in 0...sizeOf(p.type) ) hxd.Math.fmt(buf.params.toData()[p.pos + i])]);
+					log('\t@$pos ' + p.name + '=' + [for( i in 0...sizeOf(p.type) ) hxd.Math.fmt(buf.params #if hl .toData() #end[p.pos + i])]);
 					p = p.next;
 				}
 			}

+ 3 - 1
hxd/fs/Convert.hx

@@ -26,10 +26,12 @@ class Convert {
 	function command( cmd : String, args : Array<String> ) {
 		#if flash
 		trace("TODO");
-		#else
+		#elseif sys
 		var code = Sys.command(cmd, args);
 		if( code != 0 )
 			throw "Command '" + cmd + (args.length == 0 ? "" : " " + args.join(" ")) + "' failed with exit code " + code;
+		#else
+		throw "Don't know how to run command on this platform";
 		#end
 	}