|
@@ -66,7 +66,6 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
_directionalLights = new THREE.Color(),
|
|
|
_pointLights = new THREE.Color(),
|
|
|
|
|
|
- _pi2 = Math.PI * 2,
|
|
|
_vector3 = new THREE.Vector3(), // Needed for PointLight
|
|
|
|
|
|
_pixelMap, _pixelMapContext, _pixelMapImage, _pixelMapData,
|
|
@@ -105,7 +104,7 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
|
|
|
} else {
|
|
|
|
|
|
- _context.setLineDash = function ( values ) {}
|
|
|
+ _context.setLineDash = function () {}
|
|
|
|
|
|
}
|
|
|
|
|
@@ -298,7 +297,7 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
_v1 = element;
|
|
|
_v1.x *= _canvasWidthHalf; _v1.y *= _canvasHeightHalf;
|
|
|
|
|
|
- renderParticle( _v1, element, material, scene );
|
|
|
+ renderParticle( _v1, element, material );
|
|
|
|
|
|
} else if ( element instanceof THREE.RenderableLine ) {
|
|
|
|
|
@@ -311,7 +310,7 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
|
|
|
if ( _clipBox.isIntersectionBox( _elemBox ) === true ) {
|
|
|
|
|
|
- renderLine( _v1, _v2, element, material, scene );
|
|
|
+ renderLine( _v1, _v2, element, material );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -337,7 +336,7 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
|
|
|
_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen, _v3.positionScreen ] );
|
|
|
|
|
|
- renderFace3( _v1, _v2, _v3, 0, 1, 2, element, material, scene );
|
|
|
+ renderFace3( _v1, _v2, _v3, 0, 1, 2, element, material );
|
|
|
|
|
|
} else if ( element instanceof THREE.RenderableFace4 ) {
|
|
|
|
|
@@ -468,7 +467,7 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- function renderParticle( v1, element, material, scene ) {
|
|
|
+ function renderParticle( v1, element, material ) {
|
|
|
|
|
|
setOpacity( material.opacity );
|
|
|
setBlending( material.blending );
|
|
@@ -580,7 +579,7 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- function renderLine( v1, v2, element, material, scene ) {
|
|
|
+ function renderLine( v1, v2, element, material ) {
|
|
|
|
|
|
setOpacity( material.opacity );
|
|
|
setBlending( material.blending );
|
|
@@ -615,7 +614,7 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- function renderFace3( v1, v2, v3, uv1, uv2, uv3, element, material, scene ) {
|
|
|
+ function renderFace3( v1, v2, v3, uv1, uv2, uv3, element, material ) {
|
|
|
|
|
|
_this.info.render.vertices += 3;
|
|
|
_this.info.render.faces ++;
|
|
@@ -795,7 +794,7 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- function renderFace4( v1, v2, v3, v4, v5, v6, element, material, scene ) {
|
|
|
+ function renderFace4( v1, v2, v3, v4, v5, v6, element, material ) {
|
|
|
|
|
|
_this.info.render.vertices += 4;
|
|
|
_this.info.render.faces ++;
|
|
@@ -807,8 +806,8 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
|
|
|
// Let renderFace3() handle this
|
|
|
|
|
|
- renderFace3( v1, v2, v4, 0, 1, 3, element, material, scene );
|
|
|
- renderFace3( v5, v3, v6, 1, 2, 3, element, material, scene );
|
|
|
+ renderFace3( v1, v2, v4, 0, 1, 3, element, material );
|
|
|
+ renderFace3( v5, v3, v6, 1, 2, 3, element, material );
|
|
|
|
|
|
return;
|
|
|
|