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

add -C to egg2obj

Browse Source
This commit is contained in:
David Rose 2012-09-04 16:58:49 +00:00
parent d995a97ca1
commit f7353b79e7
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandatool/src/objprogs/eggToObj.cxx
View File

@ -38,6 +38,11 @@ EggToObj() :
"Specify the coordinate system of the resulting " + _format_name + "Specify the coordinate system of the resulting " + _format_name +
" file. Normally, this is z-up."); " file. Normally, this is z-up.");
add_option
("C", "", 0,
"Clean out higher-order polygons by subdividing into triangles.",
&EggToObj::dispatch_none, &_triangulate_polygons);
_coordinate_system = CS_zup_right; _coordinate_system = CS_zup_right;
_got_coordinate_system = true; _got_coordinate_system = true;
} }
@ -49,6 +54,12 @@ EggToObj() :
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void EggToObj:: void EggToObj::
run() { run() {
if (_triangulate_polygons) {
nout << "Triangulating polygons.\n";
int num_produced = _data->triangulate_polygons(~0);
nout << " (" << num_produced << " triangles produced.)\n";
}
_data->flatten_transforms(); _data->flatten_transforms();
collect_vertices(_data); collect_vertices(_data);

2
pandatool/src/objprogs/eggToObj.h
View File

@ -63,6 +63,8 @@ private:
const UniqueVertices &unique); const UniqueVertices &unique);
private: private:
bool _triangulate_polygons;
UniqueVertices _unique_vert3, _unique_vert4, _unique_uv2, _unique_uv3, _unique_norm; UniqueVertices _unique_vert3, _unique_vert4, _unique_uv2, _unique_uv3, _unique_norm;
VertexMap _vmap; VertexMap _vmap;
EggGroupNode *_current_group; EggGroupNode *_current_group;