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.22 by root, Tue Apr 11 13:14:36 2006 UTC vs.
Revision 1.37 by root, Sun Apr 16 07:25:29 2006 UTC

… …
18 $VERSION = '0.1'; 18 $VERSION = '0.1';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23
24use AnyEvent;
25use BerkeleyDB;
26use SDL::OpenGL;
23 27
24our %GL_EXT; 28our %GL_EXT;
25our $GL_VERSION; 29our $GL_VERSION;
26 30
27our $GL_NPOT; 31our $GL_NPOT;
… …
29sub gl_init { 33sub gl_init {
30 $GL_VERSION = gl_version * 1; 34 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32 36
33 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 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;
34 46
35 CFClient::Texture::restore_state (); 47 CFClient::Texture::restore_state ();
36} 48}
37 49
38sub find_rcfile($) { 50sub find_rcfile($) {
… …
76 } 88 }
77 89
78 close CFG; 90 close CFG;
79} 91}
80 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 => "/proc/self/fd/2",
99 -ErrPrefix => "DATABASE",
100 -Verbose => 1,
101 -Flags => DB_CREATE | DB_JOINENV | 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 new CFClient::Database
106 -Env => $DB_ENV,
107 -Filename => "database",
108 -Subname => $_[0],
109 -Flags => DB_CREATE | DB_UPGRADE,
110 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
111}
112
113package CFClient::Database;
114
115our @ISA = BerkeleyDB::Btree::;
116
117sub get($$) {
118 my $data;
119
120 $_[0]->db_get ($_[1], $data) == 0
121 ? $data
122 : ()
123}
124
125my %DB_SYNC;
126
127sub put($$$) {
128 my ($db, $key, $data) = @_;
129
130 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
131
132 $db->db_put ($key => $data)
133}
134
81package CFClient::Texture; 135package CFClient::Texture;
82 136
137use strict;
138
83use Scalar::Util; 139use Scalar::Util;
84 140
85use SDL::OpenGL; 141use SDL::OpenGL;
86 142
87my @textures; 143my %TEXTURES;
88 144
89sub new { 145sub new {
90 my ($class, %data) = @_; 146 my ($class, %data) = @_;
91 147
92 my $self = bless { 148 my $self = bless {
93 internalformat => GL_RGBA, 149 internalformat => GL_RGBA,
94 format => GL_RGBA, 150 format => GL_RGBA,
151 type => GL_UNSIGNED_BYTE,
95 %data, 152 %data,
96 }, $class; 153 }, $class;
97 154
98 push @textures, $self; 155 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
99 Scalar::Util::weaken $textures[-1];
100 156
101 $self->upload; 157 $self->upload;
102 158
103 $self 159 $self
104} 160}
105 161
106sub new_from_image { 162sub new_from_image {
107 my ($class, $image) = @_; 163 my ($class, $image, %arg) = @_;
108 164
109 $class->new (image => $image) 165 $class->new (image => $image, %arg)
110} 166}
111 167
112sub new_from_file { 168sub new_from_file {
113 my ($class, $path) = @_; 169 my ($class, $path) = @_;
114 170
… …
124# 180#
125# $surface->rgba; 181# $surface->rgba;
126# 182#
127# $class->new ( 183# $class->new (
128# data => $surface->pixels, 184# data => $surface->pixels,
129# width => $surface->width, 185# w => $surface->width,
130# height => $surface->height, 186# h => $surface->height,
131# ) 187# )
132#} 188#}
133 189
134sub new_from_layout { 190sub new_from_layout {
135 my ($class, $layout) = @_; 191 my ($class, $layout) = @_;
136 192
137 my ($w, $h, $data) = $layout->render; 193 my ($w, $h, $data) = $layout->render;
138 194
139 $class->new ( 195 $class->new (
140 width => $w, 196 w => $w,
141 height => $h, 197 h => $h,
142 data => $data, 198 data => $data,
143 internalformat => GL_ALPHA4, 199 internalformat => GL_ALPHA4,
144 format => GL_ALPHA, 200 format => GL_ALPHA,
201 type => GL_UNSIGNED_BYTE,
145 ) 202 )
146} 203}
147 204
148sub new_from_opengl { 205sub new_from_opengl {
149 my ($class, $w, $h, $cb) = @_; 206 my ($class, $w, $h, $cb) = @_;
150 207
151 $class->new (width => $w, height => $h, rendercb => $cb) 208 $class->new (w => $w, h => $h, render_cb => $cb)
152} 209}
153 210
154sub topot { 211sub topot {
155 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 212 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
156} 213}
157 214
158sub upload { 215sub upload {
159 my ($self) = @_; 216 my ($self) = @_;
160 217
161 return unless $SDL::App::USING_OPENGL; 218 return unless $GL_VERSION;
162 219
163 my $data; 220 my $data;
164 221
165 if (exists $self->{data}) { 222 if (exists $self->{data}) {
166 $data = $self->{data}; 223 $data = $self->{data};
224
167 } elsif (exists $self->{rendercb}) { 225 } elsif (exists $self->{render_cb}) {
168 glViewport 0, 0, $self->{width}, $self->{height}; 226 glViewport 0, 0, $self->{w}, $self->{h};
169 glMatrixMode GL_PROJECTION; 227 glMatrixMode GL_PROJECTION;
170 glLoadIdentity; 228 glLoadIdentity;
171 glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000; 229 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
172 glMatrixMode GL_MODELVIEW; 230 glMatrixMode GL_MODELVIEW;
173 glPushmatrix;
174 glLoadIdentity; 231 glLoadIdentity;
175 glClear GL_COLOR_BUFFER_BIT;
176
177 $self->{rendercb}->($self, $self->{width}, $self->{height}); 232 $self->{render_cb}->($self, $self->{w}, $self->{h});
233
178 } else { 234 } else {
179 my $pb = new Gtk2::Gdk::PixbufLoader; 235 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
180 $pb->write ($self->{image}); 236 = 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 } 237 }
191 238
192 my ($tw, $th) = @$self{qw(width height)}; 239 my ($tw, $th) = @$self{qw(w h)};
240
241 unless ($tw && $th) {
242 $tw = $th = 1;
243 $data = "\x00" x 64;
244 }
245
246 $self->{minified} = [CFClient::average $tw, $th, $data]
247 if $self->{minify};
193 248
194 unless ($GL_NPOT) { 249 unless ($GL_NPOT) {
250 # TODO: does not work for zero-sized textures
195 $tw = topot $tw; 251 $tw = topot $tw;
196 $th = topot $th; 252 $th = topot $th;
197 253
198 if (defined $data) { 254 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
199 my $bpp = (length $data) / ($self->{width} * $self->{height}); 255 my $bpp = (length $data) / ($self->{w} * $self->{h});
200 $data = pack "(a" . ($tw * $bpp) . ")*", 256 $data = pack "(a" . ($tw * $bpp) . ")*",
201 unpack "(a" . ($self->{width} * $bpp) . ")*", $data; 257 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
202 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{height}); 258 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
203 } 259 }
204 } 260 }
205 261
206 $self->{s} = $self->{width} / $tw; 262 $self->{s} = $self->{w} / $tw;
207 $self->{t} = $self->{height} / $th; 263 $self->{t} = $self->{h} / $th;
208 264
209 $self->{name} ||= (glGenTextures 1)->[0]; 265 $self->{name} ||= (glGenTextures 1)->[0];
210 266
211 glBindTexture GL_TEXTURE_2D, $self->{name}; 267 glBindTexture GL_TEXTURE_2D, $self->{name};
212 268
213 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 269 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
214 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 270 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
215 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 271 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
216 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 272 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
217 273
218 glGetError;
219 if (defined $data) { 274 if (defined $data) {
220 glTexImage2D GL_TEXTURE_2D, 0, 275 glTexImage2D GL_TEXTURE_2D, 0,
221 $self->{internalformat}, 276 $self->{internalformat},
222 $tw, $th, # need to pad texture first 277 $tw, $th, # need to pad texture first
223 0, 278 0,
224 $self->{format}, 279 $self->{format},
225 GL_UNSIGNED_BYTE, 280 $self->{type},
226 $data; 281 $data;
227 glGetError and die; 282 glGetError and die;
228 } else { 283 } else {
229 glCopyTexImage2D GL_TEXTURE_2D, 0, 284 glCopyTexImage2D GL_TEXTURE_2D, 0,
230 $self->{internalformat}, 285 $self->{internalformat},
231 0, 0, 286 0, 0,
232 $tw, $th, 287 $tw, $th,
233 0; 288 0;
234 glPopmatrix; 289 glGetError and die "glCopyTexImage2D $tw,$th";
235 } 290 }
236} 291}
237 292
238sub DESTROY { 293sub DESTROY {
239 my ($self) = @_; 294 my ($self) = @_;
240 295
241 return unless exists $self->{name}; 296 delete $TEXTURES{$self+0};
242 297
243 glDeleteTextures delete $self->{name}; 298 glDeleteTextures delete $self->{name}
299 if $self->{name};
244} 300}
245 301
246sub restore_state{ 302sub restore_state{
247 $_->upload 303 $_->upload
248 for grep $_, @textures; 304 for values %TEXTURES;
249}; 305};
250 306
2511; 3071;
252 308
253=back 309=back

Diff Legend

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