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

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2001-04-11 20:42:19 +00:00
parent 79aae25945
commit 5cbe317cc2
21 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandatool/src/bam/Sources.pp
View File

@ -1,11 +1,11 @@
#begin bin_target #begin bin_target
#define TARGET bam-info #define TARGET bam-info
#define LOCAL_LIBS \ #define LOCAL_LIBS \
eggbase progbase progbase
#define OTHER_LIBS \ #define OTHER_LIBS \
cull:c loader:c egg:c sgraphutil:c sgattrib:c sgraph:c pnmimagetypes:c \ cull:c loader:c egg:c sgraphutil:c sgattrib:c sgraph:c pnmimagetypes:c \
graph:c putil:c express:c panda:m pandaexpress:m \ graph:c putil:c express:c panda:m pandaexpress:m \
interrogatedb:c dtoolutil:c dconfig:c dtool:m pystub interrogatedb:c dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
#define UNIX_SYS_LIBS \ #define UNIX_SYS_LIBS \
m m
@ -24,7 +24,7 @@
loader:c egg2sg:c builder:c egg:c pnmimagetypes:c gobj:c \ loader:c egg2sg:c builder:c egg:c pnmimagetypes:c gobj:c \
chan:c graph:c putil:c \ chan:c graph:c putil:c \
express:c pandaegg:m panda:m pandaexpress:m \ express:c pandaegg:m panda:m pandaexpress:m \
interrogatedb:c dtoolutil:c dconfig:c dtool:m pystub interrogatedb:c dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
#define UNIX_SYS_LIBS \ #define UNIX_SYS_LIBS \
m m

3
pandatool/src/cvscopy/cvsCopy.cxx
View File

@ -7,6 +7,7 @@
#include "cvsSourceDirectory.h" #include "cvsSourceDirectory.h"
#include <notify.h> #include <notify.h>
#include <algorithm>
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: CVSCopy::Constructor // Function: CVSCopy::Constructor
@ -158,7 +159,7 @@ handle_args(Args &args) {
return false; return false;
} }
_source_files.insert(_source_files.end(), args.begin(), args.end()); copy(args.begin(), args.end(), back_inserter<vector_string>(_source_files));
return true; return true;
} }

2
pandatool/src/egg-mkfont/Sources.pp
View File

@ -3,7 +3,7 @@
#define OTHER_LIBS \ #define OTHER_LIBS \
pnmimagetypes:c pnmimage:c \ pnmimagetypes:c pnmimage:c \
egg:c linmath:c putil:c express:c pandaegg:m panda:m pandaexpress:m \ egg:c linmath:c putil:c express:c pandaegg:m panda:m pandaexpress:m \
dtoolutil:c dconfig:c dtool:m pystub dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
#define UNIX_SYS_LIBS m #define UNIX_SYS_LIBS m

4
pandatool/src/egg-mkfont/charBitmap.cxx
View File

@ -5,6 +5,8 @@
#include "charBitmap.h" #include "charBitmap.h"
#include <notify.h>
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: CharBitmap::Constructor // Function: CharBitmap::Constructor
@ -40,7 +42,7 @@ bool CharBitmap::
paint(bool black, int num_pixels, int &repeat) { paint(bool black, int num_pixels, int &repeat) {
if (_y < _block.size()) { if (_y < _block.size()) {
while (num_pixels > 0 && _y < _block.size()) { while (num_pixels > 0 && _y < _block.size()) {
assert(_x < _block[_y].size()); nassertr(_x < _block[_y].size(), true);
_block[_y][_x] = black; _block[_y][_x] = black;
_x++; _x++;
if (_x >= _block[_y].size()) { if (_x >= _block[_y].size()) {

8
pandatool/src/egg-mkfont/eggMakeFont.cxx
View File

@ -748,21 +748,21 @@ run() {
// All done! Write everything out. // All done! Write everything out.
nout << "Scale factor is " << _scale_factor << "\n"; nout << "Scale factor is " << _scale_factor << "\n";
PNMImage small(_output_xsize, _output_ysize, _output_zsize); PNMImage small_image(_output_xsize, _output_ysize, _output_zsize);
small.gaussian_filter_from(_gaussian_radius, _output_image); small_image.gaussian_filter_from(_gaussian_radius, _output_image);
// Fix antialiasing, if required. // Fix antialiasing, if required.
if (_use_alpha && _bg[3] != 0.0 && _bg[3] != 1.0) { if (_use_alpha && _bg[3] != 0.0 && _bg[3] != 1.0) {
// If we have some non-transparent background, we need to // If we have some non-transparent background, we need to
// compensate for the antialiasing. // compensate for the antialiasing.
unsmooth_rgb(small); unsmooth_rgb(small_image);
} }
nout << "Generating " << _output_xsize << " by " << _output_ysize nout << "Generating " << _output_xsize << " by " << _output_ysize
<< " by " << _output_zsize << " image: " << " by " << _output_zsize << " image: "
<< _output_image_filename << "\n"; << _output_image_filename << "\n";
small.write(_output_image_filename); small_image.write(_output_image_filename);
write_egg_file(); write_egg_file();
} }

2
pandatool/src/egg-mkfont/pkFontFile.cxx
View File

@ -816,7 +816,7 @@ do_pre() {
int comment_len = fetch_byte(); int comment_len = fetch_byte();
assert(_p + comment_len <= (int)_pk.size()); assert(_p + comment_len <= (int)_pk.size());
nout.write(&_pk[_p], comment_len); nout.write((const char *)&_pk[_p], comment_len);
nout << "\n"; nout << "\n";
_p += comment_len; _p += comment_len;

2
pandatool/src/egg-palettize/Sources.pp
View File

@ -5,7 +5,7 @@
#define OTHER_LIBS \ #define OTHER_LIBS \
egg:c loader:c linmath:c putil:c express:c pnmimage:c pnmimagetypes:c \ egg:c loader:c linmath:c putil:c express:c pnmimage:c pnmimagetypes:c \
pandaegg:m panda:m pandaexpress:m \ pandaegg:m panda:m pandaexpress:m \
dtoolutil:c dconfig:c dtool:m pystub dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
#define UNIX_SYS_LIBS \ #define UNIX_SYS_LIBS \
m m

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

@ -117,7 +117,7 @@ get_groups() const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void PaletteGroup:: void PaletteGroup::
get_placements(vector<TexturePlacement *> &placements) const { get_placements(vector<TexturePlacement *> &placements) const {
Placements::iterator pi; Placements::const_iterator pi;
for (pi = _placements.begin(); pi != _placements.end(); ++pi) { for (pi = _placements.begin(); pi != _placements.end(); ++pi) {
placements.push_back(*pi); placements.push_back(*pi);
} }
@ -388,7 +388,7 @@ write_image_info(ostream &out, int indent_level) const {
page->write_image_info(out, indent_level); page->write_image_info(out, indent_level);
} }
Placements::iterator pli; Placements::const_iterator pli;
for (pli = _placements.begin(); pli != _placements.end(); ++pli) { for (pli = _placements.begin(); pli != _placements.end(); ++pli) {
TexturePlacement *placement = (*pli); TexturePlacement *placement = (*pli);
if (placement->get_omit_reason() != OR_none) { if (placement->get_omit_reason() != OR_none) {

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

@ -25,8 +25,10 @@ private:
typedef set<PaletteGroup *> Groups; typedef set<PaletteGroup *> Groups;
public: public:
#ifndef WIN32_VC
typedef Groups::const_pointer pointer; typedef Groups::const_pointer pointer;
typedef Groups::const_pointer const_pointer; typedef Groups::const_pointer const_pointer;
#endif
typedef Groups::const_reference reference; typedef Groups::const_reference reference;
typedef Groups::const_reference const_reference; typedef Groups::const_reference const_reference;
typedef Groups::const_iterator iterator; typedef Groups::const_iterator iterator;

2
pandatool/src/eggprogs/Sources.pp
View File

@ -2,7 +2,7 @@
eggbase progbase eggbase progbase
#define OTHER_LIBS \ #define OTHER_LIBS \
egg:c linmath:c putil:c express:c pandaegg:m panda:m pandaexpress:m \ egg:c linmath:c putil:c express:c pandaegg:m panda:m pandaexpress:m \
dtoolutil:c dconfig:c dtool:m pystub dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
#define UNIX_SYS_LIBS m #define UNIX_SYS_LIBS m
#begin bin_target #begin bin_target

5
pandatool/src/eggprogs/eggTextureCards.cxx
View File

@ -11,6 +11,8 @@
#include <eggTexture.h> #include <eggTexture.h>
#include <eggPolygon.h> #include <eggPolygon.h>
#include <algorithm>
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: EggTextureCards::Constructor // Function: EggTextureCards::Constructor
// Access: Public // Access: Public
@ -68,7 +70,8 @@ handle_args(ProgramBase::Args &args) {
return false; return false;
} }
_texture_names.insert(_texture_names.end(), args.begin(), args.end()); copy(args.begin(), args.end(),
back_inserter<vector_string>(_texture_names));
return true; return true;
} }

4
pandatool/src/flt/Sources.pp
View File

@ -2,7 +2,7 @@
#define TARGET flt #define TARGET flt
#define LOCAL_LIBS pandatoolbase #define LOCAL_LIBS pandatoolbase
#define OTHER_LIBS \ #define OTHER_LIBS \
mathutil:c linmath:c putil:c express:c panda:m dtool mathutil:c linmath:c putil:c express:c panda:m dtoolconfig dtool
#define UNIX_SYS_LIBS \ #define UNIX_SYS_LIBS \
m m
@ -61,7 +61,7 @@
flt flt
#define OTHER_LIBS \ #define OTHER_LIBS \
express:c pandaexpress:m \ express:c pandaexpress:m \
dtoolutil:c dconfig:c dtool:m pystub dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
#define SOURCES \ #define SOURCES \
test_flt.cxx test_flt.cxx

6
pandatool/src/flt/fltRecord.cxx
View File

@ -298,13 +298,13 @@ set_comment(const string &comment) {
// exactly the sort of thing we expect. // exactly the sort of thing we expect.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void FltRecord:: void FltRecord::
check_remaining_size(const DatagramIterator &iterator) const { check_remaining_size(const DatagramIterator &di) const {
if (iterator.get_remaining_size() == 0) { if (di.get_remaining_size() == 0) {
return; return;
} }
if (_header->get_flt_version() <= _header->max_flt_version()) { if (_header->get_flt_version() <= _header->max_flt_version()) {
nout << "Warning! Ignoring extra " << iterator.get_remaining_size() nout << "Warning! Ignoring extra " << di.get_remaining_size()
<< " bytes at the end of a " << get_type() << " record.\n"; << " bytes at the end of a " << get_type() << " record.\n";
} }
} }

2
pandatool/src/flt/fltRecord.h
View File

@ -58,7 +58,7 @@ public:
void clear_comment(); void clear_comment();
void set_comment(const string &comment); void set_comment(const string &comment);
void check_remaining_size(const DatagramIterator &iterator) const; void check_remaining_size(const DatagramIterator &di) const;
virtual void output(ostream &out) const; virtual void output(ostream &out) const;
virtual void write(ostream &out, int indent_level = 0) const; virtual void write(ostream &out, int indent_level = 0) const;

2
pandatool/src/fltprogs/Sources.pp
View File

@ -5,7 +5,7 @@
#define OTHER_LIBS \ #define OTHER_LIBS \
linmath:c panda:m \ linmath:c panda:m \
express:c pandaexpress:m \ express:c pandaexpress:m \
dtoolutil:c dconfig:c dtool:m pystub dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
#define SOURCES \ #define SOURCES \
fltCopy.cxx fltCopy.h fltCopy.cxx fltCopy.h

2
pandatool/src/gtk-stats/Sources.pp
View File

@ -9,7 +9,7 @@
gtkbase progbase pstatserver gtkbase progbase pstatserver
#define OTHER_LIBS \ #define OTHER_LIBS \
pstatclient:c linmath:c putil:c express:c panda:m \ pstatclient:c linmath:c putil:c express:c panda:m \
dtoolutil:c dconfig:c dtool:m dtoolutil:c dconfig:c dtoolconfig:m dtool:m
#define UNIX_SYS_LIBS \ #define UNIX_SYS_LIBS \
m m

2
pandatool/src/imageprogs/Sources.pp
View File

@ -6,7 +6,7 @@
imagebase progbase imagebase progbase
#define OTHER_LIBS \ #define OTHER_LIBS \
pnmimagetypes:c pnmimage:c putil:c express:c panda:m \ pnmimagetypes:c pnmimage:c putil:c express:c panda:m \
pandaexpress:m dtool pystub pandaexpress:m dtoolconfig dtool pystub
#define UNIX_SYS_LIBS \ #define UNIX_SYS_LIBS \
m m

2
pandatool/src/softprogs/Sources.pp
View File

@ -5,7 +5,7 @@
#define OTHER_LIBS \ #define OTHER_LIBS \
linmath:c panda:m \ linmath:c panda:m \
express:c pandaexpress:m \ express:c pandaexpress:m \
dtoolutil:c dconfig:c dtool:m pystub dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
#define SOURCES \ #define SOURCES \
softCVS.cxx softCVS.h softFilename.cxx softFilename.h softCVS.cxx softCVS.h softFilename.cxx softFilename.h

4
pandatool/src/softprogs/softCVS.cxx
View File

@ -456,10 +456,10 @@ scan_scene_file(istream &in) {
SoftFilename v("", word); SoftFilename v("", word);
// Increment the use count on all matching elements of the multiset. // Increment the use count on all matching elements of the multiset.
pair<set<SoftFilename>::iterator, set<SoftFilename>::iterator> range; pair<ElementFiles::iterator, ElementFiles::iterator> range;
range = _element_files.equal_range(v); range = _element_files.equal_range(v);
set<SoftFilename>::iterator ei; ElementFiles::iterator ei;
for (ei = range.first; ei != range.second; ++ei) { for (ei = range.first; ei != range.second; ++ei) {
// We cheat and get a non-const reference to the filename out // We cheat and get a non-const reference to the filename out
// of the set. We can safely do this because incrementing the // of the set. We can safely do this because incrementing the

6
pandatool/src/stitch/Sources.pp
View File

@ -3,7 +3,7 @@
#define LOCAL_LIBS \ #define LOCAL_LIBS \
stitchbase progbase stitchbase progbase
#define OTHER_LIBS \ #define OTHER_LIBS \
linmath:c putil:c express:c panda:m pandaexpress:m pystub dtool linmath:c putil:c express:c panda:m pandaexpress:m pystub dtoolconfig dtool
#define SOURCES \ #define SOURCES \
stitchCommandProgram.cxx stitchCommandProgram.h stitchCommandProgram.cxx stitchCommandProgram.h
@ -18,7 +18,7 @@
stitchbase progbase stitchbase progbase
#define OTHER_LIBS \ #define OTHER_LIBS \
pnmimagetypes:c pnmimage:c linmath:c putil:c express:c panda:m \ pnmimagetypes:c pnmimage:c linmath:c putil:c express:c panda:m \
pandaexpress:m pystub dtool pandaexpress:m pystub dtoolconfig dtool
#define SOURCES \ #define SOURCES \
stitchImageProgram.cxx stitchImageProgram.h stitchImageProgram.cxx stitchImageProgram.h
@ -34,7 +34,7 @@
event:c chancfg:c display:c sgraphutil:c light:c \ event:c chancfg:c display:c sgraphutil:c light:c \
pnmimagetypes:c pnmimage:c putil:c express:c \ pnmimagetypes:c pnmimage:c putil:c express:c \
panda:m pandaexpress:m \ panda:m pandaexpress:m \
dtoolutil:c dconfig:c dtool:m pystub dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
#define SOURCES \ #define SOURCES \
stitchViewerProgram.cxx stitchViewerProgram.h stitchViewerProgram.cxx stitchViewerProgram.h

2
pandatool/src/text-stats/Sources.pp
View File

@ -7,7 +7,7 @@
progbase pstatserver progbase pstatserver
#define OTHER_LIBS \ #define OTHER_LIBS \
pstatclient:c linmath:c putil:c express:c panda:m pandaexpress:m \ pstatclient:c linmath:c putil:c express:c panda:m pandaexpress:m \
dtoolutil:c dconfig:c dtool:m pystub dtoolutil:c dconfig:c dtoolconfig:m dtool:m pystub
#define UNIX_SYS_LIBS \ #define UNIX_SYS_LIBS \
m m