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

better reporting of unexpected vertex dimensionality

Browse Source
This commit is contained in:
David Rose 2003-01-23 18:42:45 +00:00
parent 55e5ee50ea
commit 623c59ee8f
1 changed files with 81 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/egg2pg/eggLoader.cxx
View File

@ -52,6 +52,7 @@
#include "eggBin.h" #include "eggBin.h"
#include "eggTable.h" #include "eggTable.h"
#include "eggBinner.h" #include "eggBinner.h"
#include "eggVertexPool.h"
#include "characterMaker.h" #include "characterMaker.h"
#include "character.h" #include "character.h"
#include "animBundleMaker.h" #include "animBundleMaker.h"
@ -254,6 +255,12 @@ make_nonindexed_primitive(EggPrimitive *egg_prim, PandaNode *parent,
EggPrimitive::const_iterator vi; EggPrimitive::const_iterator vi;
for (vi = egg_prim->begin(); vi != egg_prim->end(); ++vi) { for (vi = egg_prim->begin(); vi != egg_prim->end(); ++vi) {
EggVertex *egg_vert = *vi; EggVertex *egg_vert = *vi;
if (egg_vert->get_num_dimensions() != 3) {
egg2pg_cat.error()
<< "Vertex " << egg_vert->get_pool()->get_name()
<< ":" << egg_vert->get_index() << " has dimension "
<< egg_vert->get_num_dimensions() << "\n";
} else {
BuilderVertex bvert(LCAST(float, egg_vert->get_pos3() * mat)); BuilderVertex bvert(LCAST(float, egg_vert->get_pos3() * mat));
if (egg_vert->has_normal()) { if (egg_vert->has_normal()) {
@ -280,6 +287,7 @@ make_nonindexed_primitive(EggPrimitive *egg_prim, PandaNode *parent,
bprim.add_vertex(bvert); bprim.add_vertex(bvert);
} }
}
// Finally, if the primitive didn't have a color, and it didn't have // Finally, if the primitive didn't have a color, and it didn't have
// vertex color, make it white. // vertex color, make it white.
@ -351,6 +359,12 @@ make_indexed_primitive(EggPrimitive *egg_prim, PandaNode *parent,
for (vi = egg_prim->begin(); vi != egg_prim->end(); ++vi) { for (vi = egg_prim->begin(); vi != egg_prim->end(); ++vi) {
EggVertex *egg_vert = *vi; EggVertex *egg_vert = *vi;
if (egg_vert->get_num_dimensions() != 3) {
egg2pg_cat.error()
<< "Vertex " << egg_vert->get_pool()->get_name()
<< ":" << egg_vert->get_index() << " has dimension "
<< egg_vert->get_num_dimensions() << "\n";
} else {
// Set up the ComputedVerticesMaker for the coordinate space of // Set up the ComputedVerticesMaker for the coordinate space of
// the vertex. // the vertex.
_comp_verts_maker.begin_new_space(); _comp_verts_maker.begin_new_space();
@ -400,6 +414,7 @@ make_indexed_primitive(EggPrimitive *egg_prim, PandaNode *parent,
bprim.add_vertex(bvert); bprim.add_vertex(bvert);
} }
}
// Finally, if the primitive didn't have a color, and it didn't have // Finally, if the primitive didn't have a color, and it didn't have
// vertex color, make it white. // vertex color, make it white.