Skip to content

T
three.js

Ablesons / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

体验新版 GitCode，发现更多精彩内容 >>

提交 2e8db19f 编写于 作者: M Mr.doob
浏览文件
操作

Small tweaks to CanvasRenderer, SVGRenderer and SoftwareRenderer.

上级 c16b26c6
展开全部 隐藏空白更改
内联 并排
Showing with 154 addition and 99 deletion
build/three.js
浏览文件 @ 2e8db19f
......@@ -14108,11 +14108,7 @@ THREE.CanvasRenderer = function ( parameters ) {
}
if ( this.autoClear === true ) {
this.clear();
}
if ( this.autoClear === true ) this.clear();
_context.setTransform( 1, 0, 0, - 1, _canvasWidthHalf, _canvasHeightHalf );
......@@ -14154,7 +14150,10 @@ THREE.CanvasRenderer = function ( parameters ) {
_v1.positionScreen.x *= _canvasWidthHalf; _v1.positionScreen.y *= _canvasHeightHalf;
_v2.positionScreen.x *= _canvasWidthHalf; _v2.positionScreen.y *= _canvasHeightHalf;
_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen ] );
_elemBox.setFromPoints( [
_v1.positionScreen,
_v2.positionScreen
] );
if ( _clipBox.isIntersectionBox( _elemBox ) === true ) {
......@@ -14182,9 +14181,17 @@ THREE.CanvasRenderer = function ( parameters ) {
}
_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen, _v3.positionScreen ] );
_elemBox.setFromPoints( [
_v1.positionScreen,
_v2.positionScreen,
_v3.positionScreen
] );
renderFace3( _v1, _v2, _v3, 0, 1, 2, element, material );
if ( _clipBox.isIntersectionBox( _elemBox ) === true ) {
renderFace3( _v1, _v2, _v3, 0, 1, 2, element, material );
}
} else if ( element instanceof THREE.RenderableFace4 ) {
......@@ -14214,9 +14221,18 @@ THREE.CanvasRenderer = function ( parameters ) {
}
_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen, _v3.positionScreen, _v4.positionScreen ] );
_elemBox.setFromPoints( [
_v1.positionScreen,
_v2.positionScreen,
_v3.positionScreen,
_v4.positionScreen
] );
if ( _clipBox.isIntersectionBox( _elemBox ) === true ) {
renderFace4( _v1, _v2, _v3, _v4, _v5, _v6, element, material, scene );
renderFace4( _v1, _v2, _v3, _v4, _v5, _v6, element, material );
}
}
......@@ -14340,6 +14356,7 @@ THREE.CanvasRenderer = function ( parameters ) {
if ( _clipBox.isIntersectionBox( _elemBox ) === false ) {
_elemBox.makeEmpty();
return;
}
......@@ -14372,6 +14389,7 @@ THREE.CanvasRenderer = function ( parameters ) {
if ( _clipBox.isIntersectionBox( _elemBox ) === false ) {
_elemBox.makeEmpty();
return;
}
......@@ -14407,6 +14425,7 @@ THREE.CanvasRenderer = function ( parameters ) {
if ( _clipBox.isIntersectionBox( _elemBox ) === false ) {
_elemBox.makeEmpty();
return;
}
......
build/three.min.js
浏览文件 @ 2e8db19f
此差异已折叠。
examples/js/renderers/SVGRenderer.js
浏览文件 @ 2e8db19f
......@@ -160,9 +160,17 @@ THREE.SVGRenderer = function () {
_v2.positionScreen.x *= _svgWidthHalf; _v2.positionScreen.y *= - _svgHeightHalf;
_v3.positionScreen.x *= _svgWidthHalf; _v3.positionScreen.y *= - _svgHeightHalf;
_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen, _v3.positionScreen ] );
_elemBox.setFromPoints( [
_v1.positionScreen,
_v2.positionScreen,
_v3.positionScreen
] );
renderFace3( _v1, _v2, _v3, element, material );
if ( _clipBox.isIntersectionBox( _elemBox ) === true ) {
renderFace3( _v1, _v2, _v3, element, material );
}
} else if ( element instanceof THREE.RenderableFace4 ) {
......@@ -178,9 +186,18 @@ THREE.SVGRenderer = function () {
_v3.positionScreen.x *= _svgWidthHalf; _v3.positionScreen.y *= -_svgHeightHalf;
_v4.positionScreen.x *= _svgWidthHalf; _v4.positionScreen.y *= -_svgHeightHalf;
_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen, _v3.positionScreen, _v4.positionScreen ] );
_elemBox.setFromPoints( [
_v1.positionScreen,
_v2.positionScreen,
_v3.positionScreen,
_v4.positionScreen
] );
renderFace4( _v1, _v2, _v3, _v4, element, material );
if ( _clipBox.isIntersectionBox( _elemBox ) === true ) {
renderFace4( _v1, _v2, _v3, _v4, element, material );
}
}
......
examples/js/renderers/SoftwareRenderer.js
浏览文件 @ 2e8db19f
......@@ -114,7 +114,7 @@ THREE.SoftwareRenderer = function () {
rectx2 = 0;
recty2 = 0;
if ( this.autoClear ) this.clear();
if ( this.autoClear === true ) this.clear();
var renderData = projector.projectScene( scene, camera );
var elements = renderData.elements;
......
src/renderers/CanvasRenderer.js
浏览文件 @ 2e8db19f
......@@ -250,11 +250,7 @@ THREE.CanvasRenderer = function ( parameters ) {
}
if ( this.autoClear === true ) {
this.clear();
}
if ( this.autoClear === true ) this.clear();
_context.setTransform( 1, 0, 0, - 1, _canvasWidthHalf, _canvasHeightHalf );
......@@ -296,7 +292,10 @@ THREE.CanvasRenderer = function ( parameters ) {
_v1.positionScreen.x *= _canvasWidthHalf; _v1.positionScreen.y *= _canvasHeightHalf;
_v2.positionScreen.x *= _canvasWidthHalf; _v2.positionScreen.y *= _canvasHeightHalf;
_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen ] );
_elemBox.setFromPoints( [
_v1.positionScreen,
_v2.positionScreen
] );
if ( _clipBox.isIntersectionBox( _elemBox ) === true ) {
......@@ -324,9 +323,17 @@ THREE.CanvasRenderer = function ( parameters ) {
}
_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen, _v3.positionScreen ] );
_elemBox.setFromPoints( [
_v1.positionScreen,
_v2.positionScreen,
_v3.positionScreen
] );
renderFace3( _v1, _v2, _v3, 0, 1, 2, element, material );
if ( _clipBox.isIntersectionBox( _elemBox ) === true ) {
renderFace3( _v1, _v2, _v3, 0, 1, 2, element, material );
}
} else if ( element instanceof THREE.RenderableFace4 ) {
......@@ -356,9 +363,18 @@ THREE.CanvasRenderer = function ( parameters ) {
}
_elemBox.setFromPoints( [ _v1.positionScreen, _v2.positionScreen, _v3.positionScreen, _v4.positionScreen ] );
_elemBox.setFromPoints( [
_v1.positionScreen,
_v2.positionScreen,
_v3.positionScreen,
_v4.positionScreen
] );
if ( _clipBox.isIntersectionBox( _elemBox ) === true ) {
renderFace4( _v1, _v2, _v3, _v4, _v5, _v6, element, material, scene );
renderFace4( _v1, _v2, _v3, _v4, _v5, _v6, element, material );
}
}
......@@ -482,6 +498,7 @@ THREE.CanvasRenderer = function ( parameters ) {
if ( _clipBox.isIntersectionBox( _elemBox ) === false ) {
_elemBox.makeEmpty();
return;
}
......@@ -514,6 +531,7 @@ THREE.CanvasRenderer = function ( parameters ) {
if ( _clipBox.isIntersectionBox( _elemBox ) === false ) {
_elemBox.makeEmpty();
return;
}
......@@ -549,6 +567,7 @@ THREE.CanvasRenderer = function ( parameters ) {
if ( _clipBox.isIntersectionBox( _elemBox ) === false ) {
_elemBox.makeEmpty();
return;
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或