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

ColladaLoader2: Clean up.

上级 a2ebe814
...@@ -470,7 +470,7 @@ THREE.ColladaLoader.prototype = { ...@@ -470,7 +470,7 @@ THREE.ColladaLoader.prototype = {
case 'technique': case 'technique':
data[ child.nodeName ] = parseEffectParameterTextureExtraTechnique( child ); data[ child.nodeName ] = parseEffectParameterTextureExtraTechnique( child );
break; break;
} }
} }
...@@ -492,29 +492,17 @@ THREE.ColladaLoader.prototype = { ...@@ -492,29 +492,17 @@ THREE.ColladaLoader.prototype = {
switch ( child.nodeName ) { switch ( child.nodeName ) {
case 'repeatU': case 'repeatU':
data[ child.nodeName ] = parseFloat( child.textContent );
break;
case 'repeatV': case 'repeatV':
data[ child.nodeName ] = parseFloat( child.textContent );
break;
case 'offsetU': case 'offsetU':
data[ child.nodeName ] = parseFloat( child.textContent );
break;
case 'offsetV': case 'offsetV':
data[ child.nodeName ] = parseFloat( child.textContent ); data[ child.nodeName ] = parseFloat( child.textContent );
break; break;
case 'wrapU': case 'wrapU':
data[ child.nodeName ] = parseInt( child.textContent );
break;
case 'wrapV': case 'wrapV':
data[ child.nodeName ] = parseInt( child.textContent ); data[ child.nodeName ] = parseInt( child.textContent );
break; break;
} }
} }
...@@ -599,18 +587,18 @@ THREE.ColladaLoader.prototype = { ...@@ -599,18 +587,18 @@ THREE.ColladaLoader.prototype = {
var texture = new THREE.Texture( getImage( surface.init_from ) ); var texture = new THREE.Texture( getImage( surface.init_from ) );
//find techniques var extra = textureObject.extra;
if (textureObject.extra !== undefined) {
if (textureObject.extra.technique !== undefined) { if ( extra !== undefined && extra.technique !== undefined ) {
texture.wrapS = textureObject.extra.technique.wrapU ? THREE.RepeatWrapping : THREE.ClampToEdgeWrapping;
texture.wrapT = textureObject.extra.technique.wrapV ? THREE.RepeatWrapping : THREE.ClampToEdgeWrapping; var technique = extra.technique;
var offsetU = textureObject.extra.technique.offsetU;
var offsetV = textureObject.extra.technique.offsetV; texture.wrapS = technique.wrapU ? THREE.RepeatWrapping : THREE.ClampToEdgeWrapping;
texture.offset.set(offsetU, offsetV); texture.wrapT = technique.wrapV ? THREE.RepeatWrapping : THREE.ClampToEdgeWrapping;
var repeatU = textureObject.extra.technique.repeatU;
var repeatV = textureObject.extra.technique.repeatV; texture.offset.set( technique.offsetU, technique.offsetV );
texture.repeat.set(repeatU, repeatV); texture.repeat.set( technique.repeatU, technique.repeatV );
}
} }
texture.needsUpdate = true; texture.needsUpdate = true;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册