diff --git a/panda/src/gobj/texture.I b/panda/src/gobj/texture.I index 513e5b7d9c..f31314a2a6 100644 --- a/panda/src/gobj/texture.I +++ b/panda/src/gobj/texture.I @@ -27,7 +27,7 @@ get_level() const { //////////////////////////////////////////////////////////////////// // Function: Texture::get_wrapu -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE Texture::WrapMode Texture:: @@ -37,7 +37,7 @@ get_wrapu() const { //////////////////////////////////////////////////////////////////// // Function: Texture::get_wrapv -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE Texture::WrapMode Texture:: @@ -47,7 +47,7 @@ get_wrapv() const { //////////////////////////////////////////////////////////////////// // Function: Texture::get_minfilter -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE Texture::FilterType Texture:: @@ -57,7 +57,7 @@ get_minfilter() const { //////////////////////////////////////////////////////////////////// // Function: Texture::get_magfilter -// Access: Public +// Access: Published // Description: //////////////////////////////////////////////////////////////////// INLINE Texture::FilterType Texture:: @@ -67,7 +67,7 @@ get_magfilter() const { //////////////////////////////////////////////////////////////////// // Function: Texture::get_anisotropic_degree -// Access: Public +// Access: Published // Description: Returns the degree of anisotropic filtering that // should be applied to the texture. Normally, this is // 1, to indicate that anisotropic filtering should be diff --git a/panda/src/gobj/texture.N b/panda/src/gobj/texture.N deleted file mode 100644 index 66007cb6c9..0000000000 --- a/panda/src/gobj/texture.N +++ /dev/null @@ -1,2 +0,0 @@ -ignoreinvolved FilterType -ignoreinvolved WrapMode diff --git a/panda/src/gobj/texture.cxx b/panda/src/gobj/texture.cxx index 25faeff141..5d51ed84b5 100644 --- a/panda/src/gobj/texture.cxx +++ b/panda/src/gobj/texture.cxx @@ -98,7 +98,7 @@ consider_rescale(PNMImage &pnmimage, const string &name) { //////////////////////////////////////////////////////////////////// // Function: Constructor -// Access: +// Access: Published // Description: //////////////////////////////////////////////////////////////////// Texture:: @@ -115,7 +115,7 @@ Texture() : ImageBuffer() { //////////////////////////////////////////////////////////////////// // Function: Destructor -// Access: +// Access: Published // Description: //////////////////////////////////////////////////////////////////// Texture:: @@ -125,7 +125,7 @@ Texture:: //////////////////////////////////////////////////////////////////// // Function: read -// Access: +// Access: Published // Description: //////////////////////////////////////////////////////////////////// bool Texture:: @@ -148,7 +148,7 @@ read(const string& name) { //////////////////////////////////////////////////////////////////// // Function: read -// Access: +// Access: Published // Description: Combine a 3-component image with a grayscale image // to get a 4-component image //////////////////////////////////////////////////////////////////// @@ -201,7 +201,7 @@ read(const string &name, const string &gray) { //////////////////////////////////////////////////////////////////// // Function: write -// Access: +// Access: Published // Description: //////////////////////////////////////////////////////////////////// bool Texture::write(const string& name) const @@ -211,7 +211,7 @@ bool Texture::write(const string& name) const //////////////////////////////////////////////////////////////////// // Function: load -// Access: +// Access: Public // Description: //////////////////////////////////////////////////////////////////// bool Texture::load(const PNMImage& pnmimage) @@ -226,7 +226,7 @@ bool Texture::load(const PNMImage& pnmimage) //////////////////////////////////////////////////////////////////// // Function: store -// Access: +// Access: Public // Description: //////////////////////////////////////////////////////////////////// bool Texture::store(PNMImage& pnmimage) const @@ -343,11 +343,11 @@ void Texture::draw(GraphicsStateGuardianBase *gsg, const DisplayRegion *dr, //////////////////////////////////////////////////////////////////// // Function: set_wrapu -// Access: +// Access: Published // Description: //////////////////////////////////////////////////////////////////// -void Texture::set_wrapu(WrapMode wrap) -{ +void Texture:: +set_wrapu(Texture::WrapMode wrap) { if (_wrapu != wrap) { unprepare(); _wrapu = wrap; @@ -356,11 +356,11 @@ void Texture::set_wrapu(WrapMode wrap) //////////////////////////////////////////////////////////////////// // Function: set_wrapv -// Access: +// Access: Published // Description: //////////////////////////////////////////////////////////////////// -void Texture::set_wrapv(WrapMode wrap) -{ +void Texture:: +set_wrapv(Texture::WrapMode wrap) { if (_wrapv != wrap) { unprepare(); _wrapv = wrap; @@ -369,11 +369,11 @@ void Texture::set_wrapv(WrapMode wrap) //////////////////////////////////////////////////////////////////// // Function: set_minfilter -// Access: +// Access: Published // Description: //////////////////////////////////////////////////////////////////// -void Texture::set_minfilter(FilterType filter) -{ +void Texture:: +set_minfilter(Texture::FilterType filter) { if (_minfilter != filter) { unprepare(); _minfilter = filter; @@ -382,11 +382,11 @@ void Texture::set_minfilter(FilterType filter) //////////////////////////////////////////////////////////////////// // Function: set_magfilter -// Access: +// Access: Published // Description: //////////////////////////////////////////////////////////////////// -void Texture::set_magfilter(FilterType filter) -{ +void Texture:: +set_magfilter(Texture::FilterType filter) { if (_magfilter != filter) { unprepare(); _magfilter = filter; @@ -395,7 +395,7 @@ void Texture::set_magfilter(FilterType filter) //////////////////////////////////////////////////////////////////// // Function: set_anisotropic_degree -// Access: Public +// Access: Published // Description: Specifies the level of anisotropic filtering to apply // to the texture. Normally, this is 1, to indicate // anisotropic filtering is disabled. This may be set diff --git a/panda/src/gobj/texture.h b/panda/src/gobj/texture.h index 9a58ad6eab..a44b0b96c4 100644 --- a/panda/src/gobj/texture.h +++ b/panda/src/gobj/texture.h @@ -27,7 +27,7 @@ class PNMImage; // Description : 2D texture class //////////////////////////////////////////////////////////////////// class EXPCL_PANDA Texture : public ImageBuffer { -public: +PUBLISHED: enum FilterType { // Mag Filter and Min Filter @@ -88,14 +88,16 @@ public: INLINE bool has_ram_image(void) const { return !_pbuffer->_image.empty(); } - - void set_wrapu( WrapMode wrap ); - void set_wrapv( WrapMode wrap ); - void set_minfilter( FilterType filter ); - void set_magfilter( FilterType filter ); - void set_anisotropic_degree(int anisotropic_degree); INLINE int get_level() const; + +PUBLISHED: + void set_wrapu(WrapMode wrap); + void set_wrapv(WrapMode wrap); + void set_minfilter(FilterType filter); + void set_magfilter(FilterType filter); + void set_anisotropic_degree(int anisotropic_degree); + INLINE WrapMode get_wrapu() const; INLINE WrapMode get_wrapv() const; INLINE FilterType get_minfilter() const;