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.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC

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

Diff Legend

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