diff --git a/examples/SimpleOpenGL/project.nmml b/examples/SimpleOpenGL/project.nmml index d050fe566..a3f2429c3 100644 --- a/examples/SimpleOpenGL/project.nmml +++ b/examples/SimpleOpenGL/project.nmml @@ -27,6 +27,7 @@ - + + \ No newline at end of file diff --git a/examples/SimpleOpenGL/src/Main.hx b/examples/SimpleOpenGL/src/Main.hx index 35729598b..b24605e48 100644 --- a/examples/SimpleOpenGL/src/Main.hx +++ b/examples/SimpleOpenGL/src/Main.hx @@ -11,6 +11,8 @@ import lime.gl.GLProgram; import lime.utils.Float32Array; import lime.geometry.Matrix3D; +import motion.Actuate; + class Main { public var lib : LiME; @@ -34,7 +36,18 @@ class Main { lib = _lime; // Init the shaders and view - init(); + init(); + + lib.audio.create_sound('sound1', 'assets/music_credit.ogg'); + lib.audio.create_sound('sound2', 'assets/shoot.wav'); + + lib.audio.sounds.get('sound1').volume = 1; + lib.audio.sounds.get('sound1').play(); + lib.audio.sounds.get('sound2').play(); + + // Actuate.timer (0.5).repeat ().onRepeat(function(){ + // lib.audio.sounds.get('sound2').play(); + // }); } diff --git a/lime/AudioHandler.hx b/lime/AudioHandler.hx index 637e034d3..b369a0fbe 100644 --- a/lime/AudioHandler.hx +++ b/lime/AudioHandler.hx @@ -82,7 +82,7 @@ class AudioHandler { var _sound = new Sound(_handle); sounds.set(_name, _sound); } - + private static var nme_sound_from_file = Libs.load("nme","nme_sound_from_file", 2); private static var nme_sound_from_data = Libs.load("nme","nme_sound_from_data", 3); diff --git a/lime/LiME.hx b/lime/LiME.hx index 02b1dfeb5..175b8f40d 100644 --- a/lime/LiME.hx +++ b/lime/LiME.hx @@ -266,8 +266,6 @@ class LiME { do_render(_event); - //make sure the c++ knows our sleep time - render.next_wake(); } // if !has_shutdown @@ -288,6 +286,9 @@ class LiME { } render.render(); + //make sure the c++ knows our sleep time + // render.next_wake(); + } //do_render diff --git a/ndll/Mac/nme-debug.ndll b/ndll/Mac/nme-debug.ndll index 29a77b61e..043f89bfd 100644 Binary files a/ndll/Mac/nme-debug.ndll and b/ndll/Mac/nme-debug.ndll differ diff --git a/ndll/Mac/nme.ndll b/ndll/Mac/nme.ndll index ae29d16c4..15f880e1d 100644 Binary files a/ndll/Mac/nme.ndll and b/ndll/Mac/nme.ndll differ