瀏覽代碼

moved Stage.getFrameRate() to System.getDefaultFrameRate()

ncannasse 9 年之前
父節點
當前提交
b48633d4ff
共有 4 個文件被更改,包括 12 次插入12 次删除
  1. 1 1
      h3d/Engine.hx
  2. 1 1
      h3d/impl/RenderContext.hx
  3. 2 10
      hxd/Stage.hx
  4. 8 0
      hxd/System.hx

+ 1 - 1
h3d/Engine.hx

@@ -50,7 +50,7 @@ class Engine {
 		this.autoResize = true;
 		fullScreen = !hxd.System.isWindowed;
 		var stage = hxd.Stage.getInstance();
-		realFps = stage.getFrameRate();
+		realFps = hxd.System.getDefaultFrameRate();
 		lastTime = haxe.Timer.stamp();
 		stage.addResizeEvent(onStageResize);
 		#if (js || cpp)

+ 1 - 1
h3d/impl/RenderContext.hx

@@ -11,7 +11,7 @@ class RenderContext {
 		engine = h3d.Engine.getCurrent();
 		frame = 0;
 		time = 0.;
-		elapsedTime = 1. / hxd.Stage.getInstance().getFrameRate();
+		elapsedTime = 1. / hxd.System.getDefaultFrameRate();
 	}
 
 }

+ 2 - 10
hxd/Stage.hx

@@ -12,8 +12,8 @@ class Stage {
 	var stage : flash.display.Stage;
 	var fsDelayed : Bool;
 	#end
-	var resizeEvents : List < Void -> Void > ;
-	var eventTargets : List < Event -> Void > ;
+	var resizeEvents : List<Void -> Void>;
+	var eventTargets : List<Event -> Void>;
 
 	#if js
 	@:allow(hxd)
@@ -140,14 +140,6 @@ class Stage {
 		resizeEvents.remove(f);
 	}
 
-	public function getFrameRate() : Float {
-		#if (flash || openfl)
-		return stage.frameRate;
-		#else
-		return 60.;
-		#end
-	}
-
 	function onResize(e:Dynamic) {
 		for( r in resizeEvents )
 			r();

+ 8 - 0
hxd/System.hx

@@ -586,4 +586,12 @@ class System {
 
 	#end
 
+	public static function getDefaultFrameRate() : Float {
+		#if (flash || openfl)
+		return flash.Lib.current.stage.frameRate;
+		#else
+		return 60.;
+		#end
+	}
+
 }