… | |
… | |
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 | |
… | |
… | |
87 | my ($class, $w, $h, $cb) = @_; |
87 | my ($class, $w, $h, $cb) = @_; |
88 | |
88 | |
89 | $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) |
89 | $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) |
90 | } |
90 | } |
91 | |
91 | |
92 | sub topot { |
|
|
93 | (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] |
|
|
94 | } |
|
|
95 | |
|
|
96 | sub upload { |
92 | sub upload { |
97 | my ($self) = @_; |
93 | my ($self) = @_; |
98 | |
94 | |
99 | return unless $GL_VERSION; |
95 | return unless $GL_VERSION; |
100 | |
96 | |
… | |
… | |
111 | glMatrixMode GL_MODELVIEW; |
107 | glMatrixMode GL_MODELVIEW; |
112 | glLoadIdentity; |
108 | glLoadIdentity; |
113 | $self->{render_cb}->($self, $self->{w}, $self->{h}); |
109 | $self->{render_cb}->($self, $self->{w}, $self->{h}); |
114 | |
110 | |
115 | } else { |
111 | } else { |
116 | ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) |
112 | ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type}) |
117 | = CFClient::load_image_inline $self->{image}; |
113 | = CFClient::load_image_inline $self->{image}; |
|
|
114 | |
|
|
115 | $self->{internalformat} ||= $internalformat; |
118 | } |
116 | } |
119 | |
117 | |
120 | my ($tw, $th) = @$self{qw(w h)}; |
118 | my ($tw, $th) = @$self{qw(w h)}; |
121 | |
|
|
122 | unless ($tw > 0 && $th > 0) { |
|
|
123 | $tw = $th = 1; |
|
|
124 | $data = "\x00" x 64; |
|
|
125 | } |
|
|
126 | |
119 | |
127 | $self->{minified} ||= [CFClient::average $tw, $th, $data] |
120 | $self->{minified} ||= [CFClient::average $tw, $th, $data] |
128 | if $self->{minify}; |
121 | if $self->{minify}; |
129 | |
122 | |
130 | pad2pot $data, $tw, $th unless $GL_NPOT; |
123 | pad2pot $data, $tw, $th unless $GL_NPOT; |