flash player 16 api sync

fponticelli · Mar 1, 2015 · 5a58ba1 · 5a58ba1
1 parent e09ed5e
commit 5a58ba1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/extra/extract.hxml b/extra/extract.hxml
@@ -1,6 +1,6 @@
 -debug
 -swf-lib library.swf
 -swf test.swf
--swf-version 11.8
---macro patchTypes("../doc/extract.patch")
+-swf-version 15
+--macro patchTypes("../extra/extract.patch")
 --gen-hx-classes
diff --git a/genxml.ml b/genxml.ml
@@ -425,7 +425,7 @@ let generate_type com t =
 	let print_meta ml =
 		List.iter (fun (m,pl,_) ->
 			match m with
-			| Meta.DefParam | Meta.CoreApi | Meta.Used | Meta.MaybeUsed | Meta.FlatEnum -> ()
+			| Meta.DefParam | Meta.CoreApi | Meta.Used | Meta.MaybeUsed | Meta.FlatEnum | Meta.Value | Meta.DirectlyUsed -> ()
 			| _ ->
 			match pl with
 			| [] -> p "@%s " (fst (MetaInfo.to_string m))

diff --git a/std/flash/display3D/Context3D.hx b/std/flash/display3D/Context3D.hx
@@ -25,6 +25,7 @@ package flash.display3D;
 	function setColorMask(red : Bool, green : Bool, blue : Bool, alpha : Bool) : Void;
 	function setCulling(triangleFaceToCull : Context3DTriangleFace) : Void;
 	function setDepthTest(depthMask : Bool, passCompareMode : Context3DCompareMode) : Void;
+	@:require(flash16) function setFillMode( fillMode : Context3DFillMode ) : Void;
 	function setProgram(program : Program3D) : Void;
 	@:require(flash11_2) function setProgramConstantsFromByteArray(programType : Context3DProgramType, firstRegister : Int, numRegisters : Int, data : flash.utils.ByteArray, byteArrayOffset : UInt) : Void;
 	function setProgramConstantsFromMatrix(programType : Context3DProgramType, firstRegister : Int, matrix : flash.geom.Matrix3D, transposedMatrix : Bool = false) : Void;

diff --git a/std/flash/display3D/Context3DFillMode.hx b/std/flash/display3D/Context3DFillMode.hx
@@ -0,0 +1,6 @@
+package flash.display3D;
+
+@:fakeEnum(String) @:require(flash16) extern enum Context3DFillMode {
+	SOLID;
+	WIREFRAME;
+}
diff --git a/std/flash/display3D/Context3DProfile.hx b/std/flash/display3D/Context3DProfile.hx
@@ -5,4 +5,5 @@ package flash.display3D;
 	BASELINE_CONSTRAINED;
 	BASELINE_EXTENDED;
 	STANDARD;
+	STANDARD_CONSTRAINED;
 }
diff --git a/std/flash/media/AVCaptionStyle.hx b/std/flash/media/AVCaptionStyle.hx
@@ -3,6 +3,7 @@ package flash.media;
 extern class AVCaptionStyle {
 	var backgroundColor : String;
 	var backgroundOpacity : String;
+	var bottomInset : String;
 	var edgeColor : String;
 	var fillColor : String;
 	var fillOpacity : String;