Skip to content

T
three.js

车家大少爷 / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

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

提交 5fc41c0e 编写于 作者: A alteredq
浏览文件
操作

Changed face.materialIndex default to be 0 instead of "undefined". 

See discussion in https://github.com/mrdoob/three.js/commit/d951fcbcfa8efa8b7cecc10075e5e78be4027bac
上级 22205eff
隐藏空白更改
内联 并排
Showing with 252 addition and 258 deletion
build/three.js
浏览文件 @ 5fc41c0e
......@@ -4931,7 +4931,7 @@ THREE.Face3 = function ( a, b, c, normal, color, materialIndex ) {
this.vertexTangents = [];
this.materialIndex = materialIndex;
this.materialIndex = materialIndex !== undefined ? materialIndex : 0;
this.centroid = new THREE.Vector3();
......@@ -4981,7 +4981,7 @@ THREE.Face4 = function ( a, b, c, d, normal, color, materialIndex ) {
this.vertexTangents = [];
this.materialIndex = materialIndex;
this.materialIndex = materialIndex !== undefined ? materialIndex : 0;
this.centroid = new THREE.Vector3();
......@@ -16597,7 +16597,7 @@ THREE.WebGLRenderer = function ( parameters ) {
function getBufferMaterial( object, geometryGroup ) {
return object.material instanceof THREE.MeshFaceMaterial
? object.material.materials[ geometryGroup.materialIndex !== undefined ? geometryGroup.materialIndex : 0 ]
? object.material.materials[ geometryGroup.materialIndex ]
: object.material;
};
......@@ -19970,7 +19970,7 @@ THREE.WebGLRenderer = function ( parameters ) {
if ( meshMaterial instanceof THREE.MeshFaceMaterial ) {
materialIndex = buffer.materialIndex !== undefined ? buffer.materialIndex : 0;
materialIndex = buffer.materialIndex;
material = meshMaterial.materials[ materialIndex ];
......@@ -20015,8 +20015,7 @@ THREE.WebGLRenderer = function ( parameters ) {
function sortFacesByMaterial ( geometry, material ) {
var f, fl, face, materialIndex, vertices,
materialHash, groupHash,
hash_map = {};
groupHash, hash_map = {};
var numMorphTargets = geometry.morphTargets.length;
var numMorphNormals = geometry.morphNormals.length;
......@@ -20028,17 +20027,15 @@ THREE.WebGLRenderer = function ( parameters ) {
for ( f = 0, fl = geometry.faces.length; f < fl; f ++ ) {
face = geometry.faces[ f ];
materialIndex = usesFaceMaterial ? face.materialIndex : undefined;
materialIndex = usesFaceMaterial ? face.materialIndex : 0;
materialHash = ( materialIndex !== undefined ) ? materialIndex : -1;
if ( hash_map[ materialIndex ] === undefined ) {
if ( hash_map[ materialHash ] === undefined ) {
hash_map[ materialHash ] = { 'hash': materialHash, 'counter': 0 };
hash_map[ materialIndex ] = { 'hash': materialIndex, 'counter': 0 };
}
groupHash = hash_map[ materialHash ].hash + '_' + hash_map[ materialHash ].counter;
groupHash = hash_map[ materialIndex ].hash + '_' + hash_map[ materialIndex ].counter;
if ( geometry.geometryGroups[ groupHash ] === undefined ) {
......@@ -20050,8 +20047,8 @@ THREE.WebGLRenderer = function ( parameters ) {
if ( geometry.geometryGroups[ groupHash ].vertices + vertices > 65535 ) {
hash_map[ materialHash ].counter += 1;
groupHash = hash_map[ materialHash ].hash + '_' + hash_map[ materialHash ].counter;
hash_map[ materialIndex ].counter += 1;
groupHash = hash_map[ materialIndex ].hash + '_' + hash_map[ materialIndex ].counter;
if ( geometry.geometryGroups[ groupHash ] === undefined ) {
......
build/three.min.js
浏览文件 @ 5fc41c0e
因为 它太大了无法显示 source diff 。你可以改为 查看blob。
src/core/Face3.js
浏览文件 @ 5fc41c0e
......@@ -17,7 +17,7 @@ THREE.Face3 = function ( a, b, c, normal, color, materialIndex ) {
this.vertexTangents = [];
this.materialIndex = materialIndex;
this.materialIndex = materialIndex !== undefined ? materialIndex : 0;
this.centroid = new THREE.Vector3();
......
src/core/Face4.js
浏览文件 @ 5fc41c0e
......@@ -18,7 +18,7 @@ THREE.Face4 = function ( a, b, c, d, normal, color, materialIndex ) {
this.vertexTangents = [];
this.materialIndex = materialIndex;
this.materialIndex = materialIndex !== undefined ? materialIndex : 0;
this.centroid = new THREE.Vector3();
......
src/renderers/WebGLRenderer.js
浏览文件 @ 5fc41c0e
......@@ -901,7 +901,7 @@ THREE.WebGLRenderer = function ( parameters ) {
function getBufferMaterial( object, geometryGroup ) {
return object.material instanceof THREE.MeshFaceMaterial
? object.material.materials[ geometryGroup.materialIndex !== undefined ? geometryGroup.materialIndex : 0 ]
? object.material.materials[ geometryGroup.materialIndex ]
: object.material;
};
......@@ -4274,7 +4274,7 @@ THREE.WebGLRenderer = function ( parameters ) {
if ( meshMaterial instanceof THREE.MeshFaceMaterial ) {
materialIndex = buffer.materialIndex !== undefined ? buffer.materialIndex : 0;
materialIndex = buffer.materialIndex;
material = meshMaterial.materials[ materialIndex ];
......@@ -4319,8 +4319,7 @@ THREE.WebGLRenderer = function ( parameters ) {
function sortFacesByMaterial ( geometry, material ) {
var f, fl, face, materialIndex, vertices,
materialHash, groupHash,
hash_map = {};
groupHash, hash_map = {};
var numMorphTargets = geometry.morphTargets.length;
var numMorphNormals = geometry.morphNormals.length;
......@@ -4332,17 +4331,15 @@ THREE.WebGLRenderer = function ( parameters ) {
for ( f = 0, fl = geometry.faces.length; f < fl; f ++ ) {
face = geometry.faces[ f ];
materialIndex = usesFaceMaterial ? face.materialIndex : undefined;
materialIndex = usesFaceMaterial ? face.materialIndex : 0;
materialHash = ( materialIndex !== undefined ) ? materialIndex : -1;
if ( hash_map[ materialIndex ] === undefined ) {
if ( hash_map[ materialHash ] === undefined ) {
hash_map[ materialHash ] = { 'hash': materialHash, 'counter': 0 };
hash_map[ materialIndex ] = { 'hash': materialIndex, 'counter': 0 };
}
groupHash = hash_map[ materialHash ].hash + '_' + hash_map[ materialHash ].counter;
groupHash = hash_map[ materialIndex ].hash + '_' + hash_map[ materialIndex ].counter;
if ( geometry.geometryGroups[ groupHash ] === undefined ) {
......@@ -4354,8 +4351,8 @@ THREE.WebGLRenderer = function ( parameters ) {
if ( geometry.geometryGroups[ groupHash ].vertices + vertices > 65535 ) {
hash_map[ materialHash ].counter += 1;
groupHash = hash_map[ materialHash ].hash + '_' + hash_map[ materialHash ].counter;
hash_map[ materialIndex ].counter += 1;
groupHash = hash_map[ materialIndex ].hash + '_' + hash_map[ materialIndex ].counter;
if ( geometry.geometryGroups[ groupHash ] === undefined ) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或