Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/jsm/controls/ArcballControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class ArcballControls extends Controls {
* Constructs a new controls instance.
*
* @param {Camera} camera - The camera to be controlled. The camera must not be a child of another object, unless that object is the scene itself.
* @param {?HTMLDOMElement} [domElement=null] - The HTML element used for event listeners.
* @param {?HTMLElement} [domElement=null] - The HTML element used for event listeners.
* @param {?Scene} [scene=null] The scene rendered by the camera. If not given, gizmos cannot be shown.
*/
constructor( camera, domElement = null, scene = null ) {
Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/controls/DragControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class DragControls extends Controls {
*
* @param {Array<Object3D>} objects - An array of draggable 3D objects.
* @param {Camera} camera - The camera of the rendered scene.
* @param {?HTMLDOMElement} [domElement=null] - The HTML DOM element used for event listeners.
* @param {?HTMLElement} [domElement=null] - The HTML DOM element used for event listeners.
*/
constructor( objects, camera, domElement = null ) {

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/controls/FirstPersonControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class FirstPersonControls extends Controls {
* Constructs a new controls instance.
*
* @param {Object3D} object - The object that is managed by the controls.
* @param {?HTMLDOMElement} domElement - The HTML element used for event listeners.
* @param {?HTMLElement} domElement - The HTML element used for event listeners.
*/
constructor( object, domElement = null ) {

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/controls/FlyControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class FlyControls extends Controls {
* Constructs a new controls instance.
*
* @param {Object3D} object - The object that is managed by the controls.
* @param {?HTMLDOMElement} domElement - The HTML element used for event listeners.
* @param {?HTMLElement} domElement - The HTML element used for event listeners.
*/
constructor( object, domElement = null ) {

Expand Down
4 changes: 2 additions & 2 deletions examples/jsm/controls/OrbitControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class OrbitControls extends Controls {
* Constructs a new controls instance.
*
* @param {Object3D} object - The object that is managed by the controls.
* @param {?HTMLDOMElement} domElement - The HTML element used for event listeners.
* @param {?HTMLElement} domElement - The HTML element used for event listeners.
*/
constructor( object, domElement = null ) {

Expand Down Expand Up @@ -541,7 +541,7 @@ class OrbitControls extends Controls {
* Adds key event listeners to the given DOM element.
* `window` is a recommended argument for using this method.
*
* @param {HTMLDOMElement} domElement - The DOM element
* @param {HTMLElement} domElement - The DOM element
*/
listenToKeyEvents( domElement ) {

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/controls/PointerLockControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class PointerLockControls extends Controls {
* Constructs a new controls instance.
*
* @param {Camera} camera - The camera that is managed by the controls.
* @param {?HTMLDOMElement} domElement - The HTML element used for event listeners.
* @param {?HTMLElement} domElement - The HTML element used for event listeners.
*/
constructor( camera, domElement = null ) {

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/controls/TrackballControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class TrackballControls extends Controls {
* Constructs a new controls instance.
*
* @param {Object3D} object - The object that is managed by the controls.
* @param {?HTMLDOMElement} domElement - The HTML element used for event listeners.
* @param {?HTMLElement} domElement - The HTML element used for event listeners.
*/
constructor( object, domElement = null ) {

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/controls/TransformControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class TransformControls extends Controls {
* Constructs a new controls instance.
*
* @param {Camera} camera - The camera of the rendered scene.
* @param {?HTMLDOMElement} domElement - The HTML element used for event listeners.
* @param {?HTMLElement} domElement - The HTML element used for event listeners.
*/
constructor( camera, domElement = null ) {

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/helpers/ViewHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ViewHelper extends Object3D {
* Constructs a new view helper.
*
* @param {Camera} camera - The camera whose transformation should be visualized.
* @param {HTMLDOMElement} [domElement] - The DOM element that is used to render the view.
* @param {HTMLElement} [domElement] - The DOM element that is used to render the view.
*/
constructor( camera, domElement ) {

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/interactive/InteractiveGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class InteractiveGroup extends Group {
/**
* The internal raycaster.
*
* @type {?HTMLDOMElement}
* @type {?HTMLElement}
* @default null
*/
this.element = null;
Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/loaders/ColladaLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class ColladaLoader extends Loader {
* an array of animation clips and kinematics.
*
* @param {string} text - The raw Collada data as a string.
* @param {string} path - The asset path.
* @param {string} [path] - The asset path.
* @return {?{scene:Group,animations:Array<AnimationClip>,kinematics:Object}} An object representing the parsed asset.
*/
parse( text, path ) {
Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/loaders/DDSLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class DDSLoader extends CompressedTextureLoader {
*/
parse( buffer, loadMipmaps ) {

const dds = { mipmaps: [], width: 0, height: 0, format: null, mipmapCount: 1 };
const dds = { mipmaps: [], width: 0, height: 0, format: null, mipmapCount: 1, isCubemap: false };

// Adapted from @toji's DDS utils
// https://github.com/toji/webgl-texture-utils/blob/master/texture-util/dds.js
Expand Down
4 changes: 2 additions & 2 deletions examples/jsm/misc/ProgressiveLightMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,9 @@ class ProgressiveLightMap {
*
* @private
* @param {number} res - The square resolution of this object's lightMap.
* @param {?WebGLRenderTarget} [lightMap] - The lightmap to initialize the plane with.
* @param {WebGLRenderTarget} lightMap - The lightmap to initialize the plane with.
*/
_initializeBlurPlane( res, lightMap = null ) {
_initializeBlurPlane( res, lightMap ) {

const blurMaterial = new MeshBasicMaterial();
blurMaterial.uniforms = { previousShadowMap: { value: null },
Expand Down
8 changes: 4 additions & 4 deletions examples/jsm/renderers/CSS2DRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class CSS2DObject extends Object3D {
/**
* Constructs a new CSS2D object.
*
* @param {DOMElement} [element] - The DOM element.
* @param {HTMLElement} [element] - The DOM element.
*/
constructor( element = document.createElement( 'div' ) ) {

Expand All @@ -34,7 +34,7 @@ class CSS2DObject extends Object3D {
/**
* The DOM element which defines the appearance of this 3D object.
*
* @type {DOMElement}
* @type {HTMLElement}
* @readonly
* @default true
*/
Expand Down Expand Up @@ -132,7 +132,7 @@ class CSS2DRenderer {
/**
* The DOM where the renderer appends its child-elements.
*
* @type {DOMElement}
* @type {HTMLElement}
*/
this.domElement = domElement;

Expand Down Expand Up @@ -310,7 +310,7 @@ class CSS2DRenderer {
* Constructor parameters of `CSS2DRenderer`.
*
* @typedef {Object} CSS2DRenderer~Parameters
* @property {DOMElement} [element] - A DOM element where the renderer appends its child-elements.
* @property {HTMLElement} [element] - A DOM element where the renderer appends its child-elements.
* If not passed in here, a new div element will be created.
**/

Expand Down
10 changes: 5 additions & 5 deletions examples/jsm/renderers/CSS3DRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class CSS3DObject extends Object3D {
/**
* Constructs a new CSS3D object.
*
* @param {DOMElement} [element] - The DOM element.
* @param {HTMLElement} [element] - The DOM element.
*/
constructor( element = document.createElement( 'div' ) ) {

Expand All @@ -40,7 +40,7 @@ class CSS3DObject extends Object3D {
/**
* The DOM element which defines the appearance of this 3D object.
*
* @type {DOMElement}
* @type {HTMLElement}
* @readonly
* @default true
*/
Expand Down Expand Up @@ -94,7 +94,7 @@ class CSS3DSprite extends CSS3DObject {
/**
* Constructs a new CSS3D sprite object.
*
* @param {DOMElement} [element] - The DOM element.
* @param {HTMLElement} [element] - The DOM element.
*/
constructor( element ) {

Expand Down Expand Up @@ -179,7 +179,7 @@ class CSS3DRenderer {
/**
* The DOM where the renderer appends its child-elements.
*
* @type {DOMElement}
* @type {HTMLElement}
*/
this.domElement = domElement;

Expand Down Expand Up @@ -446,7 +446,7 @@ class CSS3DRenderer {
* Constructor parameters of `CSS3DRenderer`.
*
* @typedef {Object} CSS3DRenderer~Parameters
* @property {DOMElement} [element] - A DOM element where the renderer appends its child-elements.
* @property {HTMLElement} [element] - A DOM element where the renderer appends its child-elements.
* If not passed in here, a new div element will be created.
**/

Expand Down
2 changes: 1 addition & 1 deletion examples/jsm/renderers/SVGRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class SVGRenderer {
/**
* The DOM where the renderer appends its child-elements.
*
* @type {DOMElement}
* @type {SVGSVGElement}
*/
this.domElement = _svg;

Expand Down
6 changes: 3 additions & 3 deletions src/extras/Controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Controls extends EventDispatcher {
* Constructs a new controls instance.
*
* @param {Object3D} object - The object that is managed by the controls.
* @param {?HTMLDOMElement} domElement - The HTML element used for event listeners.
* @param {?HTMLElement} domElement - The HTML element used for event listeners.
*/
constructor( object, domElement = null ) {

Expand All @@ -28,7 +28,7 @@ class Controls extends EventDispatcher {
/**
* The HTML element used for event listeners.
*
* @type {?HTMLDOMElement}
* @type {?HTMLElement}
* @default null
*/
this.domElement = domElement;
Expand Down Expand Up @@ -78,7 +78,7 @@ class Controls extends EventDispatcher {
* Connects the controls to the DOM. This method has so called "side effects" since
* it adds the module's event listeners to the DOM.
*
* @param {HTMLDOMElement} element - The DOM element to connect to.
* @param {HTMLElement} element - The DOM element to connect to.
*/
connect( element ) {

Expand Down
4 changes: 2 additions & 2 deletions src/renderers/WebGLRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class WebGLRenderer {
* document.body.appendChild( renderer.domElement );
* ```
*
* @type {DOMElement}
* @type {HTMLCanvasElement|OffscreenCanvas}
*/
this.domElement = canvas;

Expand Down Expand Up @@ -3414,7 +3414,7 @@ class WebGLRenderer {
* WebGLRenderer options.
*
* @typedef {Object} WebGLRenderer~Options
* @property {DOMElement} [canvas=null] - A canvas element where the renderer draws its output. If not passed in here, a new canvas element will be created by the renderer.
* @property {HTMLCanvasElement|OffscreenCanvas} [canvas=null] - A canvas element where the renderer draws its output. If not passed in here, a new canvas element will be created by the renderer.
* @property {WebGL2RenderingContext} [context=null] - Can be used to attach an existing rendering context to this renderer.
* @property {('highp'|'mediump'|'lowp')} [precision='highp'] - The default shader precision. Uses `highp` if supported by the device.
* @property {boolean} [alpha=false] - Controls the default clear alpha value. When set to`true`, the value is `0`. Otherwise it's `1`.
Expand Down
Loading