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

fix palettization issues with qpgeom

Browse Source
This commit is contained in:
David Rose 2005-04-12 16:14:35 +00:00
parent f9798faa46
commit e037e595cb
4 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1778,7 +1778,7 @@ make_node(EggGroup *egg_group, PandaNode *parent) {
bool all_polysets = false;
bool any_hidden = false;
if (use_qpgeom) {
// check_for_polysets(egg_group, all_polysets, any_hidden);
check_for_polysets(egg_group, all_polysets, any_hidden);
}
if (all_polysets && !any_hidden) {

24
panda/src/egg2pg/eggRenderState.I
View File

@ -42,27 +42,3 @@ INLINE void EggRenderState::
add_attrib(const RenderAttrib *attrib) {
_state = _state->add_attrib(attrib);
}
////////////////////////////////////////////////////////////////////
// Function: EggRenderState::int compare_to
// Access: Public
// Description: Provides a unique ordering for different
// EggRenderState objects, so that primitives of similar
// state can be grouped together by the EggBinner.
////////////////////////////////////////////////////////////////////
INLINE int EggRenderState::
compare_to(const EggRenderState &other) const {
if (_state != other._state) {
return _state < other._state ? -1 : 1;
}
if (_hidden != other._hidden) {
return (int)_hidden - (int)other._hidden;
}
if (_flat_shaded != other._flat_shaded) {
return (int)_flat_shaded - (int)other._flat_shaded;
}
if (_primitive_type != other._primitive_type) {
return (int)_primitive_type - (int)other._primitive_type;
}
return 0;
}

45
panda/src/egg2pg/eggRenderState.cxx
View File

@ -386,6 +386,51 @@ fill_state(EggPrimitive *egg_prim) {
}
}
////////////////////////////////////////////////////////////////////
// Function: EggRenderState::int compare_to
// Access: Public
// Description: Provides a unique ordering for different
// EggRenderState objects, so that primitives of similar
// state can be grouped together by the EggBinner.
////////////////////////////////////////////////////////////////////
int EggRenderState::
compare_to(const EggRenderState &other) const {
if (_state != other._state) {
return _state < other._state ? -1 : 1;
}
if (_hidden != other._hidden) {
return (int)_hidden - (int)other._hidden;
}
if (_flat_shaded != other._flat_shaded) {
return (int)_flat_shaded - (int)other._flat_shaded;
}
if (_primitive_type != other._primitive_type) {
return (int)_primitive_type - (int)other._primitive_type;
}
if (_bake_in_uvs.size() != other._bake_in_uvs.size()) {
return (int)_bake_in_uvs.size() - (int)other._bake_in_uvs.size();
}
BakeInUVs::const_iterator ai, bi;
ai = _bake_in_uvs.begin();
bi = other._bake_in_uvs.begin();
while (ai != _bake_in_uvs.end()) {
nassertr(bi != other._bake_in_uvs.end(), false);
if ((*ai).first != (*bi).first) {
return (*ai).first < (*bi).first ? -1 : 1;
}
if ((*ai).second != (*bi).second) {
return (*ai).second < (*bi).second ? -1 : 1;
}
++ai;
++bi;
}
nassertr(bi == other._bake_in_uvs.end(), false);
return 0;
}
////////////////////////////////////////////////////////////////////
// Function: EggRenderState::get_material_attrib
// Access: Private

2
panda/src/egg2pg/eggRenderState.h
View File

@ -50,7 +50,7 @@ public:
void fill_state(EggPrimitive *egg_prim);
INLINE int compare_to(const EggRenderState &other) const;
int compare_to(const EggRenderState &other) const;
private:
CPT(RenderAttrib) get_material_attrib(const EggMaterial *egg_mat,