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.23 by root, Tue Apr 11 17:02:35 2006 UTC vs.
Revision 1.59 by elmex, Tue May 23 17:30:18 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 ();
25use AnyEvent ();
26use BerkeleyDB;
27
28use CFClient::OpenGL;
29
24our %GL_EXT; 30our %GL_EXT;
25our $GL_VERSION; 31our $GL_VERSION;
26 32
27our $GL_NPOT; 33our $GL_NPOT;
34our $GL_DEBUG = 1;
28 35
29sub gl_init { 36sub gl_init {
30 $GL_VERSION = gl_version * 1; 37 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 38 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32 39
33 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 40 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
41 $GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
42
43 glDisable GL_COLOR_MATERIAL;
44 glShadeModel GL_FLAT;
45 glDisable GL_DITHER;
46 glDisable GL_DEPTH_TEST;
47 glDepthMask 0;
48 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
34 49
35 CFClient::Texture::restore_state (); 50 CFClient::Texture::restore_state ();
51}
52
53sub gl_check {
54 return unless $GL_DEBUG;
55
56 if (my $error = glGetError) {
57 Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);
58 }
36} 59}
37 60
38sub find_rcfile($) { 61sub find_rcfile($) {
39 my $path; 62 my $path;
40 63
41 for (@INC) { 64 for (grep !ref, @INC) {
42 $path = "$_/CFClient/resources/$_[0]"; 65 $path = "$_/CFClient/resources/$_[0]";
43 return $path if -r $path; 66 return $path if -r $path;
44 } 67 }
45 68
46 die "FATAL: can't find required file $_[0]\n"; 69 die "FATAL: can't find required file $_[0]\n";
… …
76 } 99 }
77 100
78 close CFG; 101 close CFG;
79} 102}
80 103
104mkdir "$Crossfire::VARDIR/pclient", 0777;
105
106our $DB_ENV = new BerkeleyDB::Env
107 -Home => "$Crossfire::VARDIR/pclient",
108 -Cachesize => 1_000_000,
109 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
110# -ErrPrefix => "DATABASE",
111 -Verbose => 1,
112 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
113 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
114
115sub db_table($) {
116 my ($table) = @_;
117
118 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
119
120 new CFClient::Database
121 -Env => $DB_ENV,
122 -Filename => $table,
123# -Filename => "database",
124# -Subname => $table,
125 -Property => DB_CHKSUM,
126 -Flags => DB_CREATE | DB_UPGRADE,
127 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
128}
129
130sub pod_to_pango($) {
131 my ($pom) = @_;
132
133 $pom->present ("CFClient::PodToPango")
134}
135
136package CFClient::PodToPango;
137
138use base Pod::POM::View::Text;
139
140our $indent = 0;
141
142*view_seq_code =
143*view_seq_bold = sub { "<b>$_[1]</b>" };
144*view_seq_italic = sub { "<i>$_[1]</i>" };
145*view_seq_space =
146*view_seq_link =
147*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
148
149sub view_seq_text {
150 my $text = $_[1];
151 $text =~ s/\s+/ /g;
152 CFClient::UI::Label::escape ($text)
153}
154
155sub view_item {
156 ("\t" x ($indent / 4))
157 . $_[1]->title->present ($_[0])
158 . "\n"
159 . $_[1]->content->present ($_[0])
160}
161
162sub view_verbatim {
163 (join "",
164 map +("\t" x ($indent / 2)) . "$_\n",
165 split /\n/, CFClient::UI::Label::escape ($_[1]))
166 . "\n"
167}
168
169sub view_textblock {
170 ("\t" x ($indent / 2)) . "$_[1]\n\n"
171}
172
173sub view_head2 {
174 "<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"
175 . $_[1]->content->present ($_[0])
176};
177
178sub view_over {
179 local $indent = $indent + $_[1]->indent;
180 $_[1]->content->present ($_[0])
181}
182
183package CFClient::Database;
184
185our @ISA = BerkeleyDB::Btree::;
186
187sub get($$) {
188 my $data;
189
190 $_[0]->db_get ($_[1], $data) == 0
191 ? $data
192 : ()
193}
194
195my %DB_SYNC;
196
197sub put($$$) {
198 my ($db, $key, $data) = @_;
199
200 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
201
202 $db->db_put ($key => $data)
203}
204
81package CFClient::Texture; 205package CFClient::Texture;
82 206
207use strict;
208
83use Scalar::Util; 209use Scalar::Util;
84 210
85use SDL::OpenGL; 211use CFClient::OpenGL;
86 212
87my @textures; 213my %TEXTURES;
88 214
89sub new { 215sub new {
90 my ($class, %data) = @_; 216 my ($class, %data) = @_;
91 217
92 my $self = bless { 218 my $self = bless {
93 internalformat => GL_RGBA, 219 internalformat => GL_RGBA,
94 format => GL_RGBA, 220 format => GL_RGBA,
221 type => GL_UNSIGNED_BYTE,
95 %data, 222 %data,
96 }, $class; 223 }, $class;
97 224
98 push @textures, $self; 225 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
99 Scalar::Util::weaken $textures[-1];
100 226
101 $self->upload; 227 $self->upload;
102 228
103 $self 229 $self
104} 230}
105 231
106sub new_from_image { 232sub new_from_image {
107 my ($class, $image) = @_; 233 my ($class, $image, %arg) = @_;
108 234
109 $class->new (image => $image) 235 $class->new (image => $image, %arg)
110} 236}
111 237
112sub new_from_file { 238sub new_from_file {
113 my ($class, $path) = @_; 239 my ($class, $path, %arg) = @_;
114 240
115 open my $fh, "<:raw", $path 241 open my $fh, "<:raw", $path
116 or die "$path: $!"; 242 or die "$path: $!";
117 243
118 local $/; 244 local $/;
119 $class->new_from_image (<$fh>) 245 $class->new_from_image (<$fh>, %arg)
120} 246}
121 247
122#sub new_from_surface { 248#sub new_from_surface {
123# my ($class, $surface) = @_; 249# my ($class, $surface) = @_;
124# 250#
125# $surface->rgba; 251# $surface->rgba;
126# 252#
127# $class->new ( 253# $class->new (
128# data => $surface->pixels, 254# data => $surface->pixels,
129# width => $surface->width, 255# w => $surface->width,
130# height => $surface->height, 256# h => $surface->height,
131# ) 257# )
132#} 258#}
133 259
134sub new_from_layout { 260sub new_from_layout {
135 my ($class, $layout) = @_; 261 my ($class, $layout, %arg) = @_;
136 262
137 my ($w, $h, $data) = $layout->render; 263 my ($w, $h, $data, $format, $internalformat) = $layout->render;
138 264
139 $class->new ( 265 $class->new (
140 width => $w, 266 w => $w,
141 height => $h, 267 h => $h,
142 data => $data, 268 data => $data,
143 internalformat => GL_ALPHA4,
144 format => GL_ALPHA, 269 format => $format,
270 internalformat => $format,
271 type => GL_UNSIGNED_BYTE,
272 %arg,
145 ) 273 )
146} 274}
147 275
148sub new_from_opengl { 276sub new_from_opengl {
149 my ($class, $w, $h, $cb) = @_; 277 my ($class, $w, $h, $cb) = @_;
150 278
151 $class->new (width => $w, height => $h, rendercb => $cb) 279 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
152} 280}
153 281
154sub topot { 282sub topot {
155 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 283 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
156} 284}
157 285
158sub upload { 286sub upload {
159 my ($self) = @_; 287 my ($self) = @_;
160 288
161 return unless $SDL::App::USING_OPENGL; 289 return unless $GL_VERSION;
162 290
163 my $data; 291 my $data;
164 292
165 if (exists $self->{data}) { 293 if (exists $self->{data}) {
166 $data = $self->{data}; 294 $data = $self->{data};
295
167 } elsif (exists $self->{rendercb}) { 296 } elsif (exists $self->{render_cb}) {
168 glViewport 0, 0, $self->{width}, $self->{height}; 297 glViewport 0, 0, $self->{w}, $self->{h};
169 glMatrixMode GL_PROJECTION; 298 glMatrixMode GL_PROJECTION;
170 glLoadIdentity; 299 glLoadIdentity;
171 glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000; 300 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
172 glMatrixMode GL_MODELVIEW; 301 glMatrixMode GL_MODELVIEW;
173 glPushmatrix;
174 glLoadIdentity; 302 glLoadIdentity;
175 glClear GL_COLOR_BUFFER_BIT;
176
177 $self->{rendercb}->($self, $self->{width}, $self->{height}); 303 $self->{render_cb}->($self, $self->{w}, $self->{h});
304
178 } else { 305 } else {
179 my $pb = new Gtk2::Gdk::PixbufLoader; 306 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
180 $pb->write ($self->{image}); 307 = CFClient::load_image_inline $self->{image};
181 $pb->close;
182
183 $pb = $pb->get_pixbuf;
184 $pb = $pb->add_alpha (0, 0, 0, 0);
185
186 $self->{width} = $pb->get_width;
187 $self->{height} = $pb->get_height;
188
189 $data = $pb->get_pixels;
190 } 308 }
191 309
192 my ($tw, $th) = @$self{qw(width height)}; 310 my ($tw, $th) = @$self{qw(w h)};
193 311
312 unless ($tw > 0 && $th > 0) {
313 $tw = $th = 1;
314 $data = "\x00" x 64;
315 }
316
317 $self->{minified} = [CFClient::average $tw, $th, $data]
318 if $self->{minify};
319
194 unless ($GL_NPOT && $tw && $th) { 320 unless ($GL_NPOT) {
321 # TODO: does not work for zero-sized textures
195 $tw = topot $tw; 322 $tw = topot $tw;
196 $th = topot $th; 323 $th = topot $th;
197 324
198 if (defined $data) { 325 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
199 my $bpp = (length $data) / ($self->{width} * $self->{height}); 326 my $bpp = (length $data) / ($self->{w} * $self->{h});
200 $data = pack "(a" . ($tw * $bpp) . ")*", 327 $data = pack "(a" . ($tw * $bpp) . ")*",
201 unpack "(a" . ($self->{width} * $bpp) . ")*", $data; 328 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
202 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{height}); 329 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
203 } 330 }
204 } 331 }
205 332
206 $self->{s} = $self->{width} / $tw; 333 $self->{s} = $self->{w} / $tw;
207 $self->{t} = $self->{height} / $th; 334 $self->{t} = $self->{h} / $th;
208 335
209 $self->{name} ||= (glGenTextures 1)->[0]; 336 $self->{name} ||= glGenTexture;
210 337
211 glBindTexture GL_TEXTURE_2D, $self->{name}; 338 glBindTexture GL_TEXTURE_2D, $self->{name};
212 339
213 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
214 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
215 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 340 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
216 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 341 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
342
343 if ($::FAST) {
344 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
345 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
346 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
347 # alternatively check for 0x8191
348 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
349 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
350 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
351 } else {
352 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
353 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
354 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
355 }
217 356
218 glGetError; 357 glGetError;
358
219 if (defined $data) { 359 if (defined $data) {
220 glTexImage2D GL_TEXTURE_2D, 0, 360 glTexImage2D GL_TEXTURE_2D, 0,
221 $self->{internalformat}, 361 $self->{internalformat},
222 $tw, $th, # need to pad texture first 362 $tw, $th,
223 0, 363 0,
224 $self->{format}, 364 $self->{format},
225 GL_UNSIGNED_BYTE, 365 $self->{type},
226 $data; 366 $data;
227 glGetError and die; 367 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
368 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
228 } else { 369 } else {
229 glCopyTexImage2D GL_TEXTURE_2D, 0, 370 glCopyTexImage2D GL_TEXTURE_2D, 0,
230 $self->{internalformat}, 371 $self->{internalformat},
231 0, 0, 372 0, 0,
232 $tw, $th, 373 $tw, $th,
233 0; 374 0;
234 glPopmatrix; 375 CFClient::gl_check "copying to texture %dx%d if=%x",
376 $tw, $th, $self->{internalformat};
235 } 377 }
378
379 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
236} 380}
237 381
238sub DESTROY { 382sub DESTROY {
239 my ($self) = @_; 383 my ($self) = @_;
240 384
241 return unless exists $self->{name}; 385 delete $TEXTURES{$self+0};
242 386
243 glDeleteTextures delete $self->{name}; 387 glDeleteTexture delete $self->{name}
388 if $self->{name};
244} 389}
245 390
246sub restore_state{ 391sub restore_state {
247 $_->upload 392 $_->upload
248 for grep $_, @textures; 393 for values %TEXTURES;
249}; 394}
250 395
2511; 3961;
252 397
253=back 398=back
254 399

Diff Legend

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