Skip to content

T
three.js

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

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

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

提交 b0190b63 编写于 作者: M Mugen87
浏览文件
操作

FBXLoader: Sanitize node name only if necessary.

上级 eb9241d1
隐藏空白更改
内联 并排
Showing with 16 addition and 12 deletion
examples/js/loaders/FBXLoader.js
浏览文件 @ b0190b63
...@@ -883,7 +883,8 @@ THREE.FBXLoader = ( function () { ...@@ -883,7 +883,8 @@ THREE.FBXLoader = ( function () {
} }
model.name = THREE.PropertyBinding.sanitizeNodeName( node.attrName ); model.name = node.attrName ? THREE.PropertyBinding.sanitizeNodeName( node.attrName ) : '';
model.ID = id; model.ID = id;
} }
...@@ -917,7 +918,8 @@ THREE.FBXLoader = ( function () { ...@@ -917,7 +918,8 @@ THREE.FBXLoader = ( function () {
bone.matrixWorld.copy( rawBone.transformLink ); bone.matrixWorld.copy( rawBone.transformLink );
// set name and id here - otherwise in cases where "subBone" is created it will not have a name / id // set name and id here - otherwise in cases where "subBone" is created it will not have a name / id
bone.name = THREE.PropertyBinding.sanitizeNodeName( name );
bone.name = name ? THREE.PropertyBinding.sanitizeNodeName( name ) : '';
bone.ID = id; bone.ID = id;
skeleton.bones[ i ] = bone; skeleton.bones[ i ] = bone;
...@@ -1548,7 +1550,7 @@ THREE.FBXLoader = ( function () { ...@@ -1548,7 +1550,7 @@ THREE.FBXLoader = ( function () {
}, null ); }, null );
relationships.children.forEach( function( child ) { relationships.children.forEach( function ( child ) {
if ( deformers.morphTargets[ child.ID ] !== undefined ) { if ( deformers.morphTargets[ child.ID ] !== undefined ) {
...@@ -2060,7 +2062,7 @@ THREE.FBXLoader = ( function () { ...@@ -2060,7 +2062,7 @@ THREE.FBXLoader = ( function () {
// parentGeo.morphAttributes.normal = []; // not implemented // parentGeo.morphAttributes.normal = []; // not implemented
var self = this; var self = this;
morphTargets.forEach( function( morphTarget ) { morphTargets.forEach( function ( morphTarget ) {
morphTarget.rawTargets.forEach( function ( rawTarget ) { morphTarget.rawTargets.forEach( function ( rawTarget ) {
...@@ -2492,7 +2494,7 @@ THREE.FBXLoader = ( function () { ...@@ -2492,7 +2494,7 @@ THREE.FBXLoader = ( function () {
var node = { var node = {
modelName: THREE.PropertyBinding.sanitizeNodeName( rawModel.attrName ), modelName: rawModel.attrName ? THREE.PropertyBinding.sanitizeNodeName( rawModel.attrName ) : '',
ID: rawModel.id, ID: rawModel.id,
initialPosition: [ 0, 0, 0 ], initialPosition: [ 0, 0, 0 ],
initialRotation: [ 0, 0, 0 ], initialRotation: [ 0, 0, 0 ],
...@@ -2547,7 +2549,7 @@ THREE.FBXLoader = ( function () { ...@@ -2547,7 +2549,7 @@ THREE.FBXLoader = ( function () {
var node = { var node = {
modelName: THREE.PropertyBinding.sanitizeNodeName( rawModel.attrName ), modelName: rawModel.attrName ? THREE.PropertyBinding.sanitizeNodeName( rawModel.attrName ) : '',
morphName: fbxTree.Objects.Deformer[ deformerID ].attrName, morphName: fbxTree.Objects.Deformer[ deformerID ].attrName,
}; };
......
examples/jsm/loaders/FBXLoader.js
浏览文件 @ b0190b63
...@@ -931,7 +931,8 @@ var FBXLoader = ( function () { ...@@ -931,7 +931,8 @@ var FBXLoader = ( function () {
} }
model.name = PropertyBinding.sanitizeNodeName( node.attrName ); model.name = node.attrName ? PropertyBinding.sanitizeNodeName( node.attrName ) : '';
model.ID = id; model.ID = id;
} }
...@@ -965,7 +966,8 @@ var FBXLoader = ( function () { ...@@ -965,7 +966,8 @@ var FBXLoader = ( function () {
bone.matrixWorld.copy( rawBone.transformLink ); bone.matrixWorld.copy( rawBone.transformLink );
// set name and id here - otherwise in cases where "subBone" is created it will not have a name / id // set name and id here - otherwise in cases where "subBone" is created it will not have a name / id
bone.name = PropertyBinding.sanitizeNodeName( name );
bone.name = name ? PropertyBinding.sanitizeNodeName( name ) : '';
bone.ID = id; bone.ID = id;
skeleton.bones[ i ] = bone; skeleton.bones[ i ] = bone;
...@@ -1596,7 +1598,7 @@ var FBXLoader = ( function () { ...@@ -1596,7 +1598,7 @@ var FBXLoader = ( function () {
}, null ); }, null );
relationships.children.forEach( function( child ) { relationships.children.forEach( function ( child ) {
if ( deformers.morphTargets[ child.ID ] !== undefined ) { if ( deformers.morphTargets[ child.ID ] !== undefined ) {
...@@ -2108,7 +2110,7 @@ var FBXLoader = ( function () { ...@@ -2108,7 +2110,7 @@ var FBXLoader = ( function () {
// parentGeo.morphAttributes.normal = []; // not implemented // parentGeo.morphAttributes.normal = []; // not implemented
var self = this; var self = this;
morphTargets.forEach( function( morphTarget ) { morphTargets.forEach( function ( morphTarget ) {
morphTarget.rawTargets.forEach( function ( rawTarget ) { morphTarget.rawTargets.forEach( function ( rawTarget ) {
...@@ -2540,7 +2542,7 @@ var FBXLoader = ( function () { ...@@ -2540,7 +2542,7 @@ var FBXLoader = ( function () {
var node = { var node = {
modelName: PropertyBinding.sanitizeNodeName( rawModel.attrName ), modelName: rawModel.attrName ? PropertyBinding.sanitizeNodeName( rawModel.attrName ) : '',
ID: rawModel.id, ID: rawModel.id,
initialPosition: [ 0, 0, 0 ], initialPosition: [ 0, 0, 0 ],
initialRotation: [ 0, 0, 0 ], initialRotation: [ 0, 0, 0 ],
...@@ -2595,7 +2597,7 @@ var FBXLoader = ( function () { ...@@ -2595,7 +2597,7 @@ var FBXLoader = ( function () {
var node = { var node = {
modelName: PropertyBinding.sanitizeNodeName( rawModel.attrName ), modelName: rawModel.attrName ? PropertyBinding.sanitizeNodeName( rawModel.attrName ) : '',
morphName: fbxTree.Objects.Deformer[ deformerID ].attrName, morphName: fbxTree.Objects.Deformer[ deformerID ].attrName,
}; };
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或