| … | |
… | |
| 40 | } |
40 | } |
| 41 | |
41 | |
| 42 | sub new_from_image { |
42 | sub new_from_image { |
| 43 | my ($class, $image, %arg) = @_; |
43 | my ($class, $image, %arg) = @_; |
| 44 | |
44 | |
| 45 | $class->new (image => $image, %arg) |
45 | $class->new (image => $image, internalformat => undef, %arg) |
| 46 | } |
46 | } |
| 47 | |
47 | |
| 48 | sub new_from_file { |
48 | sub new_from_file { |
| 49 | my ($class, $path, %arg) = @_; |
49 | my ($class, $path, %arg) = @_; |
| 50 | |
50 | |
| … | |
… | |
| 107 | glMatrixMode GL_MODELVIEW; |
107 | glMatrixMode GL_MODELVIEW; |
| 108 | glLoadIdentity; |
108 | glLoadIdentity; |
| 109 | $self->{render_cb}->($self, $self->{w}, $self->{h}); |
109 | $self->{render_cb}->($self, $self->{w}, $self->{h}); |
| 110 | |
110 | |
| 111 | } else { |
111 | } else { |
| 112 | ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) |
112 | ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type}) |
| 113 | = CFClient::load_image_inline $self->{image}; |
113 | = CFClient::load_image_inline $self->{image}; |
|
|
114 | |
|
|
115 | $self->{internalformat} ||= $internalformat; |
| 114 | } |
116 | } |
| 115 | |
117 | |
| 116 | my ($tw, $th) = @$self{qw(w h)}; |
118 | my ($tw, $th) = @$self{qw(w h)}; |
| 117 | |
119 | |
| 118 | $self->{minified} ||= [CFClient::average $tw, $th, $data] |
120 | $self->{minified} ||= [CFClient::average $tw, $th, $data] |
