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.90 by root, Sun May 21 00:34:58 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 (
… …
713MODULE = CFClient PACKAGE = CFClient::Layout 716MODULE = CFClient PACKAGE = CFClient::Layout
714 717
715CFClient::Layout 718CFClient::Layout
716new (SV *class, int rgba = 0) 719new (SV *class, int rgba = 0)
717 CODE: 720 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
718 New (0, RETVAL, 1, struct cf_layout); 724 New (0, RETVAL, 1, struct cf_layout);
719 725
720 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
721 RETVAL->rgba = rgba; 727 RETVAL->rgba = rgba;
722 RETVAL->r = 1.; 728 RETVAL->r = 1.;
… …
902 908
903 while (p < e) 909 while (p < e)
904 { 910 {
905 uint32_t rgba = *p; 911 uint32_t rgba = *p;
906 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
907 rgba = SDL_SwapBE32 (rgba); 925 rgba = SDL_SwapBE32 (rgba);
908 *p++ = rgba; 926 *p++ = rgba;
909 } 927 }
910 } 928 }
911 929
… …
1512 const_iv (GL_COLOR_MATERIAL), 1530 const_iv (GL_COLOR_MATERIAL),
1513 const_iv (GL_SMOOTH), 1531 const_iv (GL_SMOOTH),
1514 const_iv (GL_FLAT), 1532 const_iv (GL_FLAT),
1515 const_iv (GL_DITHER), 1533 const_iv (GL_DITHER),
1516 const_iv (GL_BLEND), 1534 const_iv (GL_BLEND),
1535 const_iv (GL_CULL_FACE),
1517 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),
1518 const_iv (GL_AND), 1541 const_iv (GL_AND),
1519 const_iv (GL_ONE), 1542 const_iv (GL_ONE),
1520 const_iv (GL_ZERO), 1543 const_iv (GL_ZERO),
1521 const_iv (GL_SRC_ALPHA), 1544 const_iv (GL_SRC_ALPHA),
1522 const_iv (GL_SRC_ALPHA_SATURATE), 1545 const_iv (GL_SRC_ALPHA_SATURATE),
1523 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1546 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524 const_iv (GL_ONE_MINUS_DST_ALPHA), 1547 const_iv (GL_ONE_MINUS_DST_ALPHA),
1525 const_iv (GL_RGB), 1548 const_iv (GL_RGB),
1526 const_iv (GL_RGBA), 1549 const_iv (GL_RGBA),
1527 const_iv (GL_UNSIGNED_BYTE), 1550 const_iv (GL_UNSIGNED_BYTE),
1551 const_iv (GL_UNSIGNED_SHORT),
1552 const_iv (GL_UNSIGNED_INT),
1528 const_iv (GL_ALPHA), 1553 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY), 1554 const_iv (GL_INTENSITY),
1530 const_iv (GL_LUMINANCE), 1555 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA), 1556 const_iv (GL_LUMINANCE_ALPHA),
1532 const_iv (GL_FLOAT), 1557 const_iv (GL_FLOAT),
… …
1550 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1575 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551 const_iv (GL_GENERATE_MIPMAP), 1576 const_iv (GL_GENERATE_MIPMAP),
1552 const_iv (GL_MODULATE), 1577 const_iv (GL_MODULATE),
1553 const_iv (GL_DECAL), 1578 const_iv (GL_DECAL),
1554 const_iv (GL_REPLACE), 1579 const_iv (GL_REPLACE),
1580 const_iv (GL_DEPTH_BUFFER_BIT),
1555 const_iv (GL_COLOR_BUFFER_BIT), 1581 const_iv (GL_COLOR_BUFFER_BIT),
1556 const_iv (GL_PROJECTION), 1582 const_iv (GL_PROJECTION),
1557 const_iv (GL_MODELVIEW), 1583 const_iv (GL_MODELVIEW),
1558 const_iv (GL_COLOR_LOGIC_OP), 1584 const_iv (GL_COLOR_LOGIC_OP),
1559 const_iv (GL_SEPARABLE_2D), 1585 const_iv (GL_SEPARABLE_2D),
1560 const_iv (GL_CONVOLUTION_2D), 1586 const_iv (GL_CONVOLUTION_2D),
1561 const_iv (GL_CONVOLUTION_BORDER_MODE), 1587 const_iv (GL_CONVOLUTION_BORDER_MODE),
1562 const_iv (GL_CONSTANT_BORDER), 1588 const_iv (GL_CONSTANT_BORDER),
1563 const_iv (GL_LINES), 1589 const_iv (GL_LINES),
1590 const_iv (GL_LINE_LOOP),
1564 const_iv (GL_QUADS), 1591 const_iv (GL_QUADS),
1565 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),
1566 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1596 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567 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),
1568# undef const_iv 1602# undef const_iv
1569 }; 1603 };
1570 1604
1571 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; )
1572 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1606 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1587 1621
1588void glHint (int target, int mode) 1622void glHint (int target, int mode)
1589 1623
1590void glBlendFunc (int sfactor, int dfactor) 1624void glBlendFunc (int sfactor, int dfactor)
1591 1625
1626void glDepthMask (int flag)
1627
1592void glLogicOp (int opcode) 1628void glLogicOp (int opcode)
1593 1629
1594void glColorMask (int red, int green, int blue, int alpha) 1630void glColorMask (int red, int green, int blue, int alpha)
1595 1631
1596void glMatrixMode (int mode) 1632void glMatrixMode (int mode)
… …
1599 1635
1600void glPopMatrix () 1636void glPopMatrix ()
1601 1637
1602void glLoadIdentity () 1638void glLoadIdentity ()
1603 1639
1604# 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
1605void 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_)
1606 1645
1607void glViewport (int x, int y, int width, int height) 1646void glViewport (int x, int y, int width, int height)
1608 1647
1609void glScissor (int x, int y, int width, int height) 1648void glScissor (int x, int y, int width, int height)
… …
1625void glEnd () 1664void glEnd ()
1626 1665
1627void glColor (float r, float g, float b, float a = 1.0) 1666void glColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 1667 PROTOTYPE: @
1629 CODE: 1668 CODE:
1669 // microsoft visual "c" rounds instead of truncating...
1630 glColor4ub (MIN ((int)(r * 255.f), 255), 1670 glColor4ub (MIN ((int)(r * 255.f), 255),
1631 MIN ((int)(g * 255.f), 255), 1671 MIN ((int)(g * 255.f), 255),
1632 MIN ((int)(b * 255.f), 255), 1672 MIN ((int)(b * 255.f), 255),
1633 MIN ((int)(a * 255.f), 255)); 1673 MIN ((int)(a * 255.f), 255));
1634 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
1635void glVertex (float x, float y, float z = 0.) 1681void glVertex (float x, float y, float z = 0.)
1636 CODE: 1682 CODE:
1637 glVertex3f (x, y, z); 1683 glVertex3f (x, y, z);
1638 1684
1639void glTexCoord (float s, float t) 1685void glTexCoord (float s, float t)
… …
1705 1751
1706void glEndList () 1752void glEndList ()
1707 1753
1708void glCallList (int list) 1754void glCallList (int list)
1709 1755
1756

Diff Legend

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