[Jahshaka-cvs] openlibraries/src/openassetlib/py asset.cpp, 1.15, 1.16 openassetlib.cpp, 1.18, 1.19
Status: Beta
Brought to you by:
jahshaka
Menu
▾
▴
[Jahshaka-cvs] openlibraries/src/openassetlib/py asset.cpp, 1.15, 1.16 openassetlib.cpp, 1.18, 1.19
|
From: jpn <non...@us...> - 2006-08-15 08:14:19
|
Update of /cvsroot/openlibraries/openlibraries/src/openassetlib/py In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3953/src/openassetlib/py Modified Files: asset.cpp openassetlib.cpp Log Message: Tidied up python bindings + changed set search predicate to a more generic search Index: openassetlib.cpp =================================================================== RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/py/openassetlib.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- openassetlib.cpp 11 Aug 2006 07:55:15 -0000 1.18 +++ openassetlib.cpp 15 Aug 2006 08:14:13 -0000 1.19 @@ -104,9 +104,9 @@ // Set searches struct predicate_wrapper : public al::predicate, public py::wrapper<al::predicate> { - bool operator()(const al::asset_ptr&) const + virtual bool operator()(const al::asset_ptr& asset) const { - return py::call<bool>(this->get_override("operator()").ptr()); + return py::call<bool>(this->get_override("operator()").ptr(), asset); } }; @@ -151,15 +151,15 @@ py::def("load_set", load_set); py::class_< predicate_wrapper, boost::noncopyable >("predicate") - .def("operator()", py::pure_virtual(&al::predicate::operator())) + .def("__call__", py::pure_virtual(&al::predicate::operator())) ; - py::class_< al::field_equal_to_predicate, py::bases<predicate_wrapper> >("field_equal_to_predicate", py::init<const opl::string&, const opl::string&>()) - .def("operator()", &al::field_equal_to_predicate::operator()) + py::class_< al::key_value_regex_search_predicate, py::bases<al::predicate> >("key_value_regex_search_predicate", py::init<const opl::string&, const opl::string&>()) + .def("__call__", &al::key_value_regex_search_predicate::operator()) ; - py::class_< al::location_filename_regex_predicate, py::bases<predicate_wrapper> >("location_filename_regex_predicate", py::init<const opl::string&, const opl::string&>()) - .def("operator()", &al::location_filename_regex_predicate::operator()) + py::class_< al::location_filename_regex_predicate, py::bases<al::predicate> >("location_filename_regex_predicate", py::init<const opl::string&, const opl::string&>()) + .def("__call__", &al::location_filename_regex_predicate::operator()) ; py::def("search", set_search); Index: asset.cpp =================================================================== RCS file: /cvsroot/openlibraries/openlibraries/src/openassetlib/py/asset.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- asset.cpp 13 Aug 2006 11:03:40 -0000 1.15 +++ asset.cpp 15 Aug 2006 08:14:13 -0000 1.16 @@ -26,18 +26,9 @@ void (al::asset::*set_guid)(const opl::string& guid) = &al::asset::guid; void (al::asset::*set_bool) (const opl::string& key, const bool value) = &al::asset::set; - void (al::asset::*set_uchar) (const opl::string& key, const unsigned char value) = &al::asset::set; - void (al::asset::*set_char) (const opl::string& key, const char value) = &al::asset::set; - void (al::asset::*set_ushort) (const opl::string& key, const unsigned short value)= &al::asset::set; - void (al::asset::*set_short) (const opl::string& key, const short value) = &al::asset::set; - void (al::asset::*set_ulong) (const opl::string& key, const unsigned long value) = &al::asset::set; void (al::asset::*set_long) (const opl::string& key, const long value) = &al::asset::set; - void (al::asset::*set_uint) (const opl::string& key, const unsigned int value) = &al::asset::set; void (al::asset::*set_int) (const opl::string& key, const int value) = &al::asset::set; void (al::asset::*set_float) (const opl::string& key, const float value) = &al::asset::set; - void (al::asset::*set_double) (const opl::string& key, const double value) = &al::asset::set; - void (al::asset::*set_ldouble) (const opl::string& key, const long double value) = &al::asset::set; - void (al::asset::*set_llong) (const opl::string& key, const long long value) = &al::asset::set; void (al::asset::*set_string) (const opl::string& key, const opl::string value) = &al::asset::set; al::asset_ptr create_asset() @@ -99,21 +90,11 @@ .def("guid", set_guid) .def("get", &al::asset::get) .def("set", set_bool) - .def("set", set_uchar) - .def("set", set_char) - .def("set", set_ushort) - .def("set", set_short) - .def("set", set_ulong) .def("set", set_long) - .def("set", set_uint) .def("set", set_int) .def("set", set_float) - .def("set", set_double) - .def("set", set_ldouble) - .def("set", set_llong) .def("set", set_string) .def("__iter__", py::range(begin, end)) - .def("count", &al::asset::count) .def("empty", &al::asset::empty) .def("find", &al::asset::find_metadata) .def("size", &al::asset::size) |