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.1 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.6 by root, Wed Jun 14 18:59:31 2006 UTC

… …
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
92sub topot {
93 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
94}
95
96sub upload { 92sub upload {
97 my ($self) = @_; 93 my ($self) = @_;
98 94
99 return unless $GL_VERSION; 95 return unless $GL_VERSION;
100 96
… …
117 = CFClient::load_image_inline $self->{image}; 113 = CFClient::load_image_inline $self->{image};
118 } 114 }
119 115
120 my ($tw, $th) = @$self{qw(w h)}; 116 my ($tw, $th) = @$self{qw(w h)};
121 117
122 unless ($tw > 0 && $th > 0) {
123 $tw = $th = 1;
124 $data = "\x00" x 64;
125 }
126
127 $self->{minified} = [CFClient::average $tw, $th, $data] 118 $self->{minified} ||= [CFClient::average $tw, $th, $data]
128 if $self->{minify}; 119 if $self->{minify};
129 120
130 unless ($GL_NPOT) { 121 pad2pot $data, $tw, $th unless $GL_NPOT;
131 # TODO: does not work for zero-sized textures
132 $tw = topot $tw;
133 $th = topot $th;
134
135 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
136 my $bpp = (length $data) / ($self->{w} * $self->{h});
137 $data = pack "(a" . ($tw * $bpp) . ")*",
138 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
139 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
140 }
141 }
142 122
143 $self->{s} = $self->{w} / $tw; 123 $self->{s} = $self->{w} / $tw;
144 $self->{t} = $self->{h} / $th; 124 $self->{t} = $self->{h} / $th;
145 125
146 $self->{name} ||= glGenTexture; 126 $self->{name} ||= glGenTexture;
147 127
148 glBindTexture GL_TEXTURE_2D, $self->{name}; 128 glBindTexture GL_TEXTURE_2D, $self->{name};
149 129
130 if ($self->{wrap}) {
150 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 131 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
151 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 132 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
133 } else {
134 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
135 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, $GL_VERSION >= 1.2 ? GL_CLAMP_TO_EDGE : GL_CLAMP;
136 }
152 137
153 if ($::FAST) { 138 if ($::FAST) {
154 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; 139 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
155 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST; 140 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
156 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) { 141 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
157 # alternatively check for 0x8191
158 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1; 142 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
159 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 143 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
160 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR; 144 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
161 } else { 145 } else {
162 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap}; 146 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
… …
183 $tw, $th, 167 $tw, $th,
184 0; 168 0;
185 gl_check "copying to texture %dx%d if=%x", 169 gl_check "copying to texture %dx%d if=%x",
186 $tw, $th, $self->{internalformat}; 170 $tw, $th, $self->{internalformat};
187 } 171 }
188
189 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
190} 172}
191 173
192sub DESTROY { 174sub DESTROY {
193 my ($self) = @_; 175 my ($self) = @_;
194 176

Diff Legend

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