From 27a68210f0732c4f5d1b62db07f2c1c1bac18e22 Mon Sep 17 00:00:00 2001 From: Igor Oleinikov Date: Sat, 28 Dec 2013 17:36:51 +0400 Subject: [PATCH 1/2] threejs: fixed disabled test (with hack via TS bug https://typescript.codeplex.com/workitem/2036) --- threejs/three-tests.disabled.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/threejs/three-tests.disabled.ts b/threejs/three-tests.disabled.ts index 0e0ee9c10..5f079347f 100644 --- a/threejs/three-tests.disabled.ts +++ b/threejs/three-tests.disabled.ts @@ -10961,7 +10961,9 @@ declare var ballPosition: THREE.Vector3; object.receiveShadow = true; scene.add( object ); - object.customDepthMaterial = new THREE.ShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader } ); + // TS bug: https://typescript.codeplex.com/workitem/2036 + //object.customDepthMaterial = new THREE.ShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader } ); + object.customDepthMaterial = new THREE.ShaderMaterial( { uniforms: uniforms, vertexShader: vertexShader, fragmentShader: fragmentShader } ); // sphere @@ -13205,7 +13207,9 @@ declare var ballPosition: THREE.Vector3; color: { type: "c", value: new THREE.Color( 0xffffff ) } }; - var material = new THREE.ShaderMaterial( { uniforms: uniforms, attributes: attributes, vertexShader: vertexShader, fragmentShader: fragmentShader, side: THREE.DoubleSide } ); + //TS bug: https://typescript.codeplex.com/workitem/2036 + //var material = new THREE.ShaderMaterial( { uniforms: uniforms, attributes: attributes, vertexShader: vertexShader, fragmentShader: fragmentShader, side: THREE.DoubleSide } ); + var material = new THREE.ShaderMaterial( { uniforms: uniforms, attributes: attributes, vertexShader: vertexShader, fragmentShader: fragmentShader, side: THREE.DoubleSide } ); var position2 = attributes.position2.value; var colors = attributes.customColor.value; @@ -16435,19 +16439,19 @@ function render() { new THREE.Vector3(0,0,-100), new THREE.Vector3(0,50,-50), new THREE.Vector3(0,10,0), - new THREE.Vector3(0,50,050), + new THREE.Vector3(0,50,50), new THREE.Vector3(0,0,100) ] ]}, { type: 'LatheGeometry', args: [ [ new THREE.Vector3(0,0,-100), new THREE.Vector3(0,50,-50), new THREE.Vector3(0,10,0), - new THREE.Vector3(0,50,050), + new THREE.Vector3(0,50,50), new THREE.Vector3(0,100,100) ], 12, 0, Math.PI ] }, { type: 'LatheGeometry', args: [ [ new THREE.Vector3(0,10,-100), new THREE.Vector3(0,50,-50), new THREE.Vector3(0,10,0), - new THREE.Vector3(0,50,050), + new THREE.Vector3(0,50,50), new THREE.Vector3(0,0,100) ], 12, Math.PI*2/3, Math.PI*3/2 ] }, { type: 'TextGeometry', args: ['&', { size: 200, @@ -19452,7 +19456,9 @@ function render() { scene.fog.color.copy( uniforms.bottomColor.value ); var skyGeo = new THREE.SphereGeometry( 4000, 32, 15 ); - var skyMat = new THREE.ShaderMaterial( { vertexShader: vertexShader, fragmentShader: fragmentShader, uniforms: uniforms, side: THREE.BackSide } ); + //TS bug: https://typescript.codeplex.com/workitem/2036 + //var skyMat = new THREE.ShaderMaterial( { vertexShader: vertexShader, fragmentShader: fragmentShader, uniforms: uniforms, side: THREE.BackSide } ); + var skyMat = new THREE.ShaderMaterial( { vertexShader: vertexShader, fragmentShader: fragmentShader, uniforms: uniforms, side: THREE.BackSide } ); var sky = new THREE.Mesh( skyGeo, skyMat ); scene.add( sky ); From 93aed7628853fc143878fddde755bc3ae6d700e4 Mon Sep 17 00:00:00 2001 From: Igor Oleinikov Date: Sat, 28 Dec 2013 17:44:55 +0400 Subject: [PATCH 2/2] threejs: enabled tests --- threejs/{three-tests.disabled.ts => three-tests.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename threejs/{three-tests.disabled.ts => three-tests.ts} (100%) diff --git a/threejs/three-tests.disabled.ts b/threejs/three-tests.ts similarity index 100% rename from threejs/three-tests.disabled.ts rename to threejs/three-tests.ts