Merge pull request #3076 from gyohk/master

update to three.js r69.

physijs/tests/body.ts

@@ -1,6 +1,6 @@
 /// <reference path="../../stats/stats.d.ts" />
 /// <reference path="../physijs.d.ts" />
-
+/// <reference path="../../threejs/three-projector.d.ts" />
 
 Physijs.scripts.worker = '../physijs_worker.js';
 Physijs.scripts.ammo = 'examples/js/ammo.js';

physijs/tests/constraints_car.ts

@@ -1,6 +1,6 @@
 /// <reference path="../../stats/stats.d.ts" />
 /// <reference path="../physijs.d.ts" />
-
+/// <reference path="../../threejs/three-projector.d.ts" />
 
 Physijs.scripts.worker = '../physijs_worker.js';
 Physijs.scripts.ammo = 'examples/js/ammo.js';

physijs/tests/jenga.ts

@@ -1,6 +1,6 @@
 /// <reference path="../../stats/stats.d.ts" />
 /// <reference path="../physijs.d.ts" />
-
+/// <reference path="../../threejs/three-projector.d.ts" />
 
 Physijs.scripts.worker = '../physijs_worker.js';
 Physijs.scripts.ammo = 'examples/js/ammo.js';

physijs/tests/vehicle.ts

@@ -1,5 +1,6 @@
 /// <reference path="../../stats/stats.d.ts" />
 /// <reference path="../physijs.d.ts" />
+/// <reference path="../../threejs/three-projector.d.ts" />
 
 var TWEEN: any;
 var SimplexNoise: any;

threejs/tests/canvas/canvas_camera_orthographic.ts

@@ -50,7 +50,7 @@
         var material1 = new THREE.LineBasicMaterial({ color: 0x000000, opacity: 0.2 });
 
         var line = new THREE.Line(geometry, material1);
-        line.type = THREE.LinePieces;
+        line.mode = THREE.LinePieces;
         scene.add(line);
 
         // Cubes

threejs/tests/canvas/canvas_materials.ts

@@ -45,7 +45,7 @@
         var material = new THREE.LineBasicMaterial({ color: 0xffffff, opacity: 0.2 });
 
         var line = new THREE.Line(geometry, material);
-        line.type = THREE.LinePieces;
+        line.mode = THREE.LinePieces;
         scene.add(line);
 
         // Spheres

threejs/tests/three-tests-setup.ts

@@ -4,7 +4,9 @@
 
 /// <reference path="../../stats/stats.d.ts" />
 /// <reference path="../detector.d.ts" />
+/// <reference path="../three-canvasrenderer.d.ts" />
 /// <reference path="../three-css3drenderer.d.ts" />
+/// <reference path="../three-projector.d.ts" />
 /// <reference path="../three-orbitcontrols.d.ts" />
 /// <reference path="../three-trackballcontrols.d.ts" />
 /// <reference path="../three-effectcomposer.d.ts" />

threejs/three-canvasrenderer.d.ts

@@ -0,0 +1,57 @@
+// Type definitions for CanvasRenderer.js
+// Project: https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/CanvasRenderer.js
+// Definitions by: Satoru Kimura <https://github.com/gyohk>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="./three.d.ts" />
+
+declare module THREE {
+    export interface SpriteCanvasMaterialParameters extends MaterialParameters{
+        color?: number;
+
+    }
+
+    export class SpriteCanvasMaterial extends Material {
+        constructor(parameters?: SpriteCanvasMaterialParameters);
+
+        color: Color;
+
+        program(context: any, color: Color): void;
+        clone(): SpriteCanvasMaterial;
+    }
+
+    export interface CanvasRendererParameters {
+        canvas?: HTMLCanvasElement;
+        devicePixelRatio?: number;
+    }
+
+    export class CanvasRenderer implements Renderer {
+        constructor(parameters?: CanvasRendererParameters);
+
+        domElement: HTMLCanvasElement;
+        devicePixelRatio: number;
+        autoClear: boolean;
+        sortObjects: boolean;
+        sortElements: boolean;
+        info: { render: { vertices: number; faces: number; }; };
+
+        supportsVertexTextures(): void;
+        setFaceCulling(): void;
+        setSize(width: number, height: number, updateStyle?: boolean): void;
+        setViewport(x: number, y: number, width: number, height: number): void;
+        setScissor(): void;
+        enableScissorTest(): void;
+        setClearColor(color: Color, opacity?: number): void;
+        setClearColor(color: string, opacity?: number): void;
+        setClearColor(color: number, opacity?: number): void;
+        setClearColorHex(hex: number, alpha?: number): void;
+        getClearColor(): Color;
+        getClearAlpha(): number;
+        getMaxAnisotropy(): number;
+        clear(): void;
+        clearColor(): void;
+        clearDepth(): void;
+        clearStencil(): void;
+        render(scene: Scene, camera: Camera): void;
+    }
+}

threejs/three-projector.d.ts

@@ -0,0 +1,97 @@
+// Type definitions for Projector.js
+// Project: https://github.com/mrdoob/three.js/blob/master/examples/js/renderers/Projector.js
+// Definitions by: Satoru Kimura <https://github.com/gyohk>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="./three.d.ts" />
+
+declare module THREE {
+    // Renderers / Renderables /////////////////////////////////////////////////////////////////////
+    export class RenderableObject {
+        constructor();
+
+        id: number;
+        object: Object;
+        z: number;
+    }
+
+    export class RenderableFace {
+        constructor();
+
+        id: number;
+        v1: RenderableVertex;
+        v2: RenderableVertex;
+        v3: RenderableVertex;
+        normalModel: Vector3;
+        vertexNormalsModel: Vector3[];
+        vertexNormalsLength: number;
+        color: Color;
+        material: Material;
+        uvs: Vector2[][];
+        z: number;
+
+    }
+
+    export class RenderableVertex {
+        constructor();
+
+        position: Vector3;
+        positionWorld: Vector3;
+        positionScreen: Vector4;
+        visible: boolean;
+
+        copy(vertex: RenderableVertex): void;
+    }
+
+    export class RenderableLine {
+        constructor();
+
+        id: number;
+        v1: RenderableVertex;
+        v2: RenderableVertex;
+        vertexColors: Color[];
+        material: Material;
+        z: number;
+    }
+
+    export class RenderableSprite {
+        constructor();
+
+        id: number;
+        object: Object;
+        x: number;
+        y: number;
+        z: number;
+        rotation: number;
+        scale: Vector2;
+        material: Material;
+    }
+
+    /**
+     * Projects points between spaces.
+     */
+    export class Projector {
+        constructor();
+        
+        // deprecated.
+        projectVector(vector: Vector3, camera: Camera): Vector3;
+
+        // deprecated.
+        unprojectVector(vector: Vector3, camera: Camera): Vector3;
+
+        /**
+         * Transforms a 3D scene object into 2D render data that can be rendered in a screen with your renderer of choice, projecting and clipping things out according to the used camera.
+         * If the scene were a real scene, this method would be the equivalent of taking a picture with the camera (and developing the film would be the next step, using a Renderer).
+         *
+         * @param scene scene to project.
+         * @param camera camera to use in the projection.
+         * @param sort select whether to sort elements using the Painter's algorithm.
+         */
+        projectScene(scene: Scene, camera: Camera, sortObjects: boolean, sortElements?: boolean): {
+            objects: Object3D[];     // Mesh, Line or other object  
+            sprites: Object3D[];    // Sprite or Particle 
+            lights: Light[];
+            elements: Face3[];    // Line, Particle, Face3 or Face4
+        };
+    }
+}