--- deliantra/Deliantra-Client/DC.pm	2006/04/18 01:36:12	1.39
+++ deliantra/Deliantra-Client/DC.pm	2006/04/21 07:09:10	1.42
@@ -23,7 +23,7 @@
 
 use AnyEvent;
 use BerkeleyDB;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 our %GL_EXT;
 our $GL_VERSION;
@@ -143,7 +143,7 @@
 
 use Scalar::Util;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 my %TEXTURES;
 
@@ -171,13 +171,13 @@
 }
 
 sub new_from_file {
-   my ($class, $path) = @_;
+   my ($class, $path, %arg) = @_;
 
    open my $fh, "<:raw", $path
       or die "$path: $!";
 
    local $/;
-   $class->new_from_image (<$fh>)
+   $class->new_from_image (<$fh>, %arg)
 }
 
 #sub new_from_surface {
@@ -193,7 +193,7 @@
 #}
 
 sub new_from_layout {
-   my ($class, $layout) = @_;
+   my ($class, $layout, %arg) = @_;
 
    my ($w, $h, $data) = $layout->render;
 
@@ -204,6 +204,7 @@
       internalformat => GL_ALPHA4,
       format         => GL_ALPHA,
       type           => GL_UNSIGNED_BYTE,
+      %arg,
    )
 }
 
@@ -267,14 +268,23 @@
    $self->{s} = $self->{w} / $tw;
    $self->{t} = $self->{h} / $th;
 
-   $self->{name} ||= (glGenTextures 1)->[0];
+   glGetError;
+
+   $self->{name} ||= glGenTexture;
 
    glBindTexture GL_TEXTURE_2D, $self->{name};
 
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
+
+   if ($::FAST) {
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
+   } else {
+      glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
+      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR;
+   }
    
    if (defined $data) {
       glTexImage2D GL_TEXTURE_2D, 0,
@@ -303,7 +313,7 @@
 
    delete $TEXTURES{$self+0};
 
-   glDeleteTextures delete $self->{name}
+   glDeleteTexture delete $self->{name}
       if $self->{name};
 }