hedgewars: comparison hedgewars/uRender.pas

equal deleted inserted replaced

-:56d2f2d5aad8
+:4feced261c68
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 *)
 {$INCLUDE "options.inc"}
+{$IF GLunit = GL}{$DEFINE GLunit:=GL,GLext}{$ENDIF}
 unit uRender;
 interface
-uses SDLh, uTypes, GLunit, uConsts;
+uses SDLh, uTypes, GLunit, uConsts, uStore{$IFDEF GL2}, uMatrix{$ENDIF};
 procedure DrawSprite            (Sprite: TSprite; X, Y, Frame: LongInt);
 procedure DrawSprite            (Sprite: TSprite; X, Y, FrameX, FrameY: LongInt);
 procedure DrawSpriteFromRect    (Sprite: TSprite; r: TSDL_Rect; X, Y, Height, Position: LongInt); inline;
 procedure DrawSpriteClipped     (Sprite: TSprite; X, Y, TopY, RightX, BottomY, LeftX: LongInt);
 procedure Tint                  (r, g, b, a: Byte); inline;
 procedure Tint                  (c: Longword); inline;
 procedure untint(); inline;
 procedure setTintAdd            (f: boolean); inline;
 implementation
 uses uVariables;
 {$IFDEF USE_TOUCH_INTERFACE}
 const
 procedure DrawTextureFromRect(X, Y: LongInt; r: PSDL_Rect; SourceTexture: PTexture); inline;
 begin
 DrawTextureFromRectDir(X, Y, r^.w, r^.h, r, SourceTexture, 1)
 end;
 procedure DrawTextureFromRect(X, Y, W, H: LongInt; r: PSDL_Rect; SourceTexture: PTexture); inline;
 begin
 DrawTextureFromRectDir(X, Y, W, H, r, SourceTexture, 1)
 end;
 TextureBuffer[3].X:= _l;
 TextureBuffer[3].Y:= _b;
 glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
 glTexCoordPointer(2, GL_FLOAT, 0, @TextureBuffer[0]);
-glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
+glDrawArrays(GL_TRIANGLE_FAN, 0, High(VertexBuffer) - Low(VertexBuffer) + 1);
 end;
 procedure DrawTexture(X, Y: LongInt; Texture: PTexture); inline;
 begin
 DrawTexture(X, Y, Texture, 1.0);
 end;
 procedure DrawTexture(X, Y: LongInt; Texture: PTexture; Scale: GLfloat);
 begin
+{$IFDEF GL2}
+hglPushMatrix;
+hglTranslatef(X, Y, 0);
+hglScalef(Scale, Scale, 1);
+{$ELSE}
 glPushMatrix;
 glTranslatef(X, Y, 0);
 glScalef(Scale, Scale, 1);
+{$ENDIF}
 glBindTexture(GL_TEXTURE_2D, Texture^.id);
-glVertexPointer(2, GL_FLOAT, 0, @Texture^.vb);
+SetVertexPointer(@Texture^.vb, Length(Texture^.vb));
-glTexCoordPointer(2, GL_FLOAT, 0, @Texture^.tb);
+SetTexCoordPointer(@Texture^.tb, Length(Texture^.vb));
+{$IFDEF GL2}
+UpdateModelviewProjection;
 glDrawArrays(GL_TRIANGLE_FAN, 0, Length(Texture^.vb));
+hglPopMatrix;
-glPopMatrix
+{$ELSE}
+glDrawArrays(GL_TRIANGLE_FAN, 0, Length(Texture^.vb));
+glPopMatrix;
+{$ENDIF}
 end;
 procedure DrawTextureF(Texture: PTexture; Scale: GLfloat; X, Y, Frame, Dir, w, h: LongInt);
 begin
 DrawTextureRotatedF(Texture, Scale, 0, 0, X, Y, Frame, Dir, w, h, 0)
 if (abs(X) > W) and ((abs(X + dir * OffsetX) - W / 2) * cScaleFactor > cScreenWidth) then
 exit;
 if (abs(Y) > H) and ((abs(Y + OffsetY - (0.5 * cScreenHeight)) - W / 2) * cScaleFactor > cScreenHeight) then
 exit;
+{$IFDEF GL2}
+hglPushMatrix;
+hglTranslatef(X, Y, 0);
+{$ELSE}
 glPushMatrix;
 glTranslatef(X, Y, 0);
+{$ENDIF}
 if Dir = 0 then Dir:= 1;
+{$IFDEF GL2}
+hglRotatef(Angle, 0, 0, Dir);
+hglTranslatef(Dir*OffsetX, OffsetY, 0);
+hglScalef(Scale, Scale, 1);
+{$ELSE}
 glRotatef(Angle, 0, 0, Dir);
 glTranslatef(Dir*OffsetX, OffsetY, 0);
 glScalef(Scale, Scale, 1);
+{$ENDIF}
 // Any reason for this call? And why only in t direction, not s?
 //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 hw:= w div (2 div Dir);
 TextureBuffer[2].X:= fr;
 TextureBuffer[2].Y:= fb;
 TextureBuffer[3].X:= fl;
 TextureBuffer[3].Y:= fb;
-glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
+SetVertexPointer(@VertexBuffer[0], Length(VertexBuffer));
-glTexCoordPointer(2, GL_FLOAT, 0, @TextureBuffer[0]);
+SetTexCoordPointer(@TextureBuffer[0], Length(VertexBuffer));
+{$IFDEF GL2}
+UpdateModelviewProjection;
+{$ENDIF}
 glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
-glPopMatrix
+{$IFDEF GL2}
+hglPopMatrix;
+{$ELSE}
+glPopMatrix;
+{$ENDIF}
 end;
 procedure DrawSpriteRotated(Sprite: TSprite; X, Y, Dir: LongInt; Angle: real);
 begin
 DrawTextureRotated(SpritesData[Sprite].Texture,
 X, Y, Dir, Angle)
 end;
 procedure DrawSpriteRotatedF(Sprite: TSprite; X, Y, Frame, Dir: LongInt; Angle: real);
 begin
+{$IFDEF GL2}
+hglPushMatrix;
+hglTranslatef(X, Y, 0);
+{$ELSE}
 glPushMatrix;
 glTranslatef(X, Y, 0);
+{$ENDIF}
 if Dir < 0 then
+{$IFDEF GL2}
+hglRotatef(Angle, 0, 0, -1)
+{$ELSE}
 glRotatef(Angle, 0, 0, -1)
+{$ENDIF}
 else
+{$IFDEF GL2}
+hglRotatef(Angle, 0, 0,  1);
+{$ELSE}
 glRotatef(Angle, 0, 0,  1);
+{$ENDIF}
 if Dir < 0 then
+{$IFDEF GL2}
+hglScalef(-1.0, 1.0, 1.0);
+{$ELSE}
 glScalef(-1.0, 1.0, 1.0);
+{$ENDIF}
 DrawSprite(Sprite, -SpritesData[Sprite].Width div 2, -SpritesData[Sprite].Height div 2, Frame);
-glPopMatrix
+{$IFDEF GL2}
+hglPopMatrix;
+{$ELSE}
+glPopMatrix;
+{$ENDIF}
 end;
 procedure DrawTextureRotated(Texture: PTexture; hw, hh, X, Y, Dir: LongInt; Angle: real);
 var VertexBuffer: array [0..3] of TVertex2f;
 begin
 if (abs(X) > 2 * hw) and ((abs(X) - hw) > cScreenWidth / cScaleFactor) then
 exit;
 if (abs(Y) > 2 * hh) and ((abs(Y - 0.5 * cScreenHeight) - hh) > cScreenHeight / cScaleFactor) then
 exit;
+{$IFDEF GL2}
+hglPushMatrix;
+hglTranslatef(X, Y, 0);
+{$ELSE}
 glPushMatrix;
 glTranslatef(X, Y, 0);
+{$ENDIF}
 if Dir < 0 then
 begin
 hw:= - hw;
+{$IFDEF GL2}
+hglRotatef(Angle, 0, 0, -1);
+{$ELSE}
 glRotatef(Angle, 0, 0, -1);
+{$ENDIF}
 end
 else
-glRotatef(Angle, 0, 0,  1);
+{$IFDEF GL2}
+hglRotatef(Angle, 0, 0,  1);
+{$ELSE}
+glRotatef(Angle, 0, 0, 1);
+{$ENDIF}
 glBindTexture(GL_TEXTURE_2D, Texture^.id);
 VertexBuffer[0].X:= -hw;
 VertexBuffer[0].Y:= -hh;
 VertexBuffer[2].X:= hw;
 VertexBuffer[2].Y:= hh;
 VertexBuffer[3].X:= -hw;
 VertexBuffer[3].Y:= hh;
-glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
+SetVertexPointer(@VertexBuffer[0], Length(VertexBuffer));
-glTexCoordPointer(2, GL_FLOAT, 0, @Texture^.tb);
+SetTexCoordPointer(@Texture^.tb, Length(VertexBuffer));
+{$IFDEF GL2}
+UpdateModelviewProjection;
+{$ENDIF}
 glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
-glPopMatrix
+{$IFDEF GL2}
+hglPopMatrix;
+{$ELSE}
+glPopMatrix;
+{$ENDIF}
 end;
 procedure DrawSprite(Sprite: TSprite; X, Y, Frame: LongInt);
 var row, col, numFramesFirstCol: LongInt;
 begin
 if (Y + SpritesData[Sprite].Height > BottomY) then
 r.h:= BottomY - Y + 1;
 if (X + SpritesData[Sprite].Width > RightX) then
 r.w:= RightX - X + 1;
 if (r.h < r.y) or (r.w < r.x) then
 exit;
 dec(r.h, r.y);
 dec(r.w, r.x);
 end;
 procedure DrawLine(X0, Y0, X1, Y1, Width: Single; r, g, b, a: Byte);
 var VertexBuffer: array [0..1] of TVertex2f;
 begin
+glEnable(GL_LINE_SMOOTH);
+{$IFNDEF GL2}
 glDisable(GL_TEXTURE_2D);
-glEnable(GL_LINE_SMOOTH);
 glPushMatrix;
 glTranslatef(WorldDx, WorldDy, 0);
 glLineWidth(Width);
 VertexBuffer[0].X:= X0;
 VertexBuffer[0].Y:= Y0;
 VertexBuffer[1].X:= X1;
 VertexBuffer[1].Y:= Y1;
-glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
+SetVertexPointer(@VertexBuffer[0], Length(VertexBuffer));
 glDrawArrays(GL_LINES, 0, Length(VertexBuffer));
 untint;
 glPopMatrix;
 glEnable(GL_TEXTURE_2D);
+{$ELSE}
+EnableTexture(False);
+hglPushMatrix;
+hglTranslatef(WorldDx, WorldDy, 0);
+glLineWidth(Width);
+UpdateModelviewProjection;
+Tint(r, g, b, a);
+VertexBuffer[0].X:= X0;
+VertexBuffer[0].Y:= Y0;
+VertexBuffer[1].X:= X1;
+VertexBuffer[1].Y:= Y1;
+SetVertexPointer(@VertexBuffer[0], Length(VertexBuffer));
+glDrawArrays(GL_LINES, 0, Length(VertexBuffer));
+Tint($FF, $FF, $FF, $FF);
+hglPopMatrix;
+EnableTexture(True);
+{$ENDIF}
 glDisable(GL_LINE_SMOOTH);
 end;
 procedure DrawFillRect(r: TSDL_Rect);
 var VertexBuffer: array [0..3] of TVertex2f;
 begin
 // do not draw anything outside the visible screen space (first check fixes some sprite drawing, e.g. hedgehogs)
 if (abs(r.x) > r.w) and ((abs(r.x + r.w / 2) - r.w / 2) * cScaleFactor > cScreenWidth) then
 exit;
 if (abs(r.y) > r.h) and ((abs(r.y + r.h / 2 - (0.5 * cScreenHeight)) - r.h / 2) * cScaleFactor > cScreenHeight) then
 exit;
+{$IFDEF GL2}
+EnableTexture(False);
+{$ELSE}
 glDisable(GL_TEXTURE_2D);
+{$ENDIF}
 Tint($00, $00, $00, $80);
 VertexBuffer[0].X:= r.x;
 VertexBuffer[0].Y:= r.y;
 VertexBuffer[2].X:= r.x + r.w;
 VertexBuffer[2].Y:= r.y + r.h;
 VertexBuffer[3].X:= r.x;
 VertexBuffer[3].Y:= r.y + r.h;
-glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
+SetVertexPointer(@VertexBuffer[0], Length(VertexBuffer));
 glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
 untint;
+{$IFDEF GL2}
+EnableTexture(True);
+{$ELSE}
 glEnable(GL_TEXTURE_2D)
-end;
+{$ENDIF}
-procedure DrawCircle(X, Y, Radius, Width: LongInt; r, g, b, a: Byte);
+end;
+procedure DrawCircle(X, Y, Radius, Width: LongInt; r, g, b, a: Byte);
 begin
 Tint(r, g, b, a);
 DrawCircle(X, Y, Radius, Width);
 untint;
 end;
 procedure DrawCircle(X, Y, Radius, Width: LongInt);
 var
 i: LongInt;
 CircleVertex: array [0..59] of TVertex2f;
 begin
 for i := 0 to 59 do begin
 CircleVertex[i].X := X + Radius*cos(i*pi/30);
 CircleVertex[i].Y := Y + Radius*sin(i*pi/30);
 end;
+{$IFNDEF GL2}
 glDisable(GL_TEXTURE_2D);
 glEnable(GL_LINE_SMOOTH);
 glPushMatrix;
 glLineWidth(Width);
 glVertexPointer(2, GL_FLOAT, 0, @CircleVertex[0]);
 glDrawArrays(GL_LINE_LOOP, 0, 60);
 glPopMatrix;
 glEnable(GL_TEXTURE_2D);
 glDisable(GL_LINE_SMOOTH);
+{$ELSE}
+EnableTexture(False);
+glEnable(GL_LINE_SMOOTH);
+hglPushMatrix;
+glLineWidth(Width);
+SetVertexPointer(@CircleVertex[0], 60);
+glDrawArrays(GL_LINE_LOOP, 0, 60);
+hglPopMatrix;
+EnableTexture(True);
+glDisable(GL_LINE_SMOOTH);
+{$ENDIF}
 end;
 procedure DrawHedgehog(X, Y: LongInt; Dir: LongInt; Pos, Step: LongWord; Angle: real);
 const VertexBuffer: array [0..3] of TVertex2f = (
 begin
 l:= Step * 32 / HHTexture^.w;
 r:= (Step + 1) * 32 / HHTexture^.w
 end;
+{$IFDEF GL2}
+hglPushMatrix();
+hglTranslatef(X, Y, 0);
+hglRotatef(Angle, 0, 0, 1);
+{$ELSE}
 glPushMatrix();
 glTranslatef(X, Y, 0);
 glRotatef(Angle, 0, 0, 1);
+{$ENDIF}
 glBindTexture(GL_TEXTURE_2D, HHTexture^.id);
 TextureBuffer[0].X:= l;
 TextureBuffer[0].Y:= t;
 TextureBuffer[2].X:= r;
 TextureBuffer[2].Y:= b;
 TextureBuffer[3].X:= l;
 TextureBuffer[3].Y:= b;
-glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
+SetVertexPointer(@VertexBuffer[0], Length(VertexBuffer));
-glTexCoordPointer(2, GL_FLOAT, 0, @TextureBuffer[0]);
+SetTexCoordPointer(@TextureBuffer[0], Length(VertexBuffer));
+{$IFDEF GL2}
+UpdateModelviewProjection;
+{$ENDIF}
 glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
-glPopMatrix
+{$IFDEF GL2}
+hglPopMatrix;
+{$ELSE}
+glPopMatrix;
+{$ENDIF}
 end;
 procedure DrawScreenWidget(widget: POnScreenWidget);
 {$IFDEF USE_TOUCH_INTERFACE}
 var alpha: byte = $FF;
 if (fadeAnimStart <> 0) then
 begin
 if RealTicks > (fadeAnimStart + FADE_ANIM_TIME) then
 fadeAnimStart:= 0
 else
 if show then
 alpha:= Byte(trunc((RealTicks - fadeAnimStart)/FADE_ANIM_TIME * $FF))
 else
 alpha:= Byte($FF - trunc((RealTicks - fadeAnimStart)/FADE_ANIM_TIME * $FF));
 end;
 with moveAnim do
 if animate then
 widget:= widget; // avoid hint
 {$ENDIF}
 end;
 procedure Tint(r, g, b, a: Byte); inline;
-var nc, tw: Longword;
+var
+nc, tw: Longword;
+{$IFDEF GL2}
+scale:Real = 1.0/255.0;
+{$ENDIF}
 begin
 nc:= (r shl 24) or (g shl 16) or (b shl 8) or a;
 if nc = lastTint then
 exit;
 r:= tw;
 g:= tw;
 b:= tw
 end;
+{$IFDEF GL2}
+glUniform4f(uMainTintLocation, r*scale, g*scale, b*scale, a*scale);
+//glColor4ub(r, g, b, a);
+{$ELSE}
 glColor4ub(r, g, b, a);
+{$ENDIF}
 lastTint:= nc;
 end;
 procedure Tint(c: Longword); inline;
 begin

changeset 10015	4feced261c68
parent 9998	736015b847e3
parent 9950	2759212a27de
child 10040	4ac87acbaed9