TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2019-09-30 14:03:50 +02:00
commit 12e71ff1a6
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
panda/src/chan/animBundleNode.cxx
View File

@ -68,6 +68,19 @@ find_anim_bundle(PandaNode *root) {
return nullptr;
}
/**
*
*/
void AnimBundleNode::
output(std::ostream &out) const {
PandaNode::output(out);
if (_bundle != nullptr) {
out << " (";
_bundle->output(out);
out << ")";
}
}
/**
* Tells the BamReader how to create objects of type AnimBundleNode.
*/

2
panda/src/chan/animBundleNode.h
View File

@ -49,6 +49,8 @@ private:
PT(AnimBundle) _bundle;
public:
virtual void output(std::ostream &out) const;
static void register_with_read_factory();
virtual void write_datagram(BamWriter* manager, Datagram &me);
virtual int complete_pointers(TypedWritable **p_list,

9
panda/src/mathutil/triangulator.cxx
View File

@ -2185,6 +2185,8 @@ triangulate_single_polygon(int nvert, int posmax, int side) {
endv = mchain[posmax].vnum;
}
int num_triangles = 0;
while ((v != endv) || (ri > 1))
{
// cerr << " v = " << v << " ri = " << ri << " rc = " << rc.size() << "
@ -2199,8 +2201,13 @@ triangulate_single_polygon(int nvert, int posmax, int side) {
vert[rc[ri]].pt);
if ( crossResult >= 0 ) /* could be convex corner or straight */
{
if ( crossResult > 0) /* convex corner: cut it off */
if (crossResult > 0) { /* convex corner: cut it off */
_result.push_back(Triangle(this, rc[ri - 1], rc[ri], v));
if (++num_triangles >= nvert - 2) {
// We can't generate more than this number of triangles.
return;
}
}
/* else : perfectly straight, will be abandoned anyway */
ri--;
rc.pop_back();