From a20e1ebebb76879c135175d576bb01e24d59180f Mon Sep 17 00:00:00 2001 From: underscorediscovery Date: Fri, 26 Jul 2013 06:54:39 -0230 Subject: [PATCH] Fixing code complete! Turns out it was simply the lime native/lime_html5 not being defined = lots of missing classes --- lime/AudioHandler.hx | 1 - lime/gl/GL.hx | 12 ++---------- lime/gl/GLActiveInfo.hx | 24 +++++++++++------------- lime/gl/GLBuffer.hx | 12 +++++------- lime/gl/GLContextAttributes.hx | 29 +++++++++++++---------------- lime/gl/GLFramebuffer.hx | 14 ++++++-------- lime/gl/GLObject.hx | 13 ++++++------- lime/gl/GLProgram.hx | 13 ++++++------- lime/gl/GLRenderbuffer.hx | 10 ++++------ lime/gl/GLShader.hx | 11 +++++------ lime/gl/GLTexture.hx | 11 +++++------ lime/gl/GLUniformLocation.hx | 13 ++++++------- lime/utils/ArrayBufferView.hx | 4 +--- lime/utils/Float32Array.hx | 5 +---- lime/utils/UInt8Array.hx | 5 +---- 15 files changed, 72 insertions(+), 105 deletions(-) diff --git a/lime/AudioHandler.hx b/lime/AudioHandler.hx index f8100b4c5..c957f5cea 100644 --- a/lime/AudioHandler.hx +++ b/lime/AudioHandler.hx @@ -1,7 +1,6 @@ package lime; import lime.utils.Libs; -import nme.AssetData; class SoundTransform { diff --git a/lime/gl/GL.hx b/lime/gl/GL.hx index c6afed355..cb992a7a1 100644 --- a/lime/gl/GL.hx +++ b/lime/gl/GL.hx @@ -1,15 +1,7 @@ package lime.gl; - -#if lime_native - - typedef GL = lime.gl.native.GL; - -#end //lime_native - - #if lime_html5 - typedef GL = lime.gl.html5.GL; - +#else + typedef GL = lime.gl.native.GL; #end //lime_html5 \ No newline at end of file diff --git a/lime/gl/GLActiveInfo.hx b/lime/gl/GLActiveInfo.hx index fd56939aa..08fbf7afe 100644 --- a/lime/gl/GLActiveInfo.hx +++ b/lime/gl/GLActiveInfo.hx @@ -1,19 +1,17 @@ package lime.gl; -#if lime_native - -typedef GLActiveInfo = { - - size : Int, - type : Int, - name : String, - -}; - -#end //lime_native - #if lime_html5 typedef GLActiveInfo = js.html.webgl.ActiveInfo; - + +#else + + typedef GLActiveInfo = { + + size : Int, + type : Int, + name : String, + + }; + #end //lime_html5 \ No newline at end of file diff --git a/lime/gl/GLBuffer.hx b/lime/gl/GLBuffer.hx index 94e8b5b9f..e635a4a63 100644 --- a/lime/gl/GLBuffer.hx +++ b/lime/gl/GLBuffer.hx @@ -1,6 +1,10 @@ package lime.gl; -#if lime_native +#if lime_html5 + + typedef GLBuffer = js.html.webgl.Buffer; + +#else class GLBuffer extends GLObject { public function new (version:Int, id:Dynamic) { @@ -11,10 +15,4 @@ package lime.gl; } } -#end //lime_native - -#if lime_html5 - - typedef GLBuffer = js.html.webgl.Buffer; - #end //lime_html5 \ No newline at end of file diff --git a/lime/gl/GLContextAttributes.hx b/lime/gl/GLContextAttributes.hx index 8f5c4535f..e5a6cb8b1 100644 --- a/lime/gl/GLContextAttributes.hx +++ b/lime/gl/GLContextAttributes.hx @@ -1,23 +1,20 @@ package lime.gl; - -#if lime_native - - typedef GLContextAttributes = { - - alpha:Bool, - depth:Bool, - stencil:Bool, - antialias:Bool, - premultipliedAlpha:Bool, - preserveDrawingBuffer:Bool, - - }; - -#end //lime_native - #if lime_html5 typedef GLContextAttributes = js.html.webgl.ContextAttributes; +#else + + typedef GLContextAttributes = { + + alpha:Bool, + depth:Bool, + stencil:Bool, + antialias:Bool, + premultipliedAlpha:Bool, + preserveDrawingBuffer:Bool, + + }; + #end //lime_html5 \ No newline at end of file diff --git a/lime/gl/GLFramebuffer.hx b/lime/gl/GLFramebuffer.hx index 07b4d44cf..331c00567 100644 --- a/lime/gl/GLFramebuffer.hx +++ b/lime/gl/GLFramebuffer.hx @@ -1,6 +1,11 @@ package lime.gl; -#if lime_native + +#if lime_html5 + + typedef GLFramebuffer = js.html.webgl.Framebuffer; + +#else class GLFramebuffer extends GLObject { @@ -15,11 +20,4 @@ package lime.gl; } //GLFramebuffer -#end //lime_native - - -#if lime_html5 - - typedef GLFramebuffer = js.html.webgl.Framebuffer; - #end //lime_html5 \ No newline at end of file diff --git a/lime/gl/GLObject.hx b/lime/gl/GLObject.hx index 68a96d4fb..c33f7284b 100644 --- a/lime/gl/GLObject.hx +++ b/lime/gl/GLObject.hx @@ -1,6 +1,11 @@ package lime.gl; -#if lime_native + +#if lime_html5 + + typedef GLObject = Dynamic; + +#else //lime_html5 class GLObject { @@ -50,9 +55,3 @@ package lime.gl; } #end //lime_native - -#if lime_html5 - - typedef GLObject = Dynamic; - -#end //lime_html5 \ No newline at end of file diff --git a/lime/gl/GLProgram.hx b/lime/gl/GLProgram.hx index b6b46bc52..cba91aa72 100644 --- a/lime/gl/GLProgram.hx +++ b/lime/gl/GLProgram.hx @@ -1,7 +1,12 @@ package lime.gl; -#if lime_native + +#if lime_html5 + + typedef GLProgram = js.html.webgl.Program; + +#else //lime_html5 class GLProgram extends GLObject { @@ -26,9 +31,3 @@ package lime.gl; } #end //lime_native - -#if lime_html5 - - typedef GLProgram = js.html.webgl.Program; - -#end //lime_html5 \ No newline at end of file diff --git a/lime/gl/GLRenderbuffer.hx b/lime/gl/GLRenderbuffer.hx index 420f2b4b4..902db21c2 100644 --- a/lime/gl/GLRenderbuffer.hx +++ b/lime/gl/GLRenderbuffer.hx @@ -1,7 +1,10 @@ package lime.gl; +#if lime_html5 -#if lime_native + typedef GLRenderbuffer = js.html.webgl.Renderbuffer; + +#else //lime_html5 class GLRenderbuffer extends GLObject { @@ -17,8 +20,3 @@ package lime.gl; #end //lime_native -#if lime_html5 - - typedef GLRenderbuffer = js.html.webgl.Renderbuffer; - -#end //lime_html5 \ No newline at end of file diff --git a/lime/gl/GLShader.hx b/lime/gl/GLShader.hx index 30b4fc793..776ecc883 100644 --- a/lime/gl/GLShader.hx +++ b/lime/gl/GLShader.hx @@ -1,7 +1,11 @@ package lime.gl; -#if lime_native +#if lime_html5 + + typedef GLShader = js.html.webgl.Shader; + +#else //lime_html5 class GLShader extends GLObject { @@ -17,8 +21,3 @@ package lime.gl; #end //lime_native -#if lime_html5 - - typedef GLShader = js.html.webgl.Shader; - -#end //lime_html5 \ No newline at end of file diff --git a/lime/gl/GLTexture.hx b/lime/gl/GLTexture.hx index 2f2db532b..d86edeac8 100644 --- a/lime/gl/GLTexture.hx +++ b/lime/gl/GLTexture.hx @@ -1,7 +1,11 @@ package lime.gl; -#if lime_native +#if lime_html5 + + typedef GLTexture = js.html.webgl.Texture; + +#else //lime_html5 class GLTexture extends GLObject { @@ -18,8 +22,3 @@ package lime.gl; #end //lime_native -#if lime_html5 - - typedef GLTexture = js.html.webgl.Texture; - -#end //lime_html5 \ No newline at end of file diff --git a/lime/gl/GLUniformLocation.hx b/lime/gl/GLUniformLocation.hx index 44691d2e6..505972147 100644 --- a/lime/gl/GLUniformLocation.hx +++ b/lime/gl/GLUniformLocation.hx @@ -1,13 +1,12 @@ package lime.gl; -#if lime_native - - typedef GLUniformLocation = Dynamic; - -#end //lime_native - #if lime_html5 typedef GLUniformLocation = js.html.webgl.UniformLocation; -#end //lime_html5 \ No newline at end of file +#else //lime_html5 + + typedef GLUniformLocation = Dynamic; + +#end //lime_native + diff --git a/lime/utils/ArrayBufferView.hx b/lime/utils/ArrayBufferView.hx index c3f9606f6..00352476c 100644 --- a/lime/utils/ArrayBufferView.hx +++ b/lime/utils/ArrayBufferView.hx @@ -4,9 +4,7 @@ package lime.utils; typedef ArrayBufferView = js.html.ArrayBufferView; -#end //lime_html5 - -#if lime_native +#else import lime.utils.ByteArray; diff --git a/lime/utils/Float32Array.hx b/lime/utils/Float32Array.hx index cd39e4559..7b698a97e 100644 --- a/lime/utils/Float32Array.hx +++ b/lime/utils/Float32Array.hx @@ -4,10 +4,7 @@ package lime.utils; typedef Float32Array = js.html.Float32Array; -#end //lime_html5 - - -#if lime_native +#else import lime.geometry.Matrix3D; diff --git a/lime/utils/UInt8Array.hx b/lime/utils/UInt8Array.hx index 8a3c7c6b8..e8c8f1808 100644 --- a/lime/utils/UInt8Array.hx +++ b/lime/utils/UInt8Array.hx @@ -4,10 +4,7 @@ package lime.utils; typedef UInt8Array = js.html.Uint8Array; -#end //lime_html5 - - -#if lime_native +#else class UInt8Array extends ArrayBufferView implements ArrayAccess {