ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.5 by root, Wed Apr 19 23:43:07 2006 UTC vs.
Revision 1.7 by root, Thu Apr 20 21:28:50 2006 UTC

… …
106 GL_CONVOLUTION_2D, 106 GL_CONVOLUTION_2D,
107 GL_ALPHA, 107 GL_ALPHA,
108 3, 3, 108 3, 3,
109 GL_ALPHA, GL_FLOAT, 109 GL_ALPHA, GL_FLOAT,
110 pack "f*", 110 pack "f*",
111 0.1, 0.1, 0.1, 111 0.05, 0.13, 0.05,
112 0.1, 0.2, 0.1, 112 0.13, 0.30, 0.13,
113 0.1, 0.1, 0.1, 113 0.05, 0.13, 0.05,
114 ); 114 );
115 glEnable GL_CONVOLUTION_2D; 115 glEnable GL_CONVOLUTION_2D;
116 } 116 }
117 117
118 $self->{fow_texture} = new CFClient::Texture 118 $self->{fow_texture} = new CFClient::Texture
… …
127 glEnable GL_BLEND; 127 glEnable GL_BLEND;
128 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 128 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
129 glEnable GL_TEXTURE_2D; 129 glEnable GL_TEXTURE_2D;
130 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 130 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
131 131
132 glColor +($::CFG->{fow_intensity}) x 3, 1; 132 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
133 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 133 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
134 134
135 glDisable GL_TEXTURE_2D; 135 glDisable GL_TEXTURE_2D;
136 glDisable GL_BLEND; 136 glDisable GL_BLEND;
137 } 137 }
138 138
139 # HACK BEGIN 139 # HACK BEGIN
140 { 140 {
141 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove 141 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
142
143 glTranslate 0, 30;
142 my ($w, $h) = (250, 250); 144 my ($w, $h) = (250, 250);
145
146 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
143 147
144 glEnable GL_BLEND; 148 glEnable GL_BLEND;
145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 149 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
146 glEnable GL_TEXTURE_2D; 150 glEnable GL_TEXTURE_2D;
147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
148 152
149 $self->{mapmap_texture} = 153 $self->{mapmap_texture} =
150 new CFClient::Texture 154 new CFClient::Texture
151 w => $w, 155 w => $w,
152 h => $h, 156 h => $h,
153 data => $::MAP->mapmap ($w, $h), 157 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
154 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 158 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
155 159
156 $self->{mapmap_texture}->draw_quad (100, 100); 160 $self->{mapmap_texture}->draw_quad (0, 0);
157 161
158 glDisable GL_TEXTURE_2D; 162 glDisable GL_TEXTURE_2D;
163
164 glTranslate 0.375, 0.375;
165
166 glColor 1, 1, 0, 1;
167 glBegin GL_LINE_LOOP;
168 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
169 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
170 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
171 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
172 glEnd;
173
159 glDisable GL_BLEND; 174 glDisable GL_BLEND;
160 } 175 }
161 # HACK END 176 # HACK END
162 } 177 }
163 178

Diff Legend

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