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.4 by root, Fri Apr 7 18:49:52 2006 UTC vs.
Revision 1.25 by root, Tue Apr 11 19:31:17 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} 22}
23 23
24our %GL_EXT;
25our $GL_VERSION;
26
27our $GL_NPOT;
28
29sub gl_init {
30 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32
33 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
34
35 CFClient::Texture::restore_state ();
36}
37
38sub find_rcfile($) {
39 my $path;
40
41 for (@INC) {
42 $path = "$_/CFClient/resources/$_[0]";
43 return $path if -r $path;
44 }
45
46 die "FATAL: can't find required file $_[0]\n";
47}
48
49sub read_cfg {
50 my ($file) = @_;
51
52 open CFG, $file
53 or return;
54
55 my $CFG;
56
57 local $/;
58 $CFG = eval <CFG>;
59
60 $::CFG = $CFG;
61
62 close CFG;
63}
64
65sub write_cfg {
66 my ($file) = @_;
67
68 open CFG, ">$file"
69 or return;
70
71 {
72 require Data::Dumper;
73 local $Data::Dumper::Purity = 1;
74 $::CFG->{VERSION} = $::VERSION;
75 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
76 }
77
78 close CFG;
79}
80
24package Crossfire::Client::Texture; 81package CFClient::Texture;
82
83use strict;
25 84
26use Scalar::Util; 85use Scalar::Util;
27 86
28use SDL::OpenGL; 87use SDL::OpenGL;
29 88
30my @textures; 89my @textures;
31 90
32sub _new { 91sub new {
33 my ($class, %data) = @_; 92 my ($class, %data) = @_;
34 93
35 my $self = bless \%data, $class; 94 my $self = bless {
95 internalformat => GL_RGBA,
96 format => GL_RGBA,
97 %data,
98 }, $class;
36 99
37 push @textures, $self; 100 push @textures, $self;
38 Scalar::Util::weaken $textures[-1]; 101 Scalar::Util::weaken $textures[-1];
39 102
40 $self->upload; 103 $self->upload;
… …
43} 106}
44 107
45sub new_from_image { 108sub new_from_image {
46 my ($class, $image) = @_; 109 my ($class, $image) = @_;
47 110
48 $class->_new (image => $image) 111 $class->new (image => $image)
49} 112}
50 113
51sub new_from_file { 114sub new_from_file {
52 my ($class, $path) = @_; 115 my ($class, $path) = @_;
53 116
… …
56 119
57 local $/; 120 local $/;
58 $class->new_from_image (<$fh>) 121 $class->new_from_image (<$fh>)
59} 122}
60 123
61sub new_from_surface { 124#sub new_from_surface {
62 my ($class, $surface) = @_; 125# my ($class, $surface) = @_;
63 126#
64 $surface->rgba; 127# $surface->rgba;
65 128#
66 $class->_new ( 129# $class->new (
67 data => $surface->pixels, 130# data => $surface->pixels,
68 width => $surface->width, 131# w => $surface->width,
69 height => $surface->height, 132# h => $surface->height,
133# )
134#}
135
136sub new_from_layout {
137 my ($class, $layout) = @_;
138
139 my ($w, $h, $data) = $layout->render;
140
141 $class->new (
142 w => $w,
143 h => $h,
144 data => $data,
145 internalformat => GL_ALPHA4,
146 format => GL_ALPHA,
70 ) 147 )
148}
149
150sub new_from_opengl {
151 my ($class, $w, $h, $cb) = @_;
152
153 $class->new (w => $w, h => $h, render_cb => $cb)
154}
155
156sub topot {
157 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
71} 158}
72 159
73sub upload { 160sub upload {
74 my ($self) = @_; 161 my ($self) = @_;
75 162
76 return unless $SDL::App::USING_OPENGL; 163 return unless $SDL::App::USING_OPENGL;
77 164
78 my ($data, $width, $height); 165 my $data;
79 166
80 if (exists $self->{data}) { 167 if (exists $self->{data}) {
81 ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); 168 $data = $self->{data};
169
170 } elsif (exists $self->{render_cb}) {
171 glViewport 0, 0, $self->{w}, $self->{h};
172 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
173 glMatrixMode GL_PROJECTION;
174 glLoadIdentity;
175 glMatrixMode GL_MODELVIEW;
176 glLoadIdentity;
177 glClear GL_COLOR_BUFFER_BIT;
178 $self->{render_cb}->($self, $self->{w}, $self->{h});
179
82 } else { 180 } else {
83 my $pb = new Gtk2::Gdk::PixbufLoader; 181 my $pb = new Gtk2::Gdk::PixbufLoader;
84 $pb->write ($self->{image}); 182 $pb->write ($self->{image});
85 $pb->close; 183 $pb->close;
86 184
87 $pb = $pb->get_pixbuf; 185 $pb = $pb->get_pixbuf;
88 $pb = $pb->add_alpha (0, 0, 0, 0); 186 $pb = $pb->add_alpha (0, 0, 0, 0);
89 187
90 ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height); 188 $self->{w} = $pb->get_width;
91 } 189 $self->{h} = $pb->get_height;
92 190
191 $data = $pb->get_pixels;
192 }
193
194 my ($tw, $th) = @$self{qw(w h)};
195
196 unless ($tw && $th) {
197 $tw = $th = 1;
198 $data = "\x00" x 64;
199 }
200
201 unless ($GL_NPOT) {
202 # TODO: does not work for zero-sized textures
203 $tw = topot $tw;
204 $th = topot $th;
205
206 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
207 my $bpp = (length $data) / ($self->{w} * $self->{h});
208 $data = pack "(a" . ($tw * $bpp) . ")*",
209 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
210 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
211 }
212 }
213
214 $self->{s} = $self->{w} / $tw;
215 $self->{t} = $self->{h} / $th;
216
93 ($self->{name}) = @{glGenTextures 1}; 217 $self->{name} ||= (glGenTextures 1)->[0];
94 218
95 glBindTexture GL_TEXTURE_2D, $self->{name}; 219 glBindTexture GL_TEXTURE_2D, $self->{name};
96 220
97 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 221 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
98 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 222 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
99 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 223 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
100 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 224 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
101 225
226 if (defined $data) {
102 glTexImage2D GL_TEXTURE_2D, 0, 227 glTexImage2D GL_TEXTURE_2D, 0,
103 GL_RGBA8, 228 $self->{internalformat},
104 $width, $height, 229 $tw, $th, # need to pad texture first
105 0, 230 0,
106 GL_RGBA, 231 $self->{format},
107 GL_UNSIGNED_BYTE, 232 GL_UNSIGNED_BYTE,
108 $data; 233 $data;
234 glGetError and die;
235 } else {
236 glCopyTexImage2D GL_TEXTURE_2D, 0,
237 $self->{internalformat},
238 0, 0,
239 $tw, $th,
240 0;
241 glGetError and die;
242 }
109} 243}
110 244
111sub DESTROY { 245sub DESTROY {
112 my ($self) = @_; 246 my ($self) = @_;
113 247
114 return unless exists $self->{name}; 248 return unless exists $self->{name};
115 249
116 glDeleteTextures delete $self->{name}; 250 glDeleteTextures delete $self->{name};
117} 251}
118 252
119push @::GLINIT, sub { 253sub restore_state{
120 $_->upload 254 $_->upload
121 for grep $_, @textures; 255 for grep $_, @textures;
122}; 256};
123 257
1241; 2581;

Diff Legend

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