Skip to content

T
three.js

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

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

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

Updated builds.

上级 7a3d9d99
展开全部 隐藏空白更改
内联 并排
Showing with 218 addition and 194 deletion
build/three.js
浏览文件 @ d2461440
......@@ -115,9 +115,6 @@
var DoubleSide = 2;
var FlatShading = 1;
var SmoothShading = 2;
var NoColors = 0;
var FaceColors = 1;
var VertexColors = 2;
var NoBlending = 0;
var NormalBlending = 1;
var AdditiveBlending = 2;
......@@ -8610,7 +8607,7 @@
this.side = FrontSide;
this.flatShading = false;
this.vertexTangents = false;
this.vertexColors = NoColors; // THREE.NoColors, THREE.VertexColors, THREE.FaceColors
this.vertexColors = false;
this.opacity = 1;
this.transparent = false;
......@@ -8835,7 +8832,7 @@
if ( this.blending !== NormalBlending ) { data.blending = this.blending; }
if ( this.flatShading === true ) { data.flatShading = this.flatShading; }
if ( this.side !== FrontSide ) { data.side = this.side; }
if ( this.vertexColors !== NoColors ) { data.vertexColors = this.vertexColors; }
if ( this.vertexColors ) { data.vertexColors = true; }
if ( this.opacity < 1 ) { data.opacity = this.opacity; }
if ( this.transparent === true ) { data.transparent = this.transparent; }
......@@ -27030,7 +27027,7 @@
_v1$4.setFromMatrixPosition( camera.matrixWorld );
_v2$2.setFromMatrixPosition( this.matrixWorld );
var distance = _v1$4.distanceTo( _v2$2 );
var distance = _v1$4.distanceTo( _v2$2 ) / camera.zoom;
levels[ 0 ].object.visible = true;
......@@ -39421,7 +39418,6 @@
if ( json.shininess !== undefined ) { material.shininess = json.shininess; }
if ( json.clearcoat !== undefined ) { material.clearcoat = json.clearcoat; }
if ( json.clearcoatRoughness !== undefined ) { material.clearcoatRoughness = json.clearcoatRoughness; }
if ( json.vertexColors !== undefined ) { material.vertexColors = json.vertexColors; }
if ( json.fog !== undefined ) { material.fog = json.fog; }
if ( json.flatShading !== undefined ) { material.flatShading = json.flatShading; }
if ( json.blending !== undefined ) { material.blending = json.blending; }
......@@ -39470,6 +39466,20 @@
if ( json.userData !== undefined ) { material.userData = json.userData; }
if ( json.vertexColors !== undefined ) {
if ( typeof json.vertexColors === 'number' ) {
material.vertexColors = ( json.vertexColors > 0 ) ? true : false;
} else {
material.vertexColors = json.vertexColors;
}
}
// Shader Material
if ( json.uniforms !== undefined ) {
......@@ -46375,7 +46385,7 @@
geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
geometry.setAttribute( 'color', new Float32BufferAttribute( colors, 3 ) );
var material = new LineBasicMaterial( { vertexColors: VertexColors, depthTest: false, depthWrite: false, transparent: true } );
var material = new LineBasicMaterial( { vertexColors: true, depthTest: false, depthWrite: false, transparent: true } );
LineSegments.call( this, geometry, material );
......@@ -46539,7 +46549,7 @@
geometry.rotateY( Math.PI * 0.5 );
this.material = new MeshBasicMaterial( { wireframe: true, fog: false } );
if ( this.color === undefined ) { this.material.vertexColors = VertexColors; }
if ( this.color === undefined ) { this.material.vertexColors = true; }
var position = geometry.getAttribute( 'position' );
var colors = new Float32Array( position.count * 3 );
......@@ -46628,7 +46638,7 @@
geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
geometry.setAttribute( 'color', new Float32BufferAttribute( colors, 3 ) );
var material = new LineBasicMaterial( { vertexColors: VertexColors } );
var material = new LineBasicMaterial( { vertexColors: true } );
LineSegments.call( this, geometry, material );
......@@ -46735,7 +46745,7 @@
geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
geometry.setAttribute( 'color', new Float32BufferAttribute( colors, 3 ) );
var material = new LineBasicMaterial( { vertexColors: VertexColors } );
var material = new LineBasicMaterial( { vertexColors: true } );
LineSegments.call( this, geometry, material );
......@@ -46845,7 +46855,7 @@
function CameraHelper( camera ) {
var geometry = new BufferGeometry();
var material = new LineBasicMaterial( { color: 0xffffff, vertexColors: FaceColors } );
var material = new LineBasicMaterial( { color: 0xffffff, vertexColors: true } );
var vertices = [];
var colors = [];
......@@ -47379,7 +47389,7 @@
geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
geometry.setAttribute( 'color', new Float32BufferAttribute( colors, 3 ) );
var material = new LineBasicMaterial( { vertexColors: VertexColors } );
var material = new LineBasicMaterial( { vertexColors: true } );
LineSegments.call( this, geometry, material );
......@@ -48053,8 +48063,10 @@
}
var LineStrip = 0;
var LinePieces = 1;
var NoColors = 0;
var FaceColors = 1;
var VertexColors = 2;
function MeshFaceMaterial( materials ) {
build/three.min.js
浏览文件 @ d2461440
此差异已折叠。
build/three.module.js
浏览文件 @ d2461440
......@@ -109,9 +109,6 @@ var BackSide = 1;
var DoubleSide = 2;
var FlatShading = 1;
var SmoothShading = 2;
var NoColors = 0;
var FaceColors = 1;
var VertexColors = 2;
var NoBlending = 0;
var NormalBlending = 1;
var AdditiveBlending = 2;
......@@ -8604,7 +8601,7 @@ function Material() {
this.side = FrontSide;
this.flatShading = false;
this.vertexTangents = false;
this.vertexColors = NoColors; // THREE.NoColors, THREE.VertexColors, THREE.FaceColors
this.vertexColors = false;
this.opacity = 1;
this.transparent = false;
......@@ -8829,7 +8826,7 @@ Material.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
if ( this.blending !== NormalBlending ) data.blending = this.blending;
if ( this.flatShading === true ) data.flatShading = this.flatShading;
if ( this.side !== FrontSide ) data.side = this.side;
if ( this.vertexColors !== NoColors ) data.vertexColors = this.vertexColors;
if ( this.vertexColors ) data.vertexColors = true;
if ( this.opacity < 1 ) data.opacity = this.opacity;
if ( this.transparent === true ) data.transparent = this.transparent;
......@@ -27022,7 +27019,7 @@ LOD.prototype = Object.assign( Object.create( Object3D.prototype ), {
_v1$4.setFromMatrixPosition( camera.matrixWorld );
_v2$2.setFromMatrixPosition( this.matrixWorld );
var distance = _v1$4.distanceTo( _v2$2 );
var distance = _v1$4.distanceTo( _v2$2 ) / camera.zoom;
levels[ 0 ].object.visible = true;
......@@ -39413,7 +39410,6 @@ MaterialLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
if ( json.shininess !== undefined ) material.shininess = json.shininess;
if ( json.clearcoat !== undefined ) material.clearcoat = json.clearcoat;
if ( json.clearcoatRoughness !== undefined ) material.clearcoatRoughness = json.clearcoatRoughness;
if ( json.vertexColors !== undefined ) material.vertexColors = json.vertexColors;
if ( json.fog !== undefined ) material.fog = json.fog;
if ( json.flatShading !== undefined ) material.flatShading = json.flatShading;
if ( json.blending !== undefined ) material.blending = json.blending;
......@@ -39462,6 +39458,20 @@ MaterialLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
if ( json.userData !== undefined ) material.userData = json.userData;
if ( json.vertexColors !== undefined ) {
if ( typeof json.vertexColors === 'number' ) {
material.vertexColors = ( json.vertexColors > 0 ) ? true : false;
} else {
material.vertexColors = json.vertexColors;
}
}
// Shader Material
if ( json.uniforms !== undefined ) {
......@@ -46367,7 +46377,7 @@ function SkeletonHelper( object ) {
geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
geometry.setAttribute( 'color', new Float32BufferAttribute( colors, 3 ) );
var material = new LineBasicMaterial( { vertexColors: VertexColors, depthTest: false, depthWrite: false, transparent: true } );
var material = new LineBasicMaterial( { vertexColors: true, depthTest: false, depthWrite: false, transparent: true } );
LineSegments.call( this, geometry, material );
......@@ -46531,7 +46541,7 @@ function HemisphereLightHelper( light, size, color ) {
geometry.rotateY( Math.PI * 0.5 );
this.material = new MeshBasicMaterial( { wireframe: true, fog: false } );
if ( this.color === undefined ) this.material.vertexColors = VertexColors;
if ( this.color === undefined ) this.material.vertexColors = true;
var position = geometry.getAttribute( 'position' );
var colors = new Float32Array( position.count * 3 );
......@@ -46620,7 +46630,7 @@ function GridHelper( size, divisions, color1, color2 ) {
geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
geometry.setAttribute( 'color', new Float32BufferAttribute( colors, 3 ) );
var material = new LineBasicMaterial( { vertexColors: VertexColors } );
var material = new LineBasicMaterial( { vertexColors: true } );
LineSegments.call( this, geometry, material );
......@@ -46727,7 +46737,7 @@ function PolarGridHelper( radius, radials, circles, divisions, color1, color2 )
geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
geometry.setAttribute( 'color', new Float32BufferAttribute( colors, 3 ) );
var material = new LineBasicMaterial( { vertexColors: VertexColors } );
var material = new LineBasicMaterial( { vertexColors: true } );
LineSegments.call( this, geometry, material );
......@@ -46837,7 +46847,7 @@ var _camera = new Camera();
function CameraHelper( camera ) {
var geometry = new BufferGeometry();
var material = new LineBasicMaterial( { color: 0xffffff, vertexColors: FaceColors } );
var material = new LineBasicMaterial( { color: 0xffffff, vertexColors: true } );
var vertices = [];
var colors = [];
......@@ -47371,7 +47381,7 @@ function AxesHelper( size ) {
geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
geometry.setAttribute( 'color', new Float32BufferAttribute( colors, 3 ) );
var material = new LineBasicMaterial( { vertexColors: VertexColors } );
var material = new LineBasicMaterial( { vertexColors: true } );
LineSegments.call( this, geometry, material );
......@@ -48203,8 +48213,10 @@ function Face4( a, b, c, d, normal, color, materialIndex ) {
}
var LineStrip = 0;
var LinePieces = 1;
var NoColors = 0;
var FaceColors = 1;
var VertexColors = 2;
function MeshFaceMaterial( materials ) {
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或