dx uses ColorMunger

This commit is contained in:
David Rose 2005-03-22 15:03:45 +00:00
parent c32abac2b1
commit 08a1d4227f
3 changed files with 6 additions and 6 deletions

View File

@ -24,6 +24,6 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE DXGeomMunger8:: INLINE DXGeomMunger8::
DXGeomMunger8(GraphicsStateGuardian *gsg, const RenderState *state) : DXGeomMunger8(GraphicsStateGuardian *gsg, const RenderState *state) :
qpGeomMunger(gsg, state) ColorMunger(gsg, state, 1, qpGeomVertexDataType::NT_packed_argb)
{ {
} }

View File

@ -94,5 +94,5 @@ int DXGeomMunger8::
compare_to_impl(const qpGeomMunger *other) const { compare_to_impl(const qpGeomMunger *other) const {
// const DXGeomMunger8 *om = DCAST(DXGeomMunger8, other); // const DXGeomMunger8 *om = DCAST(DXGeomMunger8, other);
return 0; return ColorMunger::compare_to_impl(other);
} }

View File

@ -20,7 +20,7 @@
#define DXGEOMMUNGER8_H #define DXGEOMMUNGER8_H
#include "pandabase.h" #include "pandabase.h"
#include "qpgeomMunger.h" #include "colorMunger.h"
#include "graphicsStateGuardian.h" #include "graphicsStateGuardian.h"
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -31,7 +31,7 @@
// and that all relevant components are packed into a // and that all relevant components are packed into a
// single array, in the correct order. // single array, in the correct order.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class EXPCL_PANDADX DXGeomMunger8 : public qpGeomMunger { class EXPCL_PANDADX DXGeomMunger8 : public ColorMunger {
public: public:
INLINE DXGeomMunger8(GraphicsStateGuardian *gsg, const RenderState *state); INLINE DXGeomMunger8(GraphicsStateGuardian *gsg, const RenderState *state);
@ -45,9 +45,9 @@ public:
return _type_handle; return _type_handle;
} }
static void init_type() { static void init_type() {
qpGeomMunger::init_type(); ColorMunger::init_type();
register_type(_type_handle, "DXGeomMunger8", register_type(_type_handle, "DXGeomMunger8",
qpGeomMunger::get_class_type()); ColorMunger::get_class_type());
} }
virtual TypeHandle get_type() const { virtual TypeHandle get_type() const {
return get_class_type(); return get_class_type();