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

Fixed SceneLoader minor breakage.

上级 e3d06e87
......@@ -843,7 +843,7 @@ THREE.SceneLoader.prototype.parse = function ( json, callbackFinished, url ) {
var jsonLoader = this.geometryHandlerMap[ "ascii" ][ "loaderObject" ];
var model = jsonLoader.parse( modelJson, texture_path );
create_callback_embed( geoID )( model.geometry, model.material );
create_callback_embed( geoID )( model.geometry, model.materials );
}
......
......@@ -913,7 +913,7 @@ THREE.WebGLRenderer = function ( parameters ) {
normalType = bufferGuessNormalType( material ),
vertexColorType = bufferGuessVertexColorType( material );
//console.log( "uvType", uvType, "normalType", normalType, "vertexColorType", vertexColorType, object, geometryGroup, material );
// console.log( "uvType", uvType, "normalType", normalType, "vertexColorType", vertexColorType, object, geometryGroup, material );
geometryGroup.__vertexArray = new Float32Array( nvertices * 3 );
......@@ -1085,7 +1085,7 @@ THREE.WebGLRenderer = function ( parameters ) {
};
function bufferGuessVertexColorType ( material ) {
function bufferGuessVertexColorType( material ) {
if ( material.vertexColors ) {
......@@ -1097,11 +1097,16 @@ THREE.WebGLRenderer = function ( parameters ) {
};
function bufferGuessUVType ( material ) {
function bufferGuessUVType( material ) {
// material must use some texture to require uvs
if ( material.map || material.lightMap || material.bumpMap || material.normalMap || material.specularMap || material instanceof THREE.ShaderMaterial ) {
if ( material.map ||
material.lightMap ||
material.bumpMap ||
material.normalMap ||
material.specularMap ||
material instanceof THREE.ShaderMaterial ) {
return true;
......@@ -6243,7 +6248,7 @@ THREE.WebGLRenderer = function ( parameters ) {
if ( programInfo.code === code ) {
//console.log( "Code already compiled." /*: \n\n" + code*/ );
// console.log( "Code already compiled." /*: \n\n" + code*/ );
programInfo.usedTimes ++;
......@@ -6265,7 +6270,7 @@ THREE.WebGLRenderer = function ( parameters ) {
}
//console.log( "building new program " );
// console.log( "building new program " );
//
......@@ -6445,8 +6450,8 @@ THREE.WebGLRenderer = function ( parameters ) {
_gl.deleteShader( glFragmentShader );
_gl.deleteShader( glVertexShader );
//console.log( prefix_fragment + fragmentShader );
//console.log( prefix_vertex + vertexShader );
// console.log( prefix_fragment + fragmentShader );
// console.log( prefix_vertex + vertexShader );
program.uniforms = {};
program.attributes = {};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册