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

more of the same

This commit is contained in:
David Rose 2001-05-30 17:00:23 +00:00
parent 041881345b
commit 3af6925806
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandatool/src/egg-palettize/paletteImage.cxx
View File

@ -294,6 +294,7 @@ count_coverage() const {
bool PaletteImage::
place(TexturePlacement *placement) {
nassertr(placement->is_size_known(), true);
nassertr(!placement->is_placed(), true);
int x, y;
if (find_hole(x, y, placement->get_x_size(), placement->get_y_size())) {
@ -316,8 +317,9 @@ unplace(TexturePlacement *placement) {
Placements::iterator pi;
pi = find(_placements.begin(), _placements.end(), placement);
if (pi != _placements.end()) {
while (pi != _placements.end()) {
_placements.erase(pi);
pi = find(_placements.begin(), _placements.end(), placement);
}
_cleared_regions.push_back(ClearedRegion(placement));
@ -356,6 +358,11 @@ check_solitary() {
Placements::const_iterator pi;
for (pi = _placements.begin(); pi != _placements.end(); ++pi) {
TexturePlacement *placement = (*pi);
if (!(placement->get_omit_reason() == OR_none ||
placement->get_omit_reason() == OR_solitary)) {
cerr << "texture " << *placement->get_texture() << " is omitted for "
<< placement->get_omit_reason() << "\n";
}
nassertv(placement->get_omit_reason() == OR_none ||
placement->get_omit_reason() == OR_solitary);
placement->not_solitary();

1
pandatool/src/egg-palettize/palettePage.cxx
View File

@ -105,6 +105,7 @@ place_all() {
Assigned::const_iterator ai;
for (ai = _assigned.begin(); ai != _assigned.end(); ++ai) {
TexturePlacement *placement = (*ai);
cerr << "Placing " << *placement->get_texture() << "\n";
place(placement);
}