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.5 by root, Fri Apr 7 20:13:13 2006 UTC vs.
Revision 1.42 by root, Fri Apr 21 07:09:10 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire::Client - undocumented utility garbage for our crossfire client 3CFClient - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use Crossfire::Client; 7 use CFClient;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package Crossfire::Client; 15package CFClient;
16 16
17BEGIN { 17BEGIN {
18 $VERSION = '0.1'; 18 $VERSION = '0.1';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "Crossfire::Client", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22}
23
24use AnyEvent;
25use BerkeleyDB;
26use CFClient::OpenGL;
27
28our %GL_EXT;
29our $GL_VERSION;
30
31our $GL_NPOT;
32
33sub gl_init {
34 $GL_VERSION = gl_version * 1;
35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
36
37 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
38
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT;
42 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46
47 CFClient::Texture::restore_state ();
22} 48}
23 49
24sub find_rcfile($) { 50sub find_rcfile($) {
25 my $path; 51 my $path;
26 52
27 for (@INC) { 53 for (@INC) {
28 $path = "$_/Crossfire/resources/$_[0]"; 54 $path = "$_/CFClient/resources/$_[0]";
29 return $path if -r $path; 55 return $path if -r $path;
30 } 56 }
31 57
32 die "FATAL: can't find required file $_[0]\n"; 58 die "FATAL: can't find required file $_[0]\n";
33} 59}
53 79
54 open CFG, ">$file" 80 open CFG, ">$file"
55 or return; 81 or return;
56 82
57 { 83 {
84 require Data::Dumper;
58 local $Data::Dumper::Purity = 1; 85 local $Data::Dumper::Purity = 1;
59 $::CFG->{VERSION} = $::VERSION; 86 $::CFG->{VERSION} = $::VERSION;
60 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); 87 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
61 } 88 }
62 89
63 close CFG; 90 close CFG;
64} 91}
65 92
93mkdir "$Crossfire::VARDIR/pclient", 0777;
94
95our $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000,
98 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99# -ErrPrefix => "DATABASE",
100 -Verbose => 1,
101 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
102 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
103
104sub db_table($) {
105 my ($table) = @_;
106
107 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108
109 new CFClient::Database
110 -Env => $DB_ENV,
111 -Filename => $table,
112# -Filename => "database",
113# -Subname => $table,
114 -Flags => DB_CREATE | DB_UPGRADE,
115 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
116}
117
118package CFClient::Database;
119
120our @ISA = BerkeleyDB::Btree::;
121
122sub get($$) {
123 my $data;
124
125 $_[0]->db_get ($_[1], $data) == 0
126 ? $data
127 : ()
128}
129
130my %DB_SYNC;
131
132sub put($$$) {
133 my ($db, $key, $data) = @_;
134
135 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
136
137 $db->db_put ($key => $data)
138}
139
66package Crossfire::Client::Texture; 140package CFClient::Texture;
141
142use strict;
67 143
68use Scalar::Util; 144use Scalar::Util;
69 145
70use SDL::OpenGL; 146use CFClient::OpenGL;
71 147
72my @textures; 148my %TEXTURES;
73 149
74sub _new { 150sub new {
75 my ($class, %data) = @_; 151 my ($class, %data) = @_;
76 152
77 my $self = bless \%data, $class; 153 my $self = bless {
154 internalformat => GL_RGBA,
155 format => GL_RGBA,
156 type => GL_UNSIGNED_BYTE,
157 %data,
158 }, $class;
78 159
79 push @textures, $self; 160 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
80 Scalar::Util::weaken $textures[-1];
81 161
82 $self->upload; 162 $self->upload;
83 163
84 $self 164 $self
85} 165}
86 166
87sub new_from_image { 167sub new_from_image {
88 my ($class, $image) = @_; 168 my ($class, $image, %arg) = @_;
89 169
90 $class->_new (image => $image) 170 $class->new (image => $image, %arg)
91} 171}
92 172
93sub new_from_file { 173sub new_from_file {
94 my ($class, $path) = @_; 174 my ($class, $path, %arg) = @_;
95 175
96 open my $fh, "<:raw", $path 176 open my $fh, "<:raw", $path
97 or die "$path: $!"; 177 or die "$path: $!";
98 178
99 local $/; 179 local $/;
100 $class->new_from_image (<$fh>) 180 $class->new_from_image (<$fh>, %arg)
101} 181}
102 182
103sub new_from_surface { 183#sub new_from_surface {
104 my ($class, $surface) = @_; 184# my ($class, $surface) = @_;
105 185#
106 $surface->rgba; 186# $surface->rgba;
107 187#
108 $class->_new ( 188# $class->new (
109 data => $surface->pixels, 189# data => $surface->pixels,
110 width => $surface->width, 190# w => $surface->width,
111 height => $surface->height, 191# h => $surface->height,
192# )
193#}
194
195sub new_from_layout {
196 my ($class, $layout, %arg) = @_;
197
198 my ($w, $h, $data) = $layout->render;
199
200 $class->new (
201 w => $w,
202 h => $h,
203 data => $data,
204 internalformat => GL_ALPHA4,
205 format => GL_ALPHA,
206 type => GL_UNSIGNED_BYTE,
207 %arg,
112 ) 208 )
209}
210
211sub new_from_opengl {
212 my ($class, $w, $h, $cb) = @_;
213
214 $class->new (w => $w, h => $h, render_cb => $cb)
215}
216
217sub topot {
218 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
113} 219}
114 220
115sub upload { 221sub upload {
116 my ($self) = @_; 222 my ($self) = @_;
117 223
118 return unless $SDL::App::USING_OPENGL; 224 return unless $GL_VERSION;
119 225
120 my ($data, $width, $height); 226 my $data;
121 227
122 if (exists $self->{data}) { 228 if (exists $self->{data}) {
123 ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); 229 $data = $self->{data};
230
231 } elsif (exists $self->{render_cb}) {
232 glViewport 0, 0, $self->{w}, $self->{h};
233 glMatrixMode GL_PROJECTION;
234 glLoadIdentity;
235 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
236 glMatrixMode GL_MODELVIEW;
237 glLoadIdentity;
238 $self->{render_cb}->($self, $self->{w}, $self->{h});
239
124 } else { 240 } else {
125 my $pb = new Gtk2::Gdk::PixbufLoader; 241 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
126 $pb->write ($self->{image}); 242 = CFClient::load_image_inline $self->{image};
127 $pb->close;
128
129 $pb = $pb->get_pixbuf;
130 $pb = $pb->add_alpha (0, 0, 0, 0);
131
132 ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height);
133 } 243 }
134 244
245 my ($tw, $th) = @$self{qw(w h)};
246
247 unless ($tw && $th) {
248 $tw = $th = 1;
249 $data = "\x00" x 64;
250 }
251
252 $self->{minified} = [CFClient::average $tw, $th, $data]
253 if $self->{minify};
254
255 unless ($GL_NPOT) {
256 # TODO: does not work for zero-sized textures
257 $tw = topot $tw;
258 $th = topot $th;
259
260 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
261 my $bpp = (length $data) / ($self->{w} * $self->{h});
262 $data = pack "(a" . ($tw * $bpp) . ")*",
263 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
264 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
265 }
266 }
267
268 $self->{s} = $self->{w} / $tw;
269 $self->{t} = $self->{h} / $th;
270
271 glGetError;
272
135 ($self->{name}) = @{glGenTextures 1}; 273 $self->{name} ||= glGenTexture;
136 274
137 glBindTexture GL_TEXTURE_2D, $self->{name}; 275 glBindTexture GL_TEXTURE_2D, $self->{name};
138 276
139 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
140 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
141 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 277 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
142 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 278 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
279
280 if ($::FAST) {
281 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
282 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
283 } else {
284 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
286 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR;
287 }
143 288
289 if (defined $data) {
144 glTexImage2D GL_TEXTURE_2D, 0, 290 glTexImage2D GL_TEXTURE_2D, 0,
145 GL_RGBA8, 291 $self->{internalformat},
146 $width, $height, 292 $tw, $th, # need to pad texture first
147 0, 293 0,
148 GL_RGBA, 294 $self->{format},
149 GL_UNSIGNED_BYTE, 295 $self->{type},
150 $data; 296 $data;
297 if (my $error = glGetError) {
298 warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
299 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
300 }
301 } else {
302 glCopyTexImage2D GL_TEXTURE_2D, 0,
303 $self->{internalformat},
304 0, 0,
305 $tw, $th,
306 0;
307 glGetError and die "glCopyTexImage2D $tw,$th";
308 }
151} 309}
152 310
153sub DESTROY { 311sub DESTROY {
154 my ($self) = @_; 312 my ($self) = @_;
155 313
156 return unless exists $self->{name}; 314 delete $TEXTURES{$self+0};
157 315
158 glDeleteTextures delete $self->{name}; 316 glDeleteTexture delete $self->{name}
317 if $self->{name};
159} 318}
160 319
161push @::GLINIT, sub { 320sub restore_state{
162 $_->upload 321 $_->upload
163 for grep $_, @textures; 322 for values %TEXTURES;
164}; 323};
165 324
1661; 3251;
167 326
168=back 327=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines