--- deliantra/Deliantra-Client/Client.xs 2006/04/13 23:11:11 1.31 +++ deliantra/Deliantra-Client/Client.xs 2006/04/15 01:13:46 1.40 @@ -39,7 +39,7 @@ substitute_func (FcPattern *pattern, gpointer data) { FcPatternAddBool (pattern, FC_HINTING , 1); - FcPatternAddBool (pattern, FC_AUTOHINT, 1); + FcPatternAddBool (pattern, FC_AUTOHINT, 0); } static void @@ -68,6 +68,7 @@ GLint name; int w, h; float s, t; + uint8_t r, g, b, a; } mapface; typedef struct { @@ -244,6 +245,8 @@ surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); + assert (surface2->pitch == surface2->w * 4); + EXTEND (SP, 5); PUSHs (sv_2mortal (newSViv (surface2->w))); PUSHs (sv_2mortal (newSViv (surface2->h))); @@ -259,12 +262,37 @@ } void +average (int x, int y, uint32_t *data) + PPCODE: +{ + uint32_t r = 0, g = 0, b = 0, a = 0; + + x = y = x * y; + + while (x--) + { + uint32_t p = *data++; + + r += (p ) & 255; + g += (p >> 8) & 255; + b += (p >> 16) & 255; + a += (p >> 24) & 255; + } + + EXTEND (SP, 4); + PUSHs (sv_2mortal (newSViv (r / y))); + PUSHs (sv_2mortal (newSViv (g / y))); + PUSHs (sv_2mortal (newSViv (b / y))); + PUSHs (sv_2mortal (newSViv (a / y))); +} + +void fatal (char *message) CODE: #ifdef WIN32 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); #else - fprintf (stderr, "%s\n", message); + fprintf (stderr, "FATAL: %s\n", message); #endif exit (1); @@ -287,6 +315,16 @@ Safefree (self); void +set_text (CFClient::Layout self, SV *text_) + CODE: +{ + STRLEN textlen; + char *text = SvPVutf8 (text_, textlen); + + pango_layout_set_text (self->pl, text, textlen); +} + +void set_markup (CFClient::Layout self, SV *text_) CODE: { @@ -383,14 +421,15 @@ MODULE = CFClient PACKAGE = CFClient::Texture void -draw_quad (SV *self, double x, double y, double w = 0, double h = 0) +draw_quad (SV *self, float x, float y, float w = 0, float h = 0) PROTOTYPE: $$$;$$ CODE: { HV *hv = (HV *)SvRV (self); - double s = SvNV (*hv_fetch (hv, "s", 1, 1)); - double t = SvNV (*hv_fetch (hv, "t", 1, 1)); + float s = SvNV (*hv_fetch (hv, "s", 1, 1)); + float t = SvNV (*hv_fetch (hv, "t", 1, 1)); int name = SvIV (*hv_fetch (hv, "name", 4, 1)); + int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1)); if (items < 5) { @@ -399,11 +438,15 @@ } glBindTexture (GL_TEXTURE_2D, name); + if (wrap_mode) { + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); + } glBegin (GL_QUADS); - glTexCoord2d (0, 0); glVertex2d (x , y ); - glTexCoord2d (0, t); glVertex2d (x , y + h); - glTexCoord2d (s, t); glVertex2d (x + w, y + h); - glTexCoord2d (s, 0); glVertex2d (x + w, y ); + glTexCoord2f (0, 0); glVertex2f (x , y ); + glTexCoord2f (0, t); glVertex2f (x , y + h); + glTexCoord2f (s, t); glVertex2f (x + w, y + h); + glTexCoord2f (s, 0); glVertex2f (x + w, y ); glEnd (); } @@ -441,7 +484,7 @@ map_clear (self); void -set_texture (CFClient::Map self, int face, int name, int w, int h, float s, float t) +set_texture (CFClient::Map self, int face, int name, int w, int h, float s, float t, int r, int g, int b, int a) CODE: { while (self->faces < face) @@ -450,11 +493,17 @@ self->faces *= 2; } - self->face [face].name = name; - self->face [face].w = w; - self->face [face].h = h; - self->face [face].s = s; - self->face [face].t = t; + mapface *f = self->face + face; + + f->name = name; + f->w = w; + f->h = h; + f->s = s; + f->t = t; + f->r = r; + f->g = g; + f->b = b; + f->a = a; } void @@ -564,17 +613,90 @@ } } -void -draw (CFClient::Map self, int x0, int y0, int sw, int sh) +SV * +mapmap (CFClient::Map self, int w, int h) CODE: { - int vx = self->vx = self->w >= sw - ? self->x + (self->w - sw) / 2 - : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); + int x0, x1, x; + int y0, y1, y; + int z; + SV *map_sv = newSV (w * h * sizeof (uint32_t)); + uint32_t *map = (uint32_t *)SvPVX (map_sv); + + SvPOK_only (map_sv); + SvCUR_set (map_sv, w * h * sizeof (uint32_t)); + + x0 = self->x - w / 2; x1 = x0 + w; + y0 = self->y - h / 2; y1 = y0 + h; + + for (y = y0; y < y1; y++) + { + maprow *row = 0 <= y && y < self->rows + ? self->row + y + : 0; + + for (x = x0; x < x1; x++) + { + int r = 32, g = 32, b = 32, a = 192; + + if (row && row->c0 <= x && x < row->c1) + { + mapcell *cell = row->col + (x - row->c0); + + for (z = 0; z <= 0; z++) + { + uint16_t face = cell->face [z]; + + if (face) + { + mapface tex = self->face [face]; + int a0 = 255 - tex.a; + int a1 = tex.a; + + r = (r * a0 + tex.r * a1) / 255; + g = (g * a0 + tex.g * a1) / 255; + b = (b * a0 + tex.b * a1) / 255; + a = (a * a0 + tex.a * a1) / 255; + } + } + } + + *map++ = (r ) + | (g << 8) + | (b << 16) + | (a << 24); + } + } + + RETVAL = map_sv; +} + OUTPUT: + RETVAL + +void +draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) + PPCODE: +{ + int sw4 = (sw + 3) & ~3; + SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); + uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); - int vy = self->vy = self->h >= sh - ? self->y + (self->h - sh) / 2 - : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); + SvPOK_only (darkness_sv); + SvCUR_set (darkness_sv, sw4 * sh); + + int vx = self->x + (self->w - sw) / 2 - shift_x; + int vy = self->y + (self->h - sh) / 2 - shift_y; + + if (0) + { + int vx = self->vx = self->w >= sw + ? self->x + (self->w - sw) / 2 + : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); + + int vy = self->vy = self->h >= sh + ? self->y + (self->h - sh) / 2 + : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); + } glColor4ub (255, 255, 255, 255); @@ -599,6 +721,11 @@ if (row->c0 <= x + vx && x + vx < row->c1) { mapcell *cell = row->col + (x + vx - row->c0); + + darkness[y * sw4 + x] = cell->darkness < 0 + ? 255 - FOW_DARKNESS + : 255 - cell->darkness; + uint16_t face = cell->face [z]; if (face) @@ -625,5 +752,13 @@ } glEnd (); + + glDisable (GL_TEXTURE_2D); + glDisable (GL_BLEND); + + EXTEND (SP, 3); + PUSHs (sv_2mortal (newSViv (sw4))); + PUSHs (sv_2mortal (newSViv (sh))); + PUSHs (darkness_sv); }