ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Texture.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.32 by root, Thu Dec 27 20:38:49 2007 UTC vs.
Revision 1.36 by root, Mon Sep 8 19:53:23 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3DC::Texture - tetxure class for CFPlus 3DC::Texture - tetxure class for Deliantra-Client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use DC::Texture; 7 use DC::Texture;
8 8
47 unless defined $image; 47 unless defined $image;
48 48
49 $class->new (image => $image, internalformat => undef, %arg) 49 $class->new (image => $image, internalformat => undef, %arg)
50} 50}
51 51
52
53sub new_from_file { 52sub new_from_resource {
54 my ($class, $path, %arg) = @_; 53 my ($class, $path, %arg) = @_;
55 54
56 open my $fh, "<:raw", $path 55 $class->new (resource_path => $path, internalformat => undef, %arg)
57 or die "$path: $!";
58
59 local $/;
60 $class->new_from_image (<$fh>, %arg)
61} 56}
62 57
63#sub new_from_surface { 58#sub new_from_surface {
64# my ($class, $surface) = @_; 59# my ($class, $surface) = @_;
65# 60#
121 # $rw,$rh rendered/used size 116 # $rw,$rh rendered/used size
122 # $dw,$dh $data 117 # $dw,$dh $data
123 118
124 my ($data, $dw, $dh); 119 my ($data, $dw, $dh);
125 120
121 if (exists $self->{resource_path}) {
122 open my $fh, "<:raw", DC::find_rcfile $self->{resource_path};
123 local $/;
124 delete $self->{internalformat};
125 $self->{image} = <$fh>;
126 $self->{delete_image} = 1;
127 }
128
126 if (defined $self->{data}) { 129 if (defined $self->{data}) {
127 $data = $self->{data}; 130 $data = $self->{data};
128 ($dw, $dh) = @$self{qw(w h)}; 131 ($dw, $dh) = @$self{qw(w h)};
129 132
130 } elsif ($self->{render_cb}) { 133 } elsif ($self->{render_cb}) {
131 ($dw, $dh) = @$self{qw(w h)}; 134 ($dw, $dh) = @$self{qw(w h)};
132 135
133 } elsif (defined $self->{image}) { 136 } elsif (defined $self->{image}) {
134 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type}) 137 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
135 = DC::load_image_inline $self->{image}; 138 = DC::load_image_inline $self->{image};
136 139
137 $self->{internalformat} ||= $internalformat; 140 $self->{internalformat} ||= $internalformat;
138 ($dw, $dh) = @$self{qw(w h)}; 141 ($dw, $dh) = @$self{qw(w h)};
139 142
140 delete $self->{image} if delete $self->{delete_image}; 143 delete $self->{image} if delete $self->{delete_image};
141 144

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines