matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trying to get a putpixel command working but it segfaults atm

Browse Source
This commit is contained in:
Lieuwe 2011-03-05 15:54:47 +01:00
parent 85a2ba9a6e
commit 6596155c8a
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/pyconsole.h
View File

File diff suppressed because one or more lines are too long

BIN
powder Executable file
View File

Binary file not shown.

14
src/main.c
View File

@ -55,6 +55,8 @@
#include <air.h> #include <air.h>
#include <icon.h> #include <icon.h>
pixel *vid_buf;
#define NUM_SOUNDS 2 #define NUM_SOUNDS 2
struct sample { struct sample {
Uint8 *data; Uint8 *data;
@ -1752,6 +1754,15 @@ emb_get_prop(PyObject *self, PyObject *args)
return Py_BuildValue("i",-1); return Py_BuildValue("i",-1);
} }
emb_draw_pixel(PyObject *self, PyObject *args)
{
int x,y,r,g,b,a;
a=255;
if(!PyArg_ParseTuple(args, "IIIII|I:drawpixel",&x,&y,&r,&g,&b,&a))
return NULL;
drawpixel(vid_buf,x,y,r,g,b,a);
}
static PyMethodDef EmbMethods[] = { //WARNING! don't forget to register your function here! static PyMethodDef EmbMethods[] = { //WARNING! don't forget to register your function here!
{"create", emb_create, METH_VARARGS|METH_KEYWORDS, "create a particle."}, {"create", emb_create, METH_VARARGS|METH_KEYWORDS, "create a particle."},
{"log", emb_log, METH_VARARGS, "logs an error string to the console."}, {"log", emb_log, METH_VARARGS, "logs an error string to the console."},
@ -1777,6 +1788,7 @@ static PyMethodDef EmbMethods[] = { //WARNING! don't forget to register your fun
{"console_less", emb_console_less, METH_VARARGS, "turns the more indicator off."}, {"console_less", emb_console_less, METH_VARARGS, "turns the more indicator off."},
{"get_pmap", emb_get_pmap, METH_VARARGS, "get the pmap value."}, {"get_pmap", emb_get_pmap, METH_VARARGS, "get the pmap value."},
{"get_prop", emb_get_prop, METH_VARARGS, "get some properties."}, {"get_prop", emb_get_prop, METH_VARARGS, "get some properties."},
{"draw_pixel", emb_draw_pixel, METH_VARARGS, "draw a pixel."},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };
@ -1794,9 +1806,9 @@ int main(int argc, char *argv[])
int FPS = 0; int FPS = 0;
int pastFPS = 0; int pastFPS = 0;
int past = 0; int past = 0;
pixel *vid_buf=calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE);
void *http_ver_check; void *http_ver_check;
void *http_session_check = NULL; void *http_session_check = NULL;
pixel *vid_buf=calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE);
char *ver_data=NULL, *check_data=NULL, *tmp; char *ver_data=NULL, *check_data=NULL, *tmp;
//char console_error[255] = ""; //char console_error[255] = "";
int i, j, bq, fire_fc=0, do_check=0, do_s_check=0, old_version=0, http_ret=0,http_s_ret=0, major, minor, old_ver_len; int i, j, bq, fire_fc=0, do_check=0, do_s_check=0, old_version=0, http_ret=0,http_s_ret=0, major, minor, old_ver_len;

6
src/python/tpt_console.py
View File

@ -75,6 +75,7 @@ def _handle(txt):
except Exception as ex: except Exception as ex:
error(ex) error(ex)
#optional step handler:
def step(): def step():
try: try:
a=handle.glob a=handle.glob
@ -86,6 +87,5 @@ def step():
error(ex) error(ex)
def _step(): def _step():
#print "handling '%s'"%txt #toggle_pause()
#print "step" tpt.draw_pixel(200,200,254,254,254)
toggle_pause()