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.17 by root, Thu Jul 19 20:12:06 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 my ($rw, $rh) = ($dw, $dh);
120
121 defined $data or $self->{render_cb} or die; # some sanity check
122
123 $self->{minified} ||= [CFPlus::average $dw, $dh, $data]
124 if $self->{minify};
125
126 # against rather broken cards we enforce a maximum texture size
127 $tw = min $MAX_W, minpot $tw;
128 $th = min $MAX_H, minpot $th;
129
130 # if only pot-textures are allowed, pot'ify tw/th
131 unless ($GL_NPOT && 0) {#d#
132 $tw = minpot $tw;
133 $th = minpot $th;
134 }
135
136 # now further decrease texture size until the
137 # card does accept it
138 while (!texture_valid_2d $self->{internalformat}, $tw, $th, $self->{format}, $self->{type}) {
139 # quarter the texture size
140 $tw >>= 1;
141 $th >>= 1;
142 }
143
144 if ($self->{render_cb}) {
145 # use only part of the texture
146 #$rw >>= 1 while $rw > $tw;
147 #$rh >>= 1 while $rh > $th;
148 $rw = min $rw, $tw;
149 $rh = min $rh, $th;
150 } else {
151 if ($self->{wrap} || $tw < $dw || $th < $dh) {
152 # scale to the full texture size
153 ($rw, $rh) = ($tw, $th);
154 } else {
155 # pad
156 pad $data, $dw, $dh, $tw, $th;
157 ($rw, $rh) = ($dw, $dh);
158 ($dw, $dh) = ($tw, $th);
159 }
160 }
161
162 # rendering means we need to scale in some way
163 my $render = $self->{render_cb} || $rw != $dw || $th != $dh;
164
165 if ($render) {
103 glViewport 0, 0, $self->{w}, $self->{h}; 166 glViewport 0, 0, $tw, $th;
167 glClear 0, 0, 0, 0;
104 glMatrixMode GL_PROJECTION; 168 glMatrixMode GL_PROJECTION;
105 glLoadIdentity; 169 glLoadIdentity;
106 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000; 170 glOrtho 0, $tw, 0, $th, -10000, 10000;
107 glMatrixMode GL_MODELVIEW; 171 glMatrixMode GL_MODELVIEW;
108 glLoadIdentity; 172 glLoadIdentity;
173
174 if ($self->{render_cb}) {
175 glScale $rw / $dw, $rh / $dh;
109 $self->{render_cb}->($self, $self->{w}, $self->{h}); 176 $self->{render_cb}->($self, $rw, $rh);
110
111 } else { 177 } else {
112 ($self->{w}, $self->{h}, $data, my $internalformat, $self->{format}, $self->{type}) 178 glPixelZoom $tw / $dw, $th / $dh;
113 = CFPlus::load_image_inline $self->{image}; 179 glDrawPixels $dw, $dh,
114 180 $self->{format},
115 $self->{internalformat} ||= $internalformat; 181 $self->{type},
182 $data;
183 glPixelZoom 1, 1;
184 }
116 } 185 }
117 186
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}; 187 glBindTexture GL_TEXTURE_2D, $self->{name} ||= glGenTexture;
131 188
132 if ($self->{wrap}) { 189 if ($self->{wrap}) {
133 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 190 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
134 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 191 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
135 } else { 192 } else {
… …
150 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR; 207 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
151 } 208 }
152 209
153 glGetError; 210 glGetError;
154 211
155 if (defined $data) { 212 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, 213 glCopyTexImage2D GL_TEXTURE_2D, 0,
168 $self->{internalformat}, 214 $self->{internalformat},
169 0, 0, 215 0, 0,
170 $tw, $th, 216 $tw, $th,
171 0; 217 0;
172 gl_check "copying to texture %dx%d if=%x", 218 gl_check "copying to texture %dx%d if=%x",
173 $tw, $th, $self->{internalformat}; 219 $tw, $th, $self->{internalformat};
220 } else {
221 glTexImage2D GL_TEXTURE_2D, 0,
222 $self->{internalformat},
223 $dw, $dh,
224 0,
225 $self->{format},
226 $self->{type},
227 $data;
228 gl_check "uploading texture %dx%d if=%x f=%x t=%x",
229 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
174 } 230 }
231
232 $self->{s} = $rw / $tw;
233 $self->{t} = $rh / $th;
175} 234}
176 235
177sub shutdown { 236sub shutdown {
178 my ($self) = @_; 237 my ($self) = @_;
179 238

Diff Legend

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