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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC

… …
84 84
85static void 85static void
86substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
87{ 87{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifndef _WIN32 89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
90 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91#endif 93#endif
92} 94}
93 95
94static void 96static void
… …
441 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450 455
451 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
452 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
453 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
454 457
455 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
456 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457 460
458 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
466 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
467 470
468 ++m; 471 ++m;
469 } 472 }
470} 473}
474
475char *
476SDL_GetError ()
471 477
472int 478int
473SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
474 CODE: 480 CODE:
475 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
… …
551lowdelay (int fd, int val = 1) 557lowdelay (int fd, int val = 1)
552 CODE: 558 CODE:
553#ifndef _WIN32 559#ifndef _WIN32
554 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
555#endif 561#endif
562
563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
556 569
557char * 570char *
558gl_version () 571gl_version ()
559 CODE: 572 CODE:
560 RETVAL = (char *)glGetString (GL_VERSION); 573 RETVAL = (char *)glGetString (GL_VERSION);
… …
667} 680}
668 681
669void 682void
670error (char *message) 683error (char *message)
671 CODE: 684 CODE:
685 fprintf (stderr, "ERROR: %s\n", message);
672#ifdef _WIN32 686#ifdef _WIN32
673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 687 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
674#else
675 fprintf (stderr, "ERROR: %s\n", message);
676#endif 688#endif
677 689
678void 690void
679fatal (char *message) 691fatal (char *message)
680 CODE: 692 CODE:
693 fprintf (stderr, "FATAL: %s\n", message);
681#ifdef _WIN32 694#ifdef _WIN32
682 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
683#else
684 fprintf (stderr, "FATAL: %s\n", message);
685#endif 696#endif
686 exit (1); 697 exit (1);
687 698
688MODULE = CFClient PACKAGE = CFClient::Font 699MODULE = CFClient PACKAGE = CFClient::Font
689 700
… …
712MODULE = CFClient PACKAGE = CFClient::Layout 723MODULE = CFClient PACKAGE = CFClient::Layout
713 724
714CFClient::Layout 725CFClient::Layout
715new (SV *class, int rgba = 0) 726new (SV *class, int rgba = 0)
716 CODE: 727 CODE:
728#if _WIN32
729 rgba = 0;//D
730#endif
717 New (0, RETVAL, 1, struct cf_layout); 731 New (0, RETVAL, 1, struct cf_layout);
718 732
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 734 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 735 RETVAL->r = 1.;
… …
801set_width (CFClient::Layout self, int max_width = -1) 815set_width (CFClient::Layout self, int max_width = -1)
802 CODE: 816 CODE:
803 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 817 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804 818
805void 819void
820set_indent (CFClient::Layout self, int indent)
821 CODE:
822 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
823
824void
825set_spacing (CFClient::Layout self, int spacing)
826 CODE:
827 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
828
829void
830set_ellipsise (CFClient::Layout self, int ellipsise)
831 CODE:
832 pango_layout_set_ellipsize (self->pl,
833 ellipsise == 1 ? PANGO_ELLIPSIZE_START
834 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
835 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
836 : PANGO_ELLIPSIZE_NONE
837 );
838
839void
840set_single_paragraph_mode (CFClient::Layout self, int spm)
841 CODE:
842 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
843
844void
806size (CFClient::Layout self) 845size (CFClient::Layout self)
807 PPCODE: 846 PPCODE:
808{ 847{
809 int w, h; 848 int w, h;
810 849
… …
876 915
877 while (p < e) 916 while (p < e)
878 { 917 {
879 uint32_t rgba = *p; 918 uint32_t rgba = *p;
880 rgba = (rgba >> 24) | (rgba << 8); 919 rgba = (rgba >> 24) | (rgba << 8);
920#if 0
921#ifdef _WIN32
922 {//D
923 uint8_t r = rgba >> 24;
924 uint8_t g = rgba >> 16;
925 uint8_t b = rgba >> 8;
926 uint8_t a = rgba >> 0;
927
928 rgba = (rgba & 0xffffff00) | a;
929 }
930#endif
931#endif
881 rgba = SDL_SwapBE32 (rgba); 932 rgba = SDL_SwapBE32 (rgba);
882 *p++ = rgba; 933 *p++ = rgba;
883 } 934 }
884 } 935 }
885 936
… …
942 993
943 if (ix) 994 if (ix)
944 { 995 {
945 glEnable (GL_BLEND); 996 glEnable (GL_BLEND);
946 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
998 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f);
947 } 1000 }
948 1001
949 glBindTexture (GL_TEXTURE_2D, name); 1002 glBindTexture (GL_TEXTURE_2D, name);
950 1003
951 if (wrap_mode) 1004 if (wrap_mode)
… …
960 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1014 glTexCoord2f (s, 0); glVertex2f (x + w, y );
962 glEnd (); 1015 glEnd ();
963 1016
964 if (ix) 1017 if (ix)
1018 {
1019 glDisable (GL_ALPHA_TEST);
965 glDisable (GL_BLEND); 1020 glDisable (GL_BLEND);
1021 }
966} 1022}
967 1023
968MODULE = CFClient PACKAGE = CFClient::Map 1024MODULE = CFClient PACKAGE = CFClient::Map
969 1025
970CFClient::Map 1026CFClient::Map
… …
1481 const_iv (GL_COLOR_MATERIAL), 1537 const_iv (GL_COLOR_MATERIAL),
1482 const_iv (GL_SMOOTH), 1538 const_iv (GL_SMOOTH),
1483 const_iv (GL_FLAT), 1539 const_iv (GL_FLAT),
1484 const_iv (GL_DITHER), 1540 const_iv (GL_DITHER),
1485 const_iv (GL_BLEND), 1541 const_iv (GL_BLEND),
1542 const_iv (GL_CULL_FACE),
1486 const_iv (GL_SCISSOR_TEST), 1543 const_iv (GL_SCISSOR_TEST),
1544 const_iv (GL_DEPTH_TEST),
1545 const_iv (GL_ALPHA_TEST),
1546 const_iv (GL_NORMALIZE),
1547 const_iv (GL_RESCALE_NORMAL),
1487 const_iv (GL_AND), 1548 const_iv (GL_AND),
1488 const_iv (GL_ONE), 1549 const_iv (GL_ONE),
1489 const_iv (GL_ZERO), 1550 const_iv (GL_ZERO),
1490 const_iv (GL_SRC_ALPHA), 1551 const_iv (GL_SRC_ALPHA),
1491 const_iv (GL_SRC_ALPHA_SATURATE), 1552 const_iv (GL_SRC_ALPHA_SATURATE),
1492 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1553 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1493 const_iv (GL_ONE_MINUS_DST_ALPHA), 1554 const_iv (GL_ONE_MINUS_DST_ALPHA),
1494 const_iv (GL_RGB), 1555 const_iv (GL_RGB),
1495 const_iv (GL_RGBA), 1556 const_iv (GL_RGBA),
1496 const_iv (GL_UNSIGNED_BYTE), 1557 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT),
1497 const_iv (GL_ALPHA), 1560 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY),
1498 const_iv (GL_LUMINANCE), 1562 const_iv (GL_LUMINANCE),
1563 const_iv (GL_LUMINANCE_ALPHA),
1499 const_iv (GL_FLOAT), 1564 const_iv (GL_FLOAT),
1500 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1565 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501 const_iv (GL_COMPILE), 1566 const_iv (GL_COMPILE),
1502 const_iv (GL_TEXTURE_1D), 1567 const_iv (GL_TEXTURE_1D),
1503 const_iv (GL_TEXTURE_2D), 1568 const_iv (GL_TEXTURE_2D),
… …
1517 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1582 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1518 const_iv (GL_GENERATE_MIPMAP), 1583 const_iv (GL_GENERATE_MIPMAP),
1519 const_iv (GL_MODULATE), 1584 const_iv (GL_MODULATE),
1520 const_iv (GL_DECAL), 1585 const_iv (GL_DECAL),
1521 const_iv (GL_REPLACE), 1586 const_iv (GL_REPLACE),
1587 const_iv (GL_DEPTH_BUFFER_BIT),
1522 const_iv (GL_COLOR_BUFFER_BIT), 1588 const_iv (GL_COLOR_BUFFER_BIT),
1523 const_iv (GL_PROJECTION), 1589 const_iv (GL_PROJECTION),
1524 const_iv (GL_MODELVIEW), 1590 const_iv (GL_MODELVIEW),
1525 const_iv (GL_COLOR_LOGIC_OP), 1591 const_iv (GL_COLOR_LOGIC_OP),
1526 const_iv (GL_SEPARABLE_2D), 1592 const_iv (GL_SEPARABLE_2D),
1527 const_iv (GL_CONVOLUTION_2D), 1593 const_iv (GL_CONVOLUTION_2D),
1528 const_iv (GL_CONVOLUTION_BORDER_MODE), 1594 const_iv (GL_CONVOLUTION_BORDER_MODE),
1529 const_iv (GL_CONSTANT_BORDER), 1595 const_iv (GL_CONSTANT_BORDER),
1530 const_iv (GL_LINES), 1596 const_iv (GL_LINES),
1597 const_iv (GL_LINE_LOOP),
1531 const_iv (GL_QUADS), 1598 const_iv (GL_QUADS),
1532 const_iv (GL_LINE_LOOP), 1599 const_iv (GL_QUAD_STRIP),
1600 const_iv (GL_TRIANGLES),
1601 const_iv (GL_TRIANGLE_STRIP),
1602 const_iv (GL_TRIANGLE_FAN),
1533 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1603 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1534 const_iv (GL_FASTEST), 1604 const_iv (GL_FASTEST),
1605 const_iv (GL_V2F),
1606 const_iv (GL_V3F),
1607 const_iv (GL_T2F_V3F),
1608 const_iv (GL_T2F_N3F_V3F),
1535# undef const_iv 1609# undef const_iv
1536 }; 1610 };
1537 1611
1538 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1539 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1554 1628
1555void glHint (int target, int mode) 1629void glHint (int target, int mode)
1556 1630
1557void glBlendFunc (int sfactor, int dfactor) 1631void glBlendFunc (int sfactor, int dfactor)
1558 1632
1633void glDepthMask (int flag)
1634
1559void glLogicOp (int opcode) 1635void glLogicOp (int opcode)
1560 1636
1561void glColorMask (int red, int green, int blue, int alpha) 1637void glColorMask (int red, int green, int blue, int alpha)
1562 1638
1563void glMatrixMode (int mode) 1639void glMatrixMode (int mode)
… …
1566 1642
1567void glPopMatrix () 1643void glPopMatrix ()
1568 1644
1569void glLoadIdentity () 1645void glLoadIdentity ()
1570 1646
1571# near and far are due to microsofts buggy c compiler 1647# near_ and far_ are due to microsofts buggy "c" compiler
1648void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649
1650# near_ and far_ are due to microsofts buggy "c" compiler
1572void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1651void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1573 1652
1574void glViewport (int x, int y, int width, int height) 1653void glViewport (int x, int y, int width, int height)
1575 1654
1576void glScissor (int x, int y, int width, int height) 1655void glScissor (int x, int y, int width, int height)
… …
1592void glEnd () 1671void glEnd ()
1593 1672
1594void glColor (float r, float g, float b, float a = 1.0) 1673void glColor (float r, float g, float b, float a = 1.0)
1595 PROTOTYPE: @ 1674 PROTOTYPE: @
1596 CODE: 1675 CODE:
1676 // microsoft visual "c" rounds instead of truncating...
1597 glColor4ub (MIN ((int)(r * 255.f), 255), 1677 glColor4ub (MIN ((int)(r * 255.f), 255),
1598 MIN ((int)(g * 255.f), 255), 1678 MIN ((int)(g * 255.f), 255),
1599 MIN ((int)(b * 255.f), 255), 1679 MIN ((int)(b * 255.f), 255),
1600 MIN ((int)(a * 255.f), 255)); 1680 MIN ((int)(a * 255.f), 255));
1601 1681
1682void glInterleavedArrays (int format, int stride, char *data)
1683
1684void glDrawElements (int mode, int count, int type, char *indices)
1685
1686# 1.2 void glDrawRangeElements (int mode, int start, int end
1687
1688void glRasterPos (float x, float y, float z = 0.)
1689 CODE:
1690 glRasterPos3f (0, 0, z);
1691 glBitmap (0, 0, 0, 0, x, y, 0);
1692
1602void glVertex (float x, float y, float z = 0.) 1693void glVertex (float x, float y, float z = 0.)
1603 CODE: 1694 CODE:
1604 glVertex3f (x, y, z); 1695 glVertex3f (x, y, z);
1605 1696
1606void glTexCoord (float s, float t) 1697void glTexCoord (float s, float t)
… …
1633 1724
1634void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1635 1726
1636void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1637 1728
1638void glRasterPos (int x, int y) 1729void glDrawPixels (int width, int height, int format, int type, char *pixels)
1639 CODE:
1640 glRasterPos2i (x, y);
1641 1730
1642void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1731void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1643 1732
1644int glGenTexture () 1733int glGenTexture ()
1645 CODE: 1734 CODE:
… …
1672 1761
1673void glEndList () 1762void glEndList ()
1674 1763
1675void glCallList (int list) 1764void glCallList (int list)
1676 1765
1766

Diff Legend

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