mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
Merged in cwalther/cwe/notify_int (mainly by boq) (https://foundry.openuru.org/fisheye/cru/CWE-12)
Allow plNotify variable events to carry integers in addition to floats This fixes crashes when trying to upload a KI note with an odd vault node id > 2^24 to an imager, and allows for future cleanup of other plNotifyMsg uses. To be accompanied by moulscript 886c4.
This commit is contained in:
@ -1363,12 +1363,19 @@ hsBool plPythonFileMod::MsgReceive(plMessage* msg)
|
||||
// depending on the data type create the data
|
||||
switch ( eventData->fDataType )
|
||||
{
|
||||
case proEventData::kNumber:
|
||||
PyList_SetItem(event, 3, PyFloat_FromDouble(eventData->fNumber));
|
||||
case proEventData::kFloat:
|
||||
PyList_SetItem(event, 3, PyFloat_FromDouble(eventData->fNumber.f));
|
||||
break;
|
||||
case proEventData::kKey:
|
||||
PyList_SetItem(event, 3, pyKey::New(eventData->fKey));
|
||||
break;
|
||||
case proEventData::kInt:
|
||||
PyList_SetItem(event, 3, PyInt_FromLong(eventData->fNumber.i));
|
||||
break;
|
||||
default:
|
||||
Py_XINCREF(Py_None);
|
||||
PyList_SetItem(event, 3, Py_None);
|
||||
break;
|
||||
}
|
||||
// add this event record to the main event list (lists within a list)
|
||||
PyList_Append(levents, event);
|
||||
|
@ -151,6 +151,16 @@ void pyNotify::AddVarNumber(const char* name, hsScalar number)
|
||||
fBuildMsg.AddVariableEvent(name,number);
|
||||
}
|
||||
|
||||
void pyNotify::AddVarNumber(const char* name, Int32 number)
|
||||
{
|
||||
fBuildMsg.AddVariableEvent(name,number);
|
||||
}
|
||||
|
||||
void pyNotify::AddVarNull(const char* name)
|
||||
{
|
||||
fBuildMsg.AddVariableEvent(name);
|
||||
}
|
||||
|
||||
void pyNotify::AddVarKey(const char* name, pyKey* key)
|
||||
{
|
||||
fBuildMsg.AddVariableEvent(name, key ? key->getKey() : plKey() );
|
||||
|
@ -100,6 +100,8 @@ public:
|
||||
virtual void AddPickEvent(hsBool enabled, pyKey* other, pyKey* self, pyPoint3 hitPoint);
|
||||
virtual void AddControlKeyEvent( Int32 key, hsBool down );
|
||||
virtual void AddVarNumber(const char* name, hsScalar number);
|
||||
virtual void AddVarNumber(const char* name, Int32 number);
|
||||
virtual void AddVarNull(const char* name);
|
||||
virtual void AddVarKey(const char* name, pyKey* key);
|
||||
virtual void AddFacingEvent( hsBool enabled, pyKey* other, pyKey* self, hsScalar dot);
|
||||
virtual void AddContainerEvent( hsBool entering, pyKey* container, pyKey* contained);
|
||||
|
@ -194,18 +194,86 @@ PYTHON_METHOD_DEFINITION(ptNotify, addControlKeyEvent, args)
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptNotify, addVarNumber, args)
|
||||
{
|
||||
char* name;
|
||||
PyObject* number = NULL;
|
||||
if (!PyArg_ParseTuple(args, "s|O", &name, &number))
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "addVarNumber expects a string and optional number");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
|
||||
if (number == NULL || number == Py_None)
|
||||
self->fThis->AddVarNull(name);
|
||||
else if (PyInt_Check(number))
|
||||
self->fThis->AddVarNumber(name, PyInt_AsLong(number));
|
||||
else if (PyLong_Check(number))
|
||||
{
|
||||
// try as int first
|
||||
Int32 i = (Int32)PyLong_AsLong(number);
|
||||
if (!PyErr_Occurred())
|
||||
{
|
||||
self->fThis->AddVarNumber(name, i);
|
||||
}
|
||||
else
|
||||
{
|
||||
// OverflowError, try float
|
||||
PyErr_Clear();
|
||||
self->fThis->AddVarNumber(name, (float)PyLong_AsDouble(number));
|
||||
}
|
||||
}
|
||||
else if (PyNumber_Check(number))
|
||||
{
|
||||
PyObject* f = PyNumber_Float(number);
|
||||
self->fThis->AddVarNumber(name, (float)PyFloat_AsDouble(f));
|
||||
Py_DECREF(f);
|
||||
}
|
||||
else
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "addVarNumber expects a string and optional number");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
PYTHON_RETURN_NONE;
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptNotify, addVarFloat, args)
|
||||
{
|
||||
char* name;
|
||||
float number;
|
||||
if (!PyArg_ParseTuple(args, "sf", &name, &number))
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "addVarNumber expects a string and a float");
|
||||
PyErr_SetString(PyExc_TypeError, "addVarFloat expects a string and a float");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
self->fThis->AddVarNumber(name, number);
|
||||
PYTHON_RETURN_NONE;
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptNotify, addVarInt, args)
|
||||
{
|
||||
char* name;
|
||||
Int32 number;
|
||||
if (!PyArg_ParseTuple(args, "sl", &name, &number))
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "addVarInt expects a string and a integer");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
self->fThis->AddVarNumber(name, number);
|
||||
PYTHON_RETURN_NONE;
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptNotify, addVarNull, args)
|
||||
{
|
||||
char* name;
|
||||
if (!PyArg_ParseTuple(args, "s", &name))
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "addVarNull expects a string");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
self->fThis->AddVarNull(name);
|
||||
PYTHON_RETURN_NONE;
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptNotify, addVarKey, args)
|
||||
{
|
||||
char* name;
|
||||
@ -337,6 +405,13 @@ PYTHON_START_METHODS_TABLE(ptNotify)
|
||||
PYTHON_METHOD(ptNotify, addPickEvent, "Params: enabledFlag,pickerKey,pickeeKey,hitPoint\nAdd a pick event record to the Notify message"),
|
||||
PYTHON_METHOD(ptNotify, addControlKeyEvent, "Params: keynumber,downFlag\nAdd a keyboard event record to the Notify message"),
|
||||
PYTHON_METHOD(ptNotify, addVarNumber, "Params: name,number\nAdd a number variable event record to the Notify message\n"
|
||||
"Method will try to pick appropriate variable type\n"
|
||||
"This event record is used to pass a number variable to another python program"),
|
||||
PYTHON_METHOD(ptNotify, addVarFloat, "Params: name,number\nAdd a float variable event record to the Notify message\n"
|
||||
"This event record is used to pass a number variable to another python program"),
|
||||
PYTHON_METHOD(ptNotify, addVarInt, "Params: name,number\nAdd a int variable event record to the Notify message\n"
|
||||
"This event record is used to pass a number variable to another python program"),
|
||||
PYTHON_METHOD(ptNotify, addVarNull, "Params: name,number\nAdd a null (no data) variable event record to the Notify message\n"
|
||||
"This event record is used to pass a number variable to another python program"),
|
||||
PYTHON_METHOD(ptNotify, addVarKey, "Params: name,key\nAdd a ptKey variable event record to the Notify message\n"
|
||||
"This event record is used to pass a ptKey variable to another python program"),
|
||||
@ -402,8 +477,10 @@ void pyNotify::AddPlasmaConstantsClasses(PyObject *m)
|
||||
PYTHON_ENUM_END(m, PtEventType);
|
||||
|
||||
PYTHON_ENUM_START(PtNotifyDataType);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kNumber, proEventData::kNumber);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kKey, proEventData::kKey);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kFloat, proEventData::kFloat);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kInt, proEventData::kInt);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kNull, proEventData::kNull);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kKey, proEventData::kKey);
|
||||
PYTHON_ENUM_END(m, PtNotifyDataType);
|
||||
|
||||
PYTHON_ENUM_START(PtMultiStageEventType);
|
||||
|
Reference in New Issue
Block a user