Skip to content

Commit 59cd8f2

Browse files
armanbilgearmanbilge
committed
Migrate webgl to dom
1 parent 4277b18 commit 59cd8f2

File tree

60 files changed

+631
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+631
-353
lines changed

‎api-reports/2_12.txt

Lines changed: 196 additions & 142 deletions
Large diffs are not rendered by default.

‎api-reports/2_13.txt

Lines changed: 196 additions & 142 deletions
Large diffs are not rendered by default.

‎src/main/scala/org/scalajs/dom/WebGLRenderingContext.scala

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,21 @@ object WebGLRenderingContext {
701701
final val CONTEXT_LOST_WEBGL = 0x9242
702702
final val UNPACK_COLORSPACE_CONVERSION_WEBGL = 0x9243
703703
final val BROWSER_DEFAULT_WEBGL = 0x9244
704+
705+
implicit class WebGLRenderingContextOps(val webGL: WebGLRenderingContext) extends AnyVal {
706+
707+
/** Returns the WebGL extension for the given identifier, if present on this browser.
708+
*
709+
* @param id
710+
* the identifier singleton.
711+
* @tparam T
712+
* The type of the result for this extension.
713+
* @return
714+
* `Some(extension)` or `None`
715+
*/
716+
def getExtension[T](id: webgl.WebGLExtensionIdentifier[T]): js.UndefOr[T] =
717+
webGL.getExtension(id.value).asInstanceOf[js.UndefOr[T]]
718+
}
704719
}
705720

706721
@js.native

‎src/main/scala/org/scalajs/dom/experimental/webgl/extensions/package.scala

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
package org.scalajs.dom.experimental.webgl
2+
3+
import org.scalajs.dom
4+
5+
package object extensions {
6+
7+
@deprecated("use dom.webgl.extensions.ANGLEInstancedArrays instead", "2.0.0")
8+
type ANGLEInstancedArrays = dom.webgl.extensions.ANGLEInstancedArrays
9+
10+
@deprecated("use dom.webgl.extensions.EXTBlendMinmax instead", "2.0.0")
11+
type EXTBlendMinmax = dom.webgl.extensions.EXTBlendMinmax
12+
13+
@deprecated("use dom.webgl.extensions.EXTColorBufferHalfFloat instead", "2.0.0")
14+
type EXTColorBufferHalfFloat = dom.webgl.extensions.EXTColorBufferHalfFloat
15+
16+
@deprecated("use dom.webgl.extensions.EXTDisjointTimerQuery instead", "2.0.0")
17+
type EXTDisjointTimerQuery = dom.webgl.extensions.EXTDisjointTimerQuery
18+
19+
@deprecated("use dom.webgl.extensions.EXTFragDepth instead", "2.0.0")
20+
type EXTFragDepth = dom.webgl.extensions.EXTFragDepth
21+
22+
@deprecated("use dom.webgl.extensions.EXTShaderTextureLOD instead", "2.0.0")
23+
type EXTShaderTextureLOD = dom.webgl.extensions.EXTShaderTextureLOD
24+
25+
@deprecated("use dom.webgl.extensions.EXTsRGB instead", "2.0.0")
26+
type EXTsRGB = dom.webgl.extensions.EXTsRGB
27+
28+
@deprecated("use dom.webgl.extensions.EXTTextureFilterAnisotropic instead", "2.0.0")
29+
type EXTTextureFilterAnisotropic = dom.webgl.extensions.EXTTextureFilterAnisotropic
30+
31+
@deprecated("use dom.webgl.extensions.OESElementIndexUint instead", "2.0.0")
32+
type OESElementIndexUint = dom.webgl.extensions.OESElementIndexUint
33+
34+
@deprecated("use dom.webgl.extensions.OESStandardDerivatives instead", "2.0.0")
35+
type OESStandardDerivatives = dom.webgl.extensions.OESStandardDerivatives
36+
37+
@deprecated("use dom.webgl.extensions.OESTextureFloatLinear instead", "2.0.0")
38+
type OESTextureFloatLinear = dom.webgl.extensions.OESTextureFloatLinear
39+
40+
@deprecated("use dom.webgl.extensions.OESTextureFloat instead", "2.0.0")
41+
type OESTextureFloat = dom.webgl.extensions.OESTextureFloat
42+
43+
@deprecated("use dom.webgl.extensions.OESTextureHalfFloatLinear instead", "2.0.0")
44+
type OESTextureHalfFloatLinear = dom.webgl.extensions.OESTextureHalfFloatLinear
45+
46+
@deprecated("use dom.webgl.extensions.OESTextureHalfFloat instead", "2.0.0")
47+
type OESTextureHalfFloat = dom.webgl.extensions.OESTextureHalfFloat
48+
49+
@deprecated("use dom.webgl.extensions.OESVertexArrayObject instead", "2.0.0")
50+
type OESVertexArrayObject = dom.webgl.extensions.OESVertexArrayObject
51+
52+
@deprecated("use dom.webgl.extensions.WEBGLColorBufferFloat instead", "2.0.0")
53+
type WEBGLColorBufferFloat = dom.webgl.extensions.WEBGLColorBufferFloat
54+
55+
@deprecated("use dom.webgl.extensions.WebGLCompressedTextureATC instead", "2.0.0")
56+
type WebGLCompressedTextureATC = dom.webgl.extensions.WebGLCompressedTextureATC
57+
58+
@deprecated("use dom.webgl.extensions.WEBGLCompressedTextureETC1 instead", "2.0.0")
59+
type WEBGLCompressedTextureETC1 = dom.webgl.extensions.WEBGLCompressedTextureETC1
60+
61+
@deprecated("use dom.webgl.extensions.WebGLCompressedTexturePVRTC instead", "2.0.0")
62+
type WebGLCompressedTexturePVRTC = dom.webgl.extensions.WebGLCompressedTexturePVRTC
63+
64+
@deprecated("use dom.webgl.extensions.WebGLCompressedTextureS3TC instead", "2.0.0")
65+
type WebGLCompressedTextureS3TC = dom.webgl.extensions.WebGLCompressedTextureS3TC
66+
67+
@deprecated("use dom.webgl.extensions.WebGLDebugRendererInfo instead", "2.0.0")
68+
type WebGLDebugRendererInfo = dom.webgl.extensions.WebGLDebugRendererInfo
69+
70+
@deprecated("use dom.webgl.extensions.WebGLDebugShaders instead", "2.0.0")
71+
type WebGLDebugShaders = dom.webgl.extensions.WebGLDebugShaders
72+
73+
@deprecated("use dom.webgl.extensions.WebGLDepthTexture instead", "2.0.0")
74+
type WebGLDepthTexture = dom.webgl.extensions.WebGLDepthTexture
75+
76+
@deprecated("use dom.webgl.extensions.WEBGLDrawBuffers instead", "2.0.0")
77+
type WEBGLDrawBuffers = dom.webgl.extensions.WEBGLDrawBuffers
78+
79+
@deprecated("use dom.webgl.extensions.WebGLLoseContext instead", "2.0.0")
80+
type WebGLLoseContext = dom.webgl.extensions.WebGLLoseContext
81+
82+
@deprecated("use dom.webgl.extensions.WebGLTimerQueryEXT instead", "2.0.0")
83+
type WebGLTimerQueryEXT = dom.webgl.extensions.WebGLTimerQueryEXT
84+
85+
@deprecated("use dom.webgl.extensions.WebGLVertexArrayObjectOES instead", "2.0.0")
86+
type WebGLVertexArrayObjectOES = dom.webgl.extensions.WebGLVertexArrayObjectOES
87+
88+
}

‎src/main/scala/org/scalajs/dom/experimental/webgl/package.scala

Lines changed: 81 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,88 @@
11
package org.scalajs.dom.experimental
22

3+
import org.scalajs.dom
34
import org.scalajs.dom.WebGLRenderingContext
4-
import scala.scalajs.js
55

66
package object webgl {
77

8-
implicit class WebGLRenderingContextOps(val webGL: WebGLRenderingContext) extends AnyVal {
9-
10-
/** Returns the WebGL extension for the given identifier, if present on this browser.
11-
*
12-
* @param id
13-
* the identifier singleton.
14-
* @tparam T
15-
* The type of the result for this extension.
16-
* @return
17-
* `Some(extension)` or `None`
18-
*/
19-
def getExtension[T](id: WebGLExtensionIdentifier[T]): js.UndefOr[T] =
20-
webGL.getExtension(id.value).asInstanceOf[js.UndefOr[T]]
21-
}
8+
@deprecated("use dom.WebGLRenderingContext.WebGLRenderingContextOps", "2.0.0")
9+
type WebGLRenderingContextOps = WebGLRenderingContext.WebGLRenderingContextOps
10+
11+
@deprecated("use dom.webgl.ANGLE_instanced_arrays instead", "2.0.0")
12+
val ANGLE_instanced_arrays = dom.webgl.ANGLE_instanced_arrays
13+
14+
@deprecated("use dom.webgl.EXT_blend_minmax instead", "2.0.0")
15+
val EXT_blend_minmax = dom.webgl.EXT_blend_minmax
16+
17+
@deprecated("use dom.webgl.EXT_color_buffer_half_float instead", "2.0.0")
18+
val EXT_color_buffer_half_float = dom.webgl.EXT_color_buffer_half_float
19+
20+
@deprecated("use dom.webgl.EXT_disjoint_timer_query instead", "2.0.0")
21+
val EXT_disjoint_timer_query = dom.webgl.EXT_disjoint_timer_query
22+
23+
@deprecated("use dom.webgl.EXT_frag_depth instead", "2.0.0")
24+
val EXT_frag_depth = dom.webgl.EXT_frag_depth
25+
26+
@deprecated("use dom.webgl.EXT_shader_texture_lod instead", "2.0.0")
27+
val EXT_shader_texture_lod = dom.webgl.EXT_shader_texture_lod
28+
29+
@deprecated("use dom.webgl.EXT_sRGB instead", "2.0.0")
30+
val EXT_sRGB = dom.webgl.EXT_sRGB
31+
32+
@deprecated("use dom.webgl.EXT_texture_filter_anisotropic instead", "2.0.0")
33+
val EXT_texture_filter_anisotropic = dom.webgl.EXT_texture_filter_anisotropic
34+
35+
@deprecated("use dom.webgl.OES_element_index_uint instead", "2.0.0")
36+
val OES_element_index_uint = dom.webgl.OES_element_index_uint
37+
38+
@deprecated("use dom.webgl.OES_standard_derivatives instead", "2.0.0")
39+
val OES_standard_derivatives = dom.webgl.OES_standard_derivatives
40+
41+
@deprecated("use dom.webgl.OES_texture_float_linear instead", "2.0.0")
42+
val OES_texture_float_linear = dom.webgl.OES_texture_float_linear
43+
44+
@deprecated("use dom.webgl.OES_texture_float instead", "2.0.0")
45+
val OES_texture_float = dom.webgl.OES_texture_float
46+
47+
@deprecated("use dom.webgl.OES_texture_half_float_linear instead", "2.0.0")
48+
val OES_texture_half_float_linear = dom.webgl.OES_texture_half_float_linear
49+
50+
@deprecated("use dom.webgl.OES_texture_half_float instead", "2.0.0")
51+
val OES_texture_half_float = dom.webgl.OES_texture_half_float
52+
53+
@deprecated("use dom.webgl.OES_vertex_array_object instead", "2.0.0")
54+
val OES_vertex_array_object = dom.webgl.OES_vertex_array_object
55+
56+
@deprecated("use dom.webgl.WEBGL_color_buffer_float instead", "2.0.0")
57+
val WEBGL_color_buffer_float = dom.webgl.WEBGL_color_buffer_float
58+
59+
@deprecated("use dom.webgl.WEBGL_compressed_texture_atc instead", "2.0.0")
60+
val WEBGL_compressed_texture_atc = dom.webgl.WEBGL_compressed_texture_atc
61+
62+
@deprecated("use dom.webgl.WEBGL_compressed_texture_etc1 instead", "2.0.0")
63+
val WEBGL_compressed_texture_etc1 = dom.webgl.WEBGL_compressed_texture_etc1
64+
65+
@deprecated("use dom.webgl.WEBGL_compressed_texture_pvrtc instead", "2.0.0")
66+
val WEBGL_compressed_texture_pvrtc = dom.webgl.WEBGL_compressed_texture_pvrtc
67+
68+
@deprecated("use dom.webgl.WEBGL_compressed_texture_s3tc instead", "2.0.0")
69+
val WEBGL_compressed_texture_s3tc = dom.webgl.WEBGL_compressed_texture_s3tc
70+
71+
@deprecated("use dom.webgl.WEBGL_debug_renderer_info instead", "2.0.0")
72+
val WEBGL_debug_renderer_info = dom.webgl.WEBGL_debug_renderer_info
73+
74+
@deprecated("use dom.webgl.WEBGL_debug_shaders instead", "2.0.0")
75+
val WEBGL_debug_shaders = dom.webgl.WEBGL_debug_shaders
76+
77+
@deprecated("use dom.webgl.WEBGL_depth_texture instead", "2.0.0")
78+
val WEBGL_depth_texture = dom.webgl.WEBGL_depth_texture
79+
80+
@deprecated("use dom.webgl.WEBGL_draw_buffers instead", "2.0.0")
81+
val WEBGL_draw_buffers = dom.webgl.WEBGL_draw_buffers
82+
83+
@deprecated("use dom.webgl.WebGLExtensionIdentifier instead", "2.0.0")
84+
type WebGLExtensionIdentifier[T] = dom.webgl.WebGLExtensionIdentifier[T]
85+
86+
@deprecated("use dom.webgl.WEBGL_lose_context instead", "2.0.0")
87+
val WEBGL_lose_context = dom.webgl.WEBGL_lose_context
2288
}

‎src/main/scala/org/scalajs/dom/package.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,5 @@ package object dom {
108108
* At the JS layer these have the same structure.
109109
*/
110110
type HashAlgorithmIdentifier = HashAlgorithm | String
111+
111112
}

‎src/main/scala/org/scalajs/dom/experimental/webgl/ANGLE_instanced_arrays.scala renamed to ‎src/main/scala/org/scalajs/dom/webgl/ANGLE_instanced_arrays.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.webgl
1+
package org.scalajs.dom.webgl
22

33
/** Enables array instancing (Khronos Extension)
44
*

‎src/main/scala/org/scalajs/dom/experimental/webgl/EXT_blend_minmax.scala renamed to ‎src/main/scala/org/scalajs/dom/webgl/EXT_blend_minmax.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.webgl
1+
package org.scalajs.dom.webgl
22

33
/** Extends `blendEquation` to support `MIN_EXT` and `MAX_EXT`. (Khronos Extension)
44
*

‎src/main/scala/org/scalajs/dom/experimental/webgl/EXT_color_buffer_half_float.scala renamed to ‎src/main/scala/org/scalajs/dom/webgl/EXT_color_buffer_half_float.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.webgl
1+
package org.scalajs.dom.webgl
22

33
/** Enables 16-bit float colour buffer support. (Community Extension)
44
*

‎src/main/scala/org/scalajs/dom/experimental/webgl/EXT_disjoint_timer_query.scala renamed to ‎src/main/scala/org/scalajs/dom/webgl/EXT_disjoint_timer_query.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.experimental.webgl
1+
package org.scalajs.dom.webgl
22

33
/** Provides timing support to enable profiling of GL calls. (Community Extension)
44
*

0 commit comments

Comments
 (0)