Browse Source

Merge pull request #150 from hammeron-art/compilation

Fix compilation
Nicolas Cannasse 9 years ago
parent
commit
4e5dbc1eef
4 changed files with 4 additions and 5 deletions
  1. 1 1
      hxd/fs/BytesFileSystem.hx
  2. 1 1
      hxd/res/Atlas.hx
  3. 0 1
      samples/comps/Comps.hx
  4. 2 2
      samples/shadows/Main.hx

+ 1 - 1
hxd/fs/BytesFileSystem.hx

@@ -54,7 +54,7 @@ class BytesFileEntry extends FileEntry {
 	override function exists( name : String ) : Bool return false;
 	override function get( name : String ) : FileEntry return null;
 
-	override function iterator() : hxd.impl.ArrayIterator<FileEntry> return new hxd.impl.ArrayIterator([]);
+	override function iterator() : hxd.impl.ArrayIterator<FileEntry> return new hxd.impl.ArrayIterator(new Array<FileEntry>());
 
 	override function get_size() return bytes.length;
 

+ 1 - 1
hxd/res/Atlas.hx

@@ -40,7 +40,7 @@ class Atlas extends Resource {
 			var cont = getContents().keys();
 			name = cont.next();
 			if( cont.hasNext() )
-				throw "Altas has several items in it " + Lambda.array( { iterator : contents.keys } );
+				throw "Altas has several items in it " + Lambda.array( contents );
 		}
 		var c = getContents().get(name);
 		if( c == null )

+ 0 - 1
samples/comps/Comps.hx

@@ -22,7 +22,6 @@ class Comps {
 
 	function update() {
 		engine.render(scene);
-		scene.checkEvents();
 	}
 
 	static function main() {

+ 2 - 2
samples/shadows/Main.hx

@@ -34,9 +34,9 @@ class Main extends hxd.App {
 		s3d.lightSystem.ambientLight.set(0.5, 0.5, 0.5);
 
 		dir = new h3d.scene.DirLight(new h3d.Vector(-0.3, -0.2, -1), s3d);
-
+		s3d.lightSystem.shadowLight = dir;
+		
 		shadow = cast(s3d.renderer.getPass("shadow"), h3d.pass.ShadowMap);
-		shadow.lightDirection = dir.direction;
 		shadow.blur.passes = 3;
 	}