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.12 by root, Sun Aug 13 16:29:36 2006 UTC vs.
Revision 1.21 by root, Thu Jul 19 23:29:17 2007 UTC

… …
14 14
15package CFPlus::Texture; 15package CFPlus::Texture;
16 16
17use strict; 17use strict;
18 18
19use Scalar::Util; 19use List::Util qw(max min);
20
21use CFPlus::OpenGL; 20use CFPlus::OpenGL;
22 21
23my %TEXTURES; 22my %TEXTURES;
23my ($MAX_W, $MAX_H) = (4096, 4096); # maximum texture size attempted by this module
24 24
25sub new { 25sub new {
26 my ($class, %data) = @_; 26 my ($class, %data) = @_;
27 27
28 my $self = bless { 28 my $self = bless {
… …
30 format => GL_RGBA, 30 format => GL_RGBA,
31 type => GL_UNSIGNED_BYTE, 31 type => GL_UNSIGNED_BYTE,
32 %data, 32 %data,
33 }, $class; 33 }, $class;
34 34
35 Scalar::Util::weaken ($TEXTURES{$self+0} = $self); 35 CFPlus::weaken ($TEXTURES{$self+0} = $self);
36 36
37 $self->upload; 37 $self->upload;
38 38
39 $self 39 $self
40} 40}
… …
92sub upload { 92sub upload {
93 my ($self) = @_; 93 my ($self) = @_;
94 94
95 return unless $GL_VERSION; 95 return unless $GL_VERSION;
96 96
97 my $data; 97 # $tw,$th texture
98 # $rw,$rh rendered/used size
99 # $dw,$dh $data
100
101 my ($data, $dw, $dh);
98 102
99 if (exists $self->{data}) { 103 if (exists $self->{data}) {
100 $data = $self->{data}; 104 $data = $self->{data};
105 ($dw, $dh) = @$self{qw(w h)};
101 106
102 } elsif (exists $self->{render_cb}) { 107 } elsif (exists $self->{render_cb}) {
108 ($dw, $dh) = @$self{qw(w h)};
109
110 } else {
111 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type})
112 = CFPlus::load_image_inline $self->{image};
113
114 $self->{internalformat} ||= $internalformat;
115 ($dw, $dh) = @$self{qw(w h)};
116 }
117
118 my ($tw, $th) = ($dw, $dh);
119
120 defined $data or $self->{render_cb} or die; # some sanity check
121
122 $self->{minified} ||= [CFPlus::average $dw, $dh, $data]
123 if $self->{minify};
124
125 # against rather broken cards we enforce a maximum texture size
126 $tw = min $MAX_W, minpot $tw;
127 $th = min $MAX_H, minpot $th;
128
129 # if only pot-textures are allowed, pot'ify tw/th
130 unless ($GL_NPOT && 0) {#d#
131 $tw = minpot $tw;
132 $th = minpot $th;
133 }
134
135 # now further decrease texture size until the
136 # card does accept it
137 while (!texture_valid_2d $self->{internalformat}, $tw, $th, $self->{format}, $self->{type}) {
138 # quarter the texture size
139 $tw >>= 1;
140 $th >>= 1;
141 }
142
143 # decide the amount of space used in the texture
144 my ($rw, $rh);
145 my $render;
146
147 if ($self->{render_cb}) {
148 # use only part of the texture
149 #$rw >>= 1 while $rw > $tw;
150 #$rh >>= 1 while $rh > $th;
151 $rw = min $dw, $tw;
152 $rh = min $dh, $th;
153 ++$render;
154 } else {
155 if ($self->{wrap} || $tw < $dw || $th < $dh) {
156 # scale to the full texture size
157 ($rw, $rh) = ($tw, $th);
158 ++$render;
159 } else {
160 # pad
161 pad $data, $dw, $dh, $tw, $th;
162 ($rw, $rh) = ($dw, $dh);
163 ($dw, $dh) = ($tw, $th);
164 }
165 }
166
167 if ($render) {
103 glViewport 0, 0, $self->{w}, $self->{h}; 168 glViewport 0, 0, $tw, $th;
169 #glScissor 0, 0, $tw, $th;
170 #glEnable GL_SCISSOR_TEST;
104 glMatrixMode GL_PROJECTION; 171 glMatrixMode GL_PROJECTION;
105 glLoadIdentity; 172 glLoadIdentity;
106 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000; 173 glOrtho 0, $tw, 0, $th, -10000, 10000;
107 glMatrixMode GL_MODELVIEW; 174 glMatrixMode GL_MODELVIEW;
108 glLoadIdentity; 175 glLoadIdentity;
176
177 if ($self->{render_cb}) {
178 glScale $rw / $dw, $rh / $dh;
109 $self->{render_cb}->($self, $self->{w}, $self->{h}); 179 $self->{render_cb}->($self, $rw, $rh);
110
111 } else { 180 } else {
112 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type}) 181 glClearColor 0, 0, 0, 0;
113 = CFPlus::load_image_inline $self->{image}; 182 glClear GL_COLOR_BUFFER_BIT;
114 183 glPixelZoom $tw / $dw, $th / $dh;
115 $self->{internalformat} ||= $internalformat; 184 glDrawPixels $dw, $dh,
185 $self->{format},
186 $self->{type},
187 $data;
188 glPixelZoom 1, 1;
189 }
116 } 190 }
117 191
118 my ($tw, $th) = @$self{qw(w h)};
119
120 $self->{minified} ||= [CFPlus::average $tw, $th, $data]
121 if $self->{minify};
122
123 pad2pot $data, $tw, $th unless $GL_NPOT;
124
125 $self->{s} = $self->{w} / $tw;
126 $self->{t} = $self->{h} / $th;
127
128 $self->{name} ||= glGenTexture;
129
130 glBindTexture GL_TEXTURE_2D, $self->{name}; 192 glBindTexture GL_TEXTURE_2D, $self->{name} ||= glGenTexture;
131 193
132 if ($self->{wrap}) { 194 if ($self->{wrap}) {
133 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 195 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
134 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 196 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
135 } else { 197 } else {
… …
150 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR; 212 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
151 } 213 }
152 214
153 glGetError; 215 glGetError;
154 216
155 if (defined $data) { 217 if ($render) {
156 glTexImage2D GL_TEXTURE_2D, 0,
157 $self->{internalformat},
158 $tw, $th,
159 0,
160 $self->{format},
161 $self->{type},
162 $data;
163 gl_check "uploading texture %dx%d if=%x f=%x t=%x",
164 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
165 } else {
166 exists $self->{render_cb} or die;
167 glCopyTexImage2D GL_TEXTURE_2D, 0, 218 glCopyTexImage2D GL_TEXTURE_2D, 0,
168 $self->{internalformat}, 219 $self->{internalformat},
169 0, 0, 220 0, 0,
170 $tw, $th, 221 $tw, $th,
171 0; 222 0;
172 gl_check "copying to texture %dx%d if=%x", 223 gl_check "copying to texture %dx%d if=%x",
173 $tw, $th, $self->{internalformat}; 224 $tw, $th, $self->{internalformat};
225
226 #glDisable GL_SCISSOR_TEST;
227 } else {
228 glTexImage2D GL_TEXTURE_2D, 0,
229 $self->{internalformat},
230 $dw, $dh,
231 0,
232 $self->{format},
233 $self->{type},
234 $data;
235 gl_check "uploading texture %dx%d if=%x f=%x t=%x",
236 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
174 } 237 }
238
239 $self->{s} = $rw / $tw;
240 $self->{t} = $rh / $th;
175} 241}
176 242
177sub shutdown { 243sub shutdown {
178 my ($self) = @_; 244 my ($self) = @_;
179 245

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines