Improve consistency between targets when merging documentation

This commit is contained in:
Joshua Granick
2015-01-26 09:08:39 -08:00
parent 26a0b6a8f3
commit c8abf857bc
23 changed files with 160 additions and 158 deletions

View File

@@ -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) {

View File

@@ -1,4 +1,4 @@
package lime.audio; #if (!js || !html5)
package lime.audio; #if (!js || !html5 || display)
class WebAudioContext {

View File

@@ -1,5 +1,5 @@
package lime.graphics;
#if (js && html5)
#if (js && html5 && !display)
typedef CanvasRenderContext = js.html.CanvasRenderingContext2D;
#else

View File

@@ -1,5 +1,5 @@
package lime.graphics;
#if (js && html5)
#if (js && html5 && !display)
typedef DOMRenderContext = js.html.DivElement;
#else

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
package lime.graphics.opengl; #if (!js || !html5)
package lime.graphics.opengl; #if (!js || !html5 || display)
class GLBuffer extends GLObject {

View File

@@ -1,4 +1,4 @@
package lime.graphics.opengl; #if (!js || !html5)
package lime.graphics.opengl; #if (!js || !html5 || display)
class GLFramebuffer extends GLObject {

View File

@@ -1,4 +1,4 @@
package lime.graphics.opengl; #if (!js || !html5)
package lime.graphics.opengl; #if (!js || !html5 || display)
class GLProgram extends GLObject {

View File

@@ -1,4 +1,4 @@
package lime.graphics.opengl; #if (!js || !html5)
package lime.graphics.opengl; #if (!js || !html5 || display)
class GLRenderbuffer extends GLObject {

View File

@@ -1,4 +1,4 @@
package lime.graphics.opengl; #if (!js || !html5)
package lime.graphics.opengl; #if (!js || !html5 || display)
class GLShader extends GLObject {

View File

@@ -1,4 +1,4 @@
package lime.graphics.opengl; #if (!js || !html5)
package lime.graphics.opengl; #if (!js || !html5 || display)
typedef GLShaderPrecisionFormat = {

View File

@@ -1,4 +1,4 @@
package lime.graphics.opengl; #if (!js || !html5)
package lime.graphics.opengl; #if (!js || !html5 || display)
class GLTexture extends GLObject {

View File

@@ -1,4 +1,4 @@
package lime.graphics.opengl; #if (!js || !html5)
package lime.graphics.opengl; #if (!js || !html5 || display)
typedef GLUniformLocation = Int;

View File

@@ -1,7 +1,7 @@
package lime.utils;
#if js
#if (js && !display)
typedef ArrayBuffer = js.html.ArrayBuffer;
#else
typedef ArrayBuffer = lime.utils.ByteArray;

View File

@@ -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

View File

@@ -1034,9 +1034,11 @@ class ByteArray #if !js extends Bytes implements ArrayAccess<Int> 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;
}

View File

@@ -1,5 +1,5 @@
package lime.utils;
#if js
#if (js && !display)
typedef Float32Array = js.html.Float32Array;
#else

View File

@@ -1,5 +1,5 @@
package lime.utils;
#if js
#if (js && !display)
typedef Int16Array = js.html.Int16Array;
#else

View File

@@ -1,5 +1,5 @@
package lime.utils;
#if js
#if (js && !display)
typedef Int32Array = js.html.Int32Array;
#else

View File

@@ -1,5 +1,5 @@
package lime.utils;
#if js
#if (js && !display)
typedef Int8Array = js.html.Int8Array;
#else

View File

@@ -1,5 +1,5 @@
package lime.utils;
#if js
#if (js && !display)
typedef UInt16Array = js.html.Uint16Array;
#else

View File

@@ -1,5 +1,5 @@
package lime.utils;
#if js
#if (js && !display)
typedef UInt32Array = js.html.Uint32Array;
#else

View File

@@ -1,5 +1,5 @@
package lime.utils;
#if js
#if (js && !display)
typedef UInt8Array = js.html.Uint8Array;
#else