--- deliantra/Deliantra-Client/DC.pm	2006/04/10 19:34:03	1.19
+++ deliantra/Deliantra-Client/DC.pm	2006/04/11 17:02:35	1.23
@@ -1,10 +1,10 @@
 =head1 NAME
 
-Crossfire::Client - undocumented utility garbage for our crossfire client
+CFClient - undocumented utility garbage for our crossfire client
 
 =head1 SYNOPSIS
 
- use Crossfire::Client;
+ use CFClient;
 
 =head1 DESCRIPTION
 
@@ -12,13 +12,13 @@
 
 =cut
 
-package Crossfire::Client;
+package CFClient;
 
 BEGIN {
    $VERSION = '0.1';
 
    use XSLoader;
-   XSLoader::load "Crossfire::Client", $VERSION;
+   XSLoader::load "CFClient", $VERSION;
 }
 
 our %GL_EXT;
@@ -32,16 +32,14 @@
 
    $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
 
-   Crossfire::Client::Texture::restore_state ();
-
-#   $GL_NPOT=0;#d#
+   CFClient::Texture::restore_state ();
 }
 
 sub find_rcfile($) {
    my $path;
 
    for (@INC) {
-      $path = "$_/Crossfire/resources/$_[0]";
+      $path = "$_/CFClient/resources/$_[0]";
       return $path if -r $path;
    }
 
@@ -80,7 +78,7 @@
    close CFG;
 }
 
-package Crossfire::Client::Texture;
+package CFClient::Texture;
 
 use Scalar::Util;
 
@@ -133,10 +131,10 @@
 #   )
 #}
 
-sub new_from_text {
-   my ($class, $text, $height) = @_;
+sub new_from_layout {
+   my ($class, $layout) = @_;
 
-   my ($w, $h, $data) = Crossfire::Client::font_render $text, $height;
+   my ($w, $h, $data) = $layout->render;
 
    $class->new (
       width          => $w,
@@ -193,25 +191,27 @@
 
    my ($tw, $th) = @$self{qw(width height)};
 
-   unless ($NPOT) {
+   unless ($GL_NPOT && $tw && $th) {
       $tw = topot $tw;
       $th = topot $th;
 
       if (defined $data) {
-         $data = pack "(a$tw)*", (unpack "(a$self->{width})*", $data);
-         $data .= ("\x00" x $tw) x ($th - $self->{height});
+         my $bpp = (length $data) / ($self->{width} * $self->{height});
+         $data = pack "(a" . ($tw * $bpp) . ")*",
+                    unpack "(a" . ($self->{width} * $bpp) . ")*", $data;
+         $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{height});
       }
    }
 
-   $self->{u} = $self->{width}  / $tw;
-   $self->{v} = $self->{height} / $th;
+   $self->{s} = $self->{width}  / $tw;
+   $self->{t} = $self->{height} / $th;
 
    $self->{name} ||= (glGenTextures 1)->[0];
 
    glBindTexture GL_TEXTURE_2D, $self->{name};
 
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;#_MIPMAP_LINEAR;
+   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
+   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;