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.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC

… …
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450 450
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
… …
469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
470 470
471 ++m; 471 ++m;
472 } 472 }
473} 473}
474
475char *
476SDL_GetError ()
474 477
475int 478int
476SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
477 CODE: 480 CODE:
478 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
… …
554lowdelay (int fd, int val = 1) 557lowdelay (int fd, int val = 1)
555 CODE: 558 CODE:
556#ifndef _WIN32 559#ifndef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558#endif 561#endif
562
563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
559 569
560char * 570char *
561gl_version () 571gl_version ()
562 CODE: 572 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION); 573 RETVAL = (char *)glGetString (GL_VERSION);
… …
670} 680}
671 681
672void 682void
673error (char *message) 683error (char *message)
674 CODE: 684 CODE:
685 fprintf (stderr, "ERROR: %s\n", message);
675#ifdef _WIN32 686#ifdef _WIN32
676 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 687 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
677#else
678 fprintf (stderr, "ERROR: %s\n", message);
679#endif 688#endif
680 689
681void 690void
682fatal (char *message) 691fatal (char *message)
683 CODE: 692 CODE:
693 fprintf (stderr, "FATAL: %s\n", message);
684#ifdef _WIN32 694#ifdef _WIN32
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686#else
687 fprintf (stderr, "FATAL: %s\n", message);
688#endif 696#endif
689 exit (1); 697 exit (1);
690 698
691MODULE = CFClient PACKAGE = CFClient::Font 699MODULE = CFClient PACKAGE = CFClient::Font
692 700
… …
715MODULE = CFClient PACKAGE = CFClient::Layout 723MODULE = CFClient PACKAGE = CFClient::Layout
716 724
717CFClient::Layout 725CFClient::Layout
718new (SV *class, int rgba = 0) 726new (SV *class, int rgba = 0)
719 CODE: 727 CODE:
728#if _WIN32
729 rgba = 0;//D
730#endif
720 New (0, RETVAL, 1, struct cf_layout); 731 New (0, RETVAL, 1, struct cf_layout);
721 732
722 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
723 RETVAL->rgba = rgba; 734 RETVAL->rgba = rgba;
724 RETVAL->r = 1.; 735 RETVAL->r = 1.;
… …
904 915
905 while (p < e) 916 while (p < e)
906 { 917 {
907 uint32_t rgba = *p; 918 uint32_t rgba = *p;
908 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
909 rgba = SDL_SwapBE32 (rgba); 932 rgba = SDL_SwapBE32 (rgba);
910 *p++ = rgba; 933 *p++ = rgba;
911 } 934 }
912 } 935 }
913 936
… …
970 993
971 if (ix) 994 if (ix)
972 { 995 {
973 glEnable (GL_BLEND); 996 glEnable (GL_BLEND);
974 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);
975 } 1000 }
976 1001
977 glBindTexture (GL_TEXTURE_2D, name); 1002 glBindTexture (GL_TEXTURE_2D, name);
978 1003
979 if (wrap_mode) 1004 if (wrap_mode)
… …
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1014 glTexCoord2f (s, 0); glVertex2f (x + w, y );
990 glEnd (); 1015 glEnd ();
991 1016
992 if (ix) 1017 if (ix)
1018 {
1019 glDisable (GL_ALPHA_TEST);
993 glDisable (GL_BLEND); 1020 glDisable (GL_BLEND);
1021 }
994} 1022}
995 1023
996MODULE = CFClient PACKAGE = CFClient::Map 1024MODULE = CFClient PACKAGE = CFClient::Map
997 1025
998CFClient::Map 1026CFClient::Map
… …
1509 const_iv (GL_COLOR_MATERIAL), 1537 const_iv (GL_COLOR_MATERIAL),
1510 const_iv (GL_SMOOTH), 1538 const_iv (GL_SMOOTH),
1511 const_iv (GL_FLAT), 1539 const_iv (GL_FLAT),
1512 const_iv (GL_DITHER), 1540 const_iv (GL_DITHER),
1513 const_iv (GL_BLEND), 1541 const_iv (GL_BLEND),
1542 const_iv (GL_CULL_FACE),
1514 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),
1515 const_iv (GL_AND), 1548 const_iv (GL_AND),
1516 const_iv (GL_ONE), 1549 const_iv (GL_ONE),
1517 const_iv (GL_ZERO), 1550 const_iv (GL_ZERO),
1518 const_iv (GL_SRC_ALPHA), 1551 const_iv (GL_SRC_ALPHA),
1519 const_iv (GL_SRC_ALPHA_SATURATE), 1552 const_iv (GL_SRC_ALPHA_SATURATE),
1520 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1553 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521 const_iv (GL_ONE_MINUS_DST_ALPHA), 1554 const_iv (GL_ONE_MINUS_DST_ALPHA),
1522 const_iv (GL_RGB), 1555 const_iv (GL_RGB),
1523 const_iv (GL_RGBA), 1556 const_iv (GL_RGBA),
1524 const_iv (GL_UNSIGNED_BYTE), 1557 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT),
1525 const_iv (GL_ALPHA), 1560 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY),
1526 const_iv (GL_LUMINANCE), 1562 const_iv (GL_LUMINANCE),
1563 const_iv (GL_LUMINANCE_ALPHA),
1527 const_iv (GL_FLOAT), 1564 const_iv (GL_FLOAT),
1528 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1565 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529 const_iv (GL_COMPILE), 1566 const_iv (GL_COMPILE),
1530 const_iv (GL_TEXTURE_1D), 1567 const_iv (GL_TEXTURE_1D),
1531 const_iv (GL_TEXTURE_2D), 1568 const_iv (GL_TEXTURE_2D),
… …
1545 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1582 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546 const_iv (GL_GENERATE_MIPMAP), 1583 const_iv (GL_GENERATE_MIPMAP),
1547 const_iv (GL_MODULATE), 1584 const_iv (GL_MODULATE),
1548 const_iv (GL_DECAL), 1585 const_iv (GL_DECAL),
1549 const_iv (GL_REPLACE), 1586 const_iv (GL_REPLACE),
1587 const_iv (GL_DEPTH_BUFFER_BIT),
1550 const_iv (GL_COLOR_BUFFER_BIT), 1588 const_iv (GL_COLOR_BUFFER_BIT),
1551 const_iv (GL_PROJECTION), 1589 const_iv (GL_PROJECTION),
1552 const_iv (GL_MODELVIEW), 1590 const_iv (GL_MODELVIEW),
1553 const_iv (GL_COLOR_LOGIC_OP), 1591 const_iv (GL_COLOR_LOGIC_OP),
1554 const_iv (GL_SEPARABLE_2D), 1592 const_iv (GL_SEPARABLE_2D),
1555 const_iv (GL_CONVOLUTION_2D), 1593 const_iv (GL_CONVOLUTION_2D),
1556 const_iv (GL_CONVOLUTION_BORDER_MODE), 1594 const_iv (GL_CONVOLUTION_BORDER_MODE),
1557 const_iv (GL_CONSTANT_BORDER), 1595 const_iv (GL_CONSTANT_BORDER),
1558 const_iv (GL_LINES), 1596 const_iv (GL_LINES),
1597 const_iv (GL_LINE_LOOP),
1559 const_iv (GL_QUADS), 1598 const_iv (GL_QUADS),
1560 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),
1561 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1603 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1562 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),
1563# undef const_iv 1609# undef const_iv
1564 }; 1610 };
1565 1611
1566 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; )
1567 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1582 1628
1583void glHint (int target, int mode) 1629void glHint (int target, int mode)
1584 1630
1585void glBlendFunc (int sfactor, int dfactor) 1631void glBlendFunc (int sfactor, int dfactor)
1586 1632
1633void glDepthMask (int flag)
1634
1587void glLogicOp (int opcode) 1635void glLogicOp (int opcode)
1588 1636
1589void glColorMask (int red, int green, int blue, int alpha) 1637void glColorMask (int red, int green, int blue, int alpha)
1590 1638
1591void glMatrixMode (int mode) 1639void glMatrixMode (int mode)
… …
1594 1642
1595void glPopMatrix () 1643void glPopMatrix ()
1596 1644
1597void glLoadIdentity () 1645void glLoadIdentity ()
1598 1646
1599# 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
1600void 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_)
1601 1652
1602void glViewport (int x, int y, int width, int height) 1653void glViewport (int x, int y, int width, int height)
1603 1654
1604void glScissor (int x, int y, int width, int height) 1655void glScissor (int x, int y, int width, int height)
… …
1620void glEnd () 1671void glEnd ()
1621 1672
1622void glColor (float r, float g, float b, float a = 1.0) 1673void glColor (float r, float g, float b, float a = 1.0)
1623 PROTOTYPE: @ 1674 PROTOTYPE: @
1624 CODE: 1675 CODE:
1676 // microsoft visual "c" rounds instead of truncating...
1625 glColor4ub (MIN ((int)(r * 255.f), 255), 1677 glColor4ub (MIN ((int)(r * 255.f), 255),
1626 MIN ((int)(g * 255.f), 255), 1678 MIN ((int)(g * 255.f), 255),
1627 MIN ((int)(b * 255.f), 255), 1679 MIN ((int)(b * 255.f), 255),
1628 MIN ((int)(a * 255.f), 255)); 1680 MIN ((int)(a * 255.f), 255));
1629 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
1630void glVertex (float x, float y, float z = 0.) 1693void glVertex (float x, float y, float z = 0.)
1631 CODE: 1694 CODE:
1632 glVertex3f (x, y, z); 1695 glVertex3f (x, y, z);
1633 1696
1634void glTexCoord (float s, float t) 1697void glTexCoord (float s, float t)
… …
1661 1724
1662void 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)
1663 1726
1664void 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)
1665 1728
1666void glRasterPos (int x, int y) 1729void glDrawPixels (int width, int height, int format, int type, char *pixels)
1667 CODE:
1668 glRasterPos2i (x, y);
1669 1730
1670void 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)
1671 1732
1672int glGenTexture () 1733int glGenTexture ()
1673 CODE: 1734 CODE:
… …
1700 1761
1701void glEndList () 1762void glEndList ()
1702 1763
1703void glCallList (int list) 1764void glCallList (int list)
1704 1765
1766

Diff Legend

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