ソースを参照

haxe 3.0 changes

Nicolas Cannasse 13 年 前
コミット
2574eaf330
2 ファイル変更15 行追加15 行削除
  1. 3 3
      h3d/Engine.hx
  2. 12 12
      h3d/mat/Material.hx

+ 3 - 3
h3d/Engine.hx

@@ -12,7 +12,7 @@ class Engine {
 	public var hardware(default, null) : Bool;
 	public var hardware(default, null) : Bool;
 	public var width(default, null) : Int;
 	public var width(default, null) : Int;
 	public var height(default, null) : Int;
 	public var height(default, null) : Int;
-	public var debug(default, setDebug) : Bool;
+	public var debug(default, set) : Bool;
 	
 	
 	public var drawTriangles(default, null) : Int;
 	public var drawTriangles(default, null) : Int;
 	public var drawCalls(default, null) : Int;
 	public var drawCalls(default, null) : Int;
@@ -201,7 +201,7 @@ class Engine {
 		return renderIndexes(b, mem.indexes, 3);
 		return renderIndexes(b, mem.indexes, 3);
 	}
 	}
 	
 	
-	function setDebug(d) {
+	function set_debug(d) {
 		debug = d;
 		debug = d;
 		if( ctx != null ) ctx.enableErrorChecking = d && hardware;
 		if( ctx != null ) ctx.enableErrorChecking = d && hardware;
 		return d;
 		return d;
@@ -211,7 +211,7 @@ class Engine {
 		ctx = s3d.context3D;
 		ctx = s3d.context3D;
 		mem = new h3d.impl.MemoryManager(ctx, 65400);
 		mem = new h3d.impl.MemoryManager(ctx, 65400);
 		hardware = ctx.driverInfo.toLowerCase().indexOf("software") == -1;
 		hardware = ctx.driverInfo.toLowerCase().indexOf("software") == -1;
-		setDebug(debug);
+		set_debug(debug);
 		resize(width, height, antiAlias);
 		resize(width, height, antiAlias);
 		onReady();
 		onReady();
 	}
 	}

+ 12 - 12
h3d/mat/Material.hx

@@ -4,12 +4,12 @@ import h3d.mat.Data;
 class Material {
 class Material {
 	
 	
 	public var bits(default,null) : Int;
 	public var bits(default,null) : Int;
-	public var culling(default,setCulling) : Face;
-	public var depthWrite(default,setDepthWrite) : Bool;
-	public var depthTest(default,setDepthTest) : Compare;
-	public var blendSrc(default,setBlendSrc) : Blend;
-	public var blendDst(default,setBlendDst) : Blend;
-	public var colorMask(default,setCM) : Int;
+	public var culling(default,set) : Face;
+	public var depthWrite(default,set) : Bool;
+	public var depthTest(default,set) : Compare;
+	public var blendSrc(default,set) : Blend;
+	public var blendDst(default,set) : Blend;
+	public var colorMask(default,set) : Int;
 	public var shader : Shader;
 	public var shader : Shader;
 	
 	
 	public function new(shader) {
 	public function new(shader) {
@@ -37,37 +37,37 @@ class Material {
 		this.colorMask = (r?1:0) | (g?2:0) | (b?4:0) | (a?8:0);
 		this.colorMask = (r?1:0) | (g?2:0) | (b?4:0) | (a?8:0);
 	}
 	}
 
 
-	function setCulling(f) {
+	function set_culling(f) {
 		culling = f;
 		culling = f;
 		bits = (bits & ~(3 << 0)) | (Type.enumIndex(f) << 0);
 		bits = (bits & ~(3 << 0)) | (Type.enumIndex(f) << 0);
 		return f;
 		return f;
 	}
 	}
 	
 	
-	function setDepthWrite(b) {
+	function set_depthWrite(b) {
 		depthWrite = b;
 		depthWrite = b;
 		bits = (bits & ~(1 << 2)) | ((b ? 1 : 0) << 2);
 		bits = (bits & ~(1 << 2)) | ((b ? 1 : 0) << 2);
 		return b;
 		return b;
 	}
 	}
 	
 	
-	function setDepthTest(c) {
+	function set_depthTest(c) {
 		depthTest = c;
 		depthTest = c;
 		bits = (bits & ~(7 << 3)) | (Type.enumIndex(c) << 3);
 		bits = (bits & ~(7 << 3)) | (Type.enumIndex(c) << 3);
 		return c;
 		return c;
 	}
 	}
 	
 	
-	function setBlendSrc(b) {
+	function set_blendSrc(b) {
 		blendSrc = b;
 		blendSrc = b;
 		bits = (bits & ~(15 << 6)) | (Type.enumIndex(b) << 6);
 		bits = (bits & ~(15 << 6)) | (Type.enumIndex(b) << 6);
 		return b;
 		return b;
 	}
 	}
 
 
-	function setBlendDst(b) {
+	function set_blendDst(b) {
 		blendDst = b;
 		blendDst = b;
 		bits = (bits & ~(15 << 10)) | (Type.enumIndex(b) << 10);
 		bits = (bits & ~(15 << 10)) | (Type.enumIndex(b) << 10);
 		return b;
 		return b;
 	}
 	}
 	
 	
-	function setCM(m) {
+	function set_colorMask(m) {
 		m &= 15;
 		m &= 15;
 		colorMask = m;
 		colorMask = m;
 		bits = (bits & ~(15 << 14)) | (m << 14);
 		bits = (bits & ~(15 << 14)) | (m << 14);