cyphesis/rulesets/Py_Map.cpp
Al Riddoch 1826587f9d * Fixes to worlds object list so it now contains world.
* More python code tweaks to work with modifications to interface.

	* Modified code which gets Thing attributes from Message::Object
	  so it can use any object dictionary to look up parent object.

	* Fixed handling of Thing's static type attribute.

	* Modified creation of operations from python to eliminate
	  some strange segfaults.

	* Re-wrote and fixed Entity creation from python.

	* Implemented dictlist.remove_value for removing things from inventory.

	* Implemented Vector3D arithmetic and methods from python.

	* Implemented as_entity() and get_xyz() methods for Thing from
	  python.

	* Commented out deletion of operations from python OperationObject
	  dealloc() function as it was causing segfaults. There is a problem
	  somewhere with ownership not being cleared, but I can't find it.

	* Implemented conversion of Python Operation and Oplist objects
	  to Message::Object.

	* Fixed MemMap so that attributes of Things are accuratly updated.

	* Fixed it so that look ops from mind are broadcast rather than sent
	  to world. This may have to be reverted.

	* Tweaked autoconf to make it cleaner and work better. Still needs
	  alot of work.

A simple test of some goals now works! The lych goals worked to some
extent and no-longer gives python errors. Only a few more things are
required before Acorn can run, at which point I will release 0.1
for testing.

Al
2000-12-06 18:21:35 +00:00

275 lines
7.5 KiB
C++

#include <Atlas/Message/Object.h>
#include <Atlas/Objects/Root.h>
#include <Atlas/Objects/Operation/Login.h>
#include <stdio.h>
#include <unistd.h>
#include <Python.h>
#include <common/BaseEntity.h>
#include "Python_API.h"
#include "MemMap.h"
static PyObject * Map_find_by_location(MapObject * self, PyObject * args)
{
if (self->m_map == NULL) {
PyErr_SetString(PyExc_TypeError, "invalid memmap");
return NULL;
}
double radius;
PyObject * where_obj;
if (!PyArg_ParseTuple(args, "Od", &where_obj, &radius)) {
return NULL;
}
if ((PyTypeObject*)PyObject_Type(where_obj) != &Location_Type) {
PyErr_SetString(PyExc_TypeError, "Argument must be a location");
return NULL;
}
LocationObject * where = (LocationObject *)where_obj;
ThingObject * thing;
list<Thing *> res = self->m_map->find_by_location(*where->location,radius);
PyObject * list = PyList_New(res.size());
if (list == NULL) {
return NULL;
}
std::list<Thing*>::iterator I;
int i = 0;
for(I = res.begin(); I != res.end(); I++, i++) {
thing = newThingObject(NULL);
if (thing == NULL) {
return NULL;
}
thing->m_thing = *I;
PyList_SetItem(list, i, (PyObject*)thing);
}
return list;
}
static PyObject * Map_find_by_type(MapObject * self, PyObject * args)
{
if (self->m_map == NULL) {
PyErr_SetString(PyExc_TypeError, "invalid memmap");
return NULL;
}
char * what;
if (!PyArg_ParseTuple(args, "s", &what)) {
return NULL;
}
ThingObject * thing;
list<Thing *> res = self->m_map->find_by_type(string(what));
PyObject * list = PyList_New(res.size());
if (list == NULL) {
return NULL;
}
std::list<Thing*>::iterator I;
int i = 0;
for(I = res.begin(); I != res.end(); I++, i++) {
thing = newThingObject(NULL);
if (thing == NULL) {
return NULL;
}
thing->m_thing = *I;
PyList_SetItem(list, i, (PyObject*)thing);
}
return list;
}
static PyObject * Map_add_object(MapObject * self, PyObject * args)
{
if (self->m_map == NULL) {
PyErr_SetString(PyExc_TypeError, "invalid memmap");
return NULL;
}
ThingObject * thing;
if (!PyArg_ParseTuple(args, "O", &thing)) {
PyErr_SetString(PyExc_TypeError,"arg not an object");
return NULL;
}
if ((PyTypeObject*)PyObject_Type((PyObject *)thing) != &Thing_Type) {
PyErr_SetString(PyExc_TypeError,"arg not a Thing");
return NULL;
}
Thing * ret = self->m_map->add_object(thing->m_thing);
thing = newThingObject(NULL);
thing->m_thing = ret;
return (PyObject *)thing;
}
static PyObject * Map_look_id(MapObject * self, PyObject * args)
{
if (self->m_map == NULL) {
PyErr_SetString(PyExc_TypeError, "invalid memmap");
return NULL;
}
if (!PyArg_ParseTuple(args, "")) {
PyErr_SetString(PyExc_TypeError,"expected 1, got multiple");
return NULL;
}
RootOperation * op = self->m_map->look_id();
if (op == NULL) {
Py_INCREF(Py_None);
return Py_None;
}
RootOperationObject * py_op = newAtlasRootOperation(NULL);
py_op->operation = op;
py_op->own = 1;
return (PyObject *)py_op;
}
static PyObject * Map_add(MapObject * self, PyObject * args)
{
if (self->m_map == NULL) {
PyErr_SetString(PyExc_TypeError, "invalid memmap");
return NULL;
}
AtlasObject * obj;
if (!PyArg_ParseTuple(args, "O", &obj)) {
PyErr_SetString(PyExc_TypeError,"arg is not an object");
return NULL;
}
if ((PyTypeObject*)PyObject_Type((PyObject *)obj) != &Object_Type) {
PyErr_SetString(PyExc_TypeError,"arg is not an Object");
return NULL;
}
Thing * ret = self->m_map->add(*(obj->m_obj));
ThingObject * thing = newThingObject(NULL);
thing->m_thing = ret;
return (PyObject *)thing;
}
static PyObject * Map_delete(MapObject * self, PyObject * args)
{
if (self->m_map == NULL) {
PyErr_SetString(PyExc_TypeError, "invalid memmap");
return NULL;
}
char * id;
if (!PyArg_ParseTuple(args, "s", &id)) {
PyErr_SetString(PyExc_TypeError,"id not a string");
return NULL;
}
self->m_map->_delete(id);
Py_INCREF(Py_None);
return Py_None;
}
static PyObject * Map_get(MapObject * self, PyObject * args)
{
if (self->m_map == NULL) {
PyErr_SetString(PyExc_TypeError, "invalid memmap");
return NULL;
}
char * id;
if (!PyArg_ParseTuple(args, "s", &id)) {
PyErr_SetString(PyExc_TypeError,"id not a string");
return NULL;
}
Thing * ret = self->m_map->get(id);
ThingObject * thing = newThingObject(NULL);
thing->m_thing = ret;
return (PyObject *)thing;
}
static PyObject * Map_get_add(MapObject * self, PyObject * args)
{
if (self->m_map == NULL) {
PyErr_SetString(PyExc_TypeError, "invalid memmap");
return NULL;
}
char * id;
if (!PyArg_ParseTuple(args, "s", &id)) {
PyErr_SetString(PyExc_TypeError,"id not a string");
return NULL;
}
Thing * ret = self->m_map->get_add(id);
ThingObject * thing = newThingObject(NULL);
thing->m_thing = ret;
return (PyObject *)thing;
}
static PyObject * Map_update(MapObject * self, PyObject * args)
{
if (self->m_map == NULL) {
PyErr_SetString(PyExc_TypeError, "invalid memmap");
return NULL;
}
AtlasObject * obj;
if (!PyArg_ParseTuple(args, "O", &obj)) {
PyErr_SetString(PyExc_TypeError,"arg is not an object");
return NULL;
}
if ((PyTypeObject*)PyObject_Type((PyObject *)obj) != &Object_Type) {
PyErr_SetString(PyExc_TypeError,"arg is not an Object");
return NULL;
}
Thing * ret = self->m_map->update(*(obj->m_obj));
ThingObject * thing = newThingObject(NULL);
thing->m_thing = ret;
return (PyObject *)thing;
}
PyMethodDef Map_methods[] = {
{"find_by_location",(PyCFunction)Map_find_by_location, METH_VARARGS},
{"find_by_type", (PyCFunction)Map_find_by_type, METH_VARARGS},
{"add_object", (PyCFunction)Map_add_object, METH_VARARGS},
{"look_id", (PyCFunction)Map_look_id, METH_VARARGS},
{"add", (PyCFunction)Map_add, METH_VARARGS},
{"delete", (PyCFunction)Map_delete, METH_VARARGS},
{"get", (PyCFunction)Map_get, METH_VARARGS},
{"get_add", (PyCFunction)Map_get_add, METH_VARARGS},
{"update", (PyCFunction)Map_update, METH_VARARGS},
{NULL, NULL} /* sentinel */
};
static void Map_dealloc(MapObject *self)
{
//if (self->m_thing != NULL) {
//delete self->m_thing;
//}
Py_XDECREF(self->Map_attr);
PyMem_DEL(self);
}
PyObject * Map_getattr(MapObject *self, char *name)
{
return Py_FindMethod(Map_methods, (PyObject *)self, name);
}
int Map_setattr(MapObject *self, char *name, PyObject *v)
{
return(0);
}
PyTypeObject Map_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0, /*ob_size*/
"Map", /*tp_name*/
sizeof(MapObject), /*tp_basicsize*/
0, /*tp_itemsize*/
/* methods */
(destructor)Map_dealloc, /*tp_dealloc*/
0, /*tp_print*/
(getattrfunc)Map_getattr, /*tp_getattr*/
(setattrfunc)Map_setattr, /*tp_setattr*/
0, /*tp_compare*/
0, /*tp_repr*/
0, /*tp_as_number*/
0, /*tp_as_sequence*/
0, /*tp_as_mapping*/
0, /*tp_hash*/
};
MapObject * newMapObject(PyObject *arg)
{
MapObject * self;
self = PyObject_NEW(MapObject, &Map_Type);
if (self == NULL) {
return NULL;
}
self->Map_attr = NULL;
return self;
}