diff --git a/docs/ImportAll.hx b/docs/ImportAll.hx index d1b3615a8..78aefccbd 100644 --- a/docs/ImportAll.hx +++ b/docs/ImportAll.hx @@ -19,6 +19,7 @@ import lime.graphics.cairo.CairoFontFace; import lime.graphics.cairo.CairoFontOptions; import lime.graphics.cairo.CairoFormat; import lime.graphics.cairo.CairoFTFontFace; +import lime.graphics.cairo.CairoGlyph; import lime.graphics.cairo.CairoHintMetrics; import lime.graphics.cairo.CairoImageSurface; import lime.graphics.cairo.CairoLineCap; @@ -35,14 +36,23 @@ import lime.graphics.opengl.GL; import lime.graphics.opengl.GLActiveInfo; import lime.graphics.opengl.GLBuffer; import lime.graphics.opengl.GLContextAttributes; +import lime.graphics.opengl.GLContextType; +import lime.graphics.opengl.GLES2Context; import lime.graphics.opengl.GLFramebuffer; import lime.graphics.opengl.GLObject; import lime.graphics.opengl.GLProgram; +import lime.graphics.opengl.GLQuery; import lime.graphics.opengl.GLRenderbuffer; +import lime.graphics.opengl.GLSampler; import lime.graphics.opengl.GLShader; import lime.graphics.opengl.GLShaderPrecisionFormat; +import lime.graphics.opengl.GLSync; import lime.graphics.opengl.GLTexture; +import lime.graphics.opengl.GLTransformFeedback; import lime.graphics.opengl.GLUniformLocation; +import lime.graphics.opengl.GLVertexArrayObject; +import lime.graphics.opengl.WebGL2Context; +import lime.graphics.opengl.WebGLContext; import lime.graphics.utils.ImageCanvasUtil; import lime.graphics.utils.ImageDataUtil; import lime.graphics.CairoRenderContext; @@ -71,10 +81,14 @@ import lime.media.codecs.vorbis.Vorbis; import lime.media.codecs.vorbis.VorbisComment; import lime.media.codecs.vorbis.VorbisFile; import lime.media.codecs.vorbis.VorbisInfo; +import lime.media.howlerjs.Howl; +import lime.media.howlerjs.Howler; import lime.media.openal.AL; +import lime.media.openal.ALBuffer; import lime.media.openal.ALC; import lime.media.openal.ALContext; import lime.media.openal.ALDevice; +import lime.media.openal.ALSource; import lime.media.ALAudioContext; import lime.media.ALCAudioContext; import lime.media.AudioBuffer; @@ -217,7 +231,10 @@ import lime.utils.AssetCache; import lime.utils.AssetLibrary; import lime.utils.AssetManifest; import lime.utils.Assets; +import lime.utils.AssetType; +import lime.utils.BytePointer; import lime.utils.Bytes; +import lime.utils.DataPointer; import lime.utils.DataView; import lime.utils.Float32Array; import lime.utils.Float64Array; @@ -226,7 +243,7 @@ import lime.utils.Int16Array; import lime.utils.Int32Array; import lime.utils.Int8Array; import lime.utils.Log; -import lime.utils.LZMA; +import lime.utils.ObjectPool; import lime.utils.UInt16Array; import lime.utils.UInt32Array; import lime.utils.UInt8Array; diff --git a/lime/graphics/GLRenderContext.hx b/lime/graphics/GLRenderContext.hx index e193d4e55..a464addd5 100644 --- a/lime/graphics/GLRenderContext.hx +++ b/lime/graphics/GLRenderContext.hx @@ -608,6 +608,10 @@ class GLRenderContext { public var canvas (get, never):CanvasElement; public var drawingBufferHeight (get, never):Int; public var drawingBufferWidth (get, never):Int; + + private function get_canvas () { return null; } + private function get_drawingBufferHeight () { return 0; } + private function get_drawingBufferWidth () { return 0; } #end public var type (default, null):GLContextType; @@ -757,7 +761,7 @@ class GLRenderContext { public function vertexAttrib3fv (indx:Int, values:lime.utils.Float32Array):Void {} public function vertexAttrib4f (indx:Int, x:Float, y:Float, z:Float, w:Float):Void {} public function vertexAttrib4fv (indx:Int, values:lime.utils.Float32Array):Void {} - public function vertexAttribPointer (indx:Int, size:Int, type:Int, normalized:Bool, stride:Int, offset:Int):Void {} + public function vertexAttribPointer (indx:Int, size:Int, type:Int, normalized:Bool, stride:Int, offset:DataPointer):Void {} public function viewport (x:Int, y:Int, width:Int, height:Int):Void {} } diff --git a/lime/graphics/cairo/CairoImageSurface.hx b/lime/graphics/cairo/CairoImageSurface.hx index e484c3e72..9aa18d7d4 100644 --- a/lime/graphics/cairo/CairoImageSurface.hx +++ b/lime/graphics/cairo/CairoImageSurface.hx @@ -63,7 +63,7 @@ import lime.utils.DataPointer; #if (lime_cffi && lime_cairo && !macro) return NativeCFFI.lime_cairo_image_surface_get_data (this); #else - return null; + return 0; #end } diff --git a/lime/tools/platforms/AndroidPlatform.hx b/lime/tools/platforms/AndroidPlatform.hx index 1af3ce548..223dd2d69 100644 --- a/lime/tools/platforms/AndroidPlatform.hx +++ b/lime/tools/platforms/AndroidPlatform.hx @@ -317,7 +317,12 @@ class AndroidPlatform extends PlatformTarget { if (!project.environment.exists ("ANDROID_SDK") || !project.environment.exists ("ANDROID_NDK_ROOT")) { - LogHelper.error ("You must define ANDROID_SDK and ANDROID_NDK_ROOT to target Android, please run '" + CommandLineTools.commandName + " setup android' first"); + var command = "lime"; + var toolsBase = Type.resolveClass ("CommandLineTools"); + if (toolsBase != null) + command = Reflect.field (toolsBase, "commandName"); + + LogHelper.error ("You must define ANDROID_SDK and ANDROID_NDK_ROOT to target Android, please run '" + command + " setup android' first"); Sys.exit (1); } diff --git a/lime/utils/DataPointer.hx b/lime/utils/DataPointer.hx index d2266c875..732b8e99b 100644 --- a/lime/utils/DataPointer.hx +++ b/lime/utils/DataPointer.hx @@ -27,7 +27,7 @@ abstract DataPointer(DataPointerType) to DataPointerType { #if (lime_cffi && !macro) var float:Float = value; return new DataPointer (float); - #elseif js + #elseif (js && !display) return new DataPointer (value); #else return null; @@ -40,7 +40,7 @@ abstract DataPointer(DataPointerType) to DataPointerType { #if (lime_cffi && !macro) return new DataPointer (value); - #elseif js + #elseif (js && !display) return new DataPointer (value); #else return null; @@ -55,7 +55,7 @@ abstract DataPointer(DataPointerType) to DataPointerType { if (pointer == null) return cast 0; var data:Float = NativeCFFI.lime_bytes_get_data_pointer (pointer.bytes); return new DataPointer (data + pointer.offset); - #elseif js + #elseif (js && !display) return fromBytes (pointer.bytes); #else return null; @@ -69,7 +69,7 @@ abstract DataPointer(DataPointerType) to DataPointerType { #if (lime_cffi && !macro) if (arrayBufferView == null) return cast 0; return fromBytes (arrayBufferView.buffer); - #elseif js + #elseif (js && !display) return new DataPointer (arrayBufferView); #else return null; @@ -83,7 +83,7 @@ abstract DataPointer(DataPointerType) to DataPointerType { #if (lime_cffi && !macro) if (buffer == null) return cast 0; return fromBytes (buffer); - #elseif js + #elseif (js && !display) return new DataPointer (buffer); #else return null; @@ -98,7 +98,7 @@ abstract DataPointer(DataPointerType) to DataPointerType { if (bytes == null) return cast 0; var data:Float = NativeCFFI.lime_bytes_get_data_pointer (bytes); return new DataPointer (data); - #elseif js + #elseif (js && !display) return fromArrayBuffer (bytes.getData ()); #else return null; @@ -112,7 +112,7 @@ abstract DataPointer(DataPointerType) to DataPointerType { #if (lime_cffi && !macro) if (bytesData == null) return cast 0; return fromBytes (Bytes.ofData (bytesData)); - #elseif js + #elseif (js && !display) return fromArrayBuffer (bytesData); #else return null;