ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.65 by root, Mon Apr 24 08:22:21 2006 UTC vs.
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC

… …
457 457
458 while (SDL_PollEvent (&ev)) 458 while (SDL_PollEvent (&ev))
459 { 459 {
460 HV *hv = newHV (); 460 HV *hv = newHV ();
461 hv_store (hv, "type", 4, newSViv (ev.type), 0); 461 hv_store (hv, "type", 4, newSViv (ev.type), 0);
462
462 switch (ev.type) 463 switch (ev.type)
463 { 464 {
464 case SDL_KEYDOWN: 465 case SDL_KEYDOWN:
465 case SDL_KEYUP: 466 case SDL_KEYUP:
466 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 467 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
… …
486 case SDL_MOUSEBUTTONUP: 487 case SDL_MOUSEBUTTONUP:
487 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 488 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 489 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 490 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 491 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
492 break;
491 } 493 }
492 494
493 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 495 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494 } 496 }
495} 497}
… …
619 PUSHs (sv_2mortal (newSViv (b / y))); 621 PUSHs (sv_2mortal (newSViv (b / y)));
620 PUSHs (sv_2mortal (newSViv (a / y))); 622 PUSHs (sv_2mortal (newSViv (a / y)));
621} 623}
622 624
623void 625void
626error (char *message)
627 CODE:
628#ifdef _WIN32
629 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
630#else
631 fprintf (stderr, "ERROR: %s\n", message);
632#endif
633
634void
624fatal (char *message) 635fatal (char *message)
625 CODE: 636 CODE:
626#ifdef _WIN32 637#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 638 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
628#else 639#else
… …
631 exit (1); 642 exit (1);
632 643
633MODULE = CFClient PACKAGE = CFClient::Font 644MODULE = CFClient PACKAGE = CFClient::Font
634 645
635CFClient::Font 646CFClient::Font
636new_from_file (SV *class, char *path) 647new_from_file (SV *class, char *path, int id = 0)
637 CODE: 648 CODE:
638{ 649{
639 int count; 650 int count;
640 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 651 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
641 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 652 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
642 FcPatternDestroy (pattern); 653 FcPatternDestroy (pattern);
643} 654}
644 OUTPUT: 655 OUTPUT:
645 RETVAL 656 RETVAL
… …
1339 } *civ, const_iv[] = { 1350 } *civ, const_iv[] = {
1340# define const_iv(name) { # name, (IV)name } 1351# define const_iv(name) { # name, (IV)name }
1341 const_iv (GL_COLOR_MATERIAL), 1352 const_iv (GL_COLOR_MATERIAL),
1342 const_iv (GL_SMOOTH), 1353 const_iv (GL_SMOOTH),
1343 const_iv (GL_FLAT), 1354 const_iv (GL_FLAT),
1355 const_iv (GL_DITHER),
1344 const_iv (GL_BLEND), 1356 const_iv (GL_BLEND),
1357 const_iv (GL_SCISSOR_TEST),
1345 const_iv (GL_AND), 1358 const_iv (GL_AND),
1359 const_iv (GL_ONE),
1360 const_iv (GL_ZERO),
1346 const_iv (GL_SRC_ALPHA), 1361 const_iv (GL_SRC_ALPHA),
1362 const_iv (GL_SRC_ALPHA_SATURATE),
1347 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1363 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364 const_iv (GL_ONE_MINUS_DST_ALPHA),
1348 const_iv (GL_RGB), 1365 const_iv (GL_RGB),
1349 const_iv (GL_RGBA), 1366 const_iv (GL_RGBA),
1350 const_iv (GL_UNSIGNED_BYTE), 1367 const_iv (GL_UNSIGNED_BYTE),
1351 const_iv (GL_ALPHA), 1368 const_iv (GL_ALPHA),
1352 const_iv (GL_FLOAT), 1369 const_iv (GL_FLOAT),
… …
1367 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1384 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1368 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1385 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1369 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1386 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1370 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1387 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1371 const_iv (GL_GENERATE_MIPMAP), 1388 const_iv (GL_GENERATE_MIPMAP),
1372 const_iv (GL_LINEAR),
1373 const_iv (GL_MODULATE), 1389 const_iv (GL_MODULATE),
1390 const_iv (GL_DECAL),
1374 const_iv (GL_REPLACE), 1391 const_iv (GL_REPLACE),
1375 const_iv (GL_COLOR_BUFFER_BIT), 1392 const_iv (GL_COLOR_BUFFER_BIT),
1376 const_iv (GL_PROJECTION), 1393 const_iv (GL_PROJECTION),
1377 const_iv (GL_MODELVIEW), 1394 const_iv (GL_MODELVIEW),
1378 const_iv (GL_COLOR_LOGIC_OP), 1395 const_iv (GL_COLOR_LOGIC_OP),
1396 const_iv (GL_SEPARABLE_2D),
1379 const_iv (GL_CONVOLUTION_2D), 1397 const_iv (GL_CONVOLUTION_2D),
1380 const_iv (GL_CONVOLUTION_BORDER_MODE), 1398 const_iv (GL_CONVOLUTION_BORDER_MODE),
1381 const_iv (GL_CONSTANT_BORDER), 1399 const_iv (GL_CONSTANT_BORDER),
1382 const_iv (GL_LINES), 1400 const_iv (GL_LINES),
1383 const_iv (GL_QUADS), 1401 const_iv (GL_QUADS),
… …
1408 1426
1409void glBlendFunc (int sfactor, int dfactor) 1427void glBlendFunc (int sfactor, int dfactor)
1410 1428
1411void glLogicOp (int opcode) 1429void glLogicOp (int opcode)
1412 1430
1431void glColorMask (int red, int green, int blue, int alpha)
1432
1413void glMatrixMode (int mode) 1433void glMatrixMode (int mode)
1414 1434
1415void glPushMatrix () 1435void glPushMatrix ()
1416 1436
1417void glPopMatrix () 1437void glPopMatrix ()
… …
1420 1440
1421# near and far are due to microsofts buggy c compiler 1441# near and far are due to microsofts buggy c compiler
1422void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1442void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1423 1443
1424void glViewport (int x, int y, int width, int height) 1444void glViewport (int x, int y, int width, int height)
1445
1446void glScissor (int x, int y, int width, int height)
1425 1447
1426void glTranslate (float x, float y, float z = 0.) 1448void glTranslate (float x, float y, float z = 0.)
1427 CODE: 1449 CODE:
1428 glTranslatef (x, y, z); 1450 glTranslatef (x, y, z);
1429 1451
… …
1440void glEnd () 1462void glEnd ()
1441 1463
1442void glColor (float r, float g, float b, float a = 1.0) 1464void glColor (float r, float g, float b, float a = 1.0)
1443 PROTOTYPE: @ 1465 PROTOTYPE: @
1444 CODE: 1466 CODE:
1445 glColor4f (r, g, b, a); 1467 glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1446 1468
1447void glVertex (float x, float y, float z = 0.) 1469void glVertex (float x, float y, float z = 0.)
1448 CODE: 1470 CODE:
1449 glVertex3f (x, y, z); 1471 glVertex3f (x, y, z);
1450 1472
… …
1469void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1491void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1470 CODE: 1492 CODE:
1471 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1493 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1472 (target, internalformat, width, height, format, type, data)); 1494 (target, internalformat, width, height, format, type, data));
1473 1495
1496void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1497 CODE:
1498 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1499 (target, internalformat, width, height, format, type, row, column));
1500
1474void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1501void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1475 1502
1476void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1503void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1504
1505void glRasterPos (int x, int y)
1506 CODE:
1507 glRasterPos2i (x, y);
1508
1509void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1477 1510
1478int glGenTexture () 1511int glGenTexture ()
1479 CODE: 1512 CODE:
1480{ 1513{
1481 GLuint name; 1514 GLuint name;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines