diff --git a/lime/_backend/html5/HTML5Renderer.hx b/lime/_backend/html5/HTML5Renderer.hx index e1d969e5f..00b3e1aba 100644 --- a/lime/_backend/html5/HTML5Renderer.hx +++ b/lime/_backend/html5/HTML5Renderer.hx @@ -47,7 +47,7 @@ class HTML5Renderer { if (parent.window.backend.div != null) { - parent.context = DOM (parent.window.backend.div); + parent.context = DOM (cast parent.window.backend.div); } else if (parent.window.backend.canvas != null) { diff --git a/lime/audio/WebAudioContext.hx b/lime/audio/WebAudioContext.hx index dc1fa9b61..cb0a9dc39 100644 --- a/lime/audio/WebAudioContext.hx +++ b/lime/audio/WebAudioContext.hx @@ -1,4 +1,4 @@ -package lime.audio; #if (!js || !html5) +package lime.audio; #if (!js || !html5 || display) class WebAudioContext { diff --git a/lime/graphics/CanvasRenderContext.hx b/lime/graphics/CanvasRenderContext.hx index efc3a9ba1..80dbb50bb 100644 --- a/lime/graphics/CanvasRenderContext.hx +++ b/lime/graphics/CanvasRenderContext.hx @@ -1,5 +1,5 @@ package lime.graphics; -#if (js && html5) +#if (js && html5 && !display) typedef CanvasRenderContext = js.html.CanvasRenderingContext2D; #else diff --git a/lime/graphics/DOMRenderContext.hx b/lime/graphics/DOMRenderContext.hx index 7c99e18d3..5220a05d0 100644 --- a/lime/graphics/DOMRenderContext.hx +++ b/lime/graphics/DOMRenderContext.hx @@ -1,5 +1,5 @@ package lime.graphics; -#if (js && html5) +#if (js && html5 && !display) typedef DOMRenderContext = js.html.DivElement; #else diff --git a/lime/graphics/opengl/GL.hx b/lime/graphics/opengl/GL.hx index b310ef81d..cc5836cf5 100644 --- a/lime/graphics/opengl/GL.hx +++ b/lime/graphics/opengl/GL.hx @@ -382,7 +382,7 @@ class GL { public static inline function activeTexture (texture:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.activeTexture (texture); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_active_texture (texture); @@ -395,7 +395,7 @@ class GL { public static inline function attachShader (program:GLProgram, shader:GLShader):Void { - #if (js && html5) + #if (js && html5 && !display) context.attachShader (program, shader); #elseif ((cpp || neko || nodejs) && lime_opengl) program.attach (shader); @@ -410,7 +410,7 @@ class GL { public static inline function bindAttribLocation (program:GLProgram, index:Int, name:String):Void { - #if (js && html5) + #if (js && html5 && !display) context.bindAttribLocation (program, index, name); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_bind_attrib_location (program.id, index, name); @@ -423,7 +423,7 @@ class GL { public static inline function bindBuffer (target:Int, buffer:GLBuffer):Void { - #if (js && html5) + #if (js && html5 && !display) context.bindBuffer (target, buffer); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_bind_buffer (target, buffer == null ? 0 : buffer.id); @@ -436,7 +436,7 @@ class GL { public static inline function bindFramebuffer (target:Int, framebuffer:GLFramebuffer):Void { - #if (js && html5) + #if (js && html5 && !display) context.bindFramebuffer (target, framebuffer); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_bind_framebuffer (target, framebuffer == null ? 0 : framebuffer.id); @@ -449,7 +449,7 @@ class GL { public static inline function bindRenderbuffer (target:Int, renderbuffer:GLRenderbuffer):Void { - #if (js && html5) + #if (js && html5 && !display) context.bindRenderbuffer (target, renderbuffer); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_bind_renderbuffer (target, renderbuffer == null ? 0 : renderbuffer.id); @@ -462,7 +462,7 @@ class GL { public static inline function bindTexture (target:Int, texture:GLTexture):Void { - #if (js && html5) + #if (js && html5 && !display) context.bindTexture (target, texture); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_bind_texture (target, texture == null ? 0 : texture.id); @@ -475,7 +475,7 @@ class GL { public static inline function blendColor (red:Float, green:Float, blue:Float, alpha:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.blendColor (red, green, blue, alpha); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_blend_color (red, green, blue, alpha); @@ -488,7 +488,7 @@ class GL { public static inline function blendEquation (mode:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.blendEquation (mode); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_blend_equation (mode); @@ -501,7 +501,7 @@ class GL { public static inline function blendEquationSeparate (modeRGB:Int, modeAlpha:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.blendEquationSeparate (modeRGB, modeAlpha); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_blend_equation_separate (modeRGB, modeAlpha); @@ -514,7 +514,7 @@ class GL { public static inline function blendFunc (sfactor:Int, dfactor:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.blendFunc (sfactor, dfactor); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_blend_func (sfactor, dfactor); @@ -527,7 +527,7 @@ class GL { public static inline function blendFuncSeparate (srcRGB:Int, dstRGB:Int, srcAlpha:Int, dstAlpha:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.blendFuncSeparate (srcRGB, dstRGB, srcAlpha, dstAlpha); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_blend_func_separate (srcRGB, dstRGB, srcAlpha, dstAlpha); @@ -540,7 +540,7 @@ class GL { public static inline function bufferData (target:Int, data:ArrayBufferView, usage:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.bufferData (target, data, usage); #elseif ((cpp || neko) && lime_opengl) lime_gl_buffer_data (target, data.getByteBuffer (), data.getStart (), data.getLength (), usage); @@ -555,7 +555,7 @@ class GL { public static inline function bufferSubData (target:Int, offset:Int, data:ArrayBufferView):Void { - #if (js && html5) + #if (js && html5 && !display) context.bufferSubData (target, offset, data); #elseif ((cpp || neko) && lime_opengl) lime_gl_buffer_sub_data (target, offset, data.getByteBuffer (), data.getStart (), data.getLength ()); @@ -570,7 +570,7 @@ class GL { public static inline function checkFramebufferStatus (target:Int):Int { - #if (js && html5) + #if (js && html5 && !display) return context.checkFramebufferStatus (target); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_check_framebuffer_status (target); @@ -585,7 +585,7 @@ class GL { public static inline function clear (mask:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.clear (mask); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_clear (mask); @@ -598,7 +598,7 @@ class GL { public static inline function clearColor (red:Float, green:Float, blue:Float, alpha:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.clearColor (red, green, blue, alpha); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_clear_color (red, green, blue, alpha); @@ -611,7 +611,7 @@ class GL { public static inline function clearDepth (depth:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.clearDepth (depth); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_clear_depth (depth); @@ -624,7 +624,7 @@ class GL { public static inline function clearStencil (s:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.clearStencil (s); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_clear_stencil (s); @@ -637,7 +637,7 @@ class GL { public static inline function colorMask (red:Bool, green:Bool, blue:Bool, alpha:Bool):Void { - #if (js && html5) + #if (js && html5 && !display) context.colorMask (red, green, blue, alpha); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_color_mask (red, green, blue, alpha); @@ -650,7 +650,7 @@ class GL { public static inline function compileShader (shader:GLShader):Void { - #if (js && html5) + #if (js && html5 && !display) context.compileShader (shader); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_compile_shader (shader.id); @@ -663,7 +663,7 @@ class GL { public static inline function compressedTexImage2D (target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, data:ArrayBufferView):Void { - #if (js && html5) + #if (js && html5 && !display) context.compressedTexImage2D (target, level, internalformat, width, height, border, data); #elseif ((cpp || neko) && lime_opengl) lime_gl_compressed_tex_image_2d (target, level, internalformat, width, height, border, data == null ? null : data.getByteBuffer (), data == null ? null : data.getStart ()); @@ -678,7 +678,7 @@ class GL { public static inline function compressedTexSubImage2D (target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, data:ArrayBufferView):Void { - #if (js && html5) + #if (js && html5 && !display) context.compressedTexSubImage2D (target, level, xoffset, yoffset, width, height, format, data); #elseif ((cpp || neko) && lime_opengl) lime_gl_compressed_tex_sub_image_2d (target, level, xoffset, yoffset, width, height, format, data == null ? null : data.getByteBuffer (), data == null ? null : data.getStart ()); @@ -693,7 +693,7 @@ class GL { public static inline function copyTexImage2D (target:Int, level:Int, internalformat:Int, x:Int, y:Int, width:Int, height:Int, border:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.copyTexImage2D (target, level, internalformat, x, y, width, height, border); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_copy_tex_image_2d (target, level, internalformat, x, y, width, height, border); @@ -706,7 +706,7 @@ class GL { public static inline function copyTexSubImage2D (target:Int, level:Int, xoffset:Int, yoffset:Int, x:Int, y:Int, width:Int, height:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.copyTexSubImage2D (target, level, xoffset, yoffset, x, y, width, height); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_copy_tex_sub_image_2d (target, level, xoffset, yoffset, x, y, width, height); @@ -719,7 +719,7 @@ class GL { public static inline function createBuffer ():GLBuffer { - #if (js && html5) + #if (js && html5 && !display) return context.createBuffer (); #elseif ((cpp || neko || nodejs) && lime_opengl) return new GLBuffer (version, lime_gl_create_buffer ()); @@ -735,7 +735,7 @@ class GL { public static inline function createFramebuffer ():GLFramebuffer { - #if (js && html5) + #if (js && html5 && !display) return context.createFramebuffer (); #elseif ((cpp || neko || nodejs) && lime_opengl) return new GLFramebuffer (version, lime_gl_create_framebuffer ()); @@ -751,7 +751,7 @@ class GL { public static inline function createProgram ():GLProgram { - #if (js && html5) + #if (js && html5 && !display) return context.createProgram (); #elseif ((cpp || neko || nodejs) && lime_opengl) return new GLProgram (version, lime_gl_create_program ()); @@ -766,7 +766,7 @@ class GL { public static inline function createRenderbuffer ():GLRenderbuffer { - #if (js && html5) + #if (js && html5 && !display) return context.createRenderbuffer (); #elseif ((cpp || neko || nodejs) && lime_opengl) return new GLRenderbuffer (version, lime_gl_create_render_buffer ()); @@ -782,7 +782,7 @@ class GL { public static inline function createShader (type:Int):GLShader { - #if (js && html5) + #if (js && html5 && !display) return context.createShader (type); #elseif ((cpp || neko || nodejs) && lime_opengl) return new GLShader (version, lime_gl_create_shader (type)); @@ -797,7 +797,7 @@ class GL { public static inline function createTexture ():GLTexture { - #if (js && html5) + #if (js && html5 && !display) return context.createTexture (); #elseif ((cpp || neko || nodejs) && lime_opengl) return new GLTexture (version, lime_gl_create_texture ()); @@ -813,7 +813,7 @@ class GL { public static inline function cullFace (mode:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.cullFace (mode); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_cull_face (mode); @@ -826,7 +826,7 @@ class GL { public static inline function deleteBuffer (buffer:GLBuffer):Void { - #if (js && html5) + #if (js && html5 && !display) context.deleteBuffer (buffer); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_delete_buffer (buffer.id); @@ -841,7 +841,7 @@ class GL { public static inline function deleteFramebuffer (framebuffer:GLFramebuffer):Void { - #if (js && html5) + #if (js && html5 && !display) context.deleteFramebuffer (framebuffer); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_delete_framebuffer (framebuffer.id); @@ -856,7 +856,7 @@ class GL { public static inline function deleteProgram (program:GLProgram):Void { - #if (js && html5) + #if (js && html5 && !display) context.deleteProgram (program); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_delete_program (program.id); @@ -871,7 +871,7 @@ class GL { public static inline function deleteRenderbuffer (renderbuffer:GLRenderbuffer):Void { - #if (js && html5) + #if (js && html5 && !display) context.deleteRenderbuffer (renderbuffer); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_delete_render_buffer (renderbuffer.id); @@ -886,7 +886,7 @@ class GL { public static inline function deleteShader (shader:GLShader):Void { - #if (js && html5) + #if (js && html5 && !display) context.deleteShader (shader); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_delete_shader (shader.id); @@ -901,7 +901,7 @@ class GL { public static inline function deleteTexture (texture:GLTexture):Void { - #if (js && html5) + #if (js && html5 && !display) context.deleteTexture (texture); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_delete_texture (texture.id); @@ -916,7 +916,7 @@ class GL { public static inline function depthFunc (func:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.depthFunc (func); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_depth_func (func); @@ -929,7 +929,7 @@ class GL { public static inline function depthMask (flag:Bool):Void { - #if (js && html5) + #if (js && html5 && !display) context.depthMask (flag); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_depth_mask (flag); @@ -942,7 +942,7 @@ class GL { public static inline function depthRange (zNear:Float, zFar:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.depthRange (zNear, zFar); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_depth_range (zNear, zFar); @@ -955,7 +955,7 @@ class GL { public static inline function detachShader (program:GLProgram, shader:GLShader):Void { - #if (js && html5) + #if (js && html5 && !display) context.detachShader (program, shader); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_detach_shader (program.id, shader.id); @@ -968,7 +968,7 @@ class GL { public static inline function disable (cap:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.disable (cap); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_disable (cap); @@ -981,7 +981,7 @@ class GL { public static inline function disableVertexAttribArray (index:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.disableVertexAttribArray (index); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_disable_vertex_attrib_array (index); @@ -994,7 +994,7 @@ class GL { public static inline function drawArrays (mode:Int, first:Int, count:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.drawArrays (mode, first, count); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_draw_arrays (mode, first, count); @@ -1007,7 +1007,7 @@ class GL { public static inline function drawElements (mode:Int, count:Int, type:Int, offset:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.drawElements (mode, count, type, offset); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_draw_elements (mode, count, type, offset); @@ -1020,7 +1020,7 @@ class GL { public static inline function enable (cap:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.enable (cap); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_enable (cap); @@ -1033,7 +1033,7 @@ class GL { public static inline function enableVertexAttribArray (index:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.enableVertexAttribArray (index); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_enable_vertex_attrib_array (index); @@ -1046,7 +1046,7 @@ class GL { public static inline function finish ():Void { - #if (js && html5) + #if (js && html5 && !display) context.finish (); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_finish (); @@ -1059,7 +1059,7 @@ class GL { public static inline function flush ():Void { - #if (js && html5) + #if (js && html5 && !display) context.flush (); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_flush (); @@ -1072,7 +1072,7 @@ class GL { public static inline function framebufferRenderbuffer (target:Int, attachment:Int, renderbuffertarget:Int, renderbuffer:GLRenderbuffer):Void { - #if (js && html5) + #if (js && html5 && !display) context.framebufferRenderbuffer (target, attachment, renderbuffertarget, renderbuffer); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_framebuffer_renderbuffer (target, attachment, renderbuffertarget, renderbuffer.id); @@ -1085,7 +1085,7 @@ class GL { public static inline function framebufferTexture2D (target:Int, attachment:Int, textarget:Int, texture:GLTexture, level:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.framebufferTexture2D (target, attachment, textarget, texture, level); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_framebuffer_texture2D (target, attachment, textarget, texture.id, level); @@ -1098,7 +1098,7 @@ class GL { public static inline function frontFace (mode:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.frontFace (mode); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_front_face (mode); @@ -1111,7 +1111,7 @@ class GL { public static inline function generateMipmap (target:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.generateMipmap (target); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_generate_mipmap (target); @@ -1124,7 +1124,7 @@ class GL { public static inline function getActiveAttrib (program:GLProgram, index:Int):GLActiveInfo { - #if (js && html5) + #if (js && html5 && !display) return context.getActiveAttrib (program, index); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_active_attrib (program.id, index); @@ -1140,7 +1140,7 @@ class GL { public static inline function getActiveUniform (program:GLProgram, index:Int):GLActiveInfo { - #if (js && html5) + #if (js && html5 && !display) return context.getActiveUniform (program, index); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_active_uniform (program.id, index); @@ -1156,7 +1156,7 @@ class GL { public static inline function getAttachedShaders (program:GLProgram):Array { - #if (js && html5) + #if (js && html5 && !display) return context.getAttachedShaders (program); #elseif ((cpp || neko || nodejs) && lime_opengl) return program.getShaders (); @@ -1171,7 +1171,7 @@ class GL { public static inline function getAttribLocation (program:GLProgram, name:String):Int { - #if (js && html5) + #if (js && html5 && !display) return context.getAttribLocation (program, name); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_attrib_location (program.id, name); @@ -1186,7 +1186,7 @@ class GL { public static inline function getBufferParameter (target:Int, pname:Int):Int /*Dynamic*/ { - #if (js && html5) + #if (js && html5 && !display) return context.getBufferParameter (target, pname); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_buffer_parameter (target, pname); @@ -1202,7 +1202,7 @@ class GL { public static inline function getContextAttributes ():GLContextAttributes { - #if (js && html5) + #if (js && html5 && !display) return context.getContextAttributes (); #elseif ((cpp || neko || nodejs) && lime_opengl) var base = lime_gl_get_context_attributes (); @@ -1224,7 +1224,7 @@ class GL { public static inline function getError ():Int { - #if (js && html5) + #if (js && html5 && !display) return context.getError (); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_error (); @@ -1239,7 +1239,7 @@ class GL { public static inline function getExtension (name:String):Dynamic { - #if (js && html5) + #if (js && html5 && !display) return context.getExtension (name); #elseif ((cpp || neko || nodejs) && lime_opengl) //todo?! @@ -1254,7 +1254,7 @@ class GL { public static inline function getFramebufferAttachmentParameter (target:Int, attachment:Int, pname:Int):Int /*Dynamic*/ { - #if (js && html5) + #if (js && html5 && !display) return context.getFramebufferAttachmentParameter (target, attachment, pname); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_framebuffer_attachment_parameter (target, attachment, pname); @@ -1270,7 +1270,7 @@ class GL { public static inline function getParameter (pname:Int):Dynamic { - #if (js && html5) + #if (js && html5 && !display) return context.getParameter (pname); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_parameter (pname); @@ -1285,7 +1285,7 @@ class GL { public static inline function getProgramInfoLog (program:GLProgram):String { - #if (js && html5) + #if (js && html5 && !display) return context.getProgramInfoLog (program); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_program_info_log (program.id); @@ -1300,7 +1300,7 @@ class GL { public static inline function getProgramParameter (program:GLProgram, pname:Int):Int { - #if (js && html5) + #if (js && html5 && !display) return context.getProgramParameter (program, pname); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_program_parameter (program.id, pname); @@ -1316,7 +1316,7 @@ class GL { public static inline function getRenderbufferParameter (target:Int, pname:Int):Int /*Dynamic*/ { - #if (js && html5) + #if (js && html5 && !display) return context.getRenderbufferParameter (target, pname); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_render_buffer_parameter (target, pname); @@ -1332,7 +1332,7 @@ class GL { public static inline function getShaderInfoLog (shader:GLShader):String { - #if (js && html5) + #if (js && html5 && !display) return context.getShaderInfoLog (shader); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_shader_info_log (shader.id); @@ -1347,7 +1347,7 @@ class GL { public static inline function getShaderParameter (shader:GLShader, pname:Int):Int { - #if (js && html5) + #if (js && html5 && !display) return context.getShaderParameter (shader, pname); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_shader_parameter (shader.id, pname); @@ -1363,7 +1363,7 @@ class GL { public static inline function getShaderPrecisionFormat (shadertype:Int, precisiontype:Int):GLShaderPrecisionFormat { - #if (js && html5) + #if (js && html5 && !display) return context.getShaderPrecisionFormat (shadertype, precisiontype); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_shader_precision_format (shadertype, precisiontype); @@ -1379,7 +1379,7 @@ class GL { public static inline function getShaderSource (shader:GLShader):String { - #if (js && html5) + #if (js && html5 && !display) return context.getShaderSource (shader); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_shader_source (shader.id); @@ -1394,7 +1394,7 @@ class GL { public static inline function getSupportedExtensions ():Array { - #if (js && html5) + #if (js && html5 && !display) return context.getSupportedExtensions (); #elseif ((cpp || neko || nodejs) && lime_opengl) var result = new Array (); @@ -1411,7 +1411,7 @@ class GL { public static inline function getTexParameter (target:Int, pname:Int):Int /*Dynamic*/ { - #if (js && html5) + #if (js && html5 && !display) return context.getTexParameter (target, pname); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_tex_parameter (target, pname); @@ -1427,7 +1427,7 @@ class GL { public static inline function getUniform (program:GLProgram, location:GLUniformLocation):Dynamic { - #if (js && html5) + #if (js && html5 && !display) return context.getUniform (program, location); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_uniform (program.id, location); @@ -1443,7 +1443,7 @@ class GL { public static inline function getUniformLocation (program:GLProgram, name:String):GLUniformLocation { - #if (js && html5) + #if (js && html5 && !display) return context.getUniformLocation (program, name); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_uniform_location (program.id, name); @@ -1458,7 +1458,7 @@ class GL { public static inline function getVertexAttrib (index:Int, pname:Int):Int /*Dynamic*/ { - #if (js && html5) + #if (js && html5 && !display) return context.getVertexAttrib (index, pname); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_vertex_attrib (index, pname); @@ -1473,7 +1473,7 @@ class GL { public static inline function getVertexAttribOffset (index:Int, pname:Int):Int { - #if (js && html5) + #if (js && html5 && !display) return context.getVertexAttribOffset (index, pname); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_get_vertex_attrib_offset (index, pname); @@ -1488,7 +1488,7 @@ class GL { public static inline function hint (target:Int, mode:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.hint (target, mode); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_hint (target, mode); @@ -1499,7 +1499,7 @@ class GL { public static inline function isBuffer (buffer:GLBuffer):Bool { - #if (js && html5) + #if (js && html5 && !display) return context.isBuffer (buffer); #elseif ((cpp || neko || nodejs) && lime_opengl) return buffer != null && buffer.id > 0 && lime_gl_is_buffer (buffer.id); @@ -1512,7 +1512,7 @@ class GL { public static inline function isContextLost ():Bool { - #if (js && html5) + #if (js && html5 && !display) return context.isContextLost (); #else return false; @@ -1523,7 +1523,7 @@ class GL { public static inline function isEnabled (cap:Int):Bool { - #if (js && html5) + #if (js && html5 && !display) return context.isEnabled (cap); #elseif ((cpp || neko || nodejs) && lime_opengl) return lime_gl_is_enabled (cap); @@ -1536,7 +1536,7 @@ class GL { public static inline function isFramebuffer (framebuffer:GLFramebuffer):Bool { - #if (js && html5) + #if (js && html5 && !display) return context.isFramebuffer (framebuffer); #elseif ((cpp || neko || nodejs) && lime_opengl) return framebuffer != null && framebuffer.id > 0 && lime_gl_is_framebuffer (framebuffer.id); @@ -1549,7 +1549,7 @@ class GL { public static inline function isProgram (program:GLProgram):Bool { - #if (js && html5) + #if (js && html5 && !display) return context.isProgram (program); #elseif ((cpp || neko || nodejs) && lime_opengl) return program != null && program.id > 0 && lime_gl_is_program (program.id); @@ -1562,7 +1562,7 @@ class GL { public static inline function isRenderbuffer (renderbuffer:GLRenderbuffer):Bool { - #if (js && html5) + #if (js && html5 && !display) return context.isRenderbuffer (renderbuffer); #elseif ((cpp || neko || nodejs) && lime_opengl) return renderbuffer != null && renderbuffer.id > 0 && lime_gl_is_renderbuffer (renderbuffer.id); @@ -1575,7 +1575,7 @@ class GL { public static inline function isShader (shader:GLShader):Bool { - #if (js && html5) + #if (js && html5 && !display) return context.isShader (shader); #elseif ((cpp || neko || nodejs) && lime_opengl) return shader != null && shader.id > 0 && lime_gl_is_shader (shader.id); @@ -1588,7 +1588,7 @@ class GL { public static inline function isTexture (texture:GLTexture):Bool { - #if (js && html5) + #if (js && html5 && !display) return context.isTexture (texture); #elseif ((cpp || neko || nodejs) && lime_opengl) return texture != null && texture.id > 0 && lime_gl_is_texture (texture.id); @@ -1601,7 +1601,7 @@ class GL { public static inline function lineWidth (width:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.lineWidth (width); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_line_width (width); @@ -1612,7 +1612,7 @@ class GL { public static inline function linkProgram (program:GLProgram):Void { - #if (js && html5) + #if (js && html5 && !display) context.linkProgram (program); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_link_program (program.id); @@ -1623,7 +1623,7 @@ class GL { public static inline function pixelStorei (pname:Int, param:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.pixelStorei (pname, param); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_pixel_storei (pname, param); @@ -1634,7 +1634,7 @@ class GL { public static inline function polygonOffset (factor:Float, units:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.polygonOffset (factor, units); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_polygon_offset (factor, units); @@ -1645,7 +1645,7 @@ class GL { public static inline function readPixels (x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:ArrayBufferView):Void { - #if (js && html5) + #if (js && html5 && !display) context.readPixels (x, y, width, height, format, type, pixels); #elseif ((cpp || neko) && lime_opengl) lime_gl_read_pixels (x, y, width, height, format, type, pixels == null ? null : pixels.getByteBuffer (), pixels == null ? null : pixels.getStart ()); @@ -1658,7 +1658,7 @@ class GL { public static inline function renderbufferStorage (target:Int, internalformat:Int, width:Int, height:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.renderbufferStorage (target, internalformat, width, height); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_renderbuffer_storage (target, internalformat, width, height); @@ -1669,7 +1669,7 @@ class GL { public static inline function sampleCoverage (value:Float, invert:Bool):Void { - #if (js && html5) + #if (js && html5 && !display) context.sampleCoverage (value, invert); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_sample_coverage (value, invert); @@ -1680,7 +1680,7 @@ class GL { public static inline function scissor (x:Int, y:Int, width:Int, height:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.scissor (x, y, width, height); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_scissor (x, y, width, height); @@ -1691,7 +1691,7 @@ class GL { public static inline function shaderSource (shader:GLShader, source:String):Void { - #if (js && html5) + #if (js && html5 && !display) context.shaderSource (shader, source); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_shader_source (shader.id, source); @@ -1702,7 +1702,7 @@ class GL { public static inline function stencilFunc (func:Int, ref:Int, mask:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.stencilFunc (func, ref, mask); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_stencil_func (func, ref, mask); @@ -1713,7 +1713,7 @@ class GL { public static inline function stencilFuncSeparate (face:Int, func:Int, ref:Int, mask:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.stencilFuncSeparate (face, func, ref, mask); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_stencil_func_separate (face, func, ref, mask); @@ -1724,7 +1724,7 @@ class GL { public static inline function stencilMask (mask:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.stencilMask (mask); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_stencil_mask (mask); @@ -1735,7 +1735,7 @@ class GL { public static inline function stencilMaskSeparate (face:Int, mask:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.stencilMaskSeparate (face, mask); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_stencil_mask_separate (face, mask); @@ -1746,7 +1746,7 @@ class GL { public static inline function stencilOp (fail:Int, zfail:Int, zpass:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.stencilOp (fail, zfail, zpass); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_stencil_op (fail, zfail, zpass); @@ -1757,7 +1757,7 @@ class GL { public static inline function stencilOpSeparate (face:Int, fail:Int, zfail:Int, zpass:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.stencilOpSeparate (face, fail, zfail, zpass); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_stencil_op_separate (face, fail, zfail, zpass); @@ -1768,7 +1768,7 @@ class GL { public static inline function texImage2D (target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, format:Int, type:Int, pixels:ArrayBufferView):Void { - #if (js && html5) + #if (js && html5 && !display) context.texImage2D (target, level, internalformat, width, height, border, format, type, pixels); #elseif ((cpp || neko) && lime_opengl) lime_gl_tex_image_2d (target, level, internalformat, width, height, border, format, type, pixels == null ? null : pixels.getByteBuffer (), pixels == null ? null : pixels.getStart ()); @@ -1781,7 +1781,7 @@ class GL { public static inline function texParameterf (target:Int, pname:Int, param:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.texParameterf (target, pname, param); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_tex_parameterf (target, pname, param); @@ -1792,7 +1792,7 @@ class GL { public static inline function texParameteri (target:Int, pname:Int, param:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.texParameteri (target, pname, param); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_tex_parameteri (target, pname, param); @@ -1803,7 +1803,7 @@ class GL { public static inline function texSubImage2D (target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, type:Int, pixels:ArrayBufferView):Void { - #if (js && html5) + #if (js && html5 && !display) context.texSubImage2D (target, level, xoffset, yoffset, width, height, format, type, pixels); #elseif ((cpp || neko) && lime_opengl) lime_gl_tex_sub_image_2d (target, level, xoffset, yoffset, width, height, format, type, pixels == null ? null : pixels.getByteBuffer(), pixels == null ? null : pixels.getStart()); @@ -1816,7 +1816,7 @@ class GL { public static inline function uniform1f (location:GLUniformLocation, x:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform1f (location, x); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_uniform1f (location, x); @@ -1827,7 +1827,7 @@ class GL { public static inline function uniform1fv (location:GLUniformLocation, x:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform1fv (location, x); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform1fv (location, x.getByteBuffer ()); @@ -1840,7 +1840,7 @@ class GL { public static inline function uniform1i (location:GLUniformLocation, x:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform1i (location, x); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_uniform1i (location, x); @@ -1851,7 +1851,7 @@ class GL { public static inline function uniform1iv (location:GLUniformLocation, v:Int32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform1iv (location, v); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform1iv (location, v.getByteBuffer ()); @@ -1864,7 +1864,7 @@ class GL { public static inline function uniform2f (location:GLUniformLocation, x:Float, y:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform2f (location, x, y); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_uniform2f (location, x, y); @@ -1875,7 +1875,7 @@ class GL { public static inline function uniform2fv (location:GLUniformLocation, v:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform2fv (location, v); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform2fv (location, v.getByteBuffer ()); @@ -1888,7 +1888,7 @@ class GL { public static inline function uniform2i (location:GLUniformLocation, x:Int, y:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform2i (location, x, y); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_uniform2i (location, x, y); @@ -1899,7 +1899,7 @@ class GL { public static inline function uniform2iv (location:GLUniformLocation, v:Int32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform2iv (location, v); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform2iv (location, v.getByteBuffer ()); @@ -1912,7 +1912,7 @@ class GL { public static inline function uniform3f (location:GLUniformLocation, x:Float, y:Float, z:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform3f (location, x, y, z); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_uniform3f (location, x, y, z); @@ -1923,7 +1923,7 @@ class GL { public static inline function uniform3fv (location:GLUniformLocation, v:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform3fv (location, v); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform3fv (location, v.getByteBuffer ()); @@ -1936,7 +1936,7 @@ class GL { public static inline function uniform3i (location:GLUniformLocation, x:Int, y:Int, z:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform3i (location, x, y, z); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_uniform3i (location, x, y, z); @@ -1947,7 +1947,7 @@ class GL { public static inline function uniform3iv (location:GLUniformLocation, v:Int32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform3iv (location, v); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform3iv (location, v.getByteBuffer ()); @@ -1960,7 +1960,7 @@ class GL { public static inline function uniform4f (location:GLUniformLocation, x:Float, y:Float, z:Float, w:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform4f (location, x, y, z, w); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_uniform4f (location, x, y, z, w); @@ -1971,7 +1971,7 @@ class GL { public static inline function uniform4fv (location:GLUniformLocation, v:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform4fv (location, v); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform4fv (location, v.getByteBuffer ()); @@ -1984,7 +1984,7 @@ class GL { public static inline function uniform4i (location:GLUniformLocation, x:Int, y:Int, z:Int, w:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform4i (location, x, y, z, w); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_uniform4i (location, x, y, z, w); @@ -1995,7 +1995,7 @@ class GL { public static inline function uniform4iv (location:GLUniformLocation, v:Int32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniform4iv (location, v); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform4iv (location, v.getByteBuffer ()); @@ -2008,7 +2008,7 @@ class GL { public static inline function uniformMatrix2fv (location:GLUniformLocation, transpose:Bool, v:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniformMatrix2fv (location, transpose, v); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform_matrix (location, transpose, v.getByteBuffer (), 2); @@ -2021,7 +2021,7 @@ class GL { public static inline function uniformMatrix3fv (location:GLUniformLocation, transpose:Bool, v:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniformMatrix3fv (location, transpose, v); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform_matrix (location, transpose, v.getByteBuffer (), 3); @@ -2034,7 +2034,7 @@ class GL { public static inline function uniformMatrix4fv (location:GLUniformLocation, transpose:Bool, v:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.uniformMatrix4fv (location, transpose, v); #elseif ((cpp || neko) && lime_opengl) lime_gl_uniform_matrix (location, transpose, v.getByteBuffer (), 4); @@ -2054,7 +2054,7 @@ class GL { public static inline function useProgram (program:GLProgram):Void { - #if (js && html5) + #if (js && html5 && !display) context.useProgram (program); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_use_program (program == null ? 0 : program.id); @@ -2065,7 +2065,7 @@ class GL { public static inline function validateProgram (program:GLProgram):Void { - #if (js && html5) + #if (js && html5 && !display) context.validateProgram (program); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_validate_program (program.id); @@ -2076,7 +2076,7 @@ class GL { public static inline function vertexAttrib1f (indx:Int, x:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.vertexAttrib1f (indx, x); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_vertex_attrib1f (indx, x); @@ -2087,7 +2087,7 @@ class GL { public static inline function vertexAttrib1fv (indx:Int, values:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.vertexAttrib1fv (indx, values); #elseif ((cpp || neko) && lime_opengl) lime_gl_vertex_attrib1fv (indx, values.getByteBuffer ()); @@ -2100,7 +2100,7 @@ class GL { public static inline function vertexAttrib2f (indx:Int, x:Float, y:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.vertexAttrib2f (indx, x, y); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_vertex_attrib2f (indx, x, y); @@ -2111,7 +2111,7 @@ class GL { public static inline function vertexAttrib2fv (indx:Int, values:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.vertexAttrib2fv (indx, values); #elseif ((cpp || neko) && lime_opengl) lime_gl_vertex_attrib2fv (indx, values.getByteBuffer()); @@ -2124,7 +2124,7 @@ class GL { public static inline function vertexAttrib3f (indx:Int, x:Float, y:Float, z:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.vertexAttrib3f (indx, x, y, z); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_vertex_attrib3f (indx, x, y, z); @@ -2135,7 +2135,7 @@ class GL { public static inline function vertexAttrib3fv (indx:Int, values:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.vertexAttrib3fv (indx, values); #elseif ((cpp || neko) && lime_opengl) lime_gl_vertex_attrib3fv (indx, values.getByteBuffer ()); @@ -2148,7 +2148,7 @@ class GL { public static inline function vertexAttrib4f (indx:Int, x:Float, y:Float, z:Float, w:Float):Void { - #if (js && html5) + #if (js && html5 && !display) context.vertexAttrib4f (indx, x, y, z, w); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_vertex_attrib4f (indx, x, y, z, w); @@ -2159,7 +2159,7 @@ class GL { public static inline function vertexAttrib4fv (indx:Int, values:Float32Array):Void { - #if (js && html5) + #if (js && html5 && !display) context.vertexAttrib4fv (indx, values); #elseif ((cpp || neko) && lime_opengl) lime_gl_vertex_attrib4fv (indx, values.getByteBuffer ()); @@ -2172,7 +2172,7 @@ class GL { public static inline function vertexAttribPointer (indx:Int, size:Int, type:Int, normalized:Bool, stride:Int, offset:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.vertexAttribPointer (indx, size, type, normalized, stride, offset); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_vertex_attrib_pointer (indx, size, type, normalized, stride, offset); @@ -2183,7 +2183,7 @@ class GL { public static inline function viewport (x:Int, y:Int, width:Int, height:Int):Void { - #if (js && html5) + #if (js && html5 && !display) context.viewport (x, y, width, height); #elseif ((cpp || neko || nodejs) && lime_opengl) lime_gl_viewport (x, y, width, height); diff --git a/lime/graphics/opengl/GLBuffer.hx b/lime/graphics/opengl/GLBuffer.hx index 99ec4fbd5..e854c772c 100644 --- a/lime/graphics/opengl/GLBuffer.hx +++ b/lime/graphics/opengl/GLBuffer.hx @@ -1,4 +1,4 @@ -package lime.graphics.opengl; #if (!js || !html5) +package lime.graphics.opengl; #if (!js || !html5 || display) class GLBuffer extends GLObject { diff --git a/lime/graphics/opengl/GLFramebuffer.hx b/lime/graphics/opengl/GLFramebuffer.hx index 3084947d4..7bf3be9e7 100644 --- a/lime/graphics/opengl/GLFramebuffer.hx +++ b/lime/graphics/opengl/GLFramebuffer.hx @@ -1,4 +1,4 @@ -package lime.graphics.opengl; #if (!js || !html5) +package lime.graphics.opengl; #if (!js || !html5 || display) class GLFramebuffer extends GLObject { diff --git a/lime/graphics/opengl/GLProgram.hx b/lime/graphics/opengl/GLProgram.hx index a9af4d899..474e0d5f2 100644 --- a/lime/graphics/opengl/GLProgram.hx +++ b/lime/graphics/opengl/GLProgram.hx @@ -1,4 +1,4 @@ -package lime.graphics.opengl; #if (!js || !html5) +package lime.graphics.opengl; #if (!js || !html5 || display) class GLProgram extends GLObject { diff --git a/lime/graphics/opengl/GLRenderbuffer.hx b/lime/graphics/opengl/GLRenderbuffer.hx index 6513792dd..64ddef91e 100644 --- a/lime/graphics/opengl/GLRenderbuffer.hx +++ b/lime/graphics/opengl/GLRenderbuffer.hx @@ -1,4 +1,4 @@ -package lime.graphics.opengl; #if (!js || !html5) +package lime.graphics.opengl; #if (!js || !html5 || display) class GLRenderbuffer extends GLObject { diff --git a/lime/graphics/opengl/GLShader.hx b/lime/graphics/opengl/GLShader.hx index 200067a46..c1a316ac3 100644 --- a/lime/graphics/opengl/GLShader.hx +++ b/lime/graphics/opengl/GLShader.hx @@ -1,4 +1,4 @@ -package lime.graphics.opengl; #if (!js || !html5) +package lime.graphics.opengl; #if (!js || !html5 || display) class GLShader extends GLObject { diff --git a/lime/graphics/opengl/GLShaderPrecisionFormat.hx b/lime/graphics/opengl/GLShaderPrecisionFormat.hx index 74e0f7a93..19eab52c7 100644 --- a/lime/graphics/opengl/GLShaderPrecisionFormat.hx +++ b/lime/graphics/opengl/GLShaderPrecisionFormat.hx @@ -1,4 +1,4 @@ -package lime.graphics.opengl; #if (!js || !html5) +package lime.graphics.opengl; #if (!js || !html5 || display) typedef GLShaderPrecisionFormat = { diff --git a/lime/graphics/opengl/GLTexture.hx b/lime/graphics/opengl/GLTexture.hx index 669b6e48f..7d4a4aa12 100644 --- a/lime/graphics/opengl/GLTexture.hx +++ b/lime/graphics/opengl/GLTexture.hx @@ -1,4 +1,4 @@ -package lime.graphics.opengl; #if (!js || !html5) +package lime.graphics.opengl; #if (!js || !html5 || display) class GLTexture extends GLObject { diff --git a/lime/graphics/opengl/GLUniformLocation.hx b/lime/graphics/opengl/GLUniformLocation.hx index 31989a71e..df134315d 100644 --- a/lime/graphics/opengl/GLUniformLocation.hx +++ b/lime/graphics/opengl/GLUniformLocation.hx @@ -1,4 +1,4 @@ -package lime.graphics.opengl; #if (!js || !html5) +package lime.graphics.opengl; #if (!js || !html5 || display) typedef GLUniformLocation = Int; diff --git a/lime/utils/ArrayBuffer.hx b/lime/utils/ArrayBuffer.hx index 7c8b2d61b..cb386cbb8 100644 --- a/lime/utils/ArrayBuffer.hx +++ b/lime/utils/ArrayBuffer.hx @@ -1,7 +1,7 @@ package lime.utils; -#if js +#if (js && !display) typedef ArrayBuffer = js.html.ArrayBuffer; #else typedef ArrayBuffer = lime.utils.ByteArray; diff --git a/lime/utils/ArrayBufferView.hx b/lime/utils/ArrayBufferView.hx index 4d472ebbe..d3812c95c 100644 --- a/lime/utils/ArrayBufferView.hx +++ b/lime/utils/ArrayBufferView.hx @@ -1,5 +1,5 @@ package lime.utils; -#if js +#if (js && !display) typedef ArrayBufferView = js.html.ArrayBufferView; #else @@ -76,7 +76,7 @@ import haxe.io.BytesData; #if flash buffer.endian = flash.utils.Endian.LITTLE_ENDIAN; - #else + #elseif (cpp || neko) buffer.bigEndian = false; #end diff --git a/lime/utils/ByteArray.hx b/lime/utils/ByteArray.hx index ad8af56c5..7cd497d0c 100644 --- a/lime/utils/ByteArray.hx +++ b/lime/utils/ByteArray.hx @@ -1034,9 +1034,11 @@ class ByteArray #if !js extends Bytes implements ArrayAccess implements IDa public static function __ofBuffer (buffer:ArrayBuffer):ByteArray { var bytes = new ByteArray (); + #if !display bytes.length = bytes.allocated = buffer.byteLength; bytes.data = untyped __new__("DataView", buffer); bytes.byteView = untyped __new__("Uint8Array", buffer); + #end return bytes; } diff --git a/lime/utils/Float32Array.hx b/lime/utils/Float32Array.hx index 535ebcfb2..e80f544ff 100644 --- a/lime/utils/Float32Array.hx +++ b/lime/utils/Float32Array.hx @@ -1,5 +1,5 @@ package lime.utils; -#if js +#if (js && !display) typedef Float32Array = js.html.Float32Array; #else diff --git a/lime/utils/Int16Array.hx b/lime/utils/Int16Array.hx index cc8971c25..5071890ef 100644 --- a/lime/utils/Int16Array.hx +++ b/lime/utils/Int16Array.hx @@ -1,5 +1,5 @@ package lime.utils; -#if js +#if (js && !display) typedef Int16Array = js.html.Int16Array; #else diff --git a/lime/utils/Int32Array.hx b/lime/utils/Int32Array.hx index e3cfcf0c0..38084c377 100644 --- a/lime/utils/Int32Array.hx +++ b/lime/utils/Int32Array.hx @@ -1,5 +1,5 @@ package lime.utils; -#if js +#if (js && !display) typedef Int32Array = js.html.Int32Array; #else diff --git a/lime/utils/Int8Array.hx b/lime/utils/Int8Array.hx index 937727874..75d579232 100644 --- a/lime/utils/Int8Array.hx +++ b/lime/utils/Int8Array.hx @@ -1,5 +1,5 @@ package lime.utils; -#if js +#if (js && !display) typedef Int8Array = js.html.Int8Array; #else diff --git a/lime/utils/UInt16Array.hx b/lime/utils/UInt16Array.hx index bda0836c2..7c943d960 100644 --- a/lime/utils/UInt16Array.hx +++ b/lime/utils/UInt16Array.hx @@ -1,5 +1,5 @@ package lime.utils; -#if js +#if (js && !display) typedef UInt16Array = js.html.Uint16Array; #else diff --git a/lime/utils/UInt32Array.hx b/lime/utils/UInt32Array.hx index fe51efdb3..4476ab6a5 100644 --- a/lime/utils/UInt32Array.hx +++ b/lime/utils/UInt32Array.hx @@ -1,5 +1,5 @@ package lime.utils; -#if js +#if (js && !display) typedef UInt32Array = js.html.Uint32Array; #else diff --git a/lime/utils/UInt8Array.hx b/lime/utils/UInt8Array.hx index 6e64ecb13..25c1084c0 100644 --- a/lime/utils/UInt8Array.hx +++ b/lime/utils/UInt8Array.hx @@ -1,5 +1,5 @@ package lime.utils; -#if js +#if (js && !display) typedef UInt8Array = js.html.Uint8Array; #else