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.96 by root, Wed May 24 22:28:43 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);
… …
470 470
471 ++m; 471 ++m;
472 } 472 }
473} 473}
474 474
475char *
476SDL_GetError ()
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 (
479 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
… …
482 OUTPUT: 485 OUTPUT:
483 RETVAL 486 RETVAL
484 487
485void 488void
486SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
487 493
488void 494void
489SDL_PollEvent () 495SDL_PollEvent ()
490 PPCODE: 496 PPCODE:
491{ 497{
… …
510 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512 break; 518 break;
513 519
514 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
515 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520 break; 528 break;
521 529
522 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
523 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break; 538 break;
… …
554lowdelay (int fd, int val = 1) 564lowdelay (int fd, int val = 1)
555 CODE: 565 CODE:
556#ifndef _WIN32 566#ifndef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558#endif 568#endif
569
570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
559 576
560char * 577char *
561gl_version () 578gl_version ()
562 CODE: 579 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION); 580 RETVAL = (char *)glGetString (GL_VERSION);
… …
713MODULE = CFClient PACKAGE = CFClient::Layout 730MODULE = CFClient PACKAGE = CFClient::Layout
714 731
715CFClient::Layout 732CFClient::Layout
716new (SV *class, int rgba = 0) 733new (SV *class, int rgba = 0)
717 CODE: 734 CODE:
735#if _WIN32
736 //rgba = 0;//D make stext nicer, breaks TextView
737#endif
718 New (0, RETVAL, 1, struct cf_layout); 738 New (0, RETVAL, 1, struct cf_layout);
719 739
720 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
721 RETVAL->rgba = rgba; 741 RETVAL->rgba = rgba;
722 RETVAL->r = 1.; 742 RETVAL->r = 1.;
… …
902 922
903 while (p < e) 923 while (p < e)
904 { 924 {
905 uint32_t rgba = *p; 925 uint32_t rgba = *p;
906 rgba = (rgba >> 24) | (rgba << 8); 926 rgba = (rgba >> 24) | (rgba << 8);
927#if 0
928#ifdef _WIN32
929 {//D
930 uint8_t r = rgba >> 24;
931 uint8_t g = rgba >> 16;
932 uint8_t b = rgba >> 8;
933 uint8_t a = rgba >> 0;
934
935 rgba = (rgba & 0xffffff00) | a;
936 }
937#endif
938#endif
907 rgba = SDL_SwapBE32 (rgba); 939 rgba = SDL_SwapBE32 (rgba);
908 *p++ = rgba; 940 *p++ = rgba;
909 } 941 }
910 } 942 }
911 943
… …
1065 tex->r = r; 1097 tex->r = r;
1066 tex->g = g; 1098 tex->g = g;
1067 tex->b = b; 1099 tex->b = b;
1068 tex->a = a; 1100 tex->a = a;
1069 } 1101 }
1102
1103 // somewhat hackish, but for textures that require it, it really
1104 // improves the look, and most others don't suffer.
1105 glBindTexture (GL_TEXTURE_2D, name);
1106 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1070} 1108}
1071 1109
1072int 1110int
1073ox (CFClient::Map self) 1111ox (CFClient::Map self)
1074 ALIAS: 1112 ALIAS:
… …
1512 const_iv (GL_COLOR_MATERIAL), 1550 const_iv (GL_COLOR_MATERIAL),
1513 const_iv (GL_SMOOTH), 1551 const_iv (GL_SMOOTH),
1514 const_iv (GL_FLAT), 1552 const_iv (GL_FLAT),
1515 const_iv (GL_DITHER), 1553 const_iv (GL_DITHER),
1516 const_iv (GL_BLEND), 1554 const_iv (GL_BLEND),
1555 const_iv (GL_CULL_FACE),
1517 const_iv (GL_SCISSOR_TEST), 1556 const_iv (GL_SCISSOR_TEST),
1557 const_iv (GL_DEPTH_TEST),
1558 const_iv (GL_ALPHA_TEST),
1559 const_iv (GL_NORMALIZE),
1560 const_iv (GL_RESCALE_NORMAL),
1518 const_iv (GL_AND), 1561 const_iv (GL_AND),
1519 const_iv (GL_ONE), 1562 const_iv (GL_ONE),
1520 const_iv (GL_ZERO), 1563 const_iv (GL_ZERO),
1521 const_iv (GL_SRC_ALPHA), 1564 const_iv (GL_SRC_ALPHA),
1522 const_iv (GL_SRC_ALPHA_SATURATE), 1565 const_iv (GL_SRC_ALPHA_SATURATE),
1523 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1566 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524 const_iv (GL_ONE_MINUS_DST_ALPHA), 1567 const_iv (GL_ONE_MINUS_DST_ALPHA),
1525 const_iv (GL_RGB), 1568 const_iv (GL_RGB),
1526 const_iv (GL_RGBA), 1569 const_iv (GL_RGBA),
1527 const_iv (GL_UNSIGNED_BYTE), 1570 const_iv (GL_UNSIGNED_BYTE),
1571 const_iv (GL_UNSIGNED_SHORT),
1572 const_iv (GL_UNSIGNED_INT),
1528 const_iv (GL_ALPHA), 1573 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY), 1574 const_iv (GL_INTENSITY),
1530 const_iv (GL_LUMINANCE), 1575 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA), 1576 const_iv (GL_LUMINANCE_ALPHA),
1532 const_iv (GL_FLOAT), 1577 const_iv (GL_FLOAT),
… …
1550 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1595 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551 const_iv (GL_GENERATE_MIPMAP), 1596 const_iv (GL_GENERATE_MIPMAP),
1552 const_iv (GL_MODULATE), 1597 const_iv (GL_MODULATE),
1553 const_iv (GL_DECAL), 1598 const_iv (GL_DECAL),
1554 const_iv (GL_REPLACE), 1599 const_iv (GL_REPLACE),
1600 const_iv (GL_DEPTH_BUFFER_BIT),
1555 const_iv (GL_COLOR_BUFFER_BIT), 1601 const_iv (GL_COLOR_BUFFER_BIT),
1556 const_iv (GL_PROJECTION), 1602 const_iv (GL_PROJECTION),
1557 const_iv (GL_MODELVIEW), 1603 const_iv (GL_MODELVIEW),
1558 const_iv (GL_COLOR_LOGIC_OP), 1604 const_iv (GL_COLOR_LOGIC_OP),
1559 const_iv (GL_SEPARABLE_2D), 1605 const_iv (GL_SEPARABLE_2D),
1560 const_iv (GL_CONVOLUTION_2D), 1606 const_iv (GL_CONVOLUTION_2D),
1561 const_iv (GL_CONVOLUTION_BORDER_MODE), 1607 const_iv (GL_CONVOLUTION_BORDER_MODE),
1562 const_iv (GL_CONSTANT_BORDER), 1608 const_iv (GL_CONSTANT_BORDER),
1563 const_iv (GL_LINES), 1609 const_iv (GL_LINES),
1610 const_iv (GL_LINE_LOOP),
1564 const_iv (GL_QUADS), 1611 const_iv (GL_QUADS),
1565 const_iv (GL_LINE_LOOP), 1612 const_iv (GL_QUAD_STRIP),
1613 const_iv (GL_TRIANGLES),
1614 const_iv (GL_TRIANGLE_STRIP),
1615 const_iv (GL_TRIANGLE_FAN),
1566 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1616 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567 const_iv (GL_FASTEST), 1617 const_iv (GL_FASTEST),
1618 const_iv (GL_V2F),
1619 const_iv (GL_V3F),
1620 const_iv (GL_T2F_V3F),
1621 const_iv (GL_T2F_N3F_V3F),
1568# undef const_iv 1622# undef const_iv
1569 }; 1623 };
1570 1624
1571 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1625 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1572 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1587 1641
1588void glHint (int target, int mode) 1642void glHint (int target, int mode)
1589 1643
1590void glBlendFunc (int sfactor, int dfactor) 1644void glBlendFunc (int sfactor, int dfactor)
1591 1645
1646void glDepthMask (int flag)
1647
1592void glLogicOp (int opcode) 1648void glLogicOp (int opcode)
1593 1649
1594void glColorMask (int red, int green, int blue, int alpha) 1650void glColorMask (int red, int green, int blue, int alpha)
1595 1651
1596void glMatrixMode (int mode) 1652void glMatrixMode (int mode)
… …
1599 1655
1600void glPopMatrix () 1656void glPopMatrix ()
1601 1657
1602void glLoadIdentity () 1658void glLoadIdentity ()
1603 1659
1604# near and far are due to microsofts buggy c compiler 1660# near_ and far_ are due to microsofts buggy "c" compiler
1661void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662
1663# near_ and far_ are due to microsofts buggy "c" compiler
1605void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1664void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1606 1665
1607void glViewport (int x, int y, int width, int height) 1666void glViewport (int x, int y, int width, int height)
1608 1667
1609void glScissor (int x, int y, int width, int height) 1668void glScissor (int x, int y, int width, int height)
… …
1625void glEnd () 1684void glEnd ()
1626 1685
1627void glColor (float r, float g, float b, float a = 1.0) 1686void glColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 1687 PROTOTYPE: @
1629 CODE: 1688 CODE:
1689 // microsoft visual "c" rounds instead of truncating...
1630 glColor4ub (MIN ((int)(r * 255.f), 255), 1690 glColor4ub (MIN ((int)(r * 255.f), 255),
1631 MIN ((int)(g * 255.f), 255), 1691 MIN ((int)(g * 255.f), 255),
1632 MIN ((int)(b * 255.f), 255), 1692 MIN ((int)(b * 255.f), 255),
1633 MIN ((int)(a * 255.f), 255)); 1693 MIN ((int)(a * 255.f), 255));
1634 1694
1695void glInterleavedArrays (int format, int stride, char *data)
1696
1697void glDrawElements (int mode, int count, int type, char *indices)
1698
1699# 1.2 void glDrawRangeElements (int mode, int start, int end
1700
1701void glRasterPos (float x, float y, float z = 0.)
1702 CODE:
1703 glRasterPos3f (0, 0, z);
1704 glBitmap (0, 0, 0, 0, x, y, 0);
1705
1635void glVertex (float x, float y, float z = 0.) 1706void glVertex (float x, float y, float z = 0.)
1636 CODE: 1707 CODE:
1637 glVertex3f (x, y, z); 1708 glVertex3f (x, y, z);
1638 1709
1639void glTexCoord (float s, float t) 1710void glTexCoord (float s, float t)
… …
1666 1737
1667void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1668 1739
1669void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1670 1741
1671void glRasterPos (int x, int y) 1742void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672 CODE:
1673 glRasterPos2i (x, y);
1674 1743
1675void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1744void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1676 1745
1677int glGenTexture () 1746int glGenTexture ()
1678 CODE: 1747 CODE:
… …
1705 1774
1706void glEndList () 1775void glEndList ()
1707 1776
1708void glCallList (int list) 1777void glCallList (int list)
1709 1778
1779

Diff Legend

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