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

pgraph: add version of RenderState::get_attrib(_def) taking a CPT

Browse Source
This commit is contained in:
rdb 2018-06-14 22:51:12 +02:00
parent f804b10d45
commit 19e1b1d877
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/pgraph/renderState.I
View File

@ -483,7 +483,7 @@ flush_level() {
#ifndef CPPPARSER #ifndef CPPPARSER
/** /**
* Handy templated version of get_attrib that costs to the right type. * Handy templated version of get_attrib that casts to the right type.
* Returns true if the attribute was present, false otherwise. * Returns true if the attribute was present, false otherwise.
*/ */
template<class AttribType> template<class AttribType>
@ -492,15 +492,26 @@ get_attrib(const AttribType *&attrib) const {
attrib = (const AttribType *)get_attrib((int)AttribType::get_class_slot()); attrib = (const AttribType *)get_attrib((int)AttribType::get_class_slot());
return (attrib != nullptr); return (attrib != nullptr);
} }
template<class AttribType>
INLINE bool RenderState::
get_attrib(CPT(AttribType) &attrib) const {
attrib = (const AttribType *)get_attrib((int)AttribType::get_class_slot());
return (attrib != nullptr);
}
/** /**
* Handy templated version of get_attrib_def that costs to the right type. * Handy templated version of get_attrib_def that casts to the right type.
*/ */
template<class AttribType> template<class AttribType>
INLINE void RenderState:: INLINE void RenderState::
get_attrib_def(const AttribType *&attrib) const { get_attrib_def(const AttribType *&attrib) const {
attrib = (const AttribType *)get_attrib_def((int)AttribType::get_class_slot()); attrib = (const AttribType *)get_attrib_def((int)AttribType::get_class_slot());
} }
template<class AttribType>
INLINE void RenderState::
get_attrib_def(CPT(AttribType) &attrib) const {
attrib = (const AttribType *)get_attrib_def((int)AttribType::get_class_slot());
}
#endif // CPPPARSER #endif // CPPPARSER
/** /**

4
panda/src/pgraph/renderState.h
View File

@ -162,7 +162,11 @@ public:
template<class AttribType> template<class AttribType>
INLINE bool get_attrib(const AttribType *&attrib) const; INLINE bool get_attrib(const AttribType *&attrib) const;
template<class AttribType> template<class AttribType>
INLINE bool get_attrib(CPT(AttribType) &attrib) const;
template<class AttribType>
INLINE void get_attrib_def(const AttribType *&attrib) const; INLINE void get_attrib_def(const AttribType *&attrib) const;
template<class AttribType>
INLINE void get_attrib_def(CPT(AttribType) &attrib) const;
#endif // CPPPARSER #endif // CPPPARSER
private: private: