Nicolas Cannasse пре 7 година
родитељ
комит
b3c2da22b0
6 измењених фајлова са 10 додато и 9 уклоњено
  1. 1 1
      h2d/CdbLevel.hx
  2. 1 1
      h2d/ObjectFollower.hx
  3. 3 2
      h2d/Sprite.hx
  4. 1 1
      h2d/filter/AbstractMask.hx
  5. 2 2
      h3d/scene/Mesh.hx
  6. 2 2
      h3d/scene/Skin.hx

+ 1 - 1
h2d/CdbLevel.hx

@@ -118,7 +118,7 @@ class LevelLayer {
 	public var name : String;
 
 	/**
-		CdbLevel extends Layers: this index will tell in which sprite layer this LevelLayer content is added to.
+		CdbLevel extends Layers: this index will tell in which object layer this LevelLayer content is added to.
 	**/
 	public var layerIndex(default,null) : Int;
 

+ 1 - 1
h2d/ObjectFollower.hx

@@ -1,7 +1,7 @@
 package h2d;
 
 /**
-	Allows a 2D sprite position to follow a 3D object using the current camera.
+	Allows a 2D object position to follow a 3D object using the current camera.
 **/
 class ObjectFollower extends Object {
 

+ 3 - 2
h2d/Sprite.hx

@@ -1,6 +1,7 @@
 package h2d;
 
 #if !heaps_sprite
-@:deprecated("h2d.Sprite is now h2d.Object, rename or use -D heaps-sprite") 
-#end 
+@:deprecated("h2d.Sprite is now h2d.Object, rename or use -D heaps-sprite")
+@:noCompletion
+#end
 typedef Sprite = Object;

+ 1 - 1
h2d/filter/AbstractMask.hx

@@ -100,7 +100,7 @@ class AbstractMask extends Filter {
 		if( mask == null || hide.frame != ctx.frame ) {
 			var p = obj;
 			while( p != null ) {
-				if( p == mask ) throw "You can't mask with one of the sprite parents";
+				if( p == mask ) throw "You can't mask with one of the object parents";
 				p = p.parent;
 			}
 			hide.input = null;

+ 2 - 2
h3d/scene/Mesh.hx

@@ -19,8 +19,8 @@ class Mesh extends Object {
 		return [material];
 	}
 
-	override function getBounds( ?b : h3d.col.Bounds, rec = false ) {
-		b = super.getBounds(b, rec);
+	override function getBoundsRec( b : h3d.col.Bounds ) {
+		b = super.getBoundsRec(b);
 		if( primitive == null || flags.has(FIgnoreBounds) )
 			return b;
 		var tmp = primitive.getBounds().clone();

+ 2 - 2
h3d/scene/Skin.hx

@@ -93,8 +93,8 @@ class Skin extends MultiMaterial {
 		return s;
 	}
 
-	override function getBounds( ?b : h3d.col.Bounds, rec = false ) {
-		b = super.getBounds(b, rec);
+	override function getBoundsRec( b : h3d.col.Bounds ) {
+		b = super.getBoundsRec(b);
 		var tmp = primitive.getBounds().clone();
 		var b0 = skinData.allJoints[0];
 		// not sure if that's the good joint