mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
* server/WorldRouter.cpp: Eliminate unnecessary call to opEnumerate() and enhance debugging output. * server/Player.cpp: Correct the use of string.compare() in older versions of libstdc++. * common/types.h: Added enumeration for other operations, not handled by the core, but considered valid. Added new type for storing mapping between operation parents and their enumerated type. * common/op_switch.h: Separate handling of operations known to be invalid from operations which are valid, but not explicitly added to the core. * common/inheritance.h, common/inheritance.cpp, common/custom.cpp: Provide global operation mapping where enumeration of operations can be looked up. Install all types handled by the core, and types known to be used in scripts. * common/BaseEntity.h, common/BaseEntity.cpp: Add object specific operation mapping where operation types each object is subscribed to can be enumerated, and others are rejected. Add mechanism so that objects can add to the mapping, this subscribing to operations. This makes enumerating operations much cheaper, and eliminates the overhead of handling ops an object has no interest in. * rulesets/Thing.h, rulesets/Thing.cpp: Add mechanism so scripts can subscribe to operations. * rulesets/Character.h, rulesets/Character.cpp: Add subscription mechanism for ops going to and from the mind. * rulesets/BaseMind.h, rulesets/BaseMind.cpp: Add subscription mechanism for sight and sound perception operations sub operations, and provide an interface to it for scripts. * server/Connection.cpp, server/Admin.cpp, server/Account.cpp, rulesets/World.cpp, rulesets/World.h, rulesets/Thing.cpp, rulesets/Stackable.cpp, rulesets/Plant.cpp, rulesets/Food.cpp, rulesets/Character.cpp, rulesets/BaseMind.cpp: Add subscriptions to operations for all core base classes. * rulesets/Python_API.cpp: When script is created, go through methods, and subscribe to the operations which are handled by them. * rulesets/Character.cpp: When calculating orientation of a walking character, assume it is standing upright. * physics/Vector3D.h: Add versions of mag() and distance() which omit the square root calculations, so that when their values are only used for comparison, the expensive square root calculations can be ommited. Add new version of collision and range checking functions which provide the optimal interface to the application. Add versions of methods which modify this rather than creating a new operation to eliminate wasted copies. * physics/Quaternion.cpp: Make use of faster interface provided by Vector3D. * physics/BBox.h: Add new version of collision checking function which provides optimal interface to the application. * modules/Location.h, modules/Location.cpp: Add new functions to optimally calculate the distance between any two entities. * modules/Location.h: Re-write collision and range functions to make much more optimal use of Vector3D, BBox and distance functionality. * rulesets/Py_Vector3D.cpp, rulesets/Pedestrian.cpp, rulesets/Movement.cpp, rulesets/Entity.cpp, rulesets/Character.cpp: Eliminate implicit copies from vector arithmetic. * rulesets/Pedestrian.cpp, rulesets/MemMap.cpp, common/const.h: Re-write code which uses magnitude of vectors to use the square of the magnitude instead, as it is much cheaper to calculate.
1027 lines
32 KiB
C++
1027 lines
32 KiB
C++
// This file may be redistributed and modified only under the terms of
|
|
// the GNU General Public License (See COPYING for details).
|
|
// Copyright (C) 2000 Alistair Riddoch
|
|
|
|
#include "Python_API.h"
|
|
|
|
#include "Py_Object.h"
|
|
#include "Py_Thing.h"
|
|
#include "Py_Mind.h"
|
|
#include "Py_Map.h"
|
|
#include "Py_Location.h"
|
|
#include "Py_Vector3D.h"
|
|
#include "Py_Quaternion.h"
|
|
#include "Py_WorldTime.h"
|
|
#include "Py_World.h"
|
|
#include "Py_Operation.h"
|
|
#include "Py_Oplist.h"
|
|
#include "Py_Optime.h"
|
|
|
|
#include "PythonThingScript.h"
|
|
#include "PythonMindScript.h"
|
|
#include "World.h"
|
|
#include "Thing.h"
|
|
#include "BaseMind.h"
|
|
|
|
#include <Atlas/Objects/Operation/Create.h>
|
|
#include <Atlas/Objects/Operation/Look.h>
|
|
#include <Atlas/Objects/Operation/Move.h>
|
|
#include <Atlas/Objects/Operation/Set.h>
|
|
#include <Atlas/Objects/Operation/Sight.h>
|
|
#include <Atlas/Objects/Operation/Talk.h>
|
|
#include <Atlas/Objects/Operation/Touch.h>
|
|
#include <Atlas/Objects/Operation/Info.h>
|
|
|
|
#include <common/globals.h>
|
|
#include <common/const.h>
|
|
#include <common/debug.h>
|
|
|
|
#include <common/Tick.h>
|
|
#include <common/Fire.h>
|
|
#include <common/Chop.h>
|
|
#include <common/Cut.h>
|
|
#include <common/Setup.h>
|
|
#include <common/Eat.h>
|
|
#include <common/Nourish.h>
|
|
#include <common/Generic.h>
|
|
|
|
static const bool debug_flag = false;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
} FunctionObject;
|
|
|
|
static void Function_dealloc(FunctionObject * self)
|
|
{
|
|
PyMem_DEL(self);
|
|
}
|
|
|
|
static PyObject * log_debug(PyObject * self, PyObject * args, PyObject * kwds)
|
|
{
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyTypeObject log_debug_type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0,
|
|
"Function",
|
|
sizeof(FunctionObject),
|
|
0,
|
|
/* methods */
|
|
(destructor)Function_dealloc,
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
log_debug, /* tp_call */
|
|
};
|
|
|
|
static PyObject * dictlist_remove_value(PyObject * self, PyObject * args, PyObject * kwds)
|
|
{
|
|
PyObject * dict;
|
|
ThingObject * item;
|
|
long remove_empty_key = 1;
|
|
if (!PyArg_ParseTuple(args, "OO|i", &dict, &item, &remove_empty_key)) {
|
|
return NULL;
|
|
}
|
|
int flag=0;
|
|
if (!PyDict_Check(dict)) {
|
|
PyErr_SetString(PyExc_TypeError, "Trying to set item in not dictlist");
|
|
return NULL;
|
|
}
|
|
PyObject * keys = PyDict_Keys(dict);
|
|
PyObject * values = PyDict_Values(dict);
|
|
|
|
if ((keys == NULL) || (values == NULL)) {
|
|
PyErr_SetString(PyExc_TypeError, "Error getting keys from dictlist");
|
|
return NULL;
|
|
}
|
|
int i, size = PyList_Size(keys);
|
|
for(i = 0; i < size; i++) {
|
|
PyObject * value = PyList_GetItem(values, i);
|
|
PyObject * key = PyList_GetItem(keys, i);
|
|
int j, lsize = PyList_Size(value);
|
|
for(j = 0; j < lsize; j++) {
|
|
ThingObject * entry = (ThingObject*)PyList_GetItem(value, j);
|
|
if (entry->m_thing == item->m_thing) {
|
|
flag = 1;
|
|
PyList_SetSlice(value, j, j+1, NULL);
|
|
j--; lsize--;
|
|
if ((remove_empty_key !=0) && (PyList_Size(value) == 0)) {
|
|
PyDict_DelItem(dict, key);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Py_DECREF(keys);
|
|
Py_DECREF(values);
|
|
return PyInt_FromLong(flag);
|
|
}
|
|
|
|
PyTypeObject dictlist_remove_value_type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0,
|
|
"Function",
|
|
sizeof(FunctionObject),
|
|
0,
|
|
/* methods */
|
|
(destructor)Function_dealloc,
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
dictlist_remove_value, /* tp_call */
|
|
};
|
|
static PyObject * dictlist_add_value(PyObject * self, PyObject * args, PyObject * kwds)
|
|
{
|
|
PyObject * dict;
|
|
ThingObject * item;
|
|
char * key;
|
|
if (!PyArg_ParseTuple(args, "OsO", &dict, &key, &item)) {
|
|
return NULL;
|
|
}
|
|
if (!PyDict_Check(dict)) {
|
|
PyErr_SetString(PyExc_TypeError, "Dict is not a dictionary");
|
|
return NULL;
|
|
}
|
|
PyObject * list = PyDict_GetItemString(dict, key);
|
|
if (list != NULL) {
|
|
if (!PyList_Check(list)) {
|
|
PyErr_SetString(PyExc_TypeError, "Dict does not contain a list");
|
|
return NULL;
|
|
}
|
|
int i, size = PyList_Size(list);
|
|
for(i = 0; i < size; i++) {
|
|
ThingObject * entry = (ThingObject*)PyList_GetItem(list,i);
|
|
if (entry->m_thing == item->m_thing) {
|
|
goto present;
|
|
}
|
|
}
|
|
PyList_Append(list, (PyObject*)item);
|
|
} else {
|
|
list = PyList_New(0);
|
|
PyList_Append(list, (PyObject*)item);
|
|
PyDict_SetItemString(dict, key, list);
|
|
Py_DECREF(list);
|
|
}
|
|
present:
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyTypeObject dictlist_add_value_type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0,
|
|
"Function",
|
|
sizeof(FunctionObject),
|
|
0,
|
|
/* methods */
|
|
(destructor)Function_dealloc,
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
dictlist_add_value, /* tp_call */
|
|
};
|
|
|
|
static PyObject * Get_PyClass(const std::string & package,
|
|
const std::string & _type)
|
|
{
|
|
std::string type = _type;
|
|
type[0] = toupper(type[0]);
|
|
PyObject * package_name = PyString_FromString((char *)package.c_str());
|
|
PyObject * mod_dict = PyImport_Import(package_name);
|
|
Py_DECREF(package_name);
|
|
if (mod_dict == NULL) {
|
|
std::cerr << "Cld no find python module " << package << std::endl
|
|
<< std::flush;
|
|
PyErr_Print();
|
|
return NULL;
|
|
}
|
|
PyObject * my_class = PyObject_GetAttrString(mod_dict, (char *)type.c_str());
|
|
Py_DECREF(mod_dict);
|
|
if (my_class == NULL) {
|
|
std::cerr << "Cld not find class " << type << " in module " << package
|
|
<< std::endl << std::flush;
|
|
PyErr_Print();
|
|
return NULL;
|
|
}
|
|
if (PyCallable_Check(my_class) == 0) {
|
|
std::cerr << "It does not seem to be a class at all" << std::endl
|
|
<< std::flush;
|
|
Py_DECREF(my_class);
|
|
return NULL;
|
|
}
|
|
return my_class;
|
|
}
|
|
|
|
static PyObject * Create_PyScript(PyObject * pyThing, PyObject * pyClass)
|
|
{
|
|
PyObject * pyob = PyEval_CallFunction(pyClass,"(O)", pyThing);
|
|
|
|
if (pyob == NULL) {
|
|
if (PyErr_Occurred() == NULL) {
|
|
std::cerr << "Could not get python obj" << std::endl << std::flush;
|
|
} else {
|
|
std::cerr << "Reporting python error" << std::endl << std::flush;
|
|
PyErr_Print();
|
|
}
|
|
}
|
|
Py_DECREF(pyClass);
|
|
Py_DECREF(pyThing);
|
|
return pyob;
|
|
}
|
|
|
|
template<class T>
|
|
void Subscribe_Script(T * thing, PyObject * pyclass, const std::string& package)
|
|
{
|
|
PyObject * dmap = PyObject_GetAttrString(pyclass, "__dict__");
|
|
if (dmap == NULL) {
|
|
std::cerr << "Python class for " << package << " has no __dict__"
|
|
<< std::endl << std::flush;
|
|
return;
|
|
}
|
|
if (!PyDict_Check(dmap)) {
|
|
std::cerr << "Python class for " << package << " is malformed"
|
|
<< std::endl << std::flush;
|
|
return;
|
|
}
|
|
PyObject * keys = PyDict_Keys(dmap);
|
|
if (keys == NULL) {
|
|
std::cerr << "Error getting attribute list of Python class for "
|
|
<< package << std::endl << std::flush;
|
|
return;
|
|
}
|
|
for(int i = 0; i < PyList_Size(keys); i++) {
|
|
std::string method(PyString_AsString(PyList_GetItem(keys, i)));
|
|
std::string::size_type l = method.find("_operation", 0, 10);
|
|
if (l == std::string::npos) {
|
|
debug(std::cout << method << " is not a method" << std::endl
|
|
<< std::flush;);
|
|
} else {
|
|
std::string op_name = method.substr(0,l);
|
|
debug(std::cout << method << " is a method, it contains _op.. at "
|
|
<< l << " so we can register for "
|
|
<< method.substr(0,l) << std::endl << std::flush;);
|
|
thing->scriptSubscribe(op_name);
|
|
}
|
|
}
|
|
}
|
|
|
|
void Create_PyThing(Thing * thing, const std::string & package,
|
|
const std::string & _type)
|
|
{
|
|
PyObject * c = Get_PyClass(package, _type);
|
|
if (c == NULL) { return; }
|
|
ThingObject * pyThing = newThingObject(NULL);
|
|
pyThing->m_thing = thing;
|
|
Subscribe_Script(thing, c, package);
|
|
PyObject * o = Create_PyScript((PyObject *)pyThing, c);
|
|
if (o != NULL) {
|
|
thing->setScript(new PythonThingScript(o, *thing));
|
|
}
|
|
}
|
|
|
|
void Create_PyMind(BaseMind * mind, const std::string & package,
|
|
const std::string & _type)
|
|
{
|
|
PyObject * c = Get_PyClass(package, _type);
|
|
if (c == NULL) { return; }
|
|
MindObject * pyMind = newMindObject(NULL);
|
|
pyMind->m_mind = mind;
|
|
Subscribe_Script(mind, c, package);
|
|
PyObject * o = Create_PyScript((PyObject *)pyMind, c);
|
|
|
|
if (o != NULL) {
|
|
mind->setScript(new PythonMindScript(o, *mind));
|
|
}
|
|
}
|
|
|
|
static PyObject * is_location(PyObject * self, PyObject * args)
|
|
{
|
|
PyObject * loc;
|
|
if (!PyArg_ParseTuple(args, "O", &loc)) {
|
|
return NULL;
|
|
}
|
|
if (PyLocation_Check(loc)) {
|
|
Py_INCREF(Py_True);
|
|
return Py_True;
|
|
}
|
|
Py_INCREF(Py_False);
|
|
return Py_False;
|
|
}
|
|
|
|
static PyObject * location_new(PyObject * self, PyObject * args)
|
|
{
|
|
LocationObject *o;
|
|
// We need to deal with actual args here
|
|
PyObject * refO, * coordsO = NULL;
|
|
bool decrefO = false;
|
|
if (PyArg_ParseTuple(args, "O|O", &refO, &coordsO)) {
|
|
if ((!PyThing_Check(refO)) && (!PyWorld_Check(refO)) && (!PyMind_Check(refO))) {
|
|
if (PyObject_HasAttrString(refO, "cppthing")) {
|
|
refO = PyObject_GetAttrString(refO, "cppthing");
|
|
decrefO = true;
|
|
}
|
|
if (!PyThing_Check(refO) && !PyMind_Check(refO)) {
|
|
PyErr_SetString(PyExc_TypeError, "Arg ref required");
|
|
if (decrefO) { Py_DECREF(refO); }
|
|
return NULL;
|
|
}
|
|
}
|
|
if ((coordsO != NULL) && (!PyVector3D_Check(coordsO))) {
|
|
PyErr_SetString(PyExc_TypeError, "Arg coords required");
|
|
if (decrefO) { Py_DECREF(refO); }
|
|
return NULL;
|
|
}
|
|
|
|
Entity * ref_ent;
|
|
if (PyWorld_Check(refO)) {
|
|
WorldObject * ref = (WorldObject*)refO;
|
|
if (ref->world == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "Parent world is invalid");
|
|
if (decrefO) { Py_DECREF(refO); }
|
|
return NULL;
|
|
}
|
|
ref_ent = &ref->world->gameWorld;
|
|
} else if (PyMind_Check(refO)) {
|
|
MindObject * ref = (MindObject*)refO;
|
|
if (ref->m_mind == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "Parent mind is invalid");
|
|
if (decrefO) { Py_DECREF(refO); }
|
|
return NULL;
|
|
}
|
|
ref_ent = ref->m_mind;
|
|
} else {
|
|
ThingObject * ref = (ThingObject*)refO;
|
|
if (ref->m_thing == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "Parent thing is invalid");
|
|
if (decrefO) { Py_DECREF(refO); }
|
|
return NULL;
|
|
}
|
|
ref_ent = ref->m_thing;
|
|
}
|
|
if (decrefO) { Py_DECREF(refO); }
|
|
Vector3DObject * coords = (Vector3DObject*)coordsO;
|
|
o = newLocationObject(NULL);
|
|
if ( o == NULL ) {
|
|
return NULL;
|
|
}
|
|
if (coords == NULL) {
|
|
o->location = new Location(ref_ent, Vector3D());
|
|
} else {
|
|
o->location = new Location(ref_ent, coords->coords);
|
|
}
|
|
o->own = 1;
|
|
} else if (PyArg_ParseTuple(args, "")) {
|
|
o = newLocationObject(NULL);
|
|
if ( o == NULL ) {
|
|
return NULL;
|
|
}
|
|
o->location = new Location;
|
|
o->own = 1;
|
|
} else {
|
|
return NULL;
|
|
}
|
|
return (PyObject *)o;
|
|
}
|
|
|
|
static PyObject * vector3d_new(PyObject * self, PyObject * args)
|
|
{
|
|
Vector3DObject *o;
|
|
Vector3D val;
|
|
// We need to deal with actual args here
|
|
PyObject * clist;
|
|
switch (PyTuple_Size(args)) {
|
|
case 0:
|
|
break;
|
|
case 1:
|
|
clist = PyTuple_GetItem(args, 0);
|
|
if ((!PyList_Check(clist)) || (PyList_Size(clist) != 3)) {
|
|
PyErr_SetString(PyExc_TypeError, "Vector3D() from single value must a list 3 long");
|
|
return NULL;
|
|
}
|
|
for(int i = 0; i < 3; i++) {
|
|
PyObject * item = PyList_GetItem(clist, i);
|
|
if (PyInt_Check(item)) {
|
|
val[i] = (double)PyInt_AsLong(item);
|
|
} else if (PyFloat_Check(item)) {
|
|
val[i] = PyFloat_AsDouble(item);
|
|
} else {
|
|
PyErr_SetString(PyExc_TypeError, "Vector3D() must take list of floats, or ints");
|
|
return NULL;
|
|
}
|
|
}
|
|
val.set();
|
|
break;
|
|
case 3:
|
|
for(int i = 0; i < 3; i++) {
|
|
PyObject * item = PyTuple_GetItem(args, i);
|
|
if (PyInt_Check(item)) {
|
|
val[i] = (double)PyInt_AsLong(item);
|
|
} else if (PyFloat_Check(item)) {
|
|
val[i] = PyFloat_AsDouble(item);
|
|
} else {
|
|
PyErr_SetString(PyExc_TypeError, "Vector3D() must take list of floats, or ints");
|
|
return NULL;
|
|
}
|
|
}
|
|
val.set();
|
|
break;
|
|
default:
|
|
PyErr_SetString(PyExc_TypeError, "Vector3D must take list of floats, or ints, 3 ints or 3 floats");
|
|
return NULL;
|
|
break;
|
|
}
|
|
|
|
o = newVector3DObject(args);
|
|
if ( o == NULL ) {
|
|
return NULL;
|
|
}
|
|
o->coords = val;
|
|
return (PyObject *)o;
|
|
}
|
|
|
|
static PyObject * quaternion_new(PyObject * self, PyObject * args)
|
|
{
|
|
QuaternionObject *o;
|
|
Quaternion val;
|
|
|
|
PyObject * clist;
|
|
switch (PyTuple_Size(args)) {
|
|
case 0:
|
|
break;
|
|
case 1:
|
|
clist = PyTuple_GetItem(args, 0);
|
|
if ((!PyList_Check(clist)) || (PyList_Size(clist) != 4)) {
|
|
PyErr_SetString(PyExc_TypeError, "Quaternion() from single value must a list 4 long");
|
|
return NULL;
|
|
}
|
|
for(int i = 0; i < 4; i++) {
|
|
PyObject * item = PyList_GetItem(clist, i);
|
|
if (PyInt_Check(item)) {
|
|
val[i] = (double)PyInt_AsLong(item);
|
|
} else if (PyFloat_Check(item)) {
|
|
val[i] = PyFloat_AsDouble(item);
|
|
} else {
|
|
PyErr_SetString(PyExc_TypeError, "Quaternion() must take list of floats, or ints");
|
|
return NULL;
|
|
}
|
|
}
|
|
val.set();
|
|
break;
|
|
case 2:
|
|
{
|
|
PyObject * v1 = PyTuple_GetItem(args, 0);
|
|
PyObject * v2 = PyTuple_GetItem(args, 0);
|
|
if (!PyVector3D_Check(v1) || !PyVector3D_Check(v2)) {
|
|
PyErr_SetString(PyExc_TypeError, "Quaternion(a,b) must take two vectors");
|
|
return NULL;
|
|
}
|
|
Vector3DObject * from = (Vector3DObject *)v1;
|
|
Vector3DObject * to = (Vector3DObject *)v2;
|
|
val = Quaternion(from->coords, to->coords);
|
|
}
|
|
break;
|
|
case 4:
|
|
for(int i = 0; i < 4; i++) {
|
|
PyObject * item = PyTuple_GetItem(args, i);
|
|
if (PyInt_Check(item)) {
|
|
val[i] = (double)PyInt_AsLong(item);
|
|
} else if (PyFloat_Check(item)) {
|
|
val[i] = PyFloat_AsDouble(item);
|
|
} else {
|
|
PyErr_SetString(PyExc_TypeError, "Quaternion() must take list of floats, or ints");
|
|
return NULL;
|
|
}
|
|
}
|
|
val.set();
|
|
break;
|
|
default:
|
|
PyErr_SetString(PyExc_TypeError, "Quaternion must take list of floats, or ints, 4 ints or 4 floats");
|
|
return NULL;
|
|
break;
|
|
}
|
|
|
|
o = newQuaternionObject(args);
|
|
if ( o == NULL ) {
|
|
return NULL;
|
|
}
|
|
o->rotation = val;
|
|
return (PyObject *)o;
|
|
}
|
|
|
|
static PyObject * worldtime_new(PyObject * self, PyObject * args)
|
|
{
|
|
WorldTimeObject *o;
|
|
|
|
int seconds;
|
|
if (!PyArg_ParseTuple(args, "i", &seconds)) {
|
|
return NULL;
|
|
}
|
|
o = newWorldTimeObject(args);
|
|
if ( o == NULL ) {
|
|
return NULL;
|
|
}
|
|
o->time = new WorldTime(seconds);
|
|
o->own = true;
|
|
return (PyObject *)o;
|
|
}
|
|
|
|
static inline void addToOplist(OperationObject * op, OplistObject * o)
|
|
{
|
|
if (op != NULL) {
|
|
if (PyOperation_Check(op)) {
|
|
o->ops->push_back(op->operation);
|
|
op->own = 0;
|
|
} else if ((PyObject*)op != Py_None) {
|
|
PyErr_SetString(PyExc_TypeError, "Argument must be an op");
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static PyObject * oplist_new(PyObject * self, PyObject * args)
|
|
{
|
|
OplistObject *o;
|
|
|
|
OperationObject *op1 = NULL, *op2 = NULL, *op3 = NULL, *op4 = NULL;
|
|
if (!PyArg_ParseTuple(args, "|OOOO", &op1, &op2, &op3, &op4)) {
|
|
return NULL;
|
|
}
|
|
o = newOplistObject(args);
|
|
if ( o == NULL ) {
|
|
return NULL;
|
|
}
|
|
o->ops = new OpVector();
|
|
addToOplist(op1, o);
|
|
addToOplist(op2, o);
|
|
addToOplist(op3, o);
|
|
addToOplist(op4, o);
|
|
return (PyObject *)o;
|
|
}
|
|
|
|
static PyObject * object_new(PyObject * self, PyObject * args)
|
|
{
|
|
AtlasObject *o;
|
|
|
|
if (!PyArg_ParseTuple(args, "")) {
|
|
return NULL;
|
|
}
|
|
o = newAtlasObject(args);
|
|
if ( o == NULL ) {
|
|
return NULL;
|
|
}
|
|
o->m_obj = new Object(Object::MapType());
|
|
return (PyObject *)o;
|
|
}
|
|
|
|
static PyObject * entity_new(PyObject * self, PyObject * args, PyObject * kwds)
|
|
{
|
|
AtlasObject *o;
|
|
char * id = NULL;
|
|
|
|
if (!PyArg_ParseTuple(args, "|s", &id)) {
|
|
return NULL;
|
|
}
|
|
Object::MapType omap;
|
|
if (id != NULL) {
|
|
omap["id"] = std::string(id);
|
|
}
|
|
if ((kwds != NULL) && (PyDict_Check(kwds))) {
|
|
PyObject * keys = PyDict_Keys(kwds);
|
|
PyObject * vals = PyDict_Values(kwds);
|
|
if ((keys == NULL) || (vals == NULL)) {
|
|
PyErr_SetString(PyExc_TypeError, "Error in keywords");
|
|
return NULL;
|
|
}
|
|
int i, size=PyList_Size(keys);
|
|
for(i = 0; i < size; i++) {
|
|
char * key = PyString_AsString(PyList_GetItem(keys, i));
|
|
PyObject * val = PyList_GetItem(vals, i);
|
|
if ((strcmp(key, "location") == 0) && (PyLocation_Check(val))) {
|
|
LocationObject * loc = (LocationObject*)val;
|
|
loc->location->addToObject(omap);
|
|
} else if (strcmp(key, "xyz") == 0) {
|
|
omap["pos"] = PyObject_asObject(val);
|
|
} else if ((strcmp(key, "parent") == 0) && (PyString_Check(val))) {
|
|
omap["loc"] = Object(std::string(PyString_AsString(val)));
|
|
} else if ((strcmp(key, "type") == 0) && (PyString_Check(val))) {
|
|
omap["parents"] = Object::ListType(1,std::string(PyString_AsString(val)));
|
|
} else {
|
|
Object val_obj = PyObject_asObject(val);
|
|
if (val_obj.GetType() == Object::TYPE_NONE) {
|
|
fprintf(stderr, "Could not handle %s value in Entity()", key);
|
|
PyErr_SetString(PyExc_TypeError, "Argument type error to Entity()");
|
|
Py_DECREF(keys);
|
|
Py_DECREF(vals);
|
|
return NULL;
|
|
}
|
|
omap[key] = val_obj;
|
|
}
|
|
}
|
|
Py_DECREF(keys);
|
|
Py_DECREF(vals);
|
|
}
|
|
|
|
o = newAtlasObject(args);
|
|
if ( o == NULL ) {
|
|
return NULL;
|
|
}
|
|
o->m_obj = new Object(omap);
|
|
return (PyObject *)o;
|
|
}
|
|
|
|
static PyObject * cppthing_new(PyObject * self, PyObject * args)
|
|
{
|
|
ThingObject *o;
|
|
|
|
if (!PyArg_ParseTuple(args, "")) {
|
|
return NULL;
|
|
}
|
|
o = newThingObject(args);
|
|
if ( o == NULL ) {
|
|
return NULL;
|
|
}
|
|
return (PyObject *)o;
|
|
}
|
|
|
|
static inline void addToArgs(Object::ListType & args, PyObject * ent)
|
|
{
|
|
if (ent == NULL) {
|
|
return;
|
|
}
|
|
if (PyAtlasObject_Check(ent)) {
|
|
AtlasObject * obj = (AtlasObject*)ent;
|
|
if (obj->m_obj == NULL) {
|
|
fprintf(stderr, "Invalid object in Operation arguments\n");
|
|
return;
|
|
}
|
|
Object o(*obj->m_obj);
|
|
if (o.IsMap() && (obj->Object_attr != NULL)) {
|
|
Object::MapType & ent = o.AsMap();
|
|
Object::MapType ent2 = PyDictObject_asMapType(obj->Object_attr);
|
|
Object::MapType::iterator I = ent2.begin();
|
|
for(; I != ent2.end(); I++) {
|
|
if (ent.find(I->first) != ent.end()) {
|
|
ent[I->first] = I->second;
|
|
}
|
|
}
|
|
}
|
|
args.push_back(o);
|
|
} else if (PyOperation_Check(ent)) {
|
|
OperationObject * op = (OperationObject*)ent;
|
|
if (op->operation == NULL) {
|
|
fprintf(stderr, "Invalid operation in Operation arguments\n");
|
|
return;
|
|
}
|
|
args.push_back(op->operation->AsObject());
|
|
} else {
|
|
fprintf(stderr, "Non-entity passed as arg to Operation()\n");
|
|
}
|
|
}
|
|
|
|
static PyObject * operation_new(PyObject * self, PyObject * args, PyObject * kwds)
|
|
{
|
|
OperationObject * op;
|
|
|
|
char * type;
|
|
PyObject * arg1 = NULL;
|
|
PyObject * arg2 = NULL;
|
|
PyObject * arg3 = NULL;
|
|
|
|
if (!PyArg_ParseTuple(args, "s|OOO", &type, &arg1, &arg2, &arg3)) {
|
|
return NULL;
|
|
}
|
|
op = newAtlasRootOperation(args);
|
|
if (op == NULL) {
|
|
return NULL;
|
|
}
|
|
if (strcmp(type, "tick") == 0) {
|
|
op->operation = new Tick(Tick::Instantiate());
|
|
} else if (strcmp(type, "sight") == 0) {
|
|
op->operation = new Sight(Sight::Instantiate());
|
|
} else if (strcmp(type, "set") == 0) {
|
|
op->operation = new Set(Set::Instantiate());
|
|
} else if (strcmp(type, "fire") == 0) {
|
|
op->operation = new Fire(Fire::Instantiate());
|
|
} else if (strcmp(type, "action") == 0) {
|
|
op->operation = new Action(Action::Instantiate());
|
|
} else if (strcmp(type, "chop") == 0) {
|
|
op->operation = new Chop(Chop::Instantiate());
|
|
} else if (strcmp(type, "cut") == 0) {
|
|
op->operation = new Cut(Cut::Instantiate());
|
|
} else if (strcmp(type, "create") == 0) {
|
|
op->operation = new Create(Create::Instantiate());
|
|
} else if (strcmp(type, "setup") == 0) {
|
|
op->operation = new Setup(Setup::Instantiate());
|
|
} else if (strcmp(type, "look") == 0) {
|
|
op->operation = new Look(Look::Instantiate());
|
|
} else if (strcmp(type, "move") == 0) {
|
|
op->operation = new Move(Move::Instantiate());
|
|
} else if (strcmp(type, "talk") == 0) {
|
|
op->operation = new Talk(Talk::Instantiate());
|
|
} else if (strcmp(type, "touch") == 0) {
|
|
op->operation = new Touch(Touch::Instantiate());
|
|
} else if (strcmp(type, "eat") == 0) {
|
|
op->operation = new Eat(Eat::Instantiate());
|
|
} else if (strcmp(type, "nourish") == 0) {
|
|
op->operation = new Nourish(Nourish::Instantiate());
|
|
} else if (strcmp(type, "info") == 0) {
|
|
op->operation = new Info(Info::Instantiate());
|
|
} else if ((strcmp(type,"thought")==0) || (strcmp(type,"goal_info")==0)) {
|
|
Py_DECREF(op);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
} else {
|
|
op->operation = new RootOperation(Generic::Instantiate(type));
|
|
// fprintf(stderr, "NOTICE: Python creating a custom %s op\n", type);
|
|
//*op->operation = RootOperation::Instantiate();
|
|
// Py_DECREF(op);
|
|
// Py_INCREF(Py_None);
|
|
// return Py_None;
|
|
}
|
|
op->own = 1;
|
|
if (PyMapping_HasKeyString(kwds, "to")) {
|
|
PyObject * to = PyMapping_GetItemString(kwds, "to");
|
|
PyObject * to_id;
|
|
if (PyString_Check(to)) {
|
|
to_id = to;
|
|
} else if ((to_id = PyObject_GetAttrString(to, "id")) == NULL) {
|
|
fprintf(stderr, "To was not really an entity, as it had no id\n");
|
|
Py_DECREF(to);
|
|
return NULL;
|
|
} else {
|
|
// to_id == to.getattr("id") and to is finished with
|
|
Py_DECREF(to);
|
|
}
|
|
if (!PyString_Check(to_id)) {
|
|
fprintf(stderr, "To id is not a string\n");
|
|
Py_DECREF(to_id);
|
|
return NULL;
|
|
}
|
|
op->operation->SetTo(PyString_AsString(to_id));
|
|
Py_DECREF(to_id);
|
|
}
|
|
if (PyMapping_HasKeyString(kwds, "from_")) {
|
|
PyObject * from = PyMapping_GetItemString(kwds, "from_");
|
|
PyObject * from_id;
|
|
if (PyString_Check(from)) {
|
|
from_id = from;
|
|
} else if ((from_id = PyObject_GetAttrString(from, "id")) == NULL) {
|
|
fprintf(stderr, "From was not really an entity, as it had no id\n");
|
|
Py_DECREF(from);
|
|
return NULL;
|
|
} else {
|
|
Py_DECREF(from);
|
|
}
|
|
if (!PyString_Check(from_id)) {
|
|
fprintf(stderr, "From id is not a string\n");
|
|
Py_DECREF(from_id);
|
|
return NULL;
|
|
}
|
|
op->operation->SetFrom(PyString_AsString(from_id));
|
|
Py_DECREF(from_id);
|
|
// FIXME I think I need to actually do something with said value now
|
|
}
|
|
Object::ListType args_list;
|
|
addToArgs(args_list, arg1);
|
|
addToArgs(args_list, arg2);
|
|
addToArgs(args_list, arg3);
|
|
op->operation->SetArgs(args_list);
|
|
return (PyObject *)op;
|
|
}
|
|
|
|
static PyObject * set_kw(PyObject * meth_self, PyObject * args)
|
|
{
|
|
// Takes self, kw, name, default=None
|
|
PyObject * self;
|
|
PyObject * kw;
|
|
char * name;
|
|
PyObject * def = NULL;
|
|
|
|
if (!PyArg_ParseTuple(args, "OOs|O", &self, &kw, &name, &def)) {
|
|
return NULL;
|
|
}
|
|
PyObject * attr = PyObject_GetAttrString(self, "attributes");
|
|
if (attr == NULL) {
|
|
PyErr_SetString(PyExc_TypeError, "SET_KW: No attributes list");
|
|
return NULL;
|
|
}
|
|
int i = PyList_Size(attr);
|
|
char * entry;
|
|
PyObject * item;
|
|
for(i= 0; i < PyList_Size(attr); i++) {
|
|
item = PyList_GetItem(attr, i);
|
|
if (!PyString_Check(item)) {
|
|
continue;
|
|
}
|
|
entry = PyString_AsString(item);
|
|
if (strcmp(entry, name) == 0) {
|
|
goto list_contains_it;
|
|
}
|
|
// Should I free entry at this point?
|
|
}
|
|
{
|
|
PyObject * namestr = PyString_FromString(name);
|
|
PyList_Append(attr, namestr);
|
|
Py_DECREF(namestr);
|
|
}
|
|
list_contains_it:
|
|
Py_DECREF(attr);
|
|
if (!PyDict_Check(kw)) {
|
|
PyErr_SetString(PyExc_TypeError, "SET_KW: kw not a dict");
|
|
return NULL;
|
|
}
|
|
PyObject * value = NULL;
|
|
bool decvalue = false;
|
|
if ((value = PyDict_GetItemString(kw, name)) == NULL) {
|
|
PyObject * copy = PyDict_GetItemString(kw, "copy");
|
|
if ((copy != NULL) && (PyObject_HasAttrString(copy, name))) {
|
|
value = PyObject_GetAttrString(copy, name);
|
|
decvalue = true;
|
|
} else {
|
|
value = def;
|
|
}
|
|
}
|
|
if (value == NULL) {
|
|
Py_INCREF(Py_None);
|
|
value = Py_None;
|
|
}
|
|
PyObject_SetAttrString(self, name, value);
|
|
|
|
if (decvalue) { Py_DECREF(value); }
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
static PyMethodDef atlas_methods[] = {
|
|
/* {"system", spam_system, METH_VARARGS}, */
|
|
{"Operation", (PyCFunction)operation_new, METH_VARARGS|METH_KEYWORDS},
|
|
{"isLocation", is_location, METH_VARARGS},
|
|
{"Location", location_new, METH_VARARGS},
|
|
{"Object", object_new, METH_VARARGS},
|
|
{"Entity", (PyCFunction)entity_new, METH_VARARGS|METH_KEYWORDS},
|
|
{"Message", oplist_new, METH_VARARGS},
|
|
{"cppThing", cppthing_new, METH_VARARGS},
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
static PyMethodDef vector3d_methods[] = {
|
|
{"Vector3D", vector3d_new, METH_VARARGS},
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
static PyMethodDef quaternion_methods[] = {
|
|
{"Quaternion", quaternion_new, METH_VARARGS},
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
static PyMethodDef server_methods[] = {
|
|
{"WorldTime", worldtime_new, METH_VARARGS},
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
static PyMethodDef common_methods[] = {
|
|
//{"null", null_new, METH_VARARGS},
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
static PyMethodDef misc_methods[] = {
|
|
{"set_kw", set_kw, METH_VARARGS},
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
void init_python_api()
|
|
{
|
|
std::string pypath("");
|
|
std::string importCmd("ruleset_import_hooks.install([");
|
|
std::vector<std::string>::const_iterator I;
|
|
for(I = rulesets.begin(); I != rulesets.end(); I++) {
|
|
pypath = pypath + share_directory + "/cyphesis/rulesets/" + *I + ":";
|
|
if (I != rulesets.begin()) {
|
|
importCmd = importCmd + ",";
|
|
}
|
|
importCmd = importCmd + "\"" + *I + "\"";
|
|
}
|
|
importCmd = importCmd + "])\n";
|
|
|
|
setenv("PYTHONPATH", pypath.c_str(), 1);
|
|
|
|
Py_Initialize();
|
|
|
|
PyRun_SimpleString("from hooks import ruleset_import_hooks\n");
|
|
PyRun_SimpleString((char *)importCmd.c_str());
|
|
|
|
if (Py_InitModule("atlas", atlas_methods) == NULL) {
|
|
fprintf(stderr, "Failed to Create atlas module\n");
|
|
return;
|
|
}
|
|
|
|
if (Py_InitModule("Vector3D", vector3d_methods) == NULL) {
|
|
fprintf(stderr, "Failed to Create Vector3D module\n");
|
|
return;
|
|
}
|
|
|
|
if (Py_InitModule("Quaternion", quaternion_methods) == NULL) {
|
|
fprintf(stderr, "Failed to Create Quaternion module\n");
|
|
return;
|
|
}
|
|
|
|
if (Py_InitModule("misc", misc_methods) == NULL) {
|
|
fprintf(stderr, "Failed to Create misc module\n");
|
|
return;
|
|
}
|
|
|
|
PyObject * common;
|
|
if ((common = Py_InitModule("common", common_methods)) == NULL) {
|
|
fprintf(stderr, "Failed to Create common module\n");
|
|
return;
|
|
}
|
|
PyObject * _const = PyModule_New("const");
|
|
PyObject * log = PyModule_New("log");
|
|
PyObject * dict = PyModule_GetDict(common);
|
|
PyDict_SetItemString(dict, "const", _const);
|
|
PyDict_SetItemString(dict, "log", log);
|
|
PyObject * debug = (PyObject *)PyObject_NEW(FunctionObject, &log_debug_type);
|
|
PyObject_SetAttrString(log, "debug", debug);
|
|
Py_DECREF(debug);
|
|
Py_DECREF(log);
|
|
PyObject * o;
|
|
o = PyInt_FromLong(0);
|
|
PyObject_SetAttrString(_const, "server_python", o);
|
|
Py_DECREF(o);
|
|
o = PyInt_FromLong(consts::debug_level);
|
|
PyObject_SetAttrString(_const, "debug_level", o);
|
|
Py_DECREF(o);
|
|
o = PyInt_FromLong(consts::debug_thinking);
|
|
PyObject_SetAttrString(_const, "debug_thinking", o);
|
|
Py_DECREF(o);
|
|
|
|
o = PyFloat_FromDouble(consts::time_multiplier);
|
|
PyObject_SetAttrString(_const, "time_multiplier", o);
|
|
Py_DECREF(o);
|
|
o = PyFloat_FromDouble(consts::base_velocity_coefficient);
|
|
PyObject_SetAttrString(_const, "base_velocity_coefficient", o);
|
|
Py_DECREF(o);
|
|
o = PyFloat_FromDouble(consts::base_velocity);
|
|
PyObject_SetAttrString(_const, "base_velocity", o);
|
|
Py_DECREF(o);
|
|
|
|
o = PyFloat_FromDouble(consts::basic_tick);
|
|
PyObject_SetAttrString(_const, "basic_tick", o);
|
|
Py_DECREF(o);
|
|
|
|
o = PyFloat_FromDouble(consts::sight_range);
|
|
PyObject_SetAttrString(_const, "sight_range", o);
|
|
Py_DECREF(o);
|
|
o = PyFloat_FromDouble(consts::hearing_range);
|
|
PyObject_SetAttrString(_const, "hearing_range", o);
|
|
Py_DECREF(o);
|
|
o = PyInt_FromLong(consts::enable_ranges);
|
|
PyObject_SetAttrString(_const, "enable_ranges", o);
|
|
Py_DECREF(o);
|
|
Py_DECREF(_const);
|
|
|
|
PyObject * server;
|
|
if ((server = Py_InitModule("server", server_methods)) == NULL) {
|
|
fprintf(stderr, "Failed to Create server thing\n");
|
|
return;
|
|
}
|
|
dict = PyModule_GetDict(server);
|
|
PyObject * dictlist = PyModule_New("dictlist");
|
|
PyObject * add_value = (PyObject *)PyObject_NEW(FunctionObject, &dictlist_add_value_type);
|
|
PyObject_SetAttrString(dictlist, "add_value", add_value);
|
|
Py_DECREF(add_value);
|
|
PyObject * remove_value = (PyObject *)PyObject_NEW(FunctionObject, &dictlist_remove_value_type);
|
|
PyObject_SetAttrString(dictlist, "remove_value", remove_value);
|
|
Py_DECREF(remove_value);
|
|
PyDict_SetItemString(dict, "dictlist", dictlist);
|
|
Py_DECREF(dictlist);
|
|
|
|
std::cout << Py_GetPath() << std::endl << std::flush;
|
|
}
|
|
|
|
void shutdown_python_api()
|
|
{
|
|
|
|
Py_Finalize();
|
|
}
|