diff --git a/threejs/tests/css3d/css3d_periodictable.ts b/threejs/tests/css3d/css3d_periodictable.ts index 256755c9b0..6ce32c42f6 100644 --- a/threejs/tests/css3d/css3d_periodictable.ts +++ b/threejs/tests/css3d/css3d_periodictable.ts @@ -1,4 +1,5 @@ /// +/// /// // https://github.com/mrdoob/three.js/blob/master/examples/css3d_periodictable.html @@ -316,7 +317,6 @@ .start(); } - new TWEEN.Tween(this) .to({}, duration * 2) .onUpdate(render) diff --git a/threejs/tests/three-tests-setup.ts b/threejs/tests/three-tests-setup.ts index a586af2fac..33b36098bb 100644 --- a/threejs/tests/three-tests-setup.ts +++ b/threejs/tests/three-tests-setup.ts @@ -1,45 +1,12 @@ -///////////////////////////////////////////////////////////////////// -// Lib.d.ts browser specific fixes necessary for these tests to work : -///////////////////////////////////////////////////////////////////// -interface CSSStyleDeclaration { - WebkitFilter: string; -} -interface Document { - pointerLockElement: any; - mozPointerLockElement: any; - webkitPointerLockElement: any; - fullscreenElement: any; - mozFullscreenElement: any; - mozFullScreenElement: any; - webkitFullscreenElement: any; -} -interface HTMLElement { - requestPointerLock: any; - mozRequestPointerLock: any; - webkitRequestPointerLock: any; - requestFullScreen: any; - requestFullscreen: any; - mozRequestFullScreen: any; - mozRequestFullscreen: any; - webkitRequestFullscreen: any; -} - -///////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////// // https://github.com/mrdoob/three.js/tree/master/examples ////////////////////////////////////////////////////////////// declare var Stats: any; -declare var TWEEN: any; declare var Detector: any; -declare var Qrcode: any; -declare var ImprovedNoise: any; - declare module THREE { - var AnaglyphEffect: any; var AWDLoader: any; - var PDBLoader: any; - var CSS3Renderer: any; var CSS3DSprite: any; var CSS3DRenderer: any; var CSS3DObject: any; @@ -47,38 +14,13 @@ declare module THREE { var TrackballControls: any; var FlyControls: any; var RenderPass: any; - var FilmPass: any; var EffectComposer: any; var OrbitControls: any; - var PathControls: any; - var PointerLockControls: any; var RGBShiftShader: any; - var RollControls: any; - var FirstPersonControls: any; - var SVGRenderer: any; - var SoftwareRenderer: any; - var UVsDebug: any; - var UVsUtils: any; - var Curves: any; - var ParametricGeometries: any; - var BinaryLoader: any; - var OculusRiftEffect: any; - var SubdivisionModifier: any; - var TessellateModifier: any; - var ExplodeModifier: any; var RenderPass: any; var BloomPass: any; - var FilmPass: any; var ShaderPass: any; var FXAAShader: any; var CopyShader: any; - var ColladaLoader: any; - var CTMLoader: any; - var VTKLoader: any; - var STLLoader: any; - var OBJLoader: any; - var ColladaLoader: any; - var UTF8Loader: any; - var UnpackDepthRGBAShader: any; } diff --git a/threejs/tests/webgl/webgl_custom_attributes.ts b/threejs/tests/webgl/webgl_custom_attributes.ts index 8e8be41672..93d9bfbe92 100644 --- a/threejs/tests/webgl/webgl_custom_attributes.ts +++ b/threejs/tests/webgl/webgl_custom_attributes.ts @@ -35,7 +35,7 @@ amplitude: { type: "f", value: 1.0 }, color: { type: "c", value: new THREE.Color(0xff2200) }, - texture: { type: "t", value: THREE.ImageUtils.loadTexture("textures/water.jpg") }, + texture: { type: "t", value: THREE.ImageUtils.loadTexture("textures/water.jpg") } }; diff --git a/threejs/tests/webgl/webgl_sprites.ts b/threejs/tests/webgl/webgl_sprites.ts index 5d256aa036..360a4f53d3 100644 --- a/threejs/tests/webgl/webgl_sprites.ts +++ b/threejs/tests/webgl/webgl_sprites.ts @@ -5,7 +5,7 @@ () => { // ------- variable definitions that does not exist in the original code. These are for typescript. - var material: any; + var material: THREE.SpriteMaterial; // ------- var camera, scene, renderer; diff --git a/threejs/three.d.ts b/threejs/three.d.ts index fcbbe9c22c..906774181c 100644 --- a/threejs/three.d.ts +++ b/threejs/three.d.ts @@ -3860,7 +3860,8 @@ declare module THREE { export class Sprite extends Object3D { constructor(material?: Material); - material: Material; + geometry: BufferGeometry; + material: SpriteMaterial; updateMatrix(): void; clone(object?: Sprite): Sprite;