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.12 by root, Sat Apr 8 18:48:34 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}
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 ();
22} 36}
23 37
24sub find_rcfile($) { 38sub find_rcfile($) {
25 my $path; 39 my $path;
26 40
27 for (@INC) { 41 for (@INC) {
28 $path = "$_/Crossfire/resources/$_[0]"; 42 $path = "$_/CFClient/resources/$_[0]";
29 return $path if -r $path; 43 return $path if -r $path;
30 } 44 }
31 45
32 die "FATAL: can't find required file $_[0]\n"; 46 die "FATAL: can't find required file $_[0]\n";
33} 47}
… …
62 } 76 }
63 77
64 close CFG; 78 close CFG;
65} 79}
66 80
67package Crossfire::Client::Texture; 81package CFClient::Texture;
82
83use strict;
68 84
69use Scalar::Util; 85use Scalar::Util;
70 86
71use SDL::OpenGL; 87use SDL::OpenGL;
72 88
73my @textures; 89my @textures;
74 90
75sub _new { 91sub new {
76 my ($class, %data) = @_; 92 my ($class, %data) = @_;
77 93
78 my $self = bless \%data, $class; 94 my $self = bless {
95 internalformat => GL_RGBA,
96 format => GL_RGBA,
97 %data,
98 }, $class;
79 99
80 push @textures, $self; 100 push @textures, $self;
81 Scalar::Util::weaken $textures[-1]; 101 Scalar::Util::weaken $textures[-1];
82 102
83 $self->upload; 103 $self->upload;
… …
86} 106}
87 107
88sub new_from_image { 108sub new_from_image {
89 my ($class, $image) = @_; 109 my ($class, $image) = @_;
90 110
91 $class->_new (image => $image) 111 $class->new (image => $image)
92} 112}
93 113
94sub new_from_file { 114sub new_from_file {
95 my ($class, $path) = @_; 115 my ($class, $path) = @_;
96 116
… …
99 119
100 local $/; 120 local $/;
101 $class->new_from_image (<$fh>) 121 $class->new_from_image (<$fh>)
102} 122}
103 123
104sub new_from_surface { 124#sub new_from_surface {
105 my ($class, $surface) = @_; 125# my ($class, $surface) = @_;
106 126#
107 $surface->rgba; 127# $surface->rgba;
108 128#
109 $class->_new ( 129# $class->new (
110 data => $surface->pixels, 130# data => $surface->pixels,
111 width => $surface->width, 131# w => $surface->width,
112 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,
113 ) 147 )
114}
115
116sub new_from_ttf {
117 my ($class, $ttf, $text) = @_;
118
119 utf8::encode $text;
120
121 my $surface = SDL::TTFRenderUTF8Blended $ttf, $text,
122 (new SDL::Color -r => 255, -g => 255, -b => 255);
123
124 $class->new_from_surface (bless \$surface, SDL::Surface::)
125} 148}
126 149
127sub new_from_opengl { 150sub new_from_opengl {
128 my ($class, $w, $h, $cb) = @_; 151 my ($class, $w, $h, $cb) = @_;
129 152
130 $class->_new (width => $w, height => $h, rendercb => $cb) 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]
131} 158}
132 159
133sub upload { 160sub upload {
134 my ($self) = @_; 161 my ($self) = @_;
135 162
… …
137 164
138 my $data; 165 my $data;
139 166
140 if (exists $self->{data}) { 167 if (exists $self->{data}) {
141 $data = $self->{data}; 168 $data = $self->{data};
169
142 } elsif (exists $self->{rendercb}) { 170 } elsif (exists $self->{render_cb}) {
143 glViewport 0, 0, $self->{width}, $self->{height}; 171 glViewport 0, 0, $self->{w}, $self->{h};
172 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
144 glMatrixMode GL_PROJECTION; 173 glMatrixMode GL_PROJECTION;
145 glLoadIdentity; 174 glLoadIdentity;
146 glOrtho 0, $self->{width}, $self->{height}, 0, -100, 100;
147 glMatrixMode GL_MODELVIEW; 175 glMatrixMode GL_MODELVIEW;
148 glPushmatrix;
149 glLoadIdentity; 176 glLoadIdentity;
150 glClear GL_COLOR_BUFFER_BIT; 177 glClear GL_COLOR_BUFFER_BIT;
151
152 $self->{rendercb}->($self, $self->{width}, $self->{height}); 178 $self->{render_cb}->($self, $self->{w}, $self->{h});
179
153 } else { 180 } else {
154 my $pb = new Gtk2::Gdk::PixbufLoader; 181 my $pb = new Gtk2::Gdk::PixbufLoader;
155 $pb->write ($self->{image}); 182 $pb->write ($self->{image});
156 $pb->close; 183 $pb->close;
157 184
158 $pb = $pb->get_pixbuf; 185 $pb = $pb->get_pixbuf;
159 $pb = $pb->add_alpha (0, 0, 0, 0); 186 $pb = $pb->add_alpha (0, 0, 0, 0);
160 187
161 $self->{width} = $pb->get_width; 188 $self->{w} = $pb->get_width;
162 $self->{height} = $pb->get_height; 189 $self->{h} = $pb->get_height;
163 190
164 $data = $pb->get_pixels; 191 $data = $pb->get_pixels;
165 } 192 }
166 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
167 ($self->{name}) = @{glGenTextures 1}; 217 $self->{name} ||= (glGenTextures 1)->[0];
168 218
169 glBindTexture GL_TEXTURE_2D, $self->{name}; 219 glBindTexture GL_TEXTURE_2D, $self->{name};
170 220
171 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 221 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
172 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;
173 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 223 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
174 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 224 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
175 225
176 if (defined $data) { 226 if (defined $data) {
177 glTexImage2D GL_TEXTURE_2D, 0, 227 glTexImage2D GL_TEXTURE_2D, 0,
178 GL_RGBA8, 228 $self->{internalformat},
179 $self->{width}, $self->{height}, 229 $tw, $th, # need to pad texture first
180 0, 230 0,
181 GL_RGBA, 231 $self->{format},
182 GL_UNSIGNED_BYTE, 232 GL_UNSIGNED_BYTE,
183 $data; 233 $data;
234 glGetError and die;
184 } else { 235 } else {
185 warn "I{DTEDRAW TEX: $self->{width} $self->{height} \n";
186 warn "ERR: ". (glGetError). "\n";
187 my ($bd, $br) = (glGet (GL_DRAW_BUFFER), glGet (GL_READ_BUFFER));
188 warn "BUF:[$bd $br]\n";
189
190 glCopyTexImage2D GL_TEXTURE_2D, 0, 236 glCopyTexImage2D GL_TEXTURE_2D, 0,
191 GL_RGBA8, 237 $self->{internalformat},
192 0, 0, 238 0, 0,
193 $self->{width}, $self->{height}, 239 $tw, $th,
194 0; 240 0;
195 glPopmatrix; 241 glGetError and die;
196 warn "ERR: ". (glGetError). "\n";
197 sleep 1;
198 } 242 }
199} 243}
200 244
201sub DESTROY { 245sub DESTROY {
202 my ($self) = @_; 246 my ($self) = @_;
… …
204 return unless exists $self->{name}; 248 return unless exists $self->{name};
205 249
206 glDeleteTextures delete $self->{name}; 250 glDeleteTextures delete $self->{name};
207} 251}
208 252
209push @::GLINIT, sub { 253sub restore_state{
210 $_->upload 254 $_->upload
211 for grep $_, @textures; 255 for grep $_, @textures;
212}; 256};
213 257
2141; 2581;

Diff Legend

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