提交 e06d8995 编写于 作者: M Mr.doob

Merge branch 'fix/AssimpLoaderRefError' of https://github.com/tetuyoko/three.js into dev

Conflicts:
	examples/js/loaders/AssimpJSONLoader.js
......@@ -188,27 +188,17 @@ THREE.AssimpJSONLoader.prototype = {
function convertColors( in_color, out_faces ) {
var i, e, face, a, b, c;
function makeColor( start ) {
for ( var i = 0, e = out_faces.length; i < e; ++ i ) {
var col = new THREE.Color( );
col.setRGB( arr[ 0 ], arr[ 1 ], arr[ 2 ] );
// TODO: what about alpha?
return col;
}
var face = out_faces[ i ];
var a = face.a * 4;
var b = face.b * 4;
var c = face.c * 4;
for ( i = 0, e = out_faces.length; i < e; ++ i ) {
face = out_faces[ i ];
a = face.a * 4;
b = face.b * 4;
c = face.c * 4;
face.vertexColors = [
makeColor( a ),
makeColor( b ),
makeColor( c )
new THREE.Color().fromArray( a ),
new THREE.Color().fromArray( b ),
new THREE.Color().fromArray( c )
];
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册