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.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.101 by root, Sat Jun 3 21:57:23 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
559
560char *
561gl_version ()
562 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION);
564 OUTPUT:
565 RETVAL
566
567char *
568gl_extensions ()
569 CODE:
570 RETVAL = (char *)glGetString (GL_EXTENSIONS);
571 OUTPUT:
572 RETVAL
573 569
574void 570void
575add_font (char *file) 571add_font (char *file)
576 CODE: 572 CODE:
577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
… …
714 710
715CFClient::Layout 711CFClient::Layout
716new (SV *class, int rgba = 0) 712new (SV *class, int rgba = 0)
717 CODE: 713 CODE:
718#if _WIN32 714#if _WIN32
719 rgba = 0;//D 715 //rgba = 0;//D make stext nicer, breaks TextView
720#endif 716#endif
721 New (0, RETVAL, 1, struct cf_layout); 717 New (0, RETVAL, 1, struct cf_layout);
722 718
723 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
724 RETVAL->rgba = rgba; 720 RETVAL->rgba = rgba;
… …
971{ 967{
972 HV *hv = (HV *)SvRV (self); 968 HV *hv = (HV *)SvRV (self);
973 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 969 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
974 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 970 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
975 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 971 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
976 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
977 972
978 if (items < 5) 973 if (items < 5)
979 { 974 {
980 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 975 w = SvNV (*hv_fetch (hv, "w", 1, 1));
981 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 976 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
988 glEnable (GL_ALPHA_TEST); 983 glEnable (GL_ALPHA_TEST);
989 glAlphaFunc (GL_GREATER, 0.01f); 984 glAlphaFunc (GL_GREATER, 0.01f);
990 } 985 }
991 986
992 glBindTexture (GL_TEXTURE_2D, name); 987 glBindTexture (GL_TEXTURE_2D, name);
993
994 if (wrap_mode)
995 {
996 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
997 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
998 }
999 988
1000 glBegin (GL_QUADS); 989 glBegin (GL_QUADS);
1001 glTexCoord2f (0, 0); glVertex2f (x , y ); 990 glTexCoord2f (0, 0); glVertex2f (x , y );
1002 glTexCoord2f (0, t); glVertex2f (x , y + h); 991 glTexCoord2f (0, t); glVertex2f (x , y + h);
1003 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 992 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
… …
1080 tex->r = r; 1069 tex->r = r;
1081 tex->g = g; 1070 tex->g = g;
1082 tex->b = b; 1071 tex->b = b;
1083 tex->a = a; 1072 tex->a = a;
1084 } 1073 }
1074
1075 // somewhat hackish, but for textures that require it, it really
1076 // improves the look, and most others don't suffer.
1077 glBindTexture (GL_TEXTURE_2D, name);
1078 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1080 // use uglier nearest interpolation because linear suffers
1081 // from transparent color bleeding and ugly wrapping effects.
1082 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1085} 1083}
1086 1084
1087int 1085int
1088ox (CFClient::Map self) 1086ox (CFClient::Map self)
1089 ALIAS: 1087 ALIAS:
1090 oy = 1 1088 oy = 1
1089 x = 2
1090 y = 3
1091 CODE: 1091 CODE:
1092 switch (ix) 1092 switch (ix)
1093 { 1093 {
1094 case 0: RETVAL = self->ox; break; 1094 case 0: RETVAL = self->ox; break;
1095 case 1: RETVAL = self->oy; break; 1095 case 1: RETVAL = self->oy; break;
1096 case 2: RETVAL = self->x; break;
1097 case 3: RETVAL = self->y; break;
1096 } 1098 }
1097 OUTPUT: 1099 OUTPUT:
1098 RETVAL 1100 RETVAL
1099 1101
1100void 1102void
… …
1527 const_iv (GL_COLOR_MATERIAL), 1529 const_iv (GL_COLOR_MATERIAL),
1528 const_iv (GL_SMOOTH), 1530 const_iv (GL_SMOOTH),
1529 const_iv (GL_FLAT), 1531 const_iv (GL_FLAT),
1530 const_iv (GL_DITHER), 1532 const_iv (GL_DITHER),
1531 const_iv (GL_BLEND), 1533 const_iv (GL_BLEND),
1534 const_iv (GL_CULL_FACE),
1532 const_iv (GL_SCISSOR_TEST), 1535 const_iv (GL_SCISSOR_TEST),
1536 const_iv (GL_DEPTH_TEST),
1537 const_iv (GL_ALPHA_TEST),
1538 const_iv (GL_NORMALIZE),
1539 const_iv (GL_RESCALE_NORMAL),
1533 const_iv (GL_AND), 1540 const_iv (GL_AND),
1534 const_iv (GL_ONE), 1541 const_iv (GL_ONE),
1535 const_iv (GL_ZERO), 1542 const_iv (GL_ZERO),
1536 const_iv (GL_SRC_ALPHA), 1543 const_iv (GL_SRC_ALPHA),
1537 const_iv (GL_SRC_ALPHA_SATURATE), 1544 const_iv (GL_SRC_ALPHA_SATURATE),
1538 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1545 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539 const_iv (GL_ONE_MINUS_DST_ALPHA), 1546 const_iv (GL_ONE_MINUS_DST_ALPHA),
1540 const_iv (GL_RGB), 1547 const_iv (GL_RGB),
1541 const_iv (GL_RGBA), 1548 const_iv (GL_RGBA),
1542 const_iv (GL_UNSIGNED_BYTE), 1549 const_iv (GL_UNSIGNED_BYTE),
1550 const_iv (GL_UNSIGNED_SHORT),
1551 const_iv (GL_UNSIGNED_INT),
1543 const_iv (GL_ALPHA), 1552 const_iv (GL_ALPHA),
1544 const_iv (GL_INTENSITY), 1553 const_iv (GL_INTENSITY),
1545 const_iv (GL_LUMINANCE), 1554 const_iv (GL_LUMINANCE),
1546 const_iv (GL_LUMINANCE_ALPHA), 1555 const_iv (GL_LUMINANCE_ALPHA),
1547 const_iv (GL_FLOAT), 1556 const_iv (GL_FLOAT),
… …
1553 const_iv (GL_TEXTURE_MAG_FILTER), 1562 const_iv (GL_TEXTURE_MAG_FILTER),
1554 const_iv (GL_TEXTURE_MIN_FILTER), 1563 const_iv (GL_TEXTURE_MIN_FILTER),
1555 const_iv (GL_TEXTURE_ENV_MODE), 1564 const_iv (GL_TEXTURE_ENV_MODE),
1556 const_iv (GL_TEXTURE_WRAP_S), 1565 const_iv (GL_TEXTURE_WRAP_S),
1557 const_iv (GL_TEXTURE_WRAP_T), 1566 const_iv (GL_TEXTURE_WRAP_T),
1567 const_iv (GL_REPEAT),
1558 const_iv (GL_CLAMP), 1568 const_iv (GL_CLAMP),
1559 const_iv (GL_REPEAT), 1569 const_iv (GL_CLAMP_TO_EDGE),
1560 const_iv (GL_NEAREST), 1570 const_iv (GL_NEAREST),
1561 const_iv (GL_LINEAR), 1571 const_iv (GL_LINEAR),
1562 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1572 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1563 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1573 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1564 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1574 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1565 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1575 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1566 const_iv (GL_GENERATE_MIPMAP), 1576 const_iv (GL_GENERATE_MIPMAP),
1567 const_iv (GL_MODULATE), 1577 const_iv (GL_MODULATE),
1568 const_iv (GL_DECAL), 1578 const_iv (GL_DECAL),
1569 const_iv (GL_REPLACE), 1579 const_iv (GL_REPLACE),
1580 const_iv (GL_DEPTH_BUFFER_BIT),
1570 const_iv (GL_COLOR_BUFFER_BIT), 1581 const_iv (GL_COLOR_BUFFER_BIT),
1571 const_iv (GL_PROJECTION), 1582 const_iv (GL_PROJECTION),
1572 const_iv (GL_MODELVIEW), 1583 const_iv (GL_MODELVIEW),
1573 const_iv (GL_COLOR_LOGIC_OP), 1584 const_iv (GL_COLOR_LOGIC_OP),
1574 const_iv (GL_SEPARABLE_2D), 1585 const_iv (GL_SEPARABLE_2D),
1575 const_iv (GL_CONVOLUTION_2D), 1586 const_iv (GL_CONVOLUTION_2D),
1576 const_iv (GL_CONVOLUTION_BORDER_MODE), 1587 const_iv (GL_CONVOLUTION_BORDER_MODE),
1577 const_iv (GL_CONSTANT_BORDER), 1588 const_iv (GL_CONSTANT_BORDER),
1578 const_iv (GL_LINES), 1589 const_iv (GL_LINES),
1590 const_iv (GL_LINE_LOOP),
1579 const_iv (GL_QUADS), 1591 const_iv (GL_QUADS),
1580 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),
1581 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1596 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1582 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),
1583# undef const_iv 1602# undef const_iv
1584 }; 1603 };
1585 1604
1586 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; )
1587 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1606 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1588} 1607}
1589 1608
1609char *
1610gl_vendor ()
1611 CODE:
1612 RETVAL = (char *)glGetString (GL_VENDOR);
1613 OUTPUT:
1614 RETVAL
1615
1616char *
1617gl_version ()
1618 CODE:
1619 RETVAL = (char *)glGetString (GL_VERSION);
1620 OUTPUT:
1621 RETVAL
1622
1623char *
1624gl_extensions ()
1625 CODE:
1626 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1627 OUTPUT:
1628 RETVAL
1629
1590int glGetError () 1630int glGetError ()
1591 1631
1592void glClear (int mask) 1632void glClear (int mask)
1593 1633
1594void glClearColor (float r, float g, float b, float a = 1.0) 1634void glClearColor (float r, float g, float b, float a = 1.0)
… …
1602 1642
1603void glHint (int target, int mode) 1643void glHint (int target, int mode)
1604 1644
1605void glBlendFunc (int sfactor, int dfactor) 1645void glBlendFunc (int sfactor, int dfactor)
1606 1646
1647void glDepthMask (int flag)
1648
1607void glLogicOp (int opcode) 1649void glLogicOp (int opcode)
1608 1650
1609void glColorMask (int red, int green, int blue, int alpha) 1651void glColorMask (int red, int green, int blue, int alpha)
1610 1652
1611void glMatrixMode (int mode) 1653void glMatrixMode (int mode)
… …
1614 1656
1615void glPopMatrix () 1657void glPopMatrix ()
1616 1658
1617void glLoadIdentity () 1659void glLoadIdentity ()
1618 1660
1619# near and far are due to microsofts buggy c compiler 1661# near_ and far_ are due to microsofts buggy "c" compiler
1662void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1663
1664# near_ and far_ are due to microsofts buggy "c" compiler
1620void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1665void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1621 1666
1622void glViewport (int x, int y, int width, int height) 1667void glViewport (int x, int y, int width, int height)
1623 1668
1624void glScissor (int x, int y, int width, int height) 1669void glScissor (int x, int y, int width, int height)
… …
1640void glEnd () 1685void glEnd ()
1641 1686
1642void glColor (float r, float g, float b, float a = 1.0) 1687void glColor (float r, float g, float b, float a = 1.0)
1643 PROTOTYPE: @ 1688 PROTOTYPE: @
1644 CODE: 1689 CODE:
1690 // microsoft visual "c" rounds instead of truncating...
1645 glColor4ub (MIN ((int)(r * 255.f), 255), 1691 glColor4ub (MIN ((int)(r * 256.f), 255),
1646 MIN ((int)(g * 255.f), 255), 1692 MIN ((int)(g * 256.f), 255),
1647 MIN ((int)(b * 255.f), 255), 1693 MIN ((int)(b * 256.f), 255),
1648 MIN ((int)(a * 255.f), 255)); 1694 MIN ((int)(a * 256.f), 255));
1695
1696void glInterleavedArrays (int format, int stride, char *data)
1697
1698void glDrawElements (int mode, int count, int type, char *indices)
1699
1700# 1.2 void glDrawRangeElements (int mode, int start, int end
1701
1702void glRasterPos (float x, float y, float z = 0.)
1703 CODE:
1704 glRasterPos3f (0, 0, z);
1705 glBitmap (0, 0, 0, 0, x, y, 0);
1649 1706
1650void glVertex (float x, float y, float z = 0.) 1707void glVertex (float x, float y, float z = 0.)
1651 CODE: 1708 CODE:
1652 glVertex3f (x, y, z); 1709 glVertex3f (x, y, z);
1653 1710
… …
1681 1738
1682void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1739void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1683 1740
1684void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1741void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1685 1742
1686void glRasterPos (int x, int y) 1743void glDrawPixels (int width, int height, int format, int type, char *pixels)
1687 CODE:
1688 glRasterPos2i (x, y);
1689 1744
1690void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1745void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1691 1746
1692int glGenTexture () 1747int glGenTexture ()
1693 CODE: 1748 CODE:
… …
1720 1775
1721void glEndList () 1776void glEndList ()
1722 1777
1723void glCallList (int list) 1778void glCallList (int list)
1724 1779
1780

Diff Legend

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