From 5003fb53427dcddc9d725180d2c4377d772b31b9 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 20 Jul 2005 22:47:11 +0000 Subject: [PATCH] oopsy --- panda/src/egg/eggMorphList.h | 6 ------ panda/src/egg/eggTexture.cxx | 12 ++++++++++++ panda/src/egg/eggTexture.h | 3 +++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/panda/src/egg/eggMorphList.h b/panda/src/egg/eggMorphList.h index 741c217dae..efa4f525e0 100644 --- a/panda/src/egg/eggMorphList.h +++ b/panda/src/egg/eggMorphList.h @@ -89,12 +89,6 @@ private: #define NAME vector_LVector4f #include "vector_src.h" -// Now export each EggMorphList. - -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList) -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList) - typedef EggMorphList EggMorphVertexList; typedef EggMorphList EggMorphNormalList; typedef EggMorphList EggMorphTexCoordList; diff --git a/panda/src/egg/eggTexture.cxx b/panda/src/egg/eggTexture.cxx index 24a953f0ec..592822ece5 100644 --- a/panda/src/egg/eggTexture.cxx +++ b/panda/src/egg/eggTexture.cxx @@ -846,6 +846,18 @@ string_tex_gen(const string &string) { } } +//////////////////////////////////////////////////////////////////// +// Function: EggTexture::as_transform +// Access: Public, Virtual +// Description: Returns this object cross-cast to an EggTransform +// pointer, if it inherits from EggTransform, or NULL if +// it does not. +//////////////////////////////////////////////////////////////////// +EggTransform *EggTexture:: +as_transform() { + return this; +} + //////////////////////////////////////////////////////////////////// // Function: EggTexture::egg_start_parse_body // Access: Protected, Virtual diff --git a/panda/src/egg/eggTexture.h b/panda/src/egg/eggTexture.h index 60e14da5e8..dffe0149c9 100644 --- a/panda/src/egg/eggTexture.h +++ b/panda/src/egg/eggTexture.h @@ -243,6 +243,9 @@ PUBLISHED: static CombineOperand string_combine_operand(const string &string); static TexGen string_tex_gen(const string &string); +public: + virtual EggTransform *as_transform(); + protected: virtual bool egg_start_parse_body();