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.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.91 by root, Mon May 22 03:28:54 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 (
… …
669} 673}
670 674
671void 675void
672error (char *message) 676error (char *message)
673 CODE: 677 CODE:
678 fprintf (stderr, "ERROR: %s\n", message);
674#ifdef _WIN32 679#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 680 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif 681#endif
679 682
680void 683void
681fatal (char *message) 684fatal (char *message)
682 CODE: 685 CODE:
686 fprintf (stderr, "FATAL: %s\n", message);
683#ifdef _WIN32 687#ifdef _WIN32
684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685#else
686 fprintf (stderr, "FATAL: %s\n", message);
687#endif 689#endif
688 exit (1); 690 exit (1);
689 691
690MODULE = CFClient PACKAGE = CFClient::Font 692MODULE = CFClient PACKAGE = CFClient::Font
691 693
… …
714MODULE = CFClient PACKAGE = CFClient::Layout 716MODULE = CFClient PACKAGE = CFClient::Layout
715 717
716CFClient::Layout 718CFClient::Layout
717new (SV *class, int rgba = 0) 719new (SV *class, int rgba = 0)
718 CODE: 720 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
719 New (0, RETVAL, 1, struct cf_layout); 724 New (0, RETVAL, 1, struct cf_layout);
720 725
721 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
722 RETVAL->rgba = rgba; 727 RETVAL->rgba = rgba;
723 RETVAL->r = 1.; 728 RETVAL->r = 1.;
… …
803set_width (CFClient::Layout self, int max_width = -1) 808set_width (CFClient::Layout self, int max_width = -1)
804 CODE: 809 CODE:
805 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 810 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
806 811
807void 812void
813set_indent (CFClient::Layout self, int indent)
814 CODE:
815 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816
817void
818set_spacing (CFClient::Layout self, int spacing)
819 CODE:
820 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821
822void
823set_ellipsise (CFClient::Layout self, int ellipsise)
824 CODE:
825 pango_layout_set_ellipsize (self->pl,
826 ellipsise == 1 ? PANGO_ELLIPSIZE_START
827 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
829 : PANGO_ELLIPSIZE_NONE
830 );
831
832void
833set_single_paragraph_mode (CFClient::Layout self, int spm)
834 CODE:
835 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836
837void
808size (CFClient::Layout self) 838size (CFClient::Layout self)
809 PPCODE: 839 PPCODE:
810{ 840{
811 int w, h; 841 int w, h;
812 842
… …
878 908
879 while (p < e) 909 while (p < e)
880 { 910 {
881 uint32_t rgba = *p; 911 uint32_t rgba = *p;
882 rgba = (rgba >> 24) | (rgba << 8); 912 rgba = (rgba >> 24) | (rgba << 8);
913#if 0
914#ifdef _WIN32
915 {//D
916 uint8_t r = rgba >> 24;
917 uint8_t g = rgba >> 16;
918 uint8_t b = rgba >> 8;
919 uint8_t a = rgba >> 0;
920
921 rgba = (rgba & 0xffffff00) | a;
922 }
923#endif
924#endif
883 rgba = SDL_SwapBE32 (rgba); 925 rgba = SDL_SwapBE32 (rgba);
884 *p++ = rgba; 926 *p++ = rgba;
885 } 927 }
886 } 928 }
887 929
… …
944 986
945 if (ix) 987 if (ix)
946 { 988 {
947 glEnable (GL_BLEND); 989 glEnable (GL_BLEND);
948 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 990 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
991 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f);
949 } 993 }
950 994
951 glBindTexture (GL_TEXTURE_2D, name); 995 glBindTexture (GL_TEXTURE_2D, name);
952 996
953 if (wrap_mode) 997 if (wrap_mode)
… …
962 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
963 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1007 glTexCoord2f (s, 0); glVertex2f (x + w, y );
964 glEnd (); 1008 glEnd ();
965 1009
966 if (ix) 1010 if (ix)
1011 {
1012 glDisable (GL_ALPHA_TEST);
967 glDisable (GL_BLEND); 1013 glDisable (GL_BLEND);
1014 }
968} 1015}
969 1016
970MODULE = CFClient PACKAGE = CFClient::Map 1017MODULE = CFClient PACKAGE = CFClient::Map
971 1018
972CFClient::Map 1019CFClient::Map
… …
1483 const_iv (GL_COLOR_MATERIAL), 1530 const_iv (GL_COLOR_MATERIAL),
1484 const_iv (GL_SMOOTH), 1531 const_iv (GL_SMOOTH),
1485 const_iv (GL_FLAT), 1532 const_iv (GL_FLAT),
1486 const_iv (GL_DITHER), 1533 const_iv (GL_DITHER),
1487 const_iv (GL_BLEND), 1534 const_iv (GL_BLEND),
1535 const_iv (GL_CULL_FACE),
1488 const_iv (GL_SCISSOR_TEST), 1536 const_iv (GL_SCISSOR_TEST),
1537 const_iv (GL_DEPTH_TEST),
1538 const_iv (GL_ALPHA_TEST),
1539 const_iv (GL_NORMALIZE),
1540 const_iv (GL_RESCALE_NORMAL),
1489 const_iv (GL_AND), 1541 const_iv (GL_AND),
1490 const_iv (GL_ONE), 1542 const_iv (GL_ONE),
1491 const_iv (GL_ZERO), 1543 const_iv (GL_ZERO),
1492 const_iv (GL_SRC_ALPHA), 1544 const_iv (GL_SRC_ALPHA),
1493 const_iv (GL_SRC_ALPHA_SATURATE), 1545 const_iv (GL_SRC_ALPHA_SATURATE),
1494 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1546 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1495 const_iv (GL_ONE_MINUS_DST_ALPHA), 1547 const_iv (GL_ONE_MINUS_DST_ALPHA),
1496 const_iv (GL_RGB), 1548 const_iv (GL_RGB),
1497 const_iv (GL_RGBA), 1549 const_iv (GL_RGBA),
1498 const_iv (GL_UNSIGNED_BYTE), 1550 const_iv (GL_UNSIGNED_BYTE),
1551 const_iv (GL_UNSIGNED_SHORT),
1552 const_iv (GL_UNSIGNED_INT),
1499 const_iv (GL_ALPHA), 1553 const_iv (GL_ALPHA),
1554 const_iv (GL_INTENSITY),
1500 const_iv (GL_LUMINANCE), 1555 const_iv (GL_LUMINANCE),
1556 const_iv (GL_LUMINANCE_ALPHA),
1501 const_iv (GL_FLOAT), 1557 const_iv (GL_FLOAT),
1502 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1558 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1503 const_iv (GL_COMPILE), 1559 const_iv (GL_COMPILE),
1504 const_iv (GL_TEXTURE_1D), 1560 const_iv (GL_TEXTURE_1D),
1505 const_iv (GL_TEXTURE_2D), 1561 const_iv (GL_TEXTURE_2D),
… …
1519 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1575 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1520 const_iv (GL_GENERATE_MIPMAP), 1576 const_iv (GL_GENERATE_MIPMAP),
1521 const_iv (GL_MODULATE), 1577 const_iv (GL_MODULATE),
1522 const_iv (GL_DECAL), 1578 const_iv (GL_DECAL),
1523 const_iv (GL_REPLACE), 1579 const_iv (GL_REPLACE),
1580 const_iv (GL_DEPTH_BUFFER_BIT),
1524 const_iv (GL_COLOR_BUFFER_BIT), 1581 const_iv (GL_COLOR_BUFFER_BIT),
1525 const_iv (GL_PROJECTION), 1582 const_iv (GL_PROJECTION),
1526 const_iv (GL_MODELVIEW), 1583 const_iv (GL_MODELVIEW),
1527 const_iv (GL_COLOR_LOGIC_OP), 1584 const_iv (GL_COLOR_LOGIC_OP),
1528 const_iv (GL_SEPARABLE_2D), 1585 const_iv (GL_SEPARABLE_2D),
1529 const_iv (GL_CONVOLUTION_2D), 1586 const_iv (GL_CONVOLUTION_2D),
1530 const_iv (GL_CONVOLUTION_BORDER_MODE), 1587 const_iv (GL_CONVOLUTION_BORDER_MODE),
1531 const_iv (GL_CONSTANT_BORDER), 1588 const_iv (GL_CONSTANT_BORDER),
1532 const_iv (GL_LINES), 1589 const_iv (GL_LINES),
1590 const_iv (GL_LINE_LOOP),
1533 const_iv (GL_QUADS), 1591 const_iv (GL_QUADS),
1534 const_iv (GL_LINE_LOOP), 1592 const_iv (GL_QUAD_STRIP),
1593 const_iv (GL_TRIANGLES),
1594 const_iv (GL_TRIANGLE_STRIP),
1595 const_iv (GL_TRIANGLE_FAN),
1535 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1596 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1536 const_iv (GL_FASTEST), 1597 const_iv (GL_FASTEST),
1598 const_iv (GL_V2F),
1599 const_iv (GL_V3F),
1600 const_iv (GL_T2F_V3F),
1601 const_iv (GL_T2F_N3F_V3F),
1537# undef const_iv 1602# undef const_iv
1538 }; 1603 };
1539 1604
1540 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1605 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1541 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1606 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1556 1621
1557void glHint (int target, int mode) 1622void glHint (int target, int mode)
1558 1623
1559void glBlendFunc (int sfactor, int dfactor) 1624void glBlendFunc (int sfactor, int dfactor)
1560 1625
1626void glDepthMask (int flag)
1627
1561void glLogicOp (int opcode) 1628void glLogicOp (int opcode)
1562 1629
1563void glColorMask (int red, int green, int blue, int alpha) 1630void glColorMask (int red, int green, int blue, int alpha)
1564 1631
1565void glMatrixMode (int mode) 1632void glMatrixMode (int mode)
… …
1568 1635
1569void glPopMatrix () 1636void glPopMatrix ()
1570 1637
1571void glLoadIdentity () 1638void glLoadIdentity ()
1572 1639
1573# near and far are due to microsofts buggy c compiler 1640# near_ and far_ are due to microsofts buggy "c" compiler
1641void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1642
1643# near_ and far_ are due to microsofts buggy "c" compiler
1574void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1644void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1575 1645
1576void glViewport (int x, int y, int width, int height) 1646void glViewport (int x, int y, int width, int height)
1577 1647
1578void glScissor (int x, int y, int width, int height) 1648void glScissor (int x, int y, int width, int height)
… …
1594void glEnd () 1664void glEnd ()
1595 1665
1596void glColor (float r, float g, float b, float a = 1.0) 1666void glColor (float r, float g, float b, float a = 1.0)
1597 PROTOTYPE: @ 1667 PROTOTYPE: @
1598 CODE: 1668 CODE:
1669 // microsoft visual "c" rounds instead of truncating...
1599 glColor4ub (MIN ((int)(r * 255.f), 255), 1670 glColor4ub (MIN ((int)(r * 255.f), 255),
1600 MIN ((int)(g * 255.f), 255), 1671 MIN ((int)(g * 255.f), 255),
1601 MIN ((int)(b * 255.f), 255), 1672 MIN ((int)(b * 255.f), 255),
1602 MIN ((int)(a * 255.f), 255)); 1673 MIN ((int)(a * 255.f), 255));
1603 1674
1675void glInterleavedArrays (int format, int stride, char *data)
1676
1677void glDrawElements (int mode, int count, int type, char *indices)
1678
1679# 1.2 void glDrawRangeElements (int mode, int start, int end
1680
1681void glRasterPos (float x, float y, float z = 0.)
1682 CODE:
1683 glRasterPos3f (0, 0, z);
1684 glBitmap (0, 0, 0, 0, x, y, 0);
1685
1604void glVertex (float x, float y, float z = 0.) 1686void glVertex (float x, float y, float z = 0.)
1605 CODE: 1687 CODE:
1606 glVertex3f (x, y, z); 1688 glVertex3f (x, y, z);
1607 1689
1608void glTexCoord (float s, float t) 1690void glTexCoord (float s, float t)
… …
1635 1717
1636void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1718void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1637 1719
1638void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1720void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1639 1721
1640void glRasterPos (int x, int y) 1722void glDrawPixels (int width, int height, int format, int type, char *pixels)
1641 CODE:
1642 glRasterPos2i (x, y);
1643 1723
1644void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1724void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1645 1725
1646int glGenTexture () 1726int glGenTexture ()
1647 CODE: 1727 CODE:
… …
1674 1754
1675void glEndList () 1755void glEndList ()
1676 1756
1677void glCallList (int list) 1757void glCallList (int list)
1678 1758
1759

Diff Legend

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