Changeset 420 for trunk/src/formats/md5_loader.cc
- Timestamp:
- 07/15/15 19:59:40 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/formats/md5_loader.cc
r419 r420 116 116 for ( size_t i = 0; i < m_nodes->get_count(); ++i ) 117 117 { 118 sstream >> nodes[i].name >> nodes[i].parent_id; 118 std::string name; 119 sstream >> name >> nodes[i].parent_id; 119 120 vec3 pos; 120 121 quat orient; … … 125 126 sstream >> orient.x >> orient.y >> orient.z; 126 127 unit_quat_w( orient ); 127 remove_quotes( nodes[i].name ); 128 nodes[i].target_id = -1; 128 remove_quotes( name ); 129 // nodes[i].name = name; 130 nodes[i].name_hash = hash_string< uint64 >( name.c_str() ); 131 // nodes[i].target_id = -1; 129 132 nodes[i].parent_id = -1; 130 133 nodes[i].transform = transform( pos, orient ).inverse().extract(); … … 246 249 { 247 250 std::string name; 248 sstream >> n odes[i].name >> nodes[i].parent_id >> joint_infos[i].flags >> joint_infos[i].start_index;251 sstream >> name >> nodes[i].parent_id >> joint_infos[i].flags >> joint_infos[i].start_index; 249 252 remove_quotes( name ); 253 // nodes[i].name = name; 254 nodes[i].name_hash = hash_string< uint64 >( name.c_str() ); 250 255 nodes[i].transform = mat4(); 251 nodes[i].target_id = -1;252 256 nodes[i].data = data_channel_set_creator::create( 1 ); 253 257 data_channel_set_creator( nodes[i].data ).add_channel< md5_key_t >( num_frames );
Note: See TracChangeset
for help on using the changeset viewer.