Prechádzať zdrojové kódy

Remove deprecated macros (#1150)

Christian Zommerfelds 2 rokov pred
rodič
commit
3b6c030d7d

+ 1 - 1
h2d/Font.hx

@@ -107,7 +107,7 @@ class FontChar {
 /**
 	Channel reading method for `FontType.SignedDistanceField`.
 **/
-@:enum abstract SDFChannel(Int) from Int to Int {
+enum abstract SDFChannel(Int) from Int to Int {
 	/** Use red channel of a texture to determine distance. **/
 	var Red = 0;
 	/** Use green channel of a texture to determine distance. **/

+ 1 - 1
h3d/mat/Material.hx

@@ -1,6 +1,6 @@
 package h3d.mat;
 
-@:enum private abstract DefaultKind(String) {
+private enum abstract DefaultKind(String) {
 	var Opaque = "Opaque";
 	var Alpha = "Alpha";
 	var AlphaKill = "AlphaKill";

+ 7 - 7
h3d/mat/PbrMaterial.hx

@@ -1,6 +1,6 @@
 package h3d.mat;
 
-@:enum abstract PbrMode(String) {
+enum abstract PbrMode(String) {
 	var PBR = "PBR";
 	var Forward = "Forward";
 	var Overlay = "Overlay";
@@ -12,7 +12,7 @@ package h3d.mat;
 	var TerrainPass = "TerrainPass";
 }
 
-@:enum abstract PbrBlend(String) {
+enum abstract PbrBlend(String) {
 	var None = "None";
 	var Alpha = "Alpha";
 	var Add = "Add";
@@ -21,7 +21,7 @@ package h3d.mat;
 	var AlphaMultiply = "AlphaMultiply";
 }
 
-@:enum abstract PbrDepthTest(String) {
+enum abstract PbrDepthTest(String) {
 	var Less = "Less";
 	var LessEqual = "LessEqual";
 	var Greater = "Greater";
@@ -32,13 +32,13 @@ package h3d.mat;
 	var NotEqual= "NotEqual";
 }
 
-@:enum abstract PbrDepthWrite(String) {
+enum abstract PbrDepthWrite(String) {
 	var Default = "Default";
 	var On = "On";
 	var Off = "Off";
 }
 
-@:enum abstract PbrStencilOp(String) {
+enum abstract PbrStencilOp(String) {
 	var Keep = "Keep";
 	var Zero = "Zero";
 	var Replace = "Replace";
@@ -49,7 +49,7 @@ package h3d.mat;
 	var Invert = "Invert";
 }
 
-@:enum abstract PbrStencilCompare(String) {
+enum abstract PbrStencilCompare(String) {
 	var Always = "Always";
 	var Never = "Never";
 	var Equal = "Equal";
@@ -60,7 +60,7 @@ package h3d.mat;
 	var LessEqual = "LessEqual";
 }
 
-@:enum abstract PbrCullingMode(String) {
+enum abstract PbrCullingMode(String) {
 	var None = "None";
 	var Back = "Back";
 	var Front = "Front";

+ 3 - 3
h3d/scene/Object.hx

@@ -1,6 +1,6 @@
 package h3d.scene;
 
-@:enum abstract ObjectFlags(Int) {
+enum abstract ObjectFlags(Int) {
 	public var FPosChanged = 0x01;
 	public var FVisible = 0x02;
 	public var FCulled = 0x04;
@@ -389,7 +389,7 @@ class Object {
 		Return the bounds of this object and all its children, in absolute global coordinates or relative to the
 		object being used as parameter.
 	**/
-	@:final public function getBounds( ?b : h3d.col.Bounds, ?relativeTo : Object ) {
+	final public function getBounds( ?b : h3d.col.Bounds, ?relativeTo : Object ) {
 		if( b == null )
 			b = new h3d.col.Bounds();
 		if( parent != null && parent != relativeTo )
@@ -620,7 +620,7 @@ class Object {
 		Build and return the global absolute recursive collider for the object.
 		Returns null if no collider was found or if ignoreCollide was set to true.
 	**/
-	@:final public function getCollider() : h3d.col.Collider {
+	final public function getCollider() : h3d.col.Collider {
 		if( ignoreCollide )
 			return null;
 		var colliders = [];

+ 3 - 3
h3d/scene/pbr/Renderer.hx

@@ -1,6 +1,6 @@
 package h3d.scene.pbr;
 
-@:enum abstract DisplayMode(String) {
+enum abstract DisplayMode(String) {
 	/*
 		Full PBR display
 	*/
@@ -20,7 +20,7 @@ package h3d.scene.pbr;
 	var Performance = "Performance";
 }
 
-@:enum abstract SkyMode(String) {
+enum abstract SkyMode(String) {
 	var Hide = "Hide";
 	var Env = "Env";
 	var Specular = "Specular";
@@ -29,7 +29,7 @@ package h3d.scene.pbr;
 	var CustomColor = "CustomColor";
 }
 
-@:enum abstract TonemapMap(String) {
+enum abstract TonemapMap(String) {
 	var Linear = "Linear";
 	var Reinhard = "Reinhard";
 	var Filmic = "Filmic";

+ 1 - 1
h3d/shader/Buffers.hx

@@ -1,6 +1,6 @@
 package h3d.shader;
 
-@:enum abstract BufferKind(Int) {
+enum abstract BufferKind(Int) {
 	public var Globals = 0;
 	public var Params = 1;
 	public var Textures = 2;

+ 1 - 1
h3d/shader/pbr/Slides.hx

@@ -1,6 +1,6 @@
 package h3d.shader.pbr;
 
-@:enum abstract DebugMode(Int) {
+enum abstract DebugMode(Int) {
 	var Full = 0;
 	var Albedo = 1;
 	var Normal = 2;

+ 1 - 1
hxd/Direction.hx

@@ -1,6 +1,6 @@
 package hxd;
 
-@:enum abstract Direction(Int) {
+enum abstract Direction(Int) {
 
 	public var Up = 1;
 	public var Left = 4;

+ 1 - 1
hxd/Pixels.hx

@@ -81,7 +81,7 @@ abstract PixelsFloatRGBA(Pixels) to Pixels {
 
 }
 
-@:enum abstract Channel(Int) {
+enum abstract Channel(Int) {
 	public var R = 0;
 	public var G = 1;
 	public var B = 2;

+ 1 - 1
hxd/fmt/hmd/Data.hx

@@ -1,6 +1,6 @@
 package hxd.fmt.hmd;
 
-@:enum abstract GeometryDataFormat(Int) {
+enum abstract GeometryDataFormat(Int) {
 
 	public var DFloat = 1;
 	public var DVec2 = 2;

+ 1 - 1
hxd/fmt/kframes/Data.hx

@@ -11,7 +11,7 @@ abstract KFSize<T:Float>(Array<T>) {
 	inline function set_y(v) return this[1] = v;
 }
 
-@:enum abstract KFAnimProp(String) {
+enum abstract KFAnimProp(String) {
 	var AnchorPoint = "ANCHOR_POINT";
 	var XPosition = "X_POSITION";
 	var YPosition = "Y_POSITION";

+ 1 - 1
hxd/impl/Allocator.hx

@@ -1,6 +1,6 @@
 package hxd.impl;
 
-@:enum abstract BufferFlags(Int) {
+enum abstract BufferFlags(Int) {
 	public var Dynamic = 0;
 	public var UniformDynamic = 1;
 	public var RawFormat = 2;

+ 1 - 1
hxd/res/Image.hx

@@ -1,6 +1,6 @@
 package hxd.res;
 
-@:enum abstract ImageFormat(Int) {
+enum abstract ImageFormat(Int) {
 
 	var Jpg = 0;
 	var Png = 1;

+ 1 - 1
hxsl/DynamicShader.hx

@@ -1,6 +1,6 @@
 package hxsl;
 
-@:enum private abstract AccessKind(Int) {
+private enum abstract AccessKind(Int) {
 	var Dynamic = 0;
 	var Float = 1;
 	var Structure = 2;