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.67 by root, Tue Apr 25 11:18:48 2006 UTC vs.
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC

… …
406 SDL_Rect **m; 406 SDL_Rect **m;
407 407
408 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 408 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 409 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 410 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 0); 411 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412 412
413 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 413 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 414 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 415 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 416 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
… …
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}
… …
640 exit (1); 642 exit (1);
641 643
642MODULE = CFClient PACKAGE = CFClient::Font 644MODULE = CFClient PACKAGE = CFClient::Font
643 645
644CFClient::Font 646CFClient::Font
645new_from_file (SV *class, char *path) 647new_from_file (SV *class, char *path, int id = 0)
646 CODE: 648 CODE:
647{ 649{
648 int count; 650 int count;
649 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 651 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
650 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 652 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651 FcPatternDestroy (pattern); 653 FcPatternDestroy (pattern);
652} 654}
653 OUTPUT: 655 OUTPUT:
654 RETVAL 656 RETVAL
… …
1348 } *civ, const_iv[] = { 1350 } *civ, const_iv[] = {
1349# define const_iv(name) { # name, (IV)name } 1351# define const_iv(name) { # name, (IV)name }
1350 const_iv (GL_COLOR_MATERIAL), 1352 const_iv (GL_COLOR_MATERIAL),
1351 const_iv (GL_SMOOTH), 1353 const_iv (GL_SMOOTH),
1352 const_iv (GL_FLAT), 1354 const_iv (GL_FLAT),
1355 const_iv (GL_DITHER),
1353 const_iv (GL_BLEND), 1356 const_iv (GL_BLEND),
1357 const_iv (GL_SCISSOR_TEST),
1354 const_iv (GL_AND), 1358 const_iv (GL_AND),
1355 const_iv (GL_ONE), 1359 const_iv (GL_ONE),
1356 const_iv (GL_ZERO), 1360 const_iv (GL_ZERO),
1357 const_iv (GL_SRC_ALPHA), 1361 const_iv (GL_SRC_ALPHA),
1358 const_iv (GL_SRC_ALPHA_SATURATE), 1362 const_iv (GL_SRC_ALPHA_SATURATE),
… …
1381 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1385 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1382 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1386 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1383 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1387 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1384 const_iv (GL_GENERATE_MIPMAP), 1388 const_iv (GL_GENERATE_MIPMAP),
1385 const_iv (GL_MODULATE), 1389 const_iv (GL_MODULATE),
1390 const_iv (GL_DECAL),
1386 const_iv (GL_REPLACE), 1391 const_iv (GL_REPLACE),
1387 const_iv (GL_COLOR_BUFFER_BIT), 1392 const_iv (GL_COLOR_BUFFER_BIT),
1388 const_iv (GL_PROJECTION), 1393 const_iv (GL_PROJECTION),
1389 const_iv (GL_MODELVIEW), 1394 const_iv (GL_MODELVIEW),
1390 const_iv (GL_COLOR_LOGIC_OP), 1395 const_iv (GL_COLOR_LOGIC_OP),
1396 const_iv (GL_SEPARABLE_2D),
1391 const_iv (GL_CONVOLUTION_2D), 1397 const_iv (GL_CONVOLUTION_2D),
1392 const_iv (GL_CONVOLUTION_BORDER_MODE), 1398 const_iv (GL_CONVOLUTION_BORDER_MODE),
1393 const_iv (GL_CONSTANT_BORDER), 1399 const_iv (GL_CONSTANT_BORDER),
1394 const_iv (GL_LINES), 1400 const_iv (GL_LINES),
1395 const_iv (GL_QUADS), 1401 const_iv (GL_QUADS),
… …
1420 1426
1421void glBlendFunc (int sfactor, int dfactor) 1427void glBlendFunc (int sfactor, int dfactor)
1422 1428
1423void glLogicOp (int opcode) 1429void glLogicOp (int opcode)
1424 1430
1431void glColorMask (int red, int green, int blue, int alpha)
1432
1425void glMatrixMode (int mode) 1433void glMatrixMode (int mode)
1426 1434
1427void glPushMatrix () 1435void glPushMatrix ()
1428 1436
1429void glPopMatrix () 1437void glPopMatrix ()
… …
1432 1440
1433# near and far are due to microsofts buggy c compiler 1441# near and far are due to microsofts buggy c compiler
1434void 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_)
1435 1443
1436void 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)
1437 1447
1438void glTranslate (float x, float y, float z = 0.) 1448void glTranslate (float x, float y, float z = 0.)
1439 CODE: 1449 CODE:
1440 glTranslatef (x, y, z); 1450 glTranslatef (x, y, z);
1441 1451
… …
1452void glEnd () 1462void glEnd ()
1453 1463
1454void glColor (float r, float g, float b, float a = 1.0) 1464void glColor (float r, float g, float b, float a = 1.0)
1455 PROTOTYPE: @ 1465 PROTOTYPE: @
1456 CODE: 1466 CODE:
1457 glColor4f (r, g, b, a); 1467 glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1458 1468
1459void glVertex (float x, float y, float z = 0.) 1469void glVertex (float x, float y, float z = 0.)
1460 CODE: 1470 CODE:
1461 glVertex3f (x, y, z); 1471 glVertex3f (x, y, z);
1462 1472
… …
1481void 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)
1482 CODE: 1492 CODE:
1483 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1493 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1484 (target, internalformat, width, height, format, type, data)); 1494 (target, internalformat, width, height, format, type, data));
1485 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
1486void 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)
1487 1502
1488void 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)
1489 1510
1490int glGenTexture () 1511int glGenTexture ()
1491 CODE: 1512 CODE:
1492{ 1513{
1493 GLuint name; 1514 GLuint name;

Diff Legend

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