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.11 by elmex, Sat Apr 8 18:18:09 2006 UTC

… …
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 "Crossfire::Client", $VERSION;
22}
23
24sub find_rcfile($) {
25 my $path;
26
27 for (@INC) {
28 $path = "$_/Crossfire/resources/$_[0]";
29 return $path if -r $path;
30 }
31
32 die "FATAL: can't find required file $_[0]\n";
33}
34
35sub read_cfg {
36 my ($file) = @_;
37
38 open CFG, $file
39 or return;
40
41 my $CFG;
42
43 local $/;
44 $CFG = eval <CFG>;
45
46 $::CFG = $CFG;
47
48 close CFG;
49}
50
51sub write_cfg {
52 my ($file) = @_;
53
54 open CFG, ">$file"
55 or return;
56
57 {
58 require Data::Dumper;
59 local $Data::Dumper::Purity = 1;
60 $::CFG->{VERSION} = $::VERSION;
61 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
62 }
63
64 close CFG;
22} 65}
23 66
24package Crossfire::Client::Texture; 67package Crossfire::Client::Texture;
25 68
26use Scalar::Util; 69use Scalar::Util;
… …
68 width => $surface->width, 111 width => $surface->width,
69 height => $surface->height, 112 height => $surface->height,
70 ) 113 )
71} 114}
72 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}
126
127sub new_from_opengl {
128 my ($class, $w, $h, $cb) = @_;
129
130 $class->_new (width => $w, height => $h, rendercb => $cb)
131}
132
73sub upload { 133sub upload {
74 my ($self) = @_; 134 my ($self) = @_;
75 135
76 return unless $SDL::App::USING_OPENGL; 136 return unless $SDL::App::USING_OPENGL;
77 137
78 my ($data, $width, $height); 138 my $data;
79 139
80 if (exists $self->{data}) { 140 if (exists $self->{data}) {
81 ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); 141 $data = $self->{data};
142 } elsif (exists $self->{rendercb}) {
143 glViewport 0, 0, $self->{width}, $self->{height};
144 glClear GL_COLOR_BUFFER_BIT;
145
146 $self->{rendercb}->($self, $self->{width}, $self->{height});
82 } else { 147 } else {
83 my $pb = new Gtk2::Gdk::PixbufLoader; 148 my $pb = new Gtk2::Gdk::PixbufLoader;
84 $pb->write ($self->{image}); 149 $pb->write ($self->{image});
85 $pb->close; 150 $pb->close;
86 151
87 $pb = $pb->get_pixbuf; 152 $pb = $pb->get_pixbuf;
88 $pb = $pb->add_alpha (0, 0, 0, 0); 153 $pb = $pb->add_alpha (0, 0, 0, 0);
89 154
90 ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height); 155 $self->{width} = $pb->get_width;
156 $self->{height} = $pb->get_height;
157
158 $data = $pb->get_pixels;
91 } 159 }
92 160
93 ($self->{name}) = @{glGenTextures 1}; 161 ($self->{name}) = @{glGenTextures 1};
94 162
95 glBindTexture GL_TEXTURE_2D, $self->{name}; 163 glBindTexture GL_TEXTURE_2D, $self->{name};
… …
97 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 165 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
98 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 166 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
99 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 167 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
100 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 168 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
101 169
170 if (defined $data) {
102 glTexImage2D GL_TEXTURE_2D, 0, 171 glTexImage2D GL_TEXTURE_2D, 0,
103 GL_RGBA8, 172 GL_RGBA8,
104 $width, $height, 173 $self->{width}, $self->{height},
105 0, 174 0,
106 GL_RGBA, 175 GL_RGBA,
107 GL_UNSIGNED_BYTE, 176 GL_UNSIGNED_BYTE,
108 $data; 177 $data;
178 } else {
179 warn "I{DTEDRAW TEX: $self->{width} $self->{height} \n";
180 warn "ERR: ". (glGetError). "\n";
181 my ($bd, $br) = (glGet (GL_DRAW_BUFFER), glGet (GL_READ_BUFFER));
182 warn "BUF:[$bd $br]\n";
183
184 glCopyTexImage2D GL_TEXTURE_2D, 0,
185 GL_RGBA8,
186 0, 0,
187 $self->{width}, $self->{height},
188 0;
189 warn "ERR: ". (glGetError). "\n";
190 }
109} 191}
110 192
111sub DESTROY { 193sub DESTROY {
112 my ($self) = @_; 194 my ($self) = @_;
113 195

Diff Legend

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