--- deliantra/Deliantra-Client/DC/Texture.pm	2006/06/17 15:07:53	1.8
+++ deliantra/Deliantra-Client/DC/Texture.pm	2006/12/09 21:26:46	1.13
@@ -1,10 +1,10 @@
 =head1 NAME
 
-CFClient::Texture - tetxure class for CFClient
+CFPlus::Texture - tetxure class for CFPlus
 
 =head1 SYNOPSIS
 
- use CFClient::Texture;
+ use CFPlus::Texture;
 
 =head1 DESCRIPTION
 
@@ -12,13 +12,11 @@
 
 =cut
 
-package CFClient::Texture;
+package CFPlus::Texture;
 
 use strict;
 
-use Scalar::Util;
-
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 my %TEXTURES;
 
@@ -32,7 +30,7 @@
       %data,
    }, $class;
 
-   Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
+   CFPlus::weaken ($TEXTURES{$self+0} = $self);
 
    $self->upload;
 
@@ -67,26 +65,26 @@
 #   )
 #}
 
-sub new_from_layout {
-   my ($class, $layout, %arg) = @_;
-
-   my ($w, $h, $data, $format, $internalformat) = $layout->render;
-
-   $class->new (
-      w              => $w,
-      h              => $h,
-      data           => $data,
-      format         => $format,
-      internalformat => $format,
-      type           => GL_UNSIGNED_BYTE,
-      %arg,
-   )
-}
+#sub new_from_layout {
+#   my ($class, $layout, %arg) = @_;
+#
+#   my ($w, $h, $data, $format, $internalformat) = $layout->render;
+#
+#   $class->new (
+#      w              => $w,
+#      h              => $h,
+#      data           => $data,
+#      format         => $format,
+#      internalformat => $format,
+#      type           => GL_UNSIGNED_BYTE,
+#      %arg,
+#   )
+#}
 
 sub new_from_opengl {
    my ($class, $w, $h, $cb) = @_;
 
-   $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
+   $class->new (w => $w || 1, h => $h || 1, render_cb => $cb, nearest => 1)
 }
 
 sub upload {
@@ -110,14 +108,14 @@
 
    } else {
       ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
-         = CFClient::load_image_inline $self->{image};
+         = CFPlus::load_image_inline $self->{image};
 
       $self->{internalformat} ||= $internalformat;
    }
 
    my ($tw, $th) = @$self{qw(w h)};
 
-   $self->{minified} ||= [CFClient::average $tw, $th, $data]
+   $self->{minified} ||= [CFPlus::average $tw, $th, $data]
       if $self->{minify};
 
    pad2pot $data, $tw, $th unless $GL_NPOT;
@@ -137,7 +135,7 @@
       glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
    }
 
-   if ($::FAST) {
+   if ($::FAST || $self->{nearest}) {
       glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
       glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
    } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
@@ -163,6 +161,7 @@
       gl_check "uploading texture %dx%d if=%x f=%x t=%x",
                $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
    } else {
+      exists $self->{render_cb} or die;
       glCopyTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
                    0, 0,
@@ -176,7 +175,7 @@
 sub shutdown {
    my ($self) = @_;
 
-   glDeleteTexture delete $self->{name}
+   glDeleteTexture $self->{name}
       if $self->{name};
 } 
 
@@ -188,12 +187,15 @@
    $self->shutdown;
 }
 
-$CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub {
+$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Texture"} = sub {
+   # first mark all existing texture names as in-use, in case the context lost textures
+   glBindTexture GL_TEXTURE_2D, $_->{name}
+      for values %TEXTURES;
    $_->upload
       for values %TEXTURES;
 };
 
-$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Texture"} = sub {
+$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Texture"} = sub {
    $_->shutdown
       for values %TEXTURES;
 };