Skip to content

Commit 05d87d8

Browse files
sjrdsjrd
committed
Merge pull request scala-js#126 from mseddon/webgl-fix-signatures
Fix WebGL signatures.
2 parents 9bab960 + 3c832e0 commit 05d87d8

File tree

1 file changed

+30
-38
lines changed

1 file changed

+30
-38
lines changed

‎src/main/scala/org/scalajs/dom/raw/WebGL.scala‎

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,11 +1054,11 @@ class WebGLRenderingContext extends js.Object {
10541054
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
10551055
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
10561056
* @param level the mipmap level of detail. 0 is the base image.
1057-
* @param internalformat the format of the compressed data.
10581057
* @param xoffset the x texel offset into the texture image.
10591058
* @param yoffset the y texel offset into the texture image.
10601059
* @param width the width of the texture image.
10611060
* @param height the height of the texture image.
1061+
* @param format the format of the compressed image data
10621062
* @param data the compressed image data.
10631063
*/
10641064
def compressedTexSubImage2D(target: Int, level: Int, xoffset: Int, yoffset: Int, width: Int, height: Int, format: Int, data: ArrayBufferView): Unit = js.native
@@ -1086,7 +1086,6 @@ class WebGLRenderingContext extends js.Object {
10861086
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
10871087
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
10881088
* @param level the mipmap level of detail. 0 is the base image.
1089-
* @param internalformat the format of the data. May be [[WebGLRenderingContext.ALPHA]], [[WebGLRenderingContext.LUMINANCE]], [[WebGLRenderingContext.LUMINANCE_ALPHA]], [[WebGLRenderingContext.RGB]], or [[WebGLRenderingContext.RGBA]].
10901089
* @param xoffset the x texel offset into the texture image.
10911090
* @param yoffset the y texel offset into the texture image.
10921091
* @param x the window coordinates of the lower left corner of the framebuffer.
@@ -1342,7 +1341,7 @@ class WebGLRenderingContext extends js.Object {
13421341
* Returns the value of the requested parameter for a buffer.
13431342
*
13441343
* @param target must be [[WebGLRenderingContext.ARRAY_BUFFER]] or [[WebGLRenderingContext.ELEMENT_ARRAY_BUFFER]]
1345-
* @param value the buffer parameter to retrieve, may be [[WebGLRenderingContext.BUFFER_SIZE]] or [[WebGLRenderingContext.BUFFER_USAGE]]
1344+
* @param pname the buffer parameter to retrieve, may be [[WebGLRenderingContext.BUFFER_SIZE]] or [[WebGLRenderingContext.BUFFER_USAGE]]
13461345
*
13471346
*/
13481347
def getBufferParameter(target: Int, pname: Int): Int = js.native
@@ -1455,7 +1454,7 @@ class WebGLRenderingContext extends js.Object {
14551454
/**
14561455
* Returns the value of the given texture parameter on the target of the active texture.
14571456
*
1458-
* @param target the target to query. May be either [[WebGLRenderingContext.TEXTURE_2D]] or `TEXTURE_CUBE_MAP'.
1457+
* @param target the target to query. May be either [[WebGLRenderingContext.TEXTURE_2D]] or `TEXTURE_CUBE_MAP`.
14591458
* @param pname the parameter to query. May be either [[WebGLRenderingContext.TEXTURE_MAG_FILTER]],
14601459
* [[WebGLRenderingContext.TEXTURE_MIN_FILTER]], [[WebGLRenderingContext.TEXTURE_WRAP_S]],
14611460
* or [[WebGLRenderingContext.TEXTURE_WRAP_T]].
@@ -1541,7 +1540,7 @@ class WebGLRenderingContext extends js.Object {
15411540
/**
15421541
* Specifies the line width.
15431542
*/
1544-
def lineWidth(width: Int): Unit = js.native
1543+
def lineWidth(width: Double): Unit = js.native
15451544

15461545
/**
15471546
* Attempts to link the specified [[WebGLProgram]].
@@ -1562,7 +1561,7 @@ class WebGLRenderingContext extends js.Object {
15621561
* to them, calculated as `factor`*DZ + r*`units`, where DZ is the change in z based on the polygon's screen area, and r is the minimum value that
15631562
* is guaranteed produce a measurable offset.
15641563
*/
1565-
def polygonOffset(factor: Int, units: Int): Unit = js.native
1564+
def polygonOffset(factor: Double, units: Double): Unit = js.native
15661565

15671566
/**
15681567
* Reads pixels from the framebuffer into `pixels`.
@@ -1681,7 +1680,7 @@ class WebGLRenderingContext extends js.Object {
16811680
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
16821681
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
16831682
* @param level the mipmap level of detail. 0 is the base image.
1684-
* @param internalformat the format the image is stored in.
1683+
* @param internalformat the format of the target pixel data.
16851684
* @param width the width of the texture image.
16861685
* @param height the height of the texture image.
16871686
* @param border the border width. Must be 0.
@@ -1696,10 +1695,9 @@ class WebGLRenderingContext extends js.Object {
16961695
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
16971696
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
16981697
* @param level the mipmap level of detail. 0 is the base image.
1699-
* @param internalformat the format to store the image.
1700-
* @param width the width of the texture image.
1701-
* @param height the height of the texture image.
1702-
* @param border the border width. Must be 0.
1698+
* @param internalformat the format of the target pixel data.
1699+
* @param format the format of the incoming pixel data.
1700+
* @param type the data type of the pixel data.
17031701
* @param pixels the source image data.
17041702
*/
17051703
def texImage2D(target: Int, level: Int, internalformat: Int, format: Int, `type`: Int, pixels: ImageData): Unit = js.native
@@ -1711,10 +1709,9 @@ class WebGLRenderingContext extends js.Object {
17111709
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
17121710
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
17131711
* @param level the mipmap level of detail. 0 is the base image.
1714-
* @param internalformat the format to store the image.
1715-
* @param width the width of the texture image.
1716-
* @param height the height of the texture image.
1717-
* @param border the border width. Must be 0.
1712+
* @param internalformat the format of the target pixel data.
1713+
* @param format the format of the incoming pixel data.
1714+
* @param type the data type of the pixel data.
17181715
* @param pixels the source image data.
17191716
*/
17201717
def texImage2D(target: Int, level: Int, internalformat: Int, format: Int, `type`: Int, pixels: HTMLImageElement): Unit = js.native
@@ -1726,10 +1723,9 @@ class WebGLRenderingContext extends js.Object {
17261723
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
17271724
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
17281725
* @param level the mipmap level of detail. 0 is the base image.
1729-
* @param internalformat the format to store the image.
1730-
* @param width the width of the texture image.
1731-
* @param height the height of the texture image.
1732-
* @param border the border width. Must be 0.
1726+
* @param internalformat the format of the target pixel data.
1727+
* @param format the format of the incoming pixel data.
1728+
* @param type the data type of the pixel data.
17331729
* @param pixels the source image data.
17341730
*/
17351731
def texImage2D(target: Int, level: Int, internalformat: Int, format: Int, `type`: Int, pixels: HTMLCanvasElement): Unit = js.native
@@ -1741,10 +1737,9 @@ class WebGLRenderingContext extends js.Object {
17411737
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
17421738
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
17431739
* @param level the mipmap level of detail. 0 is the base image.
1744-
* @param internalformat the format to store the image.
1745-
* @param width the width of the texture image.
1746-
* @param height the height of the texture image.
1747-
* @param border the border width. Must be 0.
1740+
* @param internalformat the format of the target pixel data.
1741+
* @param format the format of the incoming pixel data.
1742+
* @param type the data type of the pixel data.
17481743
* @param pixels the source image data.
17491744
*/
17501745
def texImage2D(target: Int, level: Int, internalformat: Int, format: Int, `type`: Int, pixels: HTMLVideoElement): Unit = js.native
@@ -1757,7 +1752,7 @@ class WebGLRenderingContext extends js.Object {
17571752
* [[WebGLRenderingContext.TEXTURE_WRAP_S]], or [[WebGLRenderingContext.TEXTURE_WRAP_T]]
17581753
* @param param the value to set. See the corresponding parameters for valid values.
17591754
*/
1760-
def texParameterf(target: Int, pname: Int, param: Int): Unit = js.native
1755+
def texParameterf(target: Int, pname: Int, param: Double): Unit = js.native
17611756

17621757
/**
17631758
* Sets the texture parameter for the active texture unit.
@@ -1776,11 +1771,12 @@ class WebGLRenderingContext extends js.Object {
17761771
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
17771772
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
17781773
* @param level the mipmap level of detail. 0 is the base image.
1779-
* @param internalformat the format of the image data.
17801774
* @param xoffset the x texel offset into the texture image.
17811775
* @param yoffset the y texel offset into the texture image.
17821776
* @param width the width of the texture image.
17831777
* @param height the height of the texture image.
1778+
* @param format the format of the incoming pixel data.
1779+
* @param type the data type of the pixel data.
17841780
* @param pixels the image data.
17851781
*/
17861782
def texSubImage2D(target: Int, level: Int, xoffset: Int, yoffset: Int, width: Int, height: Int, format: Int, `type`: Int, pixels: ArrayBufferView): Unit = js.native
@@ -1792,11 +1788,10 @@ class WebGLRenderingContext extends js.Object {
17921788
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
17931789
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
17941790
* @param level the mipmap level of detail. 0 is the base image.
1795-
* @param internalformat desired the format of the image data.
17961791
* @param xoffset the x texel offset into the texture image.
17971792
* @param yoffset the y texel offset into the texture image.
1798-
* @param width the width of the texture image.
1799-
* @param height the height of the texture image.
1793+
* @param format the format of the incoming pixel data.
1794+
* @param type the data type of the pixel data.
18001795
* @param pixels the image data.
18011796
*/
18021797
def texSubImage2D(target: Int, level: Int, xoffset: Int, yoffset: Int, format: Int, `type`: Int, pixels: ImageData): Unit = js.native
@@ -1808,11 +1803,10 @@ class WebGLRenderingContext extends js.Object {
18081803
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
18091804
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
18101805
* @param level the mipmap level of detail. 0 is the base image.
1811-
* @param internalformat desired the format of the image data.
18121806
* @param xoffset the x texel offset into the texture image.
18131807
* @param yoffset the y texel offset into the texture image.
1814-
* @param width the width of the texture image.
1815-
* @param height the height of the texture image.
1808+
* @param format the format of the incoming pixel data.
1809+
* @param type the data type of the pixel data.
18161810
* @param pixels the image data.
18171811
*/
18181812
def texSubImage2D(target: Int, level: Int, xoffset: Int, yoffset: Int, format: Int, `type`: Int, pixels: HTMLImageElement): Unit = js.native
@@ -1824,12 +1818,11 @@ class WebGLRenderingContext extends js.Object {
18241818
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
18251819
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
18261820
* @param level the mipmap level of detail. 0 is the base image.
1827-
* @param internalformat desired the format of the image data.
18281821
* @param xoffset the x texel offset into the texture image.
18291822
* @param yoffset the y texel offset into the texture image.
1830-
* @param width the width of the texture image.
1831-
* @param height the height of the texture image.
1832-
* @param pixels the image data.
1823+
* @param format the format of the incoming pixel data.
1824+
* @param type the data type of the pixel data.
1825+
* @param pixels the image data..
18331826
*/
18341827
def texSubImage2D(target: Int, level: Int, xoffset: Int, yoffset: Int, format: Int, `type`: Int, pixels: HTMLCanvasElement): Unit = js.native
18351828

@@ -1840,11 +1833,10 @@ class WebGLRenderingContext extends js.Object {
18401833
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y]], [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y]],
18411834
* [[WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z]], or [[WebGLRenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z]]
18421835
* @param level the mipmap level of detail. 0 is the base image.
1843-
* @param internalformat desired the format of the image data.
18441836
* @param xoffset the x texel offset into the texture image.
18451837
* @param yoffset the y texel offset into the texture image.
1846-
* @param width the width of the texture image.
1847-
* @param height the height of the texture image.
1838+
* @param format the format of the incoming pixel data.
1839+
* @param type the data type of the pixel data.
18481840
* @param pixels the image data.
18491841
*/
18501842
def texSubImage2D(target: Int, level: Int, xoffset: Int, yoffset: Int, format: Int, `type`: Int, pixels: HTMLVideoElement): Unit = js.native

0 commit comments

Comments
 (0)