ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.40 by root, Tue Apr 18 01:51:06 2006 UTC vs.
Revision 1.51 by root, Sun May 14 20:51:19 2006 UTC

… …
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23 23
24use Carp ();
24use AnyEvent; 25use AnyEvent;
25use BerkeleyDB; 26use BerkeleyDB;
26use SDL::OpenGL; 27use CFClient::OpenGL;
27 28
28our %GL_EXT; 29our %GL_EXT;
29our $GL_VERSION; 30our $GL_VERSION;
30 31
31our $GL_NPOT; 32our $GL_NPOT;
33our $GL_DEBUG = 1;
32 34
33sub gl_init { 35sub gl_init {
34 $GL_VERSION = gl_version * 1; 36 $GL_VERSION = gl_version * 1;
35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 37 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
36 38
37 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 39 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
38 40
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL; 41 glDisable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT; 42 glShadeModel GL_FLAT;
43 glDisable GL_DITHER;
42 glDisable GL_DEPTH_TEST; 44 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46 46
47 CFClient::Texture::restore_state (); 47 CFClient::Texture::restore_state ();
48}
49
50sub gl_check {
51 return unless $GL_DEBUG;
52
53 if (my $error = glGetError) {
54 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;
55 }
48} 56}
49 57
50sub find_rcfile($) { 58sub find_rcfile($) {
51 my $path; 59 my $path;
52 60
53 for (@INC) { 61 for (grep !ref, @INC) {
54 $path = "$_/CFClient/resources/$_[0]"; 62 $path = "$_/CFClient/resources/$_[0]";
55 return $path if -r $path; 63 return $path if -r $path;
56 } 64 }
57 65
58 die "FATAL: can't find required file $_[0]\n"; 66 die "FATAL: can't find required file $_[0]\n";
… …
109 new CFClient::Database 117 new CFClient::Database
110 -Env => $DB_ENV, 118 -Env => $DB_ENV,
111 -Filename => $table, 119 -Filename => $table,
112# -Filename => "database", 120# -Filename => "database",
113# -Subname => $table, 121# -Subname => $table,
122 -Property => DB_CHKSUM,
114 -Flags => DB_CREATE | DB_UPGRADE, 123 -Flags => DB_CREATE | DB_UPGRADE,
115 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 124 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
116} 125}
117 126
118package CFClient::Database; 127package CFClient::Database;
… …
141 150
142use strict; 151use strict;
143 152
144use Scalar::Util; 153use Scalar::Util;
145 154
146use SDL::OpenGL; 155use CFClient::OpenGL;
147 156
148my %TEXTURES; 157my %TEXTURES;
149 158
150sub new { 159sub new {
151 my ($class, %data) = @_; 160 my ($class, %data) = @_;
… …
169 178
170 $class->new (image => $image, %arg) 179 $class->new (image => $image, %arg)
171} 180}
172 181
173sub new_from_file { 182sub new_from_file {
174 my ($class, $path) = @_; 183 my ($class, $path, %arg) = @_;
175 184
176 open my $fh, "<:raw", $path 185 open my $fh, "<:raw", $path
177 or die "$path: $!"; 186 or die "$path: $!";
178 187
179 local $/; 188 local $/;
180 $class->new_from_image (<$fh>) 189 $class->new_from_image (<$fh>, %arg)
181} 190}
182 191
183#sub new_from_surface { 192#sub new_from_surface {
184# my ($class, $surface) = @_; 193# my ($class, $surface) = @_;
185# 194#
… …
191# h => $surface->height, 200# h => $surface->height,
192# ) 201# )
193#} 202#}
194 203
195sub new_from_layout { 204sub new_from_layout {
196 my ($class, $layout) = @_; 205 my ($class, $layout, %arg) = @_;
197 206
198 my ($w, $h, $data) = $layout->render; 207 my ($w, $h, $data, $format, $internalformat) = $layout->render;
199 208
200 $class->new ( 209 $class->new (
201 w => $w, 210 w => $w,
202 h => $h, 211 h => $h,
203 data => $data, 212 data => $data,
204 internalformat => GL_ALPHA4,
205 format => GL_ALPHA, 213 format => $format,
214 internalformat => $format,
206 type => GL_UNSIGNED_BYTE, 215 type => GL_UNSIGNED_BYTE,
216 %arg,
207 ) 217 )
208} 218}
209 219
210sub new_from_opengl { 220sub new_from_opengl {
211 my ($class, $w, $h, $cb) = @_; 221 my ($class, $w, $h, $cb) = @_;
212 222
213 $class->new (w => $w, h => $h, render_cb => $cb) 223 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
214} 224}
215 225
216sub topot { 226sub topot {
217 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 227 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
218} 228}
… …
241 = CFClient::load_image_inline $self->{image}; 251 = CFClient::load_image_inline $self->{image};
242 } 252 }
243 253
244 my ($tw, $th) = @$self{qw(w h)}; 254 my ($tw, $th) = @$self{qw(w h)};
245 255
246 unless ($tw && $th) { 256 unless ($tw > 0 && $th > 0) {
247 $tw = $th = 1; 257 $tw = $th = 1;
248 $data = "\x00" x 64; 258 $data = "\x00" x 64;
249 } 259 }
250 260
251 $self->{minified} = [CFClient::average $tw, $th, $data] 261 $self->{minified} = [CFClient::average $tw, $th, $data]
… …
254 unless ($GL_NPOT) { 264 unless ($GL_NPOT) {
255 # TODO: does not work for zero-sized textures 265 # TODO: does not work for zero-sized textures
256 $tw = topot $tw; 266 $tw = topot $tw;
257 $th = topot $th; 267 $th = topot $th;
258 268
259 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 269 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
260 my $bpp = (length $data) / ($self->{w} * $self->{h}); 270 my $bpp = (length $data) / ($self->{w} * $self->{h});
261 $data = pack "(a" . ($tw * $bpp) . ")*", 271 $data = pack "(a" . ($tw * $bpp) . ")*",
262 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 272 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
263 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 273 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
264 } 274 }
265 } 275 }
266 276
267 $self->{s} = $self->{w} / $tw; 277 $self->{s} = $self->{w} / $tw;
268 $self->{t} = $self->{h} / $th; 278 $self->{t} = $self->{h} / $th;
269 279
270 glGetError;
271
272 $self->{name} ||= (glGenTextures 1)->[0]; 280 $self->{name} ||= glGenTexture;
273 281
274 glBindTexture GL_TEXTURE_2D, $self->{name}; 282 glBindTexture GL_TEXTURE_2D, $self->{name};
275 283
276 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 284 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
279 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
286
287 if ($::FAST) {
288 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
289 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
290 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
291 # alternatively check for 0x8191
292 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
293 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
294 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
295 } else {
296 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
297 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
298 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
299 }
280 300
301 glGetError;
302
281 if (defined $data) { 303 if (defined $data) {
282 glTexImage2D GL_TEXTURE_2D, 0, 304 glTexImage2D GL_TEXTURE_2D, 0,
283 $self->{internalformat}, 305 $self->{internalformat},
284 $tw, $th, # need to pad texture first 306 $tw, $th, # need to pad texture first
285 0, 307 0,
286 $self->{format}, 308 $self->{format},
287 $self->{type}, 309 $self->{type},
288 $data; 310 $data;
289 if (my $error = glGetError) { 311 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
290 warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
291 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; 312 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
292 }
293 } else { 313 } else {
294 glCopyTexImage2D GL_TEXTURE_2D, 0, 314 glCopyTexImage2D GL_TEXTURE_2D, 0,
295 $self->{internalformat}, 315 $self->{internalformat},
296 0, 0, 316 0, 0,
297 $tw, $th, 317 $tw, $th,
298 0; 318 0;
299 glGetError and die "glCopyTexImage2D $tw,$th"; 319 CFClient::gl_check "copying to texture %dx%d if=%x",
320 $tw, $th, $self->{internalformat};
300 } 321 }
301} 322}
302 323
303sub DESTROY { 324sub DESTROY {
304 my ($self) = @_; 325 my ($self) = @_;
305 326
306 delete $TEXTURES{$self+0}; 327 delete $TEXTURES{$self+0};
307 328
308 glDeleteTextures delete $self->{name} 329 glDeleteTexture delete $self->{name}
309 if $self->{name}; 330 if $self->{name};
310} 331}
311 332
312sub restore_state{ 333sub restore_state{
313 $_->upload 334 $_->upload

Diff Legend

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