update to three.js r70.

This commit is contained in:
satoru kimura
2015-01-20 13:19:00 +09:00
parent 2deb7cab53
commit 33bd3c9d76
32 changed files with 496 additions and 363 deletions
+80 -40
View File
@@ -1,4 +1,4 @@
// Type definitions for three.js r69
// Type definitions for three.js r70
// Project: http://mrdoob.github.com/three.js/
// Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -98,14 +98,12 @@ declare module THREE {
// Mapping modes
export enum Mapping { }
export interface MappingConstructor {
new (): Mapping;
}
export var UVMapping: MappingConstructor;
export var CubeReflectionMapping: MappingConstructor;
export var CubeRefractionMapping: MappingConstructor;
export var SphericalReflectionMapping: MappingConstructor;
export var SphericalRefractionMapping: MappingConstructor;
export var UVMapping: Mapping;
export var CubeReflectionMapping: Mapping;
export var CubeRefractionMapping: Mapping;
export var EquirectangularReflectionMapping: Mapping;
export var EquirectangularRefractionMapping: Mapping;
export var SphericalReflectionMapping: Mapping;
// Wrapping modes
export enum Wrapping { }
@@ -145,6 +143,7 @@ declare module THREE {
export var RGBAFormat: PixelFormat;
export var LuminanceFormat: PixelFormat;
export var LuminanceAlphaFormat: PixelFormat;
export var RGBEFormat: PixelFormat;
// Compressed texture formats
// DDS / ST3C Compressed texture formats
@@ -490,7 +489,7 @@ declare module THREE {
computeTangents(): void;
computeOffsets(indexBufferSize: number): void;
merge(): void;
merge(geometry: BufferGeometry, offset: number): BufferGeometry;
normalizeNormals(): void;
reorderBuffers(indexBuffer: number, indexMap: number[], vertexCount: number): void;
toJSON(): any;
@@ -929,6 +928,8 @@ declare module THREE {
merge( geometry: Geometry, matrix: Matrix, materialIndexOffset: number): void;
mergeMesh( mesh: Mesh ): void;
/**
* Checks for duplicate vertices using hashmap.
* Duplicated vertices are removed and faces' vertices are updated.
@@ -1019,11 +1020,6 @@ declare module THREE {
*/
scale: Vector3;
/**
* Override depth-sorting order if non null.
*/
renderDepth: number;
/**
* When this is set, then the rotationMatrix gets calculated every frame.
*/
@@ -1196,6 +1192,7 @@ declare module THREE {
*/
remove(object: Object3D): void;
/* deprecated */
getChildByName( name: string, recursive?: boolean ): Object3D;
/**
@@ -1212,6 +1209,8 @@ declare module THREE {
*/
getObjectByName(name: string, recursive?: boolean): Object3D;
getObjectByProperty( name: string, value: string, recursive?: boolean ): Object3D;
getWorldPosition(optionalTarget: Vector3): Vector3;
getWorldQuaternion(optionalTarget: Quaternion): Quaternion;
getWorldRotation(optionalTarget: Euler): Euler;
@@ -1227,6 +1226,8 @@ declare module THREE {
traverseVisible(callback: (object: Object3D) => any): void;
traverseAncestors(callback: (object: Object3D) => any): void;
/**
* Updates local transform.
*/
@@ -1279,6 +1280,7 @@ declare module THREE {
precision: number;
linePrecision: number;
set(origin: Vector3, direction: Vector3): void;
setFromCamera(coords: { x: number; y: number;}, camera: Camera ): void;
intersectObject(object: Object3D, recursive?: boolean): Intersection[];
intersectObjects(objects: Object3D[], recursive?: boolean): Intersection[];
}
@@ -1685,6 +1687,8 @@ declare module THREE {
*/
statusDomElement: HTMLElement;
imageLoader: ImageLoader;
/**
* Will be called when load starts.
* The default is a function with empty body.
@@ -1724,10 +1728,17 @@ declare module THREE {
add(regex:string, loader:Loader):void;
get(file: string):Loader;
}
export class BinaryTextureLoader {
constructor();
load(url: string, onLoad: (dataTexture: DataTexture) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
}
export class BufferGeometryLoader {
constructor(manager?: LoadingManager);
manager: LoadingManager;
load(url: string, onLoad: (bufferGeometry: BufferGeometry) => void, onProgress?: (event: any) => void, onError?: (event: any) => void): void;
setCrossOrigin(crossOrigin: string): void;
parse(json: any): BufferGeometry;
@@ -1750,6 +1761,10 @@ declare module THREE {
load(url: string, onLoad: (bufferGeometry: BufferGeometry) => void, onError?: (event: any) => void): void;
}
export class DataTextureLoader extends BinaryTextureLoader {
// alias for BinaryTextureLoader.
}
/*
* GeometryLoader class is experimental, and it is not yet included in the compiled source code.
*
@@ -1765,6 +1780,8 @@ declare module THREE {
export class ImageLoader {
constructor(manager?: LoadingManager);
cache: Cache;
manager: LoadingManager;
crossOrigin: string;
/**
@@ -1828,6 +1845,8 @@ declare module THREE {
export class MaterialLoader {
constructor(manager?: LoadingManager);
manager: LoadingManager;
load(url: string, onLoad: (material: Material) => void): void;
setCrossOrigin(crossOrigin: string): void;
parse(json: any): Material;
@@ -1836,6 +1855,9 @@ declare module THREE {
export class ObjectLoader {
constructor(manager?: LoadingManager);
manager: LoadingManager;
crossOrigin: string;
load(url: string, onLoad: (object: Object3D) => void): void;
setCrossOrigin(crossOrigin: string): void;
parse<T extends Object3D>(json: any): T;
@@ -1850,7 +1872,10 @@ declare module THREE {
*/
export class TextureLoader {
constructor(manager?: LoadingManager);
manager: LoadingManager;
crossOrigin: string;
/**
* Begin loading from url
*
@@ -1863,6 +1888,8 @@ declare module THREE {
export class XHRLoader {
constructor(manager?: LoadingManager);
cache: Cache;
manager: LoadingManager;
responseType: string;
crossOrigin: string;
@@ -2718,12 +2745,14 @@ declare module THREE {
set(x: number, y: number, z: number, order?: string): Euler;
copy(euler: Euler): Euler;
setFromRotationMatrix(m: Matrix4, order?: string): Euler;
setFromRotationMatrix(m: Matrix4, order?: string, update?: boolean): Euler;
setFromQuaternion(q:Quaternion, order?: string, update?: boolean): Euler;
setFromVector3( v: Vector3, order?: string ): Euler;
reorder(newOrder: string): Euler;
equals(euler: Euler): boolean;
fromArray(xyzo: any[]): Euler;
toArray(): any[];
toVector3(optionalResult?: Vector3): Vector3;
onChange: () => void;
clone(): Euler;
@@ -2970,6 +2999,9 @@ declare module THREE {
copy(m: Matrix4): Matrix4;
copyPosition(m: Matrix4): Matrix4;
extractBasis( xAxis: Vector3, yAxis: Vector3, zAxis: Vector3): Matrix4;
makeBasis( xAxis: Vector3, yAxis: Vector3, zAxis: Vector3): Matrix4;
/**
* Copies the rotation component of the supplied matrix m into this matrix rotation component.
*/
@@ -3611,6 +3643,9 @@ declare module THREE {
fromArray(xy: number[], offset?: number): Vector2;
toArray(xy?: number[], offset?: number): number[];
fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector2;
/**
* Clones this vector.
*/
@@ -3792,6 +3827,8 @@ declare module THREE {
toArray(xyz?: number[], offset?: number): number[];
fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector3;
/**
* Clones this vector.
*/
@@ -3941,6 +3978,8 @@ declare module THREE {
toArray(xyzw?: number[], offset?: number): number[];
fromAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector4;
/**
* Clones this vector.
*/
@@ -3995,8 +4034,8 @@ declare module THREE {
constructor(geometry?: BufferGeometry, material?: LineBasicMaterial, mode?: number);
constructor(geometry?: BufferGeometry, material?: ShaderMaterial, mode?: number);
geometry: Geometry;
material: LineBasicMaterial;
geometry: any; // Geometry or BufferGeometry;
material: Material; // LineDashedMaterial or LineBasicMaterial or ShaderMaterial
mode: LineMode;
raycast(raycaster: Raycaster, intersects: any): void;
@@ -4089,7 +4128,6 @@ declare module THREE {
* An instance of Material, defining the object's appearance. Default is a ParticleBasicMaterial with randomised colour.
*/
material: Material;
sortParticles: boolean;
raycast(raycaster: Raycaster, intersects: any): void;
clone(object?: PointCloud): PointCloud;
@@ -4228,8 +4266,6 @@ declare module THREE {
//context:WebGLRenderingContext;
context: any;
devicePixelRatio: number;
/**
* Defines whether the renderer should automatically clear its output before rendering.
*/
@@ -4330,6 +4366,8 @@ declare module THREE {
*/
getContext(): WebGLRenderingContext;
forceContextLoss(): void;
/**
* Return a Boolean true if the context supports vertex textures.
*/
@@ -4341,6 +4379,8 @@ declare module THREE {
supportsBlendMinMax(): boolean;
getMaxAnisotropy(): number;
getPrecision(): string;
getPixelRatio(): number;
setPixelRatio(value: number): void;
/**
* Resizes the output canvas to (width, height), and also sets the viewport to fit that size, starting in (0, 0).
@@ -4369,6 +4409,8 @@ declare module THREE {
setClearColor(color: string, alpha?: number): void;
setClearColor(color: number, alpha?: number): void;
setClearAlpha(alpha: number): void;
/**
* Sets the clear color, using hex for the color and alpha for the opacity.
*
@@ -4801,18 +4843,7 @@ declare module THREE {
);
constructor(
image: HTMLImageElement,
mapping?: MappingConstructor,
wrapS?: Wrapping,
wrapT?: Wrapping,
magFilter?: TextureFilter,
minFilter?: TextureFilter,
format?: PixelFormat,
type?: TextureDataType,
anisotropy?: number
);
constructor(
image: HTMLCanvasElement,
mapping?: MappingConstructor,
mapping?: Mapping,
wrapS?: Wrapping,
wrapT?: Wrapping,
magFilter?: TextureFilter,
@@ -4860,7 +4891,7 @@ declare module THREE {
class VideoTexture extends Texture {
constructor(
video: HTMLVideoElement,
mapping?: MappingConstructor,
mapping?: Mapping,
wrapS?: Wrapping,
wrapT?: Wrapping,
magFilter?: TextureFilter,
@@ -4979,7 +5010,7 @@ declare module THREE {
animations: any[];
init(data: AnimationData): void;
init(data: AnimationData): AnimationData;
parse(root: Mesh): Object3D[];
play(animation: Animation): void;
stop(animation: Animation): void;
@@ -5013,6 +5044,8 @@ declare module THREE {
currentTime: number;
duration: number;
loop: boolean;
lastFrame: number;
currentFrame: number;
isPlaying: boolean;
play(): void;
@@ -5343,7 +5376,7 @@ declare module THREE {
* @param heightSegments — Number of rows of faces along the height of the cylinder.
* @param openEnded - A Boolean indicating whether or not to cap the ends of the cylinder.
*/
constructor(radiusTop?: number, radiusBottom?: number, height?: number, radiusSegments?: number, heightSegments?: number, openEnded?: boolean);
constructor(radiusTop?: number, radiusBottom?: number, height?: number, radiusSegments?: number, heightSegments?: number, openEnded?: boolean, thetaStart?: number, thetaLength?: number);
parameters: {
radiusTop: number;
@@ -5352,6 +5385,8 @@ declare module THREE {
radialSegments: number;
heightSegments: number;
openEnded: boolean;
thetaStart: number;
thetaLength: number;
};
}
@@ -5534,9 +5569,10 @@ declare module THREE {
heightScale: number;
};
}
export class TubeGeometry extends Geometry {
constructor(path: Path, segments?: number, radius?: number, radiusSegments?: number, closed?: boolean);
constructor(path: Path, segments?: number, radius?: number, radiusSegments?: number, closed?: boolean, taper?: (u: number) => number);
parameters: {
path: Path;
@@ -5544,12 +5580,16 @@ declare module THREE {
radius: number;
radialSegments: number;
closed: boolean;
taper: (u: number) => number; // NoTaper or SinusoidalTaper;
};
tangents: Vector3[];
normals: Vector3[];
binormals: Vector3[];
FrenetFrames(path: Path, segments: number, closed: boolean): void;
static NoTaper(u?: number): number;
static SinusoidalTaper(u: number): number;
static FrenetFrames(path: Path, segments: number, closed: boolean): void;
}
// Extras / Helpers /////////////////////////////////////////////////////////////////////