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.86 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC

… …
441 SDL_Rect **m; 441 SDL_Rect **m;
442 442
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, 16); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64); 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);
… …
713MODULE = CFClient PACKAGE = CFClient::Layout 723MODULE = CFClient PACKAGE = CFClient::Layout
714 724
715CFClient::Layout 725CFClient::Layout
716new (SV *class, int rgba = 0) 726new (SV *class, int rgba = 0)
717 CODE: 727 CODE:
728#if _WIN32
729 rgba = 0;//D
730#endif
718 New (0, RETVAL, 1, struct cf_layout); 731 New (0, RETVAL, 1, struct cf_layout);
719 732
720 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
721 RETVAL->rgba = rgba; 734 RETVAL->rgba = rgba;
722 RETVAL->r = 1.; 735 RETVAL->r = 1.;
… …
902 915
903 while (p < e) 916 while (p < e)
904 { 917 {
905 uint32_t rgba = *p; 918 uint32_t rgba = *p;
906 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
907 rgba = SDL_SwapBE32 (rgba); 932 rgba = SDL_SwapBE32 (rgba);
908 *p++ = rgba; 933 *p++ = rgba;
909 } 934 }
910 } 935 }
911 936
… …
1512 const_iv (GL_COLOR_MATERIAL), 1537 const_iv (GL_COLOR_MATERIAL),
1513 const_iv (GL_SMOOTH), 1538 const_iv (GL_SMOOTH),
1514 const_iv (GL_FLAT), 1539 const_iv (GL_FLAT),
1515 const_iv (GL_DITHER), 1540 const_iv (GL_DITHER),
1516 const_iv (GL_BLEND), 1541 const_iv (GL_BLEND),
1542 const_iv (GL_CULL_FACE),
1517 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),
1518 const_iv (GL_AND), 1548 const_iv (GL_AND),
1519 const_iv (GL_ONE), 1549 const_iv (GL_ONE),
1520 const_iv (GL_ZERO), 1550 const_iv (GL_ZERO),
1521 const_iv (GL_SRC_ALPHA), 1551 const_iv (GL_SRC_ALPHA),
1522 const_iv (GL_SRC_ALPHA_SATURATE), 1552 const_iv (GL_SRC_ALPHA_SATURATE),
1523 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1553 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524 const_iv (GL_ONE_MINUS_DST_ALPHA), 1554 const_iv (GL_ONE_MINUS_DST_ALPHA),
1525 const_iv (GL_RGB), 1555 const_iv (GL_RGB),
1526 const_iv (GL_RGBA), 1556 const_iv (GL_RGBA),
1527 const_iv (GL_UNSIGNED_BYTE), 1557 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT),
1528 const_iv (GL_ALPHA), 1560 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY), 1561 const_iv (GL_INTENSITY),
1530 const_iv (GL_LUMINANCE), 1562 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA), 1563 const_iv (GL_LUMINANCE_ALPHA),
1532 const_iv (GL_FLOAT), 1564 const_iv (GL_FLOAT),
… …
1550 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1582 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551 const_iv (GL_GENERATE_MIPMAP), 1583 const_iv (GL_GENERATE_MIPMAP),
1552 const_iv (GL_MODULATE), 1584 const_iv (GL_MODULATE),
1553 const_iv (GL_DECAL), 1585 const_iv (GL_DECAL),
1554 const_iv (GL_REPLACE), 1586 const_iv (GL_REPLACE),
1587 const_iv (GL_DEPTH_BUFFER_BIT),
1555 const_iv (GL_COLOR_BUFFER_BIT), 1588 const_iv (GL_COLOR_BUFFER_BIT),
1556 const_iv (GL_PROJECTION), 1589 const_iv (GL_PROJECTION),
1557 const_iv (GL_MODELVIEW), 1590 const_iv (GL_MODELVIEW),
1558 const_iv (GL_COLOR_LOGIC_OP), 1591 const_iv (GL_COLOR_LOGIC_OP),
1559 const_iv (GL_SEPARABLE_2D), 1592 const_iv (GL_SEPARABLE_2D),
1560 const_iv (GL_CONVOLUTION_2D), 1593 const_iv (GL_CONVOLUTION_2D),
1561 const_iv (GL_CONVOLUTION_BORDER_MODE), 1594 const_iv (GL_CONVOLUTION_BORDER_MODE),
1562 const_iv (GL_CONSTANT_BORDER), 1595 const_iv (GL_CONSTANT_BORDER),
1563 const_iv (GL_LINES), 1596 const_iv (GL_LINES),
1597 const_iv (GL_LINE_LOOP),
1564 const_iv (GL_QUADS), 1598 const_iv (GL_QUADS),
1565 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),
1566 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1603 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567 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),
1568# undef const_iv 1609# undef const_iv
1569 }; 1610 };
1570 1611
1571 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; )
1572 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1587 1628
1588void glHint (int target, int mode) 1629void glHint (int target, int mode)
1589 1630
1590void glBlendFunc (int sfactor, int dfactor) 1631void glBlendFunc (int sfactor, int dfactor)
1591 1632
1633void glDepthMask (int flag)
1634
1592void glLogicOp (int opcode) 1635void glLogicOp (int opcode)
1593 1636
1594void glColorMask (int red, int green, int blue, int alpha) 1637void glColorMask (int red, int green, int blue, int alpha)
1595 1638
1596void glMatrixMode (int mode) 1639void glMatrixMode (int mode)
… …
1599 1642
1600void glPopMatrix () 1643void glPopMatrix ()
1601 1644
1602void glLoadIdentity () 1645void glLoadIdentity ()
1603 1646
1604# 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
1605void 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_)
1606 1652
1607void glViewport (int x, int y, int width, int height) 1653void glViewport (int x, int y, int width, int height)
1608 1654
1609void glScissor (int x, int y, int width, int height) 1655void glScissor (int x, int y, int width, int height)
… …
1625void glEnd () 1671void glEnd ()
1626 1672
1627void glColor (float r, float g, float b, float a = 1.0) 1673void glColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 1674 PROTOTYPE: @
1629 CODE: 1675 CODE:
1676 // microsoft visual "c" rounds instead of truncating...
1630 glColor4ub (MIN ((int)(r * 255.f), 255), 1677 glColor4ub (MIN ((int)(r * 255.f), 255),
1631 MIN ((int)(g * 255.f), 255), 1678 MIN ((int)(g * 255.f), 255),
1632 MIN ((int)(b * 255.f), 255), 1679 MIN ((int)(b * 255.f), 255),
1633 MIN ((int)(a * 255.f), 255)); 1680 MIN ((int)(a * 255.f), 255));
1634 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
1635void glVertex (float x, float y, float z = 0.) 1693void glVertex (float x, float y, float z = 0.)
1636 CODE: 1694 CODE:
1637 glVertex3f (x, y, z); 1695 glVertex3f (x, y, z);
1638 1696
1639void glTexCoord (float s, float t) 1697void glTexCoord (float s, float t)
… …
1666 1724
1667void 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)
1668 1726
1669void 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)
1670 1728
1671void glRasterPos (int x, int y) 1729void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672 CODE:
1673 glRasterPos2i (x, y);
1674 1730
1675void 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)
1676 1732
1677int glGenTexture () 1733int glGenTexture ()
1678 CODE: 1734 CODE:
… …
1705 1761
1706void glEndList () 1762void glEndList ()
1707 1763
1708void glCallList (int list) 1764void glCallList (int list)
1709 1765
1766

Diff Legend

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