| … | |
… | |
| 65 | # w => $surface->width, |
65 | # w => $surface->width, |
| 66 | # h => $surface->height, |
66 | # h => $surface->height, |
| 67 | # ) |
67 | # ) |
| 68 | #} |
68 | #} |
| 69 | |
69 | |
| 70 | sub new_from_layout { |
70 | #sub new_from_layout { |
| 71 | my ($class, $layout, %arg) = @_; |
71 | # my ($class, $layout, %arg) = @_; |
| 72 | |
72 | # |
| 73 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
73 | # my ($w, $h, $data, $format, $internalformat) = $layout->render; |
| 74 | |
74 | # |
| 75 | $class->new ( |
75 | # $class->new ( |
| 76 | w => $w, |
76 | # w => $w, |
| 77 | h => $h, |
77 | # h => $h, |
| 78 | data => $data, |
78 | # data => $data, |
| 79 | format => $format, |
79 | # format => $format, |
| 80 | internalformat => $format, |
80 | # internalformat => $format, |
| 81 | type => GL_UNSIGNED_BYTE, |
81 | # type => GL_UNSIGNED_BYTE, |
| 82 | %arg, |
82 | # %arg, |
| 83 | ) |
83 | # ) |
| 84 | } |
84 | #} |
| 85 | |
85 | |
| 86 | sub new_from_opengl { |
86 | sub new_from_opengl { |
| 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) |
| … | |
… | |
| 161 | $self->{type}, |
161 | $self->{type}, |
| 162 | $data; |
162 | $data; |
| 163 | gl_check "uploading texture %dx%d if=%x f=%x t=%x", |
163 | gl_check "uploading texture %dx%d if=%x f=%x t=%x", |
| 164 | $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; |
164 | $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; |
| 165 | } else { |
165 | } else { |
|
|
166 | exists $self->{render_cb} or die; |
| 166 | glCopyTexImage2D GL_TEXTURE_2D, 0, |
167 | glCopyTexImage2D GL_TEXTURE_2D, 0, |
| 167 | $self->{internalformat}, |
168 | $self->{internalformat}, |
| 168 | 0, 0, |
169 | 0, 0, |
| 169 | $tw, $th, |
170 | $tw, $th, |
| 170 | 0; |
171 | 0; |
| … | |
… | |
| 174 | } |
175 | } |
| 175 | |
176 | |
| 176 | sub shutdown { |
177 | sub shutdown { |
| 177 | my ($self) = @_; |
178 | my ($self) = @_; |
| 178 | |
179 | |
| 179 | glDeleteTexture delete $self->{name} |
180 | glDeleteTexture $self->{name} |
| 180 | if $self->{name}; |
181 | if $self->{name}; |
| 181 | } |
182 | } |
| 182 | |
183 | |
| 183 | sub DESTROY { |
184 | sub DESTROY { |
| 184 | my ($self) = @_; |
185 | my ($self) = @_; |
| … | |
… | |
| 187 | |
188 | |
| 188 | $self->shutdown; |
189 | $self->shutdown; |
| 189 | } |
190 | } |
| 190 | |
191 | |
| 191 | $CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub { |
192 | $CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub { |
|
|
193 | # first mark all existing texture names as in-use, in case the context lost textures |
|
|
194 | glBindTexture GL_TEXTURE_2D, $_->{name} |
|
|
195 | for values %TEXTURES; |
| 192 | $_->upload |
196 | $_->upload |
| 193 | for values %TEXTURES; |
197 | for values %TEXTURES; |
| 194 | }; |
198 | }; |
| 195 | |
199 | |
| 196 | $CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Texture"} = sub { |
200 | $CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Texture"} = sub { |
