From 362c49876368e335ae363a321dbe3f65396ff756 Mon Sep 17 00:00:00 2001 From: underscorediscovery Date: Thu, 12 Sep 2013 19:44:51 -0230 Subject: [PATCH] html5; Fixing run loop problems due to new android fixes. Adding custom test command for server --- lime/LiME.hx | 33 ++++++++++++++++++++++----------- lime/RenderHandler.hx | 28 ++++++++++------------------ run.n | Bin 74235 -> 74727 bytes script/src/RunScript.hx | 15 +++++++++++++++ 4 files changed, 47 insertions(+), 29 deletions(-) diff --git a/lime/LiME.hx b/lime/LiME.hx index 121c0b143..130fccb0e 100644 --- a/lime/LiME.hx +++ b/lime/LiME.hx @@ -283,9 +283,7 @@ class LiME { } - - return __updateNextWake(); - + return __updateNextWake(); } //on_lime_event @@ -302,7 +300,7 @@ class LiME { //Called when updated by the nme/sdl runtime public function on_update(_event) { - _debug('on_update ' + Timer.stamp(), true, true); + _debug('on_update ' + Timer.stamp(), true, false); #if lime_native Timer.__checkTimers(); @@ -310,7 +308,11 @@ class LiME { if(!has_shutdown) { - var do_update = __checkRender(); + #if lime_native + var do_update = __checkRender(); + #else + var do_update = true; + #end if(do_update) { @@ -330,11 +332,13 @@ class LiME { public function perform_render() { + if (render_request_function != null) { render_request_function(); } else { render.render(); } + } //perform render @:noCompletion private function __checkRender():Bool { @@ -368,12 +372,19 @@ class LiME { @:noCompletion public function __updateNextWake():Float { - var nextWake = haxe.Timer.__nextWake (315000000.0); - - nextWake = __nextFrameDue( nextWake ); - nme_stage_set_next_wake( view_handle, nextWake ); - - return nextWake; + #if lime_native + + var nextWake = haxe.Timer.__nextWake (315000000.0); + + nextWake = __nextFrameDue( nextWake ); + nme_stage_set_next_wake( view_handle, nextWake ); + + return nextWake; + + #else + return null; + #end + } diff --git a/lime/RenderHandler.hx b/lime/RenderHandler.hx index cee903f74..0a8bdb12b 100644 --- a/lime/RenderHandler.hx +++ b/lime/RenderHandler.hx @@ -206,31 +206,36 @@ class RenderHandler { public function request_render() { #if lime_native - trace('render.request_render'); nme_stage_request_render(); #end } - public function render() { + public function render() : Bool { if( !lib.window.active ) { - return; + return false; } #if lime_html5 + + // trace('render.render'); + on_render(); + _requestAnimFrame( lib.on_update ); + return true; - #end + #end #if lime_native // trace("now doing render"); // nme_stage_request_render(); - // trace('render.render'); + nme_render_stage( lib.view_handle ); // nme_stage_request_render(); #end //lime_native + return true; } public function on_render() { @@ -239,21 +244,8 @@ class RenderHandler { lib.host.render(); } - // trace('render.on_render'); - } //on_render - public function next_wake(f:Float = 0) { - - if(lib.shutting_down) return; - - #if lime_native - //todo - sleep a tiny amount to n ot use 100% cpu - // nme_stage_set_next_wake( lib.view_handle , 0.001 ); - #end //lime_native - - // trace('render.next_wake'); - } //nme functions #if lime_native diff --git a/run.n b/run.n index 3b77e1b3f844d50d7a60b5b931b24d5843791835..21c95587f4b72d28e168fd2847411b2c91f839fc 100644 GIT binary patch delta 14268 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 diff --git a/script/src/RunScript.hx b/script/src/RunScript.hx index f7f332d3f..dcf93d78a 100644 --- a/script/src/RunScript.hx +++ b/script/src/RunScript.hx @@ -55,6 +55,7 @@ class RunScript { //buildto case "copy": + var target = data; var dest = data2; //lab copy html5 ~/Sven/Sites/out @@ -70,6 +71,20 @@ class RunScript { } return true; + + case "test": + if(data == 'html5') { + if(data2 == '-server') { + //check if the server note file exists + var args = ['server', '-p', '55555', '-h', 'localhost' ,'-d' , cwd + 'bin/html5/bin/']; + new sys.io.Process('nekotools', args); + new sys.io.Process('open', ['http://localhost:55555/']); + return true; + } + } + + return false; + default: return false; }#end