From ccb154fd2b9b0a814fea4053c58c3a4fd2f713bf Mon Sep 17 00:00:00 2001 From: underscorediscovery Date: Tue, 25 Jun 2013 03:38:35 -0230 Subject: [PATCH] Renaming to LiME --- README.md | 6 ++--- buildfiles/haxe/ApplicationMain.hx | 8 +++--- buildfiles/haxe/nme/AssetData.hx | 2 +- examples/HerokuShaders/project.nmml | 4 +-- examples/HerokuShaders/src/Main.hx | 26 +++++++++---------- examples/SimpleOpenGL/project.nmml | 6 ++--- examples/SimpleOpenGL/src/Main.hx | 26 +++++++++---------- {nmegl => lime}/Constants.hx | 2 +- {nmegl => lime}/InputHandler.hx | 12 ++++----- nmegl/NMEGL.hx => lime/LiME.hx | 22 ++++++++-------- {nmegl => lime}/RenderHandler.hx | 24 ++++++++--------- {nmegl => lime}/WindowHandler.hx | 14 +++++----- {nmegl => lime}/geometry/Matrix3D.hx | 4 +-- {nmegl => lime}/geometry/Vector3D.hx | 2 +- {nmegl => lime}/gl/GL.hx | 14 +++++----- {nmegl => lime}/gl/GLActiveInfo.hx | 2 +- {nmegl => lime}/gl/GLBuffer.hx | 2 +- {nmegl => lime}/gl/GLContextAttributes.hx | 2 +- {nmegl => lime}/gl/GLFramebuffer.hx | 2 +- {nmegl => lime}/gl/GLObject.hx | 2 +- {nmegl => lime}/gl/GLProgram.hx | 2 +- {nmegl => lime}/gl/GLRenderbuffer.hx | 2 +- {nmegl => lime}/gl/GLShader.hx | 2 +- {nmegl => lime}/gl/GLTexture.hx | 2 +- lime/gl/GLUniformLocation.hx | 4 +++ lime/utils/ArrayBuffer.hx | 4 +++ {nmegl => lime}/utils/ArrayBufferView.hx | 4 +-- {nmegl => lime}/utils/Assets.hx | 14 +++++----- {nmegl => lime}/utils/ByteArray.hx | 8 +++--- {nmegl => lime}/utils/CompressionAlgorithm.hx | 2 +- {nmegl => lime}/utils/Endian.hx | 2 +- {nmegl => lime}/utils/Float32Array.hx | 4 +-- {nmegl => lime}/utils/IDataInput.hx | 2 +- {nmegl => lime}/utils/IMemoryRange.hx | 4 +-- {nmegl => lime}/utils/Int16Array.hx | 2 +- {nmegl => lime}/utils/Int32Array.hx | 2 +- {nmegl => lime}/utils/JNI.hx | 4 +-- {nmegl => lime}/utils/Libs.hx | 2 +- {nmegl => lime}/utils/UInt8Array.hx | 2 +- {nmegl => lime}/utils/Vector.hx | 2 +- {nmegl => lime}/utils/WeakRef.hx | 4 +-- nmegl/gl/GLUniformLocation.hx | 4 --- nmegl/utils/ArrayBuffer.hx | 4 --- 43 files changed, 132 insertions(+), 132 deletions(-) rename {nmegl => lime}/Constants.hx (99%) rename {nmegl => lime}/InputHandler.hx (93%) rename nmegl/NMEGL.hx => lime/LiME.hx (95%) rename {nmegl => lime}/RenderHandler.hx (72%) rename {nmegl => lime}/WindowHandler.hx (87%) rename {nmegl => lime}/geometry/Matrix3D.hx (97%) rename {nmegl => lime}/geometry/Vector3D.hx (95%) rename {nmegl => lime}/gl/GL.hx (97%) rename {nmegl => lime}/gl/GLActiveInfo.hx (71%) rename {nmegl => lime}/gl/GLBuffer.hx (83%) rename {nmegl => lime}/gl/GLContextAttributes.hx (82%) rename {nmegl => lime}/gl/GLFramebuffer.hx (84%) rename {nmegl => lime}/gl/GLObject.hx (89%) rename {nmegl => lime}/gl/GLProgram.hx (88%) rename {nmegl => lime}/gl/GLRenderbuffer.hx (84%) rename {nmegl => lime}/gl/GLShader.hx (83%) rename {nmegl => lime}/gl/GLTexture.hx (84%) create mode 100644 lime/gl/GLUniformLocation.hx create mode 100644 lime/utils/ArrayBuffer.hx rename {nmegl => lime}/utils/ArrayBufferView.hx (94%) rename {nmegl => lime}/utils/Assets.hx (92%) rename {nmegl => lime}/utils/ByteArray.hx (95%) rename {nmegl => lime}/utils/CompressionAlgorithm.hx (81%) rename {nmegl => lime}/utils/Endian.hx (84%) rename {nmegl => lime}/utils/Float32Array.hx (94%) rename {nmegl => lime}/utils/IDataInput.hx (94%) rename {nmegl => lime}/utils/IMemoryRange.hx (71%) rename {nmegl => lime}/utils/Int16Array.hx (95%) rename {nmegl => lime}/utils/Int32Array.hx (95%) rename {nmegl => lime}/utils/JNI.hx (93%) rename {nmegl => lime}/utils/Libs.hx (99%) rename {nmegl => lime}/utils/UInt8Array.hx (95%) rename {nmegl => lime}/utils/Vector.hx (93%) rename {nmegl => lime}/utils/WeakRef.hx (91%) delete mode 100644 nmegl/gl/GLUniformLocation.hx delete mode 100644 nmegl/utils/ArrayBuffer.hx diff --git a/README.md b/README.md index 90cd3d05c..d5dd35e0d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -#NMEGL +#lime - Light Media Engine -A lightweight pure OpenGL wrapper for [NME](http://github.com/haxenme/NME) and NME build tools. +A lightweight pure OpenGL wrapper for [NME](http://github.com/haxenme/NME) and the nme build tools. A good starting point for building OpenGL applications across Mac, Windows, Linux, Blackberry, HTML5(WebGL), Android, iOS. @@ -8,4 +8,4 @@ A good starting point for building OpenGL applications across Mac, Windows, Linu NME is a cross platform library, with a build tool, for building applications across many platforms. Frameworks like [OpenFL](http://github.com/openfl) leverage NME to implement a cross platform Flash API to great effect. -NMEGL exposes the OpenGL layer across the platforms that support it, for developers to build new frameworks on top of. +lime exposes the OpenGL layer across the platforms that support it, for developers to build new frameworks on top of. diff --git a/buildfiles/haxe/ApplicationMain.hx b/buildfiles/haxe/ApplicationMain.hx index 739a4e218..51144e78d 100644 --- a/buildfiles/haxe/ApplicationMain.hx +++ b/buildfiles/haxe/ApplicationMain.hx @@ -1,15 +1,15 @@ import ::APP_MAIN::; -import nmegl.NMEGL; +import lime.LiME; class ApplicationMain { public static var _main_ : ::APP_MAIN::; - public static var _nmegl : NMEGL; + public static var _lime : LiME; public static function main () { //Create the runtime - _nmegl = new NMEGL(); + _lime = new LiME(); //Create the game class, give it the runtime _main_ = new ::APP_MAIN::(); @@ -20,7 +20,7 @@ class ApplicationMain { }; //Start up - _nmegl.init( _main_, config ); + _lime.init( _main_, config ); } } \ No newline at end of file diff --git a/buildfiles/haxe/nme/AssetData.hx b/buildfiles/haxe/nme/AssetData.hx index c01fd70a5..8283b1326 100644 --- a/buildfiles/haxe/nme/AssetData.hx +++ b/buildfiles/haxe/nme/AssetData.hx @@ -1,7 +1,7 @@ package nme; -import nmegl.utils.Assets; +import lime.utils.Assets; class AssetData { diff --git a/examples/HerokuShaders/project.nmml b/examples/HerokuShaders/project.nmml index 1d004b927..47b2e6c9b 100644 --- a/examples/HerokuShaders/project.nmml +++ b/examples/HerokuShaders/project.nmml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/examples/HerokuShaders/src/Main.hx b/examples/HerokuShaders/src/Main.hx index 7387c5a21..f200423fd 100644 --- a/examples/HerokuShaders/src/Main.hx +++ b/examples/HerokuShaders/src/Main.hx @@ -1,16 +1,16 @@ -import nmegl.utils.Assets; -import nmegl.NMEGL; +import lime.utils.Assets; +import lime.LiME; //Import GL stuff from nme -import nmegl.gl.GL; -import nmegl.gl.GLBuffer; -import nmegl.gl.GLProgram; -import nmegl.gl.GLShader; +import lime.gl.GL; +import lime.gl.GLBuffer; +import lime.gl.GLProgram; +import lime.gl.GLShader; //utils -import nmegl.utils.Float32Array; -import nmegl.geometry.Matrix3D; +import lime.utils.Float32Array; +import lime.geometry.Matrix3D; //import the shader code for the examples @@ -38,7 +38,7 @@ import shaders.VertexShader; class Main { - public var lib : NMEGL; + public var lib : LiME; //The list of shaders to cycle through @@ -99,16 +99,16 @@ class Main { public function new() {} - public function ready( _nmegl : NMEGL ) { + public function ready( _lime : LiME ) { - lib = _nmegl; + lib = _lime; // Init the shaders and view init(); } - //called each frame by NMEGL for logic (called before render) + //called each frame by lime for logic (called before render) public function update() { var time = haxe.Timer.stamp() - startTime; @@ -127,7 +127,7 @@ class Main { } - //Called each frame by NMEGL + //Called each frame by lime public function render() { GL.viewport( 0, 0, lib.config.width, lib.config.height ); diff --git a/examples/SimpleOpenGL/project.nmml b/examples/SimpleOpenGL/project.nmml index 7d31ed648..b4a7656eb 100644 --- a/examples/SimpleOpenGL/project.nmml +++ b/examples/SimpleOpenGL/project.nmml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/examples/SimpleOpenGL/src/Main.hx b/examples/SimpleOpenGL/src/Main.hx index 4c77c932e..ce990a4d2 100644 --- a/examples/SimpleOpenGL/src/Main.hx +++ b/examples/SimpleOpenGL/src/Main.hx @@ -1,19 +1,19 @@ -import nmegl.utils.Assets; -import nmegl.NMEGL; +import lime.utils.Assets; +import lime.LiME; - //Import GL stuff from nme -import nmegl.gl.GL; -import nmegl.gl.GLBuffer; -import nmegl.gl.GLProgram; + //Import GL stuff from lime +import lime.gl.GL; +import lime.gl.GLBuffer; +import lime.gl.GLProgram; //utils -import nmegl.utils.Float32Array; -import nmegl.geometry.Matrix3D; +import lime.utils.Float32Array; +import lime.geometry.Matrix3D; class Main { - public var lib : NMEGL; + public var lib : LiME; //Shader stuff for drawing private var shaderProgram:GLProgram; @@ -29,17 +29,17 @@ class Main { public function new() { } - public function ready( _nmegl : NMEGL ) { + public function ready( _lime : LiME ) { //Store a reference - lib = _nmegl; + lib = _lime; // Init the shaders and view init(); } - //Called each frame by NMEGL for logic (called before render) + //Called each frame by lime for logic (called before render) public function update() { @@ -56,7 +56,7 @@ class Main { } - //Called by NMEGL + //Called by lime public function render() { //Set the viewport for GL diff --git a/nmegl/Constants.hx b/lime/Constants.hx similarity index 99% rename from nmegl/Constants.hx rename to lime/Constants.hx index e9e3f0de8..c69b51e40 100644 --- a/nmegl/Constants.hx +++ b/lime/Constants.hx @@ -1,4 +1,4 @@ -package nmegl; +package lime; //Window constants class Window { diff --git a/nmegl/InputHandler.hx b/lime/InputHandler.hx similarity index 93% rename from nmegl/InputHandler.hx rename to lime/InputHandler.hx index eb7149b78..cc94cce9b 100644 --- a/nmegl/InputHandler.hx +++ b/lime/InputHandler.hx @@ -1,18 +1,18 @@ -package nmegl; +package lime; -import nmegl.NMEGL; +import lime.LiME; class InputHandler { - public var lib : NMEGL; - public function new( _lib:NMEGL ) { lib = _lib; } + public var lib : LiME; + public function new( _lib:LiME ) { lib = _lib; } public function startup() { - lib._debug(':: NMEGL :: \t InputHandler Initialized.'); + lib._debug(':: lime :: \t InputHandler Initialized.'); } public function shutdown() { - lib._debug(':: NMEGL :: \t InputHandler shut down.'); + lib._debug(':: lime :: \t InputHandler shut down.'); } public function process() { diff --git a/nmegl/NMEGL.hx b/lime/LiME.hx similarity index 95% rename from nmegl/NMEGL.hx rename to lime/LiME.hx index c22edb65c..9a1d7e6ae 100644 --- a/nmegl/NMEGL.hx +++ b/lime/LiME.hx @@ -1,15 +1,15 @@ -package nmegl; +package lime; -import nmegl.utils.Libs; +import lime.utils.Libs; -import nmegl.Constants; -import nmegl.RenderHandler; -import nmegl.InputHandler; -import nmegl.WindowHandler; +import lime.Constants; +import lime.RenderHandler; +import lime.InputHandler; +import lime.WindowHandler; import haxe.Timer; -class NMEGL { +class LiME { //The host class of the application public var host : Dynamic; @@ -43,8 +43,8 @@ class NMEGL { config = _config; host = _main_; - _debug(':: NMEGL :: initializing -'); - _debug(':: NMEGL :: Creating window at ' + config.width + 'x' + config.height); + _debug(':: lime :: initializing -'); + _debug(':: lime :: Creating window at ' + config.width + 'x' + config.height); nme_create_main_frame( on_main_frame_created, @@ -93,7 +93,7 @@ class NMEGL { //Since we are done... window.set_active(true); - _debug(':: NMEGL :: Ready.'); + _debug(':: lime :: Ready.'); //Tell the host application we are ready if(host.ready != null) { @@ -128,7 +128,7 @@ class NMEGL { //Flag it has_shutdown = true; - _debug(':: NMEGL :: Goodbye.'); + _debug(':: lime :: Goodbye.'); } public function cleanup() { diff --git a/nmegl/RenderHandler.hx b/lime/RenderHandler.hx similarity index 72% rename from nmegl/RenderHandler.hx rename to lime/RenderHandler.hx index eef010c8c..6e0206f0c 100644 --- a/nmegl/RenderHandler.hx +++ b/lime/RenderHandler.hx @@ -1,23 +1,23 @@ -package nmegl; +package lime; -import nmegl.NMEGL; -import nmegl.utils.Libs; +import lime.LiME; +import lime.utils.Libs; //Import GL -import nmegl.gl.GL; -import nmegl.gl.GLBuffer; -import nmegl.gl.GLProgram; +import lime.gl.GL; +import lime.gl.GLBuffer; +import lime.gl.GLProgram; //utils -import nmegl.utils.Float32Array; +import lime.utils.Float32Array; //geometry -import nmegl.geometry.Matrix3D; +import lime.geometry.Matrix3D; class RenderHandler { - public var lib : NMEGL; - public function new( _lib:NMEGL ) { lib = _lib; } + public var lib : LiME; + public function new( _lib:LiME ) { lib = _lib; } //direct_renderer_handle for NME public var direct_renderer_handle : Dynamic; @@ -34,11 +34,11 @@ class RenderHandler { nme_direct_renderer_set( direct_renderer_handle, on_render ); //Done. - lib._debug(':: NMEGL :: \t RenderHandler Initialized.'); + lib._debug(':: lime :: \t RenderHandler Initialized.'); } public function shutdown() { - lib._debug(':: NMEGL :: \t RenderHandler shut down.'); + lib._debug(':: lime :: \t RenderHandler shut down.'); } public function on_render() { diff --git a/nmegl/WindowHandler.hx b/lime/WindowHandler.hx similarity index 87% rename from nmegl/WindowHandler.hx rename to lime/WindowHandler.hx index 847e2b73f..6d9b87edf 100644 --- a/nmegl/WindowHandler.hx +++ b/lime/WindowHandler.hx @@ -1,12 +1,12 @@ -package nmegl; +package lime; -import nmegl.NMEGL; -import nmegl.utils.Libs; +import lime.LiME; +import lime.utils.Libs; class WindowHandler { - public var lib : NMEGL; - public function new( _lib:NMEGL ) { lib = _lib; } + public var lib : LiME; + public function new( _lib:LiME ) { lib = _lib; } //if the core is active public var active : Bool = false; @@ -14,11 +14,11 @@ class WindowHandler { public var invalidated : Bool = false; public function startup() { - lib._debug(':: NMEGL :: \t WindowHandler Initialized.'); + lib._debug(':: lime :: \t WindowHandler Initialized.'); } public function shutdown() { - lib._debug(':: NMEGL :: \t WindowHandler shut down.'); + lib._debug(':: lime :: \t WindowHandler shut down.'); } public function process() { diff --git a/nmegl/geometry/Matrix3D.hx b/lime/geometry/Matrix3D.hx similarity index 97% rename from nmegl/geometry/Matrix3D.hx rename to lime/geometry/Matrix3D.hx index 7dc703b1e..3069ca29d 100644 --- a/nmegl/geometry/Matrix3D.hx +++ b/lime/geometry/Matrix3D.hx @@ -1,8 +1,8 @@ -package nmegl.geometry; +package lime.geometry; #if (cpp || neko) -import nmegl.utils.Vector; +import lime.utils.Vector; class Matrix3D { diff --git a/nmegl/geometry/Vector3D.hx b/lime/geometry/Vector3D.hx similarity index 95% rename from nmegl/geometry/Vector3D.hx rename to lime/geometry/Vector3D.hx index 16a48debd..0ed5bf5bb 100644 --- a/nmegl/geometry/Vector3D.hx +++ b/lime/geometry/Vector3D.hx @@ -1,4 +1,4 @@ -package nmegl.geometry; +package lime.geometry; #if (cpp || neko) class Vector3D diff --git a/nmegl/gl/GL.hx b/lime/gl/GL.hx similarity index 97% rename from nmegl/gl/GL.hx rename to lime/gl/GL.hx index 6ffef99c3..c139a52e1 100644 --- a/nmegl/gl/GL.hx +++ b/lime/gl/GL.hx @@ -1,15 +1,15 @@ -package nmegl.gl; +package lime.gl; -import nmegl.utils.Libs; +import lime.utils.Libs; // import flash.display.BitmapData; -import nmegl.geometry.Matrix3D; +import lime.geometry.Matrix3D; // import flash.utils.ByteArray; -import nmegl.utils.ArrayBuffer; -import nmegl.utils.ArrayBufferView; -import nmegl.utils.Float32Array; -import nmegl.utils.IMemoryRange; +import lime.utils.ArrayBuffer; +import lime.utils.ArrayBufferView; +import lime.utils.Float32Array; +import lime.utils.IMemoryRange; class GL { diff --git a/nmegl/gl/GLActiveInfo.hx b/lime/gl/GLActiveInfo.hx similarity index 71% rename from nmegl/gl/GLActiveInfo.hx rename to lime/gl/GLActiveInfo.hx index e8d46a2a6..d1cfa3535 100644 --- a/nmegl/gl/GLActiveInfo.hx +++ b/lime/gl/GLActiveInfo.hx @@ -1,4 +1,4 @@ -package nmegl.gl; +package lime.gl; typedef GLActiveInfo = { diff --git a/nmegl/gl/GLBuffer.hx b/lime/gl/GLBuffer.hx similarity index 83% rename from nmegl/gl/GLBuffer.hx rename to lime/gl/GLBuffer.hx index 4e9a424f7..9309624cd 100644 --- a/nmegl/gl/GLBuffer.hx +++ b/lime/gl/GLBuffer.hx @@ -1,4 +1,4 @@ -package nmegl.gl; +package lime.gl; class GLBuffer extends GLObject { diff --git a/nmegl/gl/GLContextAttributes.hx b/lime/gl/GLContextAttributes.hx similarity index 82% rename from nmegl/gl/GLContextAttributes.hx rename to lime/gl/GLContextAttributes.hx index 62782790d..0c22c71a6 100644 --- a/nmegl/gl/GLContextAttributes.hx +++ b/lime/gl/GLContextAttributes.hx @@ -1,4 +1,4 @@ -package nmegl.gl; +package lime.gl; typedef GLContextAttributes = { diff --git a/nmegl/gl/GLFramebuffer.hx b/lime/gl/GLFramebuffer.hx similarity index 84% rename from nmegl/gl/GLFramebuffer.hx rename to lime/gl/GLFramebuffer.hx index 7642c42aa..ceaf1028e 100644 --- a/nmegl/gl/GLFramebuffer.hx +++ b/lime/gl/GLFramebuffer.hx @@ -1,4 +1,4 @@ -package nmegl.gl; +package lime.gl; class GLFramebuffer extends GLObject { diff --git a/nmegl/gl/GLObject.hx b/lime/gl/GLObject.hx similarity index 89% rename from nmegl/gl/GLObject.hx rename to lime/gl/GLObject.hx index 5aafae744..bfee596c5 100644 --- a/nmegl/gl/GLObject.hx +++ b/lime/gl/GLObject.hx @@ -1,4 +1,4 @@ -package nmegl.gl; +package lime.gl; class GLObject { diff --git a/nmegl/gl/GLProgram.hx b/lime/gl/GLProgram.hx similarity index 88% rename from nmegl/gl/GLProgram.hx rename to lime/gl/GLProgram.hx index 142bbc415..ff50a83d4 100644 --- a/nmegl/gl/GLProgram.hx +++ b/lime/gl/GLProgram.hx @@ -1,4 +1,4 @@ -package nmegl.gl; +package lime.gl; class GLProgram extends GLObject { diff --git a/nmegl/gl/GLRenderbuffer.hx b/lime/gl/GLRenderbuffer.hx similarity index 84% rename from nmegl/gl/GLRenderbuffer.hx rename to lime/gl/GLRenderbuffer.hx index 24c7ac46f..03f3e3d23 100644 --- a/nmegl/gl/GLRenderbuffer.hx +++ b/lime/gl/GLRenderbuffer.hx @@ -1,4 +1,4 @@ -package nmegl.gl; +package lime.gl; class GLRenderbuffer extends GLObject { diff --git a/nmegl/gl/GLShader.hx b/lime/gl/GLShader.hx similarity index 83% rename from nmegl/gl/GLShader.hx rename to lime/gl/GLShader.hx index b0b0a008b..32ce722f2 100644 --- a/nmegl/gl/GLShader.hx +++ b/lime/gl/GLShader.hx @@ -1,4 +1,4 @@ -package nmegl.gl; +package lime.gl; class GLShader extends GLObject { diff --git a/nmegl/gl/GLTexture.hx b/lime/gl/GLTexture.hx similarity index 84% rename from nmegl/gl/GLTexture.hx rename to lime/gl/GLTexture.hx index 1b057c958..96a10735f 100644 --- a/nmegl/gl/GLTexture.hx +++ b/lime/gl/GLTexture.hx @@ -1,4 +1,4 @@ -package nmegl.gl; +package lime.gl; class GLTexture extends GLObject { diff --git a/lime/gl/GLUniformLocation.hx b/lime/gl/GLUniformLocation.hx new file mode 100644 index 000000000..3d7e2559a --- /dev/null +++ b/lime/gl/GLUniformLocation.hx @@ -0,0 +1,4 @@ +package lime.gl; + + +typedef GLUniformLocation = Dynamic; \ No newline at end of file diff --git a/lime/utils/ArrayBuffer.hx b/lime/utils/ArrayBuffer.hx new file mode 100644 index 000000000..1a18721ed --- /dev/null +++ b/lime/utils/ArrayBuffer.hx @@ -0,0 +1,4 @@ +package lime.utils; + + +typedef ArrayBuffer = lime.utils.ByteArray; \ No newline at end of file diff --git a/nmegl/utils/ArrayBufferView.hx b/lime/utils/ArrayBufferView.hx similarity index 94% rename from nmegl/utils/ArrayBufferView.hx rename to lime/utils/ArrayBufferView.hx index b1368afa5..7c8086045 100644 --- a/nmegl/utils/ArrayBufferView.hx +++ b/lime/utils/ArrayBufferView.hx @@ -1,7 +1,7 @@ -package nmegl.utils; +package lime.utils; -import nmegl.utils.ByteArray; +import lime.utils.ByteArray; #if cpp import haxe.io.BytesData; diff --git a/nmegl/utils/Assets.hx b/lime/utils/Assets.hx similarity index 92% rename from nmegl/utils/Assets.hx rename to lime/utils/Assets.hx index 4068e03b4..c59e1b91b 100644 --- a/nmegl/utils/Assets.hx +++ b/lime/utils/Assets.hx @@ -1,4 +1,4 @@ -package nmegl.utils; +package lime.utils; #if !macro @@ -10,7 +10,7 @@ import haxe.Unserializer; // import flash.media.Sound; // import flash.net.URLRequest; // import flash.text.Font; -import nmegl.utils.ByteArray; +import lime.utils.ByteArray; @@ -177,13 +177,13 @@ class Assets { } else { - trace("[nmegl.utils.Assets] There is no asset library named \"" + libraryName + "\""); + trace("[lime.utils.Assets] There is no asset library named \"" + libraryName + "\""); } } else { - trace("[nmegl.utils.Assets] There is no BitmapData asset with an ID of \"" + id + "\""); + trace("[lime.utils.Assets] There is no BitmapData asset with an ID of \"" + id + "\""); } @@ -241,7 +241,7 @@ class Assets { } else { - trace("[nmegl.utils.Assets] There is no String or ByteArray asset with an ID of \"" + id + "\""); + trace("[lime.utils.Assets] There is no String or ByteArray asset with an ID of \"" + id + "\""); } @@ -278,7 +278,7 @@ class Assets { } else { - trace("[nmegl.utils.Assets] There is no Font asset with an ID of \"" + id + "\""); + trace("[lime.utils.Assets] There is no Font asset with an ID of \"" + id + "\""); } @@ -327,7 +327,7 @@ class Assets { } - trace("[nmegl.utils.Assets] There is no Sound asset with an ID of \"" + id + "\""); + trace("[lime.utils.Assets] There is no Sound asset with an ID of \"" + id + "\""); #end diff --git a/nmegl/utils/ByteArray.hx b/lime/utils/ByteArray.hx similarity index 95% rename from nmegl/utils/ByteArray.hx rename to lime/utils/ByteArray.hx index 0f2ef0429..c9fad2a6c 100644 --- a/nmegl/utils/ByteArray.hx +++ b/lime/utils/ByteArray.hx @@ -1,13 +1,13 @@ -package nmegl.utils; +package lime.utils; #if (cpp || neko) -import nmegl.utils.Libs; +import lime.utils.Libs; import haxe.io.Bytes; import haxe.io.BytesData; // import nme.errors.EOFError; // Ensure that the neko->haxe callbacks are initialized -import nmegl.utils.CompressionAlgorithm; -import nmegl.utils.IDataInput; +import lime.utils.CompressionAlgorithm; +import lime.utils.IDataInput; #if neko import neko.Lib; diff --git a/nmegl/utils/CompressionAlgorithm.hx b/lime/utils/CompressionAlgorithm.hx similarity index 81% rename from nmegl/utils/CompressionAlgorithm.hx rename to lime/utils/CompressionAlgorithm.hx index bb6989282..c4d191b61 100644 --- a/nmegl/utils/CompressionAlgorithm.hx +++ b/lime/utils/CompressionAlgorithm.hx @@ -1,4 +1,4 @@ -package nmegl.utils; +package lime.utils; #if (cpp || neko) enum CompressionAlgorithm { diff --git a/nmegl/utils/Endian.hx b/lime/utils/Endian.hx similarity index 84% rename from nmegl/utils/Endian.hx rename to lime/utils/Endian.hx index 207a64082..9c5d7db34 100644 --- a/nmegl/utils/Endian.hx +++ b/lime/utils/Endian.hx @@ -1,4 +1,4 @@ -package nmegl.utils; +package lime.utils; class Endian { diff --git a/nmegl/utils/Float32Array.hx b/lime/utils/Float32Array.hx similarity index 94% rename from nmegl/utils/Float32Array.hx rename to lime/utils/Float32Array.hx index 8917ab9ca..394560714 100644 --- a/nmegl/utils/Float32Array.hx +++ b/lime/utils/Float32Array.hx @@ -1,7 +1,7 @@ -package nmegl.utils; +package lime.utils; -import nmegl.geometry.Matrix3D; +import lime.geometry.Matrix3D; class Float32Array extends ArrayBufferView implements ArrayAccess { diff --git a/nmegl/utils/IDataInput.hx b/lime/utils/IDataInput.hx similarity index 94% rename from nmegl/utils/IDataInput.hx rename to lime/utils/IDataInput.hx index bb669aa46..8e893d4e4 100644 --- a/nmegl/utils/IDataInput.hx +++ b/lime/utils/IDataInput.hx @@ -1,4 +1,4 @@ -package nmegl.utils; +package lime.utils; #if (cpp || neko) interface IDataInput diff --git a/nmegl/utils/IMemoryRange.hx b/lime/utils/IMemoryRange.hx similarity index 71% rename from nmegl/utils/IMemoryRange.hx rename to lime/utils/IMemoryRange.hx index 5a98d1357..4924a0014 100644 --- a/nmegl/utils/IMemoryRange.hx +++ b/lime/utils/IMemoryRange.hx @@ -1,7 +1,7 @@ -package nmegl.utils; +package lime.utils; -import nmegl.utils.ByteArray; +import lime.utils.ByteArray; interface IMemoryRange { diff --git a/nmegl/utils/Int16Array.hx b/lime/utils/Int16Array.hx similarity index 95% rename from nmegl/utils/Int16Array.hx rename to lime/utils/Int16Array.hx index 5737407aa..245e3470e 100644 --- a/nmegl/utils/Int16Array.hx +++ b/lime/utils/Int16Array.hx @@ -1,4 +1,4 @@ -package nmegl.utils; +package lime.utils; class Int16Array extends ArrayBufferView implements ArrayAccess { diff --git a/nmegl/utils/Int32Array.hx b/lime/utils/Int32Array.hx similarity index 95% rename from nmegl/utils/Int32Array.hx rename to lime/utils/Int32Array.hx index e3b64d7b7..a395e8fe0 100644 --- a/nmegl/utils/Int32Array.hx +++ b/lime/utils/Int32Array.hx @@ -1,4 +1,4 @@ -package nmegl.utils; +package lime.utils; @:arrayAccess diff --git a/nmegl/utils/JNI.hx b/lime/utils/JNI.hx similarity index 93% rename from nmegl/utils/JNI.hx rename to lime/utils/JNI.hx index d4900ca86..32584c981 100644 --- a/nmegl/utils/JNI.hx +++ b/lime/utils/JNI.hx @@ -1,7 +1,7 @@ -package nmegl.utils; +package lime.utils; #if (android) -import nmegl.core.Libs; +import lime.core.Libs; import cpp.zip.Uncompress; import haxe.crypto.BaseCode; diff --git a/nmegl/utils/Libs.hx b/lime/utils/Libs.hx similarity index 99% rename from nmegl/utils/Libs.hx rename to lime/utils/Libs.hx index a9c637961..c5a8582b9 100644 --- a/nmegl/utils/Libs.hx +++ b/lime/utils/Libs.hx @@ -1,4 +1,4 @@ -package nmegl.utils; +package lime.utils; import sys.io.Process; diff --git a/nmegl/utils/UInt8Array.hx b/lime/utils/UInt8Array.hx similarity index 95% rename from nmegl/utils/UInt8Array.hx rename to lime/utils/UInt8Array.hx index 8d374d36f..1a02b72dd 100644 --- a/nmegl/utils/UInt8Array.hx +++ b/lime/utils/UInt8Array.hx @@ -1,4 +1,4 @@ -package nmegl.utils; +package lime.utils; class UInt8Array extends ArrayBufferView implements ArrayAccess { diff --git a/nmegl/utils/Vector.hx b/lime/utils/Vector.hx similarity index 93% rename from nmegl/utils/Vector.hx rename to lime/utils/Vector.hx index bfa5059fd..91c98bbec 100644 --- a/nmegl/utils/Vector.hx +++ b/lime/utils/Vector.hx @@ -1,4 +1,4 @@ -package nmegl.utils; +package lime.utils; @:arrayAccess abstract Vector(Array) { diff --git a/nmegl/utils/WeakRef.hx b/lime/utils/WeakRef.hx similarity index 91% rename from nmegl/utils/WeakRef.hx rename to lime/utils/WeakRef.hx index 61561f2ac..131224286 100644 --- a/nmegl/utils/WeakRef.hx +++ b/lime/utils/WeakRef.hx @@ -1,7 +1,7 @@ -package nmegl.utils; +package lime.utils; -import nmegl.core.Libs; +import lime.core.Libs; class WeakRef { diff --git a/nmegl/gl/GLUniformLocation.hx b/nmegl/gl/GLUniformLocation.hx deleted file mode 100644 index 678388caa..000000000 --- a/nmegl/gl/GLUniformLocation.hx +++ /dev/null @@ -1,4 +0,0 @@ -package nmegl.gl; - - -typedef GLUniformLocation = Dynamic; \ No newline at end of file diff --git a/nmegl/utils/ArrayBuffer.hx b/nmegl/utils/ArrayBuffer.hx deleted file mode 100644 index 67f727435..000000000 --- a/nmegl/utils/ArrayBuffer.hx +++ /dev/null @@ -1,4 +0,0 @@ -package nmegl.utils; - - -typedef ArrayBuffer = nmegl.utils.ByteArray; \ No newline at end of file