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

fixes the order of the uvset-texture link: previous checkin didn't do the job

Browse Source
This commit is contained in:
Asad M. Zaman 2005-12-13 00:48:09 +00:00
parent 7a9d0c11ad
commit a3946de5d3
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pandatool/src/mayaegg/mayaToEggConverter.cxx
View File

@ -1593,10 +1593,10 @@ find_uv_link(string match) {
return _uvset_names[idx];
}
}
mayaegg_cat.spam() << "ful: did not find " << match << endl;
mayaegg_cat.spam() << "ful: did not find uvset-texture link called:" << match << endl;
return "not found";
}
/*
////////////////////////////////////////////////////////////////////
// Function: MayaToEggConverter::store_tex_names
// Access: Private
@ -1614,7 +1614,7 @@ make_tex_names(const MFnMesh &mesh, const MObject &mesh_object) {
_tex_names.clear();
dn.getConnections(pla);
mayaegg_cat.spam() << "number of connections: " << pla.length() << endl;
mayaegg_cat.info() << "number of connections: " << pla.length() << endl;
string uv1("uvLink -query -uvSet ");
uv1.append(mesh.name().asChar());
uv1.append(".uvSet[0].uvSetName");
@ -1624,30 +1624,30 @@ make_tex_names(const MFnMesh &mesh, const MObject &mesh_object) {
maya_cat.spam() << "found uvLink to texture: " << mresult[k].asChar() << endl;
tcat.append(mresult[k].asChar());
}
maya_cat.debug() << "saving string to look up uvset: " << tcat << endl;
mayaegg_cat.info() << "saving string to look up uvset: " << tcat << endl;
_tex_names.push_back(tcat);
for (size_t j=0; j<pla.length(); ++j) {
MPlug pl = pla[j];
//maya_cat.info() << pl.name() << " is(pl) " << pl.node().apiTypeStr() << endl;
mayaegg_cat.info() << pl.name() << " is(pl) " << pl.node().apiTypeStr() << endl;
string tn;
string ts = pl.name().asChar();
if (ts.find("uvSetName") != string::npos) {
string execString = "uvLink -query -uvSet " + ts;
//maya_cat.info() << "executing command: " << execString << "\n";
//mayaegg_cat.info() << "executing command: " << execString << "\n";
MGlobal::executeCommand(MString(execString.c_str()), mresult);
for (size_t k=0; k<mresult.length(); ++k) {
maya_cat.spam() << "found uvLink to texture: " << mresult[k].asChar() << endl;
maya_cat.info() << "found uvLink to texture: " << mresult[k].asChar() << endl;
tcat.append(mresult[k].asChar());
}
// save unique of this string
if (find_uv_link(tcat) == "not found") {
maya_cat.debug() << "saving string: " << tcat << endl;
mayaegg_cat.info() << "saving string: " << tcat << endl;
_tex_names.push_back(tcat);
}
}
}
}
*/
////////////////////////////////////////////////////////////////////
// Function: MayaToEggConverter::make_polyset
// Access: Private
@ -1749,14 +1749,24 @@ make_polyset(MayaNodeDesc *node_desc, const MDagPath &dag_path,
if (!status) {
status.perror("MFnMesh getUVSetNames not found");
}
MObjectArray moa;
_tex_names.clear();
_uvset_names.clear();
for (size_t ui=0; ui<maya_uvset_names.length(); ++ui) {
mayaegg_cat.debug() << "uv_set[" << ui << "] name: " << maya_uvset_names[ui].asChar() << endl;
mayaegg_cat.spam() << "uv_set[" << ui << "] name: " << maya_uvset_names[ui].asChar() << endl;
_uvset_names.push_back(maya_uvset_names[ui].asChar());
mesh.getAssociatedUVSetTextures(maya_uvset_names[ui], moa);
string t_n("");
for (size_t ui=0; ui<moa.length(); ++ui){
MFnDependencyNode dt(moa[ui]);
t_n = dt.name().asChar();
mayaegg_cat.spam() << "texture_node:" << t_n << endl;
}
_tex_names.push_back(t_n);
}
// Get the tex_names that are connected to those uvnames
make_tex_names(mesh, mesh_object);
//make_tex_names(mesh, mesh_object);
while (!pi.isDone()) {
EggPolygon *egg_poly = new EggPolygon;

3
pandatool/src/mayaegg/mayaToEggConverter.h
View File

@ -117,7 +117,7 @@ private:
// I ran into core dumps trying to pass around a MFnMesh object by
// value. From now on, all MFn* objects will be passed around by
// reference.
void make_tex_names(const MFnMesh &mesh, const MObject &mesh_object);
// void make_tex_names(const MFnMesh &mesh, const MObject &mesh_object);
void make_nurbs_surface(MayaNodeDesc *node_desc,
const MDagPath &dag_path,
@ -152,6 +152,7 @@ private:
bool reparent_decals(EggGroupNode *egg_parent);
string find_uv_link(string match);
// string find_uv_link_2(string match, const MObjectArray &textures);
string _program_name;