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

fix a bit more type inheritance issues

Browse Source
This commit is contained in:
David Rose 2011-09-09 00:52:17 +00:00
parent 43cbd0f106
commit 00a87f7c44
7 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/gobj/config_gobj.cxx
View File

@ -17,6 +17,7 @@
#include "config_util.h" #include "config_util.h"
#include "config_gobj.h" #include "config_gobj.h"
#include "geom.h" #include "geom.h"
#include "geomCacheEntry.h"
#include "geomMunger.h" #include "geomMunger.h"
#include "geomPrimitive.h" #include "geomPrimitive.h"
#include "geomTriangles.h" #include "geomTriangles.h"
@ -465,6 +466,7 @@ ConfigureFn(config_gobj) {
AnimateVerticesRequest::init_type(); AnimateVerticesRequest::init_type();
BufferContext::init_type(); BufferContext::init_type();
Geom::init_type(); Geom::init_type();
GeomCacheEntry::init_type();
GeomPipelineReader::init_type(); GeomPipelineReader::init_type();
GeomContext::init_type(); GeomContext::init_type();
GeomLines::init_type(); GeomLines::init_type();

4
panda/src/gobj/geom.h
View File

@ -269,7 +269,9 @@ public:
return _type_handle; return _type_handle;
} }
static void init_type() { static void init_type() {
register_type(_type_handle, "Geom::CacheEntry"); GeomCacheEntry::init_type();
register_type(_type_handle, "Geom::CacheEntry",
GeomCacheEntry::get_class_type());
} }
private: private:

2
panda/src/gobj/geomCacheEntry.cxx
View File

@ -18,6 +18,8 @@
#include "config_gobj.h" #include "config_gobj.h"
#include "clockObject.h" #include "clockObject.h"
TypeHandle GeomCacheEntry::_type_handle;
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: GeomCacheEntry::Destructor // Function: GeomCacheEntry::Destructor
// Access: Public, Virtual // Access: Public, Virtual

13
panda/src/gobj/geomCacheEntry.h
View File

@ -52,6 +52,19 @@ private:
private: private:
GeomCacheEntry *_prev, *_next; GeomCacheEntry *_prev, *_next;
public:
static TypeHandle get_class_type() {
return _type_handle;
}
static void init_type() {
ReferenceCount::init_type();
register_type(_type_handle, "GeomCacheEntry",
ReferenceCount::get_class_type());
}
private:
static TypeHandle _type_handle;
friend class GeomCacheManager; friend class GeomCacheManager;
}; };

1
panda/src/pgraph/cullResult.h
View File

@ -86,6 +86,7 @@ public:
return _type_handle; return _type_handle;
} }
static void init_type() { static void init_type() {
ReferenceCount::init_type();
register_type(_type_handle, "CullResult", register_type(_type_handle, "CullResult",
ReferenceCount::get_class_type()); ReferenceCount::get_class_type());
} }

1
panda/src/pgraph/cullableObject.h
View File

@ -156,6 +156,7 @@ public:
} }
static void init_type() { static void init_type() {
#ifdef DO_MEMORY_USAGE #ifdef DO_MEMORY_USAGE
ReferenceCount::init_type();
register_type(_type_handle, "CullableObject", register_type(_type_handle, "CullableObject",
ReferenceCount::get_class_type()); ReferenceCount::get_class_type());
#else #else

1
panda/src/putil/clockObject.h
View File

@ -171,6 +171,7 @@ public:
return _type_handle; return _type_handle;
} }
static void init_type() { static void init_type() {
ReferenceCount::init_type();
register_type(_type_handle, "ClockObject", register_type(_type_handle, "ClockObject",
ReferenceCount::get_class_type()); ReferenceCount::get_class_type());
} }