TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

attempt to fix unicode issues

Browse Source
This commit is contained in:
rdb 2013-10-07 20:26:10 +00:00
parent 849b60c6e9
commit f5dc6ac8d7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandatool/src/maxegg/maxEggLoader.cxx
View File

@ -103,7 +103,7 @@ MaxEggTex *MaxEggLoader::GetTex(const string &fn)
return _tex_tab[fn]; return _tex_tab[fn];
BitmapTex *bmt = NewDefaultBitmapTex(); BitmapTex *bmt = NewDefaultBitmapTex();
bmt->SetMapName(_M(fn.c_str())); bmt->SetMapName(MSTR::FromACP(fn.c_str()));
StdMat *mat = NewDefaultStdMat(); StdMat *mat = NewDefaultStdMat();
mat->SetSubTexmap(ID_DI, bmt); mat->SetSubTexmap(ID_DI, bmt);
mat->SetTexmapAmt(ID_DI, 1.0, 0); mat->SetTexmapAmt(ID_DI, 1.0, 0);
@ -284,7 +284,7 @@ void MaxEggJoint::CreateMaxBone(void)
_node->SetWireColor(RGB(int(boneColor.x*255.0f), int(boneColor.y*255.0f), int(boneColor.z*255.0f) )); _node->SetWireColor(RGB(int(boneColor.x*255.0f), int(boneColor.y*255.0f), int(boneColor.z*255.0f) ));
_node->SetBoneNodeOnOff(TRUE, 0); _node->SetBoneNodeOnOff(TRUE, 0);
_node->SetRenderable(FALSE); _node->SetRenderable(FALSE);
_node->SetName(_M(_egg_joint->get_name().c_str())); _node->SetName(MSTR::FromACP(_egg_joint->get_name().c_str()));
_node->SetObjOffsetRot(ooquat); _node->SetObjOffsetRot(ooquat);
if (_parent) { if (_parent) {
_node->Detach(0, 1); _node->Detach(0, 1);
@ -454,7 +454,7 @@ MaxEggMesh *MaxEggLoader::GetMesh(EggVertexPool *pool)
result->_tvert_count = 0; result->_tvert_count = 0;
result->_cvert_count = 0; result->_cvert_count = 0;
result->_face_count = 0; result->_face_count = 0;
result->_node->SetName(_M(name.c_str())); result->_node->SetName(MSTR::FromACP(name.c_str()));
_mesh_tab[pool] = result; _mesh_tab[pool] = result;
} }
return result; return result;