Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
06a21a7e
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,发现更多精彩内容 >>
提交
06a21a7e
编写于
5月 22, 2015
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
39e8a976
变更
2
展开全部
隐藏空白更改
内联
并排
Showing
2 changed file
with
128 addition
and
103 deletion
+128
-103
build/three.js
build/three.js
+44
-20
build/three.min.js
build/three.min.js
+84
-83
未找到文件。
build/three.js
浏览文件 @
06a21a7e
...
@@ -9936,20 +9936,20 @@ THREE.EventDispatcher.prototype.apply( THREE.Geometry.prototype );
...
@@ -9936,20 +9936,20 @@ THREE.EventDispatcher.prototype.apply( THREE.Geometry.prototype );
THREE.GeometryIdCount = 0;
THREE.GeometryIdCount = 0;
// File:src/core/D
ynamic
Geometry.js
// File:src/core/D
irect
Geometry.js
/**
/**
* @author mrdoob / http://mrdoob.com/
* @author mrdoob / http://mrdoob.com/
*/
*/
THREE.D
ynamic
Geometry = function () {
THREE.D
irect
Geometry = function () {
Object.defineProperty( this, 'id', { value: THREE.GeometryIdCount ++ } );
Object.defineProperty( this, 'id', { value: THREE.GeometryIdCount ++ } );
this.uuid = THREE.Math.generateUUID();
this.uuid = THREE.Math.generateUUID();
this.name = '';
this.name = '';
this.type = 'D
ynamic
Geometry';
this.type = 'D
irect
Geometry';
this.vertices = [];
this.vertices = [];
this.colors = [];
this.colors = [];
...
@@ -9972,23 +9972,23 @@ THREE.DynamicGeometry = function () {
...
@@ -9972,23 +9972,23 @@ THREE.DynamicGeometry = function () {
};
};
THREE.D
ynamic
Geometry.prototype = {
THREE.D
irect
Geometry.prototype = {
constructor: THREE.D
ynamic
Geometry,
constructor: THREE.D
irect
Geometry,
computeBoundingBox: THREE.Geometry.prototype.computeBoundingBox,
computeBoundingBox: THREE.Geometry.prototype.computeBoundingBox,
computeBoundingSphere: THREE.Geometry.prototype.computeBoundingSphere,
computeBoundingSphere: THREE.Geometry.prototype.computeBoundingSphere,
computeFaceNormals: function () {
computeFaceNormals: function () {
console.warn( 'THREE.D
ynamic
Geometry: computeFaceNormals() is not a method of this type of geometry.' );
console.warn( 'THREE.D
irect
Geometry: computeFaceNormals() is not a method of this type of geometry.' );
return this;
return this;
},
},
computeVertexNormals: function () {
computeVertexNormals: function () {
console.warn( 'THREE.D
ynamic
Geometry: computeVertexNormals() is not a method of this type of geometry.' );
console.warn( 'THREE.D
irect
Geometry: computeVertexNormals() is not a method of this type of geometry.' );
return this;
return this;
},
},
...
@@ -10024,7 +10024,7 @@ THREE.DynamicGeometry.prototype = {
...
@@ -10024,7 +10024,7 @@ THREE.DynamicGeometry.prototype = {
if ( vertexUvs === undefined ) {
if ( vertexUvs === undefined ) {
console.warn( 'THREE.D
ynamic
Geometry.fromGeometry(): Missing vertexUVs', i );
console.warn( 'THREE.D
irect
Geometry.fromGeometry(): Missing vertexUVs', i );
vertexUvs = [ new THREE.Vector2(), new THREE.Vector2(), new THREE.Vector2() ];
vertexUvs = [ new THREE.Vector2(), new THREE.Vector2(), new THREE.Vector2() ];
}
}
...
@@ -10056,7 +10056,7 @@ THREE.DynamicGeometry.prototype = {
...
@@ -10056,7 +10056,7 @@ THREE.DynamicGeometry.prototype = {
};
};
THREE.EventDispatcher.prototype.apply( THREE.D
ynamic
Geometry.prototype );
THREE.EventDispatcher.prototype.apply( THREE.D
irect
Geometry.prototype );
// File:src/core/BufferGeometry.js
// File:src/core/BufferGeometry.js
...
@@ -10227,8 +10227,8 @@ THREE.BufferGeometry.prototype = {
...
@@ -10227,8 +10227,8 @@ THREE.BufferGeometry.prototype = {
if ( geometry instanceof THREE.Geometry ) {
if ( geometry instanceof THREE.Geometry ) {
console.log( 'THREE.BufferGeometry.setFromObject(): Converted THREE.Geometry to THREE.D
ynamic
Geometry as required for THREE.SkinnedMesh.', geometry );
console.log( 'THREE.BufferGeometry.setFromObject(): Converted THREE.Geometry to THREE.D
irect
Geometry as required for THREE.SkinnedMesh.', geometry );
geometry = new THREE.D
ynamic
Geometry().fromGeometry( geometry );
geometry = new THREE.D
irect
Geometry().fromGeometry( geometry );
}
}
...
@@ -10246,8 +10246,8 @@ THREE.BufferGeometry.prototype = {
...
@@ -10246,8 +10246,8 @@ THREE.BufferGeometry.prototype = {
if ( geometry instanceof THREE.Geometry ) {
if ( geometry instanceof THREE.Geometry ) {
console.log( 'THREE.BufferGeometry.setFromObject(): Converted THREE.Geometry to THREE.D
ynamic
Geometry as required for MorphTargets.', geometry );
console.log( 'THREE.BufferGeometry.setFromObject(): Converted THREE.Geometry to THREE.D
irect
Geometry as required for MorphTargets.', geometry );
geometry = new THREE.D
ynamic
Geometry().fromGeometry( geometry );
geometry = new THREE.D
irect
Geometry().fromGeometry( geometry );
}
}
...
@@ -10271,9 +10271,9 @@ THREE.BufferGeometry.prototype = {
...
@@ -10271,9 +10271,9 @@ THREE.BufferGeometry.prototype = {
}
}
if ( geometry instanceof THREE.D
ynamic
Geometry ) {
if ( geometry instanceof THREE.D
irect
Geometry ) {
this.fromD
ynamic
Geometry( geometry );
this.fromD
irect
Geometry( geometry );
} else if ( geometry instanceof THREE.Geometry ) {
} else if ( geometry instanceof THREE.Geometry ) {
...
@@ -10518,7 +10518,7 @@ THREE.BufferGeometry.prototype = {
...
@@ -10518,7 +10518,7 @@ THREE.BufferGeometry.prototype = {
},
},
fromD
ynamic
Geometry: function ( geometry ) {
fromD
irect
Geometry: function ( geometry ) {
var indices = new Uint16Array( geometry.faces.length * 3 );
var indices = new Uint16Array( geometry.faces.length * 3 );
this.addAttribute( 'index', new THREE.BufferAttribute( indices, 1 ).copyFacesArray( geometry.faces ) );
this.addAttribute( 'index', new THREE.BufferAttribute( indices, 1 ).copyFacesArray( geometry.faces ) );
...
@@ -14733,6 +14733,9 @@ THREE.LineDashedMaterial.prototype.clone = function () {
...
@@ -14733,6 +14733,9 @@ THREE.LineDashedMaterial.prototype.clone = function () {
* opacity: <float>,
* opacity: <float>,
* map: new THREE.Texture( <Image> ),
* map: new THREE.Texture( <Image> ),
*
*
* aoMap: new THREE.Texture( <Image> ),
* aoMapIntensity: <float>
*
* specularMap: new THREE.Texture( <Image> ),
* specularMap: new THREE.Texture( <Image> ),
*
*
* alphaMap: new THREE.Texture( <Image> ),
* alphaMap: new THREE.Texture( <Image> ),
...
@@ -14769,6 +14772,9 @@ THREE.MeshBasicMaterial = function ( parameters ) {
...
@@ -14769,6 +14772,9 @@ THREE.MeshBasicMaterial = function ( parameters ) {
this.map = null;
this.map = null;
this.aoMap = null;
this.aoMapIntensity = 1.0;
this.specularMap = null;
this.specularMap = null;
this.alphaMap = null;
this.alphaMap = null;
...
@@ -14809,6 +14815,9 @@ THREE.MeshBasicMaterial.prototype.clone = function () {
...
@@ -14809,6 +14815,9 @@ THREE.MeshBasicMaterial.prototype.clone = function () {
material.map = this.map;
material.map = this.map;
material.aoMap = this.aoMap;
material.aoMapIntensity = this.aoMapIntensity;
material.specularMap = this.specularMap;
material.specularMap = this.specularMap;
material.alphaMap = this.alphaMap;
material.alphaMap = this.alphaMap;
...
@@ -18088,6 +18097,7 @@ THREE.ShaderLib = {
...
@@ -18088,6 +18097,7 @@ THREE.ShaderLib = {
uniforms: THREE.UniformsUtils.merge( [
uniforms: THREE.UniformsUtils.merge( [
THREE.UniformsLib[ "common" ],
THREE.UniformsLib[ "common" ],
THREE.UniformsLib[ "aomap" ],
THREE.UniformsLib[ "fog" ],
THREE.UniformsLib[ "fog" ],
THREE.UniformsLib[ "shadowmap" ]
THREE.UniformsLib[ "shadowmap" ]
...
@@ -18144,6 +18154,7 @@ THREE.ShaderLib = {
...
@@ -18144,6 +18154,7 @@ THREE.ShaderLib = {
THREE.ShaderChunk[ "uv2_pars_fragment" ],
THREE.ShaderChunk[ "uv2_pars_fragment" ],
THREE.ShaderChunk[ "map_pars_fragment" ],
THREE.ShaderChunk[ "map_pars_fragment" ],
THREE.ShaderChunk[ "alphamap_pars_fragment" ],
THREE.ShaderChunk[ "alphamap_pars_fragment" ],
THREE.ShaderChunk[ "aomap_pars_fragment" ],
THREE.ShaderChunk[ "envmap_pars_fragment" ],
THREE.ShaderChunk[ "envmap_pars_fragment" ],
THREE.ShaderChunk[ "fog_pars_fragment" ],
THREE.ShaderChunk[ "fog_pars_fragment" ],
THREE.ShaderChunk[ "shadowmap_pars_fragment" ],
THREE.ShaderChunk[ "shadowmap_pars_fragment" ],
...
@@ -18152,8 +18163,9 @@ THREE.ShaderLib = {
...
@@ -18152,8 +18163,9 @@ THREE.ShaderLib = {
"void main() {",
"void main() {",
" vec3 outgoingLight = vec3( 0.0 );",
// outgoing light does not have an alpha, the surface does
" vec3 outgoingLight = vec3( 0.0 );",
" vec4 diffuseColor = vec4( diffuse, opacity );",
" vec4 diffuseColor = vec4( diffuse, opacity );",
" vec3 totalAmbientLight = vec3( 1.0 );", // hardwired
THREE.ShaderChunk[ "logdepthbuf_fragment" ],
THREE.ShaderChunk[ "logdepthbuf_fragment" ],
THREE.ShaderChunk[ "map_fragment" ],
THREE.ShaderChunk[ "map_fragment" ],
...
@@ -18161,8 +18173,9 @@ THREE.ShaderLib = {
...
@@ -18161,8 +18173,9 @@ THREE.ShaderLib = {
THREE.ShaderChunk[ "alphamap_fragment" ],
THREE.ShaderChunk[ "alphamap_fragment" ],
THREE.ShaderChunk[ "alphatest_fragment" ],
THREE.ShaderChunk[ "alphatest_fragment" ],
THREE.ShaderChunk[ "specularmap_fragment" ],
THREE.ShaderChunk[ "specularmap_fragment" ],
THREE.ShaderChunk[ "aomap_fragment" ],
" outgoingLight = diffuseColor.rgb;", // simple shader
" outgoingLight = diffuseColor.rgb
* totalAmbientLight
;", // simple shader
THREE.ShaderChunk[ "envmap_fragment" ],
THREE.ShaderChunk[ "envmap_fragment" ],
THREE.ShaderChunk[ "shadowmap_fragment" ], // TODO: Shadows on an otherwise unlit surface doesn't make sense.
THREE.ShaderChunk[ "shadowmap_fragment" ], // TODO: Shadows on an otherwise unlit surface doesn't make sense.
...
@@ -21152,6 +21165,10 @@ THREE.WebGLRenderer = function ( parameters ) {
...
@@ -21152,6 +21165,10 @@ THREE.WebGLRenderer = function ( parameters ) {
refreshUniformsLambert( m_uniforms, material );
refreshUniformsLambert( m_uniforms, material );
} else if ( material instanceof THREE.MeshBasicMaterial ) {
refreshUniformsBasic( m_uniforms, material );
} else if ( material instanceof THREE.MeshDepthMaterial ) {
} else if ( material instanceof THREE.MeshDepthMaterial ) {
m_uniforms.mNear.value = camera.near;
m_uniforms.mNear.value = camera.near;
...
@@ -21335,6 +21352,13 @@ THREE.WebGLRenderer = function ( parameters ) {
...
@@ -21335,6 +21352,13 @@ THREE.WebGLRenderer = function ( parameters ) {
}
}
function refreshUniformsBasic ( uniforms, material ) {
uniforms.aoMap.value = material.aoMap;
uniforms.aoMapIntensity.value = material.aoMapIntensity;
}
function refreshUniformsLights ( uniforms, lights ) {
function refreshUniformsLights ( uniforms, lights ) {
uniforms.ambientLightColor.value = lights.ambient;
uniforms.ambientLightColor.value = lights.ambient;
...
@@ -23249,7 +23273,7 @@ THREE.WebGLObjects = function ( gl, info ) {
...
@@ -23249,7 +23273,7 @@ THREE.WebGLObjects = function ( gl, info ) {
var geometry = geometries.get( object );
var geometry = geometries.get( object );
if ( object.geometry instanceof THREE.D
ynamic
Geometry ) {
if ( object.geometry instanceof THREE.D
irect
Geometry ) {
geometry.updateFromObject( object );
geometry.updateFromObject( object );
...
@@ -34127,7 +34151,7 @@ THREE.SkeletonHelper = function ( object ) {
...
@@ -34127,7 +34151,7 @@ THREE.SkeletonHelper = function ( object ) {
this.bones = this.getBoneList( object );
this.bones = this.getBoneList( object );
var geometry = new THREE.D
ynamic
Geometry();
var geometry = new THREE.D
irect
Geometry();
for ( var i = 0; i < this.bones.length; i ++ ) {
for ( var i = 0; i < this.bones.length; i ++ ) {
...
...
build/three.min.js
浏览文件 @
06a21a7e
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录