|
@@ -1389,7 +1389,10 @@ THREE.Vector2.prototype = {
|
|
|
|
|
|
negate: function () {
|
|
negate: function () {
|
|
|
|
|
|
- return this.multiplyScalar( - 1 );
|
|
|
|
|
|
+ this.x = - this.x;
|
|
|
|
+ this.y = - this.y;
|
|
|
|
+
|
|
|
|
+ return this;
|
|
|
|
|
|
},
|
|
},
|
|
|
|
|
|
@@ -1991,7 +1994,11 @@ THREE.Vector3.prototype = {
|
|
|
|
|
|
negate: function () {
|
|
negate: function () {
|
|
|
|
|
|
- return this.multiplyScalar( - 1 );
|
|
|
|
|
|
+ this.x = - this.x;
|
|
|
|
+ this.y = - this.y;
|
|
|
|
+ this.z = - this.z;
|
|
|
|
+
|
|
|
|
+ return this;
|
|
|
|
|
|
},
|
|
},
|
|
|
|
|
|
@@ -2814,7 +2821,12 @@ THREE.Vector4.prototype = {
|
|
|
|
|
|
negate: function () {
|
|
negate: function () {
|
|
|
|
|
|
- return this.multiplyScalar( - 1 );
|
|
|
|
|
|
+ this.x = - this.x;
|
|
|
|
+ this.y = - this.y;
|
|
|
|
+ this.z = - this.z;
|
|
|
|
+ this.w = - this.w;
|
|
|
|
+
|
|
|
|
+ return this;
|
|
|
|
|
|
},
|
|
},
|
|
|
|
|
|
@@ -15963,6 +15975,11 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
_canvasWidthHalf = Math.floor( _canvasWidth / 2 ),
|
|
_canvasWidthHalf = Math.floor( _canvasWidth / 2 ),
|
|
_canvasHeightHalf = Math.floor( _canvasHeight / 2 ),
|
|
_canvasHeightHalf = Math.floor( _canvasHeight / 2 ),
|
|
|
|
|
|
|
|
+ _viewportX = 0,
|
|
|
|
+ _viewportY = 0,
|
|
|
|
+ _viewportWidth = _canvasWidth,
|
|
|
|
+ _viewportHeight = _canvasHeight,
|
|
|
|
+
|
|
_context = _canvas.getContext( '2d', {
|
|
_context = _canvas.getContext( '2d', {
|
|
alpha: parameters.alpha === true
|
|
alpha: parameters.alpha === true
|
|
} ),
|
|
} ),
|
|
@@ -16091,14 +16108,11 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
|
|
|
|
this.setViewport = function ( x, y, width, height ) {
|
|
this.setViewport = function ( x, y, width, height ) {
|
|
|
|
|
|
- var viewportX = x * this.devicePixelRatio;
|
|
|
|
- var viewportY = y * this.devicePixelRatio;
|
|
|
|
-
|
|
|
|
- var viewportWidth = width * this.devicePixelRatio;
|
|
|
|
- var viewportHeight = height * this.devicePixelRatio;
|
|
|
|
|
|
+ _viewportX = x * this.devicePixelRatio;
|
|
|
|
+ _viewportY = y * this.devicePixelRatio;
|
|
|
|
|
|
- _context.setTransform( viewportWidth / _canvasWidth, 0, 0, - viewportHeight / _canvasHeight, viewportX, _canvasHeight - viewportY );
|
|
|
|
- _context.translate( _canvasWidthHalf, _canvasHeightHalf );
|
|
|
|
|
|
+ _viewportWidth = width * this.devicePixelRatio;
|
|
|
|
+ _viewportHeight = height * this.devicePixelRatio;
|
|
|
|
|
|
};
|
|
};
|
|
|
|
|
|
@@ -16135,6 +16149,11 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
_clearBox.intersect( _clipBox );
|
|
_clearBox.intersect( _clipBox );
|
|
_clearBox.expandByScalar( 2 );
|
|
_clearBox.expandByScalar( 2 );
|
|
|
|
|
|
|
|
+ _clearBox.min.x = _clearBox.min.x + _canvasWidthHalf;
|
|
|
|
+ _clearBox.min.y = - _clearBox.min.y + _canvasHeightHalf;
|
|
|
|
+ _clearBox.max.x = _clearBox.max.x + _canvasWidthHalf;
|
|
|
|
+ _clearBox.max.y = - _clearBox.max.y + _canvasHeightHalf;
|
|
|
|
+
|
|
if ( _clearAlpha < 1 ) {
|
|
if ( _clearAlpha < 1 ) {
|
|
|
|
|
|
_context.clearRect(
|
|
_context.clearRect(
|
|
@@ -16188,6 +16207,9 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
_this.info.render.vertices = 0;
|
|
_this.info.render.vertices = 0;
|
|
_this.info.render.faces = 0;
|
|
_this.info.render.faces = 0;
|
|
|
|
|
|
|
|
+ _context.setTransform( _viewportWidth / _canvasWidth, 0, 0, - _viewportHeight / _canvasHeight, _viewportX, _canvasHeight - _viewportY );
|
|
|
|
+ _context.translate( _canvasWidthHalf, _canvasHeightHalf );
|
|
|
|
+
|
|
_renderData = _projector.projectScene( scene, camera, this.sortObjects, this.sortElements );
|
|
_renderData = _projector.projectScene( scene, camera, this.sortObjects, this.sortElements );
|
|
_elements = _renderData.elements;
|
|
_elements = _renderData.elements;
|
|
_lights = _renderData.lights;
|
|
_lights = _renderData.lights;
|
|
@@ -16287,7 +16309,7 @@ THREE.CanvasRenderer = function ( parameters ) {
|
|
_context.strokeRect( _clearBox.min.x, _clearBox.min.y, _clearBox.max.x - _clearBox.min.x, _clearBox.max.y - _clearBox.min.y );
|
|
_context.strokeRect( _clearBox.min.x, _clearBox.min.y, _clearBox.max.x - _clearBox.min.x, _clearBox.max.y - _clearBox.min.y );
|
|
*/
|
|
*/
|
|
|
|
|
|
- // _context.setTransform( 1, 0, 0, 1, 0, 0 );
|
|
|
|
|
|
+ _context.setTransform( 1, 0, 0, 1, 0, 0 );
|
|
|
|
|
|
};
|
|
};
|
|
|
|
|