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

unwrap p3d_object

Browse Source
This commit is contained in:
David Rose 2009-07-09 01:30:13 +00:00
parent 66d4fca74b
commit 9f56a959c2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
direct/src/plugin_npapi/ppInstance.cxx
View File

@ -565,7 +565,17 @@ variant_to_p3dobj(const NPVariant *variant) {
NPString str = NPVARIANT_TO_STRING(*variant); NPString str = NPVARIANT_TO_STRING(*variant);
return P3D_new_string_object(str.utf8characters, str.utf8length); return P3D_new_string_object(str.utf8characters, str.utf8length);
} else if (NPVARIANT_IS_OBJECT(*variant)) { } else if (NPVARIANT_IS_OBJECT(*variant)) {
return new PPBrowserObject(this, NPVARIANT_TO_OBJECT(*variant)); NPObject *object = NPVARIANT_TO_OBJECT(*variant);
if (object->_class == &PPPandaObject::_object_class) {
// This is really a PPPandaObject.
PPPandaObject *ppobject = (PPPandaObject *)object;
P3D_object *obj = ppobject->get_p3d_object();
logfile << "Found nested Panda Object " << obj << "\n" << flush;
return P3D_OBJECT_COPY(obj);
}
// It's a generic NPObject of some kind.
return new PPBrowserObject(this, object);
} }
// Hmm, none of the above? // Hmm, none of the above?

1
direct/src/plugin_npapi/ppPandaObject.h
View File

@ -86,6 +86,7 @@ private:
PPInstance *_instance; PPInstance *_instance;
P3D_object *_p3d_object; P3D_object *_p3d_object;
public:
static NPClass _object_class; static NPClass _object_class;
}; };