Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
f1370984
T
three.js
项目概览
Ablesons
/
three.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
three.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f1370984
编写于
6月 14, 2016
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
2baec79a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
341 addition
and
269 deletion
+341
-269
build/three.js
build/three.js
+79
-9
build/three.min.js
build/three.min.js
+262
-260
未找到文件。
build/three.js
浏览文件 @
f1370984
...
@@ -23777,6 +23777,7 @@ THREE.Scene = function () {
...
@@ -23777,6 +23777,7 @@ THREE.Scene = function () {
this.type = 'Scene';
this.type = 'Scene';
this.background = null;
this.fog = null;
this.fog = null;
this.overrideMaterial = null;
this.overrideMaterial = null;
...
@@ -23791,6 +23792,7 @@ THREE.Scene.prototype.copy = function ( source, recursive ) {
...
@@ -23791,6 +23792,7 @@ THREE.Scene.prototype.copy = function ( source, recursive ) {
THREE.Object3D.prototype.copy.call( this, source, recursive );
THREE.Object3D.prototype.copy.call( this, source, recursive );
if ( source.background !== null ) this.background = source.background.clone();
if ( source.fog !== null ) this.fog = source.fog.clone();
if ( source.fog !== null ) this.fog = source.fog.clone();
if ( source.overrideMaterial !== null ) this.overrideMaterial = source.overrideMaterial.clone();
if ( source.overrideMaterial !== null ) this.overrideMaterial = source.overrideMaterial.clone();
...
@@ -24999,6 +25001,29 @@ THREE.WebGLRenderer = function ( parameters ) {
...
@@ -24999,6 +25001,29 @@ THREE.WebGLRenderer = function ( parameters ) {
//
//
var backgroundCamera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
var backgroundCamera2 = new THREE.PerspectiveCamera();
var backgroundPlaneMesh = new THREE.Mesh(
new THREE.PlaneBufferGeometry( 2, 2 ),
new THREE.MeshBasicMaterial( { depthTest: false, depthWrite: false } )
);
var backgroundBoxShader = THREE.ShaderLib[ 'cube' ];
var backgroundBoxMesh = new THREE.Mesh(
new THREE.BoxBufferGeometry( 5, 5, 5 ),
new THREE.ShaderMaterial( {
uniforms: backgroundBoxShader.uniforms,
vertexShader: backgroundBoxShader.vertexShader,
fragmentShader: backgroundBoxShader.fragmentShader,
depthTest: false,
depthWrite: false,
side: THREE.BackSide
} )
);
objects.update( backgroundPlaneMesh );
objects.update( backgroundBoxMesh );
//
function getTargetPixelRatio() {
function getTargetPixelRatio() {
return _currentRenderTarget === null ? _pixelRatio : 1;
return _currentRenderTarget === null ? _pixelRatio : 1;
...
@@ -25658,6 +25683,12 @@ THREE.WebGLRenderer = function ( parameters ) {
...
@@ -25658,6 +25683,12 @@ THREE.WebGLRenderer = function ( parameters ) {
var size = geometryAttribute.itemSize;
var size = geometryAttribute.itemSize;
var buffer = objects.getAttributeBuffer( geometryAttribute );
var buffer = objects.getAttributeBuffer( geometryAttribute );
if ( buffer === undefined ) {
console.error( objects, geometryAttribute );
}
if ( geometryAttribute instanceof THREE.InterleavedBufferAttribute ) {
if ( geometryAttribute instanceof THREE.InterleavedBufferAttribute ) {
var data = geometryAttribute.data;
var data = geometryAttribute.data;
...
@@ -25832,12 +25863,10 @@ THREE.WebGLRenderer = function ( parameters ) {
...
@@ -25832,12 +25863,10 @@ THREE.WebGLRenderer = function ( parameters ) {
lensFlares.length = 0;
lensFlares.length = 0;
_localClippingEnabled = this.localClippingEnabled;
_localClippingEnabled = this.localClippingEnabled;
_clippingEnabled = _clipping.init(
_clippingEnabled = _clipping.init( this.clippingPlanes, _localClippingEnabled, camera );
this.clippingPlanes, _localClippingEnabled, camera );
projectObject( scene, camera );
projectObject( scene, camera );
opaqueObjects.length = opaqueObjectsLastIndex + 1;
opaqueObjects.length = opaqueObjectsLastIndex + 1;
transparentObjects.length = transparentObjectsLastIndex + 1;
transparentObjects.length = transparentObjectsLastIndex + 1;
...
@@ -25875,7 +25904,46 @@ THREE.WebGLRenderer = function ( parameters ) {
...
@@ -25875,7 +25904,46 @@ THREE.WebGLRenderer = function ( parameters ) {
this.setRenderTarget( renderTarget );
this.setRenderTarget( renderTarget );
if ( this.autoClear || forceClear ) {
//
var needsClear = this.autoClear || forceClear;
var background = scene.background;
if ( background === null ) {
glClearColor( _clearColor.r, _clearColor.g, _clearColor.b, _clearAlpha );
} else if ( background instanceof THREE.CubeTexture ) {
backgroundCamera2.projectionMatrix = camera.projectionMatrix;
backgroundCamera2.matrixWorld.extractRotation( camera.matrixWorld );
backgroundCamera2.matrixWorldInverse.getInverse( backgroundCamera2.matrixWorld );
backgroundBoxMesh.material.uniforms[ "tCube" ].value = background;
backgroundBoxMesh.modelViewMatrix.multiplyMatrices( backgroundCamera2.matrixWorldInverse, backgroundBoxMesh.matrixWorld );
_this.renderBufferDirect( backgroundCamera2, null, backgroundBoxMesh.geometry, backgroundBoxMesh.material, backgroundBoxMesh, null );
needsClear = false;
} else if ( background instanceof THREE.Texture ) {
backgroundPlaneMesh.material.map = background;
_this.renderBufferDirect( backgroundCamera, null, backgroundPlaneMesh.geometry, backgroundPlaneMesh.material, backgroundPlaneMesh, null );
needsClear = false;
} else if ( background instanceof THREE.Color ) {
glClearColor( background.r, background.g, background.b, 1 );
needsClear = true;
}
if ( needsClear ) {
this.clear( this.autoClearColor, this.autoClearDepth, this.autoClearStencil );
this.clear( this.autoClearColor, this.autoClearDepth, this.autoClearStencil );
...
@@ -28749,7 +28817,7 @@ THREE.WebGLProgram = ( function () {
...
@@ -28749,7 +28817,7 @@ THREE.WebGLProgram = ( function () {
prefixVertex = [
prefixVertex = [
'#define SHADER_NAME
' + material.__webglShader.name
,
'#define SHADER_NAME
RawShaderMaterial'
,
customDefines
customDefines
...
@@ -28757,7 +28825,7 @@ THREE.WebGLProgram = ( function () {
...
@@ -28757,7 +28825,7 @@ THREE.WebGLProgram = ( function () {
prefixFragment = [
prefixFragment = [
'#define SHADER_NAME
' + material.__webglShader.name
,
'#define SHADER_NAME
RawShaderMaterial'
,
customDefines
customDefines
...
@@ -40403,7 +40471,9 @@ THREE.ArrowHelper.prototype.setColor = function ( color ) {
...
@@ -40403,7 +40471,9 @@ THREE.ArrowHelper.prototype.setColor = function ( color ) {
* @author mrdoob / http://mrdoob.com/
* @author mrdoob / http://mrdoob.com/
*/
*/
THREE.BoxHelper = function ( object ) {
THREE.BoxHelper = function ( object, color ) {
if ( color === undefined ) color = 0xffff00;
var indices = new Uint16Array( [ 0, 1, 1, 2, 2, 3, 3, 0, 4, 5, 5, 6, 6, 7, 7, 4, 0, 4, 1, 5, 2, 6, 3, 7 ] );
var indices = new Uint16Array( [ 0, 1, 1, 2, 2, 3, 3, 0, 4, 5, 5, 6, 6, 7, 7, 4, 0, 4, 1, 5, 2, 6, 3, 7 ] );
var positions = new Float32Array( 8 * 3 );
var positions = new Float32Array( 8 * 3 );
...
@@ -40412,7 +40482,7 @@ THREE.BoxHelper = function ( object ) {
...
@@ -40412,7 +40482,7 @@ THREE.BoxHelper = function ( object ) {
geometry.setIndex( new THREE.BufferAttribute( indices, 1 ) );
geometry.setIndex( new THREE.BufferAttribute( indices, 1 ) );
geometry.addAttribute( 'position', new THREE.BufferAttribute( positions, 3 ) );
geometry.addAttribute( 'position', new THREE.BufferAttribute( positions, 3 ) );
THREE.LineSegments.call( this, geometry, new THREE.LineBasicMaterial( { color:
0xffff00
} ) );
THREE.LineSegments.call( this, geometry, new THREE.LineBasicMaterial( { color:
color
} ) );
if ( object !== undefined ) {
if ( object !== undefined ) {
...
@@ -40613,7 +40683,7 @@ THREE.CameraHelper = function ( camera ) {
...
@@ -40613,7 +40683,7 @@ THREE.CameraHelper = function ( camera ) {
THREE.LineSegments.call( this, geometry, material );
THREE.LineSegments.call( this, geometry, material );
this.camera = camera;
this.camera = camera;
this.camera.updateProjectionMatrix();
if( this.camera.updateProjectionMatrix )
this.camera.updateProjectionMatrix();
this.matrix = camera.matrixWorld;
this.matrix = camera.matrixWorld;
this.matrixAutoUpdate = false;
this.matrixAutoUpdate = false;
...
...
build/three.min.js
浏览文件 @
f1370984
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录