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

plist=>p_list

This commit is contained in:
cxgeorge 2001-06-06 18:18:12 +00:00
parent ccb4fd40df
commit 756fdc8cae
22 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandatool/src/egg-palettize/eggFile.cxx
View File

@ -568,21 +568,21 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int EggFile::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr((int)plist.size() >= _num_textures + 1, 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr((int)p_list.size() >= _num_textures + 1, 0);
int index = 0;
int i;
_textures.reserve(_num_textures);
for (i = 0; i < _num_textures; i++) {
TextureReference *texture;
DCAST_INTO_R(texture, plist[index], index);
DCAST_INTO_R(texture, p_list[index], index);
_textures.push_back(texture);
index++;
}
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_default_group, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_default_group, p_list[index], index);
}
index++;

2
pandatool/src/egg-palettize/eggFile.h
View File

@ -100,7 +100,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
protected:

8
pandatool/src/egg-palettize/paletteGroup.cxx
View File

@ -631,14 +631,14 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int PaletteGroup::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr((int)plist.size() >= _num_placements + _num_pages, 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr((int)p_list.size() >= _num_placements + _num_pages, 0);
int index = 0;
int i;
for (i = 0; i < _num_placements; i++) {
TexturePlacement *placement;
DCAST_INTO_R(placement, plist[index], index);
DCAST_INTO_R(placement, p_list[index], index);
index++;
bool inserted = _placements.insert(placement).second;
nassertr(inserted, index);
@ -651,7 +651,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) {
_load_pages.reserve(_num_pages);
for (i = 0; i < _num_pages; i++) {
PalettePage *page;
DCAST_INTO_R(page, plist[index], index);
DCAST_INTO_R(page, p_list[index], index);
index++;
_load_pages.push_back(page);
}

2
pandatool/src/egg-palettize/paletteGroup.h
View File

@ -108,7 +108,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
virtual void finalize();

6
pandatool/src/egg-palettize/paletteGroups.cxx
View File

@ -297,11 +297,11 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int PaletteGroups::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr(_num_groups == (int)plist.size(), 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr(_num_groups == (int)p_list.size(), 0);
for (int i = 0; i < _num_groups; i++) {
PaletteGroup *group;
DCAST_INTO_R(group, plist[i], i);
DCAST_INTO_R(group, p_list[i], i);
_groups.insert(group);
}
return 0;

2
pandatool/src/egg-palettize/paletteGroups.h
View File

@ -77,7 +77,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
protected:

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

@ -791,21 +791,21 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int PaletteImage::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr((int)plist.size() >= _num_placements + 1, 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr((int)p_list.size() >= _num_placements + 1, 0);
int index = 0;
int i;
_placements.reserve(_num_placements);
for (i = 0; i < _num_placements; i++) {
TexturePlacement *placement;
DCAST_INTO_R(placement, plist[index], index);
DCAST_INTO_R(placement, p_list[index], index);
_placements.push_back(placement);
index++;
}
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_page, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_page, p_list[index], index);
}
index++;

2
pandatool/src/egg-palettize/paletteImage.h
View File

@ -106,7 +106,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
protected:

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

@ -294,12 +294,12 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int PalettePage::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr((int)plist.size() >= 1 + _num_images, 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr((int)p_list.size() >= 1 + _num_images, 0);
int index = 0;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_group, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_group, p_list[index], index);
}
index++;
@ -307,7 +307,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) {
_images.reserve(_num_images);
for (i = 0; i < _num_images; i++) {
PaletteImage *image;
DCAST_INTO_R(image, plist[index], index);
DCAST_INTO_R(image, p_list[index], index);
_images.push_back(image);
index++;
}

2
pandatool/src/egg-palettize/palettePage.h
View File

@ -73,7 +73,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
protected:

26
pandatool/src/egg-palettize/palettizer.cxx
View File

@ -903,48 +903,48 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int Palettizer::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr((int)plist.size() >= 4 + _num_egg_files + _num_groups + _num_textures, 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr((int)p_list.size() >= 4 + _num_egg_files + _num_groups + _num_textures, 0);
int index = 0;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_color_type, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_color_type, p_list[index], index);
}
index++;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_alpha_type, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_alpha_type, p_list[index], index);
}
index++;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_shadow_color_type, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_shadow_color_type, p_list[index], index);
}
index++;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_shadow_alpha_type, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_shadow_alpha_type, p_list[index], index);
}
index++;
int i;
for (i = 0; i < _num_egg_files; i++) {
EggFile *egg_file;
DCAST_INTO_R(egg_file, plist[index], index);
DCAST_INTO_R(egg_file, p_list[index], index);
_egg_files.insert(EggFiles::value_type(egg_file->get_name(), egg_file));
index++;
}
for (i = 0; i < _num_groups; i++) {
PaletteGroup *group;
DCAST_INTO_R(group, plist[index], index);
DCAST_INTO_R(group, p_list[index], index);
_groups.insert(Groups::value_type(group->get_name(), group));
index++;
}
for (i = 0; i < _num_textures; i++) {
TextureImage *texture;
DCAST_INTO_R(texture, plist[index], index);
DCAST_INTO_R(texture, p_list[index], index);
_textures.insert(Textures::value_type(texture->get_name(), texture));
index++;
}

2
pandatool/src/egg-palettize/palettizer.h
View File

@ -136,7 +136,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
protected:

6
pandatool/src/egg-palettize/sourceTextureImage.cxx
View File

@ -201,10 +201,10 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int SourceTextureImage::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr(plist.size() >= 1, 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr(p_list.size() >= 1, 0);
DCAST_INTO_R(_texture, plist[0], 0);
DCAST_INTO_R(_texture, p_list[0], 0);
return 1;
}

2
pandatool/src/egg-palettize/sourceTextureImage.h
View File

@ -56,7 +56,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
protected:

12
pandatool/src/egg-palettize/textureImage.cxx
View File

@ -1133,24 +1133,24 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int TextureImage::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr((int)plist.size() >= _num_placement * 2 + _num_sources + _num_dests, 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr((int)p_list.size() >= _num_placement * 2 + _num_sources + _num_dests, 0);
int index = 0;
int i;
for (i = 0; i < _num_placement; i++) {
PaletteGroup *group;
TexturePlacement *placement;
DCAST_INTO_R(group, plist[index], index);
DCAST_INTO_R(group, p_list[index], index);
index++;
DCAST_INTO_R(placement, plist[index], index);
DCAST_INTO_R(placement, p_list[index], index);
index++;
_placement.insert(Placement::value_type(group, placement));
}
for (i = 0; i < _num_sources; i++) {
SourceTextureImage *source;
DCAST_INTO_R(source, plist[index], index);
DCAST_INTO_R(source, p_list[index], index);
string key = get_source_key(source->get_filename(),
source->get_alpha_filename());
@ -1161,7 +1161,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) {
for (i = 0; i < _num_dests; i++) {
DestTextureImage *dest;
DCAST_INTO_R(dest, plist[index], index);
DCAST_INTO_R(dest, p_list[index], index);
bool inserted = _dests.insert(Dests::value_type(dest->get_filename(), dest)).second;
index++;
nassertr(inserted, index);

2
pandatool/src/egg-palettize/textureImage.h
View File

@ -135,7 +135,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
protected:

24
pandatool/src/egg-palettize/texturePlacement.cxx
View File

@ -962,32 +962,32 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int TexturePlacement::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr((int)plist.size() >= 3 + _num_references, 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr((int)p_list.size() >= 3 + _num_references, 0);
if (Palettizer::_read_pi_version >= 2) {
nassertr((int)plist.size() >= 4 + _num_references, 0);
nassertr((int)p_list.size() >= 4 + _num_references, 0);
}
int index = 0;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_texture, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_texture, p_list[index], index);
}
index++;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_group, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_group, p_list[index], index);
}
index++;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_image, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_image, p_list[index], index);
}
index++;
if (Palettizer::_read_pi_version >= 2) {
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_dest, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_dest, p_list[index], index);
}
index++;
}
@ -995,7 +995,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) {
int i;
for (i = 0; i < _num_references; i++) {
TextureReference *reference;
DCAST_INTO_R(reference, plist[index], index);
DCAST_INTO_R(reference, p_list[index], index);
_references.insert(reference);
index++;
}

2
pandatool/src/egg-palettize/texturePlacement.h
View File

@ -119,7 +119,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
protected:

12
pandatool/src/egg-palettize/textureProperties.cxx
View File

@ -576,17 +576,17 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int TextureProperties::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr(plist.size() >= 2, 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr(p_list.size() >= 2, 0);
int index = 0;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_color_type, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_color_type, p_list[index], index);
}
index++;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_alpha_type, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_alpha_type, p_list[index], index);
}
index++;

2
pandatool/src/egg-palettize/textureProperties.h
View File

@ -75,7 +75,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
protected:

16
pandatool/src/egg-palettize/textureReference.cxx
View File

@ -720,22 +720,22 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
// number of pointers processed from the list.
////////////////////////////////////////////////////////////////////
int TextureReference::
complete_pointers(vector_typedWritable &plist, BamReader *manager) {
nassertr((int)plist.size() >= 3, 0);
complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
nassertr((int)p_list.size() >= 3, 0);
int index = 0;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_egg_file, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_egg_file, p_list[index], index);
}
index++;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_source_texture, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_source_texture, p_list[index], index);
}
index++;
if (plist[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_placement, plist[index], index);
if (p_list[index] != (TypedWritable *)NULL) {
DCAST_INTO_R(_placement, p_list[index], index);
}
index++;

2
pandatool/src/egg-palettize/textureReference.h
View File

@ -105,7 +105,7 @@ private:
public:
static void register_with_read_factory();
virtual void write_datagram(BamWriter *writer, Datagram &datagram);
virtual int complete_pointers(vector_typedWritable &plist,
virtual int complete_pointers(vector_typedWritable &p_list,
BamReader *manager);
protected: