Merge pull request #2184 from gyohk/master

Removed unnecessary description of the test code. And, correct errors ...
This commit is contained in:
Masahiro Wakame
2014-05-13 14:05:26 +09:00
5 changed files with 6 additions and 63 deletions
+1 -1
View File
@@ -1,4 +1,5 @@
/// <reference path="../../three.d.ts" />
/// <reference path="../../../tween.js/tween.js.d.ts" />
/// <reference path="../three-tests-setup.ts" />
// 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)
+1 -59
View File
@@ -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;
}
@@ -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") }
};
+1 -1
View File
@@ -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;
+2 -1
View File
@@ -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;