RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unify()

This commit is contained in:
David Rose 2005-04-20 20:24:21 +00:00
parent f80d624573
commit 3a88955760
9 changed files with 122 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
panda/src/gobj/qpgeom.I
View File

@ -20,10 +20,13 @@
////////////////////////////////////////////////////////////////////
// Function: qpGeom::get_primitive_type
// Access: Published
// Description: Returns the primitive type that is common to all
// GeomPrimitives added within the Geom. All nested
// primitives within a particular Geom must be the same
// type.
// Description: Returns the fundamental primitive type that is common
// to all GeomPrimitives added within the Geom. All
// nested primitives within a particular Geom must be
// the same type (that is, you can mix triangles and
// tristrips, because they are both the same fundamental
// type PT_polygons, but you cannot mix triangles and
// points withn the same Geom).
////////////////////////////////////////////////////////////////////
INLINE qpGeom::PrimitiveType qpGeom::
get_primitive_type() const {
@ -165,6 +168,22 @@ rotate() const {
return new_geom;
}
////////////////////////////////////////////////////////////////////
// Function: qpGeom::unify
// Access: Published
// Description: Unifies all of the primitives contained within this
// Geom into a single primitive object. This may
// require decomposing the primitives if, for instance,
// the Geom contains both triangle strips and triangle
// fans.
////////////////////////////////////////////////////////////////////
INLINE CPT(qpGeom) qpGeom::
unify() const {
PT(qpGeom) new_geom = new qpGeom(*this);
new_geom->unify_in_place();
return new_geom;
}
////////////////////////////////////////////////////////////////////
// Function: qpGeom::get_modified
// Access: Published

67
panda/src/gobj/qpgeom.cxx
View File

@ -448,6 +448,73 @@ rotate_in_place() {
nassertv(all_is_valid);
}
////////////////////////////////////////////////////////////////////
// Function: qpGeom::unify_in_place
// Access: Published
// Description: Unifies all of the primitives contained within this
// Geom into a single primitive object. This may
// require decomposing the primitives if, for instance,
// the Geom contains both triangle strips and triangle
// fans.
////////////////////////////////////////////////////////////////////
void qpGeom::
unify_in_place() {
if (get_num_primitives() <= 1) {
// If we don't have more than one primitive to start with, no need
// to do anything.
return;
}
clear_cache();
CDWriter cdata(_cycler);
PT(qpGeomPrimitive) new_prim;
Primitives::const_iterator pi;
for (pi = cdata->_primitives.begin(); pi != cdata->_primitives.end(); ++pi) {
CPT(qpGeomPrimitive) primitive = (*pi);
if (new_prim == (qpGeomPrimitive *)NULL) {
// The first primitive type we come across is copied directly.
new_prim = primitive->make_copy();
} else {
// Thereafter, we must try to merge primitives. If they are not
// the same type, we have to decompose both of them.
if (new_prim->get_type() != primitive->get_type()) {
CPT(qpGeomPrimitive) decomposed = new_prim->decompose();
new_prim = (qpGeomPrimitive *)decomposed.p();
primitive = primitive->decompose();
nassertv(new_prim->get_type() == primitive->get_type());
}
// Now simply copy in the vertices.
int num_primitives = primitive->get_num_primitives();
for (int pi = 0; pi < num_primitives; ++pi) {
int start = primitive->get_primitive_start(pi);
int end = primitive->get_primitive_end(pi);
for (int vi = start; vi < end; ++vi) {
new_prim->add_vertex(primitive->get_vertex(vi));
}
new_prim->close_primitive();
}
}
}
// At the end of the day, we have just one primitive, which becomes
// the one primitive in our list of primitives.
nassertv(new_prim->check_valid(cdata->_data));
// The new primitive, naturally, inherits the Geom's overall shade
// model.
new_prim->set_shade_model(cdata->_shade_model);
cdata->_primitives.clear();
cdata->_primitives.push_back(new_prim);
cdata->_modified = qpGeom::get_next_modified();
reset_geom_rendering(cdata);
}
////////////////////////////////////////////////////////////////////
// Function: qpGeom::get_num_bytes
// Access: Published

2
panda/src/gobj/qpgeom.h
View File

@ -90,9 +90,11 @@ PUBLISHED:
INLINE CPT(qpGeom) decompose() const;
INLINE CPT(qpGeom) rotate() const;
INLINE CPT(qpGeom) unify() const;
void decompose_in_place();
void rotate_in_place();
void unify_in_place();
int get_num_bytes() const;
INLINE UpdateSeq get_modified() const;

8
panda/src/gobj/qpgeomLines.cxx
View File

@ -69,9 +69,11 @@ make_copy() const {
// Access: Public, Virtual
// Description: Returns the fundamental rendering type of this
// primitive: whether it is points, lines, or polygons.
// This is used primarily to set up the appropriate
// antialiasing settings when AntialiasAttrib::M_auto is
// in effect.
//
// This is used to set up the appropriate antialiasing
// settings when AntialiasAttrib::M_auto is in effect;
// it also implies the type of primitive that will be
// produced when decompose() is called.
////////////////////////////////////////////////////////////////////
qpGeomPrimitive::PrimitiveType qpGeomLines::
get_primitive_type() const {

8
panda/src/gobj/qpgeomLinestrips.cxx
View File

@ -71,9 +71,11 @@ make_copy() const {
// Access: Public, Virtual
// Description: Returns the fundamental rendering type of this
// primitive: whether it is points, lines, or polygons.
// This is used primarily to set up the appropriate
// antialiasing settings when AntialiasAttrib::M_auto is
// in effect.
//
// This is used to set up the appropriate antialiasing
// settings when AntialiasAttrib::M_auto is in effect;
// it also implies the type of primitive that will be
// produced when decompose() is called.
////////////////////////////////////////////////////////////////////
qpGeomPrimitive::PrimitiveType qpGeomLinestrips::
get_primitive_type() const {

8
panda/src/gobj/qpgeomPoints.cxx
View File

@ -69,9 +69,11 @@ make_copy() const {
// Access: Public, Virtual
// Description: Returns the fundamental rendering type of this
// primitive: whether it is points, lines, or polygons.
// This is used primarily to set up the appropriate
// antialiasing settings when AntialiasAttrib::M_auto is
// in effect.
//
// This is used to set up the appropriate antialiasing
// settings when AntialiasAttrib::M_auto is in effect;
// it also implies the type of primitive that will be
// produced when decompose() is called.
////////////////////////////////////////////////////////////////////
qpGeomPrimitive::PrimitiveType qpGeomPoints::
get_primitive_type() const {

8
panda/src/gobj/qpgeomTriangles.cxx
View File

@ -70,9 +70,11 @@ make_copy() const {
// Access: Public, Virtual
// Description: Returns the fundamental rendering type of this
// primitive: whether it is points, lines, or polygons.
// This is used primarily to set up the appropriate
// antialiasing settings when AntialiasAttrib::M_auto is
// in effect.
//
// This is used to set up the appropriate antialiasing
// settings when AntialiasAttrib::M_auto is in effect;
// it also implies the type of primitive that will be
// produced when decompose() is called.
////////////////////////////////////////////////////////////////////
qpGeomPrimitive::PrimitiveType qpGeomTriangles::
get_primitive_type() const {

8
panda/src/gobj/qpgeomTrifans.cxx
View File

@ -70,9 +70,11 @@ make_copy() const {
// Access: Public, Virtual
// Description: Returns the fundamental rendering type of this
// primitive: whether it is points, lines, or polygons.
// This is used primarily to set up the appropriate
// antialiasing settings when AntialiasAttrib::M_auto is
// in effect.
//
// This is used to set up the appropriate antialiasing
// settings when AntialiasAttrib::M_auto is in effect;
// it also implies the type of primitive that will be
// produced when decompose() is called.
////////////////////////////////////////////////////////////////////
qpGeomPrimitive::PrimitiveType qpGeomTrifans::
get_primitive_type() const {

8
panda/src/gobj/qpgeomTristrips.cxx
View File

@ -71,9 +71,11 @@ make_copy() const {
// Access: Public, Virtual
// Description: Returns the fundamental rendering type of this
// primitive: whether it is points, lines, or polygons.
// This is used primarily to set up the appropriate
// antialiasing settings when AntialiasAttrib::M_auto is
// in effect.
//
// This is used to set up the appropriate antialiasing
// settings when AntialiasAttrib::M_auto is in effect;
// it also implies the type of primitive that will be
// produced when decompose() is called.
////////////////////////////////////////////////////////////////////
qpGeomPrimitive::PrimitiveType qpGeomTristrips::
get_primitive_type() const {