--- deliantra/Deliantra-Client/Client.xs 2006/05/23 17:30:18 1.92 +++ deliantra/Deliantra-Client/Client.xs 2006/05/26 18:28:23 1.97 @@ -488,6 +488,9 @@ void SDL_GL_SwapBuffers () +char * +SDL_GetKeyName (int sym) + void SDL_PollEvent () PPCODE: @@ -515,6 +518,8 @@ break; case SDL_MOUSEMOTION: + hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); + hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); @@ -524,6 +529,8 @@ case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP: + hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); + hv_store (hv, "button", 6, newSViv (ev.button.button), 0); hv_store (hv, "state", 5, newSViv (ev.button.state), 0); hv_store (hv, "x", 1, newSViv (ev.button.x), 0); @@ -560,27 +567,6 @@ setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); #endif -char * -gl_vendor () - CODE: - RETVAL = (char *)glGetString (GL_VENDOR); - OUTPUT: - RETVAL - -char * -gl_version () - CODE: - RETVAL = (char *)glGetString (GL_VERSION); - OUTPUT: - RETVAL - -char * -gl_extensions () - CODE: - RETVAL = (char *)glGetString (GL_EXTENSIONS); - OUTPUT: - RETVAL - void add_font (char *file) CODE: @@ -726,7 +712,7 @@ new (SV *class, int rgba = 0) CODE: #if _WIN32 - rgba = 0;//D + //rgba = 0;//D make stext nicer, breaks TextView #endif New (0, RETVAL, 1, struct cf_layout); @@ -1092,6 +1078,12 @@ tex->b = b; tex->a = a; } + + // somewhat hackish, but for textures that require it, it really + // improves the look, and most others don't suffer. + glBindTexture (GL_TEXTURE_2D, name); + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); } int @@ -1613,6 +1605,27 @@ newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); } +char * +gl_vendor () + CODE: + RETVAL = (char *)glGetString (GL_VENDOR); + OUTPUT: + RETVAL + +char * +gl_version () + CODE: + RETVAL = (char *)glGetString (GL_VERSION); + OUTPUT: + RETVAL + +char * +gl_extensions () + CODE: + RETVAL = (char *)glGetString (GL_EXTENSIONS); + OUTPUT: + RETVAL + int glGetError () void glClear (int mask)