hedgewars-draft: comparison hedgewars/uWorld.pas

equal deleted inserted replaced

-:56d2f2d5aad8
+:4feced261c68
 , uCommands
 , uTeams
 {$IFDEF USE_VIDEO_RECORDING}
 , uVideoRec
 {$ENDIF}
+{$IFDEF GL2}
+, uMatrix
+{$ENDIF}
 ;
 var cWaveWidth, cWaveHeight: LongInt;
 AMShiftTargetX, AMShiftTargetY, AMShiftX, AMShiftY, SlotsNum: LongInt;
 AMAnimStartTime, AMState : LongInt;
 AmmoRect.w:= (BORDERSIZE*2) + (SlotsNumX * AMSlotSize) + (SlotsNumX-1);
 AmmoRect.h:= (BORDERSIZE*2) + (SlotsNumY * AMSlotSize) + (SlotsNumY-1);
 amSurface := SDL_CreateRGBSurface(SDL_SWSURFACE, AmmoRect.w, AmmoRect.h, 32, RMask, GMask, BMask, AMask);
 AMRect.x:= BORDERSIZE;
 AMRect.y:= BORDERSIZE;
 AMRect.w:= AmmoRect.w - (BORDERSIZE*2);
 AMRect.h:= AmmoRect.h - (BORDERSIZE*2);
 SDL_FillRect(amSurface, @AMRect, SDL_MapRGB(amSurface^.format, 0,0,0));
 x:= AMRect.x;
 y:= AMRect.y;
 for i:= 0 to cMaxSlotIndex do
 if ((i = 0) and (Ammo^[i, 1].Count > 0)) or ((i <> 0) and (Ammo^[i, 0].Count > 0)) then
 begin
 begin
 STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
 AMFrame:= LongInt(Ammo^[i,t].AmmoType) - 1;
 if STurns >= 0 then //weapon not usable yet, draw grayed out with turns remaining
 begin
 DrawSpriteFrame2Surf(sprAMAmmosBW, amSurface, x + AMSlotPadding,
 y + AMSlotPadding, AMFrame);
 if STurns < 100 then
 DrawSpriteFrame2Surf(sprTurnsLeft, amSurface,
 x + AMSlotSize-16,
 y + AMSlotSize + 1 - 16, STurns);
 end
 else //draw colored version
 begin
 DrawSpriteFrame2Surf(sprAMAmmos, amSurface, x + AMSlotPadding,
 y + AMSlotPadding, AMFrame);
 end;
 {$IFDEF USE_LANDSCAPE_AMMOMENU}
-	    inc(y, AMSlotSize + 1); //the plus one is for the border
+inc(y, AMSlotSize + 1); //the plus one is for the border
 {$ELSE}
-	    inc(x, AMSlotSize + 1);
+inc(x, AMSlotSize + 1);
 {$ENDIF}
-	    end;
+end;
-	end;
+end;
 {$IFDEF USE_LANDSCAPE_AMMOMENU}
 inc(x, AMSlotSize + 1);
 {$ELSE}
 inc(y, AMSlotSize + 1);
 {$ENDIF}
 end;
 for i:= 1 to SlotsNumX -1 do
 DrawLine2Surf(amSurface, i * (AMSlotSize+1)+1, BORDERSIZE, i * (AMSlotSize+1)+1, AMRect.h + BORDERSIZE - AMSlotSize - 2,160,160,160);
 for i:= 1 to SlotsNumY -1 do
 DrawLine2Surf(amSurface, BORDERSIZE, i * (AMSlotSize+1)+1, AMRect.w + BORDERSIZE, i * (AMSlotSize+1)+1,160,160,160);
 //draw outer border
 DrawSpriteFrame2Surf(sprAMCorners, amSurface, 0                    , 0                    , 0);
 bShowAmmoMenu:= false;
 AMState:= AMHidden;
 exit
 end;
 //Init the menu
 if(AmmoMenuInvalidated) then
 begin
 AmmoMenuInvalidated:= false;
 FreeTexture(AmmoMenuTex);
 AmmoMenuTex:= GetAmmoMenuTexture(Ammo);
 else
 if AMAnimState < 1 then
 begin
 AMShiftX:= Round(AMShiftTargetX * (1 - AMAnimState));
 AMShiftY:= Round(AMShiftTargetY * (1 - AMAnimState));
 if (AMAnimType and AMTypeMaskAlpha) <> 0 then
 Tint($FF, $ff, $ff, Round($ff * AMAnimState));
 end
 else
 begin
 AMShiftX:= 0;
 else
 if AMAnimState < 1 then
 begin
 AMShiftX:= Round(AMShiftTargetX * AMAnimState);
 AMShiftY:= Round(AMShiftTargetY * AMAnimState);
 if (AMAnimType and AMTypeMaskAlpha) <> 0 then
 Tint($FF, $ff, $ff, Round($ff * (1-AMAnimState)));
 end
 else
 begin
 AMShiftX:= AMShiftTargetX;
 AMShiftY:= AMShiftTargetY;
 prevPoint:= CursorPoint;
 //prevTargetPoint:= TargetCursorPoint;
 AMState:= AMHidden;
 end;
 end;
 DrawTexture(AmmoRect.x + AMShiftX, AmmoRect.y + AMShiftY, AmmoMenuTex);
 if ((AMState = AMHiding) or (AMState = AMShowingUp)) and ((AMAnimType and AMTypeMaskAlpha) <> 0 )then
 Tint($FF, $ff, $ff, $ff);
 Pos:= -1;
 Slot:= -1;
 {$IFDEF USE_LANDSCAPE_AMMOMENU}
 for t:=0 to cMaxSlotAmmoIndex do
 if (Ammo^[i, t].Count > 0) and (Ammo^[i, t].AmmoType <> amNothing) then
 begin
 if (CursorPoint.Y <= (cScreenHeight - AmmoRect.y) - ( g    * (AMSlotSize+1))) and
 (CursorPoint.Y >  (cScreenHeight - AmmoRect.y) - ((g+1) * (AMSlotSize+1))) and
 (CursorPoint.X >  AmmoRect.x                   + ( c    * (AMSlotSize+1))) and
 (CursorPoint.X <= AmmoRect.x                   + ((c+1) * (AMSlotSize+1))) then
 begin
 Slot:= i;
 Pos:= t;
 STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
 if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then
 DrawSprite(sprAMSlot,
 AmmoRect.x + BORDERSIZE + (c * (AMSlotSize+1)) + AMSlotPadding,
 AmmoRect.y + BORDERSIZE + (g  * (AMSlotSize+1)) + AMSlotPadding -1, 0);
 end;
 inc(g);
 end;
 end;
 for t:=0 to cMaxSlotAmmoIndex do
 if (Ammo^[i, t].Count > 0) and (Ammo^[i, t].AmmoType <> amNothing) then
 begin
 if (CursorPoint.Y <= (cScreenHeight - AmmoRect.y) - ( c    * (AMSlotSize+1))) and
 (CursorPoint.Y >  (cScreenHeight - AmmoRect.y) - ((c+1) * (AMSlotSize+1))) and
 (CursorPoint.X >  AmmoRect.x                   + ( g    * (AMSlotSize+1))) and
 (CursorPoint.X <= AmmoRect.x                   + ((g+1) * (AMSlotSize+1))) then
 begin
 Slot:= i;
 Pos:= t;
 STurns:= Ammoz[Ammo^[i, t].AmmoType].SkipTurns - CurrentTeam^.Clan^.TurnNumber;
 if (STurns < 0) and (AMShiftX = 0) and (AMShiftY = 0) then
 DrawSprite(sprAMSlot,
 AmmoRect.x + BORDERSIZE + (g * (AMSlotSize+1)) + AMSlotPadding,
 AmmoRect.y + BORDERSIZE + (c  * (AMSlotSize+1)) + AMSlotPadding -1, 0);
 end;
 inc(g);
 end;
 end;
 bSelected:= false;
 FreeWeaponTooltip;
 {$IFDEF USE_TOUCH_INTERFACE}//show the aiming buttons + animation
 if (Ammo^[Slot, Pos].Propz and ammoprop_NeedUpDown) <> 0 then
 begin
-if not(arrowUp.show) then
+if (not arrowUp.show) then
 begin
 animateWidget(@arrowUp, true, true);
 animateWidget(@arrowDown, true, true);
 end;
 end
 else
 FreeWeaponTooltip;
 if (WeaponTooltipTex <> nil) and (AMShiftX = 0) and (AMShiftY = 0) then
 {$IFDEF USE_LANDSCAPE_AMMOMENU}
-if not isPhone() then
+if (not isPhone()) then
 ShowWeaponTooltip(-WeaponTooltipTex^.w div 2, AmmoRect.y - WeaponTooltipTex^.h - AMSlotSize);
 {$ELSE}
 ShowWeaponTooltip(AmmoRect.x - WeaponTooltipTex^.w - 3, Min(AmmoRect.y + 1, cScreenHeight - WeaponTooltipTex^.h - 40));
 {$ENDIF}
 DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8);
 {$ENDIF}
 end;
 procedure DrawWater(Alpha: byte; OffsetY: LongInt);
-var VertexBuffer: array [0..3] of TVertex2f;
+var VertexBuffer : array [0..3] of TVertex2f;
-r: TSDL_Rect;
+r        : TSDL_Rect;
-lw, lh: GLfloat;
+lw, lh   : GLfloat;
 begin
 if SuddenDeathDmg then
 begin
 SDWaterColorArray[0].a := Alpha;
 SDWaterColorArray[1].a := Alpha;
 VertexBuffer[2].X:= lw;
 VertexBuffer[2].Y:= lh;
 VertexBuffer[3].X:= -lw;
 VertexBuffer[3].Y:= lh;
+{$IFNDEF GL2}
 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 glEnableClientState(GL_COLOR_ARRAY);
 if SuddenDeathDmg then
 glColorPointer(4, GL_UNSIGNED_BYTE, 0, @SDWaterColorArray[0])
 else
 glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
 glDisableClientState(GL_COLOR_ARRAY);
 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-glColor4ub($FF, $FF, $FF, $FF); // must not be Tint() as color array seems to stay active and color reset is required
+{$ELSE}
+UpdateModelviewProjection;
+BeginWater;
+if SuddenDeathDmg then
+SetColorPointer(@SDWaterColorArray[0], 4)
+else
+SetColorPointer(@WaterColorArray[0], 4);
+SetVertexPointer(@VertexBuffer[0], 4);
+glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+EndWater;
+{$ENDIF}
+{$IFNDEF GL2}
+// must not be Tint() as color array seems to stay active and color reset is required
+glColor4ub($FF, $FF, $FF, $FF);
+{$ENDIF}
 glEnable(GL_TEXTURE_2D);
 end;
 end;
 procedure DrawWaves(Dir, dX, dY: LongInt; tnt: Byte);
 TextureBuffer[2].Y:= SpritesData[sprite].Texture^.ry;
 TextureBuffer[3].X:= TextureBuffer[0].X;
 TextureBuffer[3].Y:= TextureBuffer[2].Y;
-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));
 untint;
 {for i:= -1 to cWaterSprCount do
 if rm = rmDefault then
 exit
 else if rm = rmLeftEye then
 d:= -d;
 stereoDepth:= stereoDepth + d;
+{$IFDEF GL2}
+hglMatrixMode(MATRIX_PROJECTION);
+hglTranslatef(d, 0, 0);
+hglMatrixMode(MATRIX_MODELVIEW);
+{$ELSE}
 glMatrixMode(GL_PROJECTION);
 glTranslatef(d, 0, 0);
 glMatrixMode(GL_MODELVIEW);
 {$ENDIF}
-end;
+{$ENDIF}
+end;
 procedure ResetDepth(rm: TRenderMode);
 begin
 {$IFNDEF USE_S3D_RENDERING}
 rm:= rm; // avoid hint
 exit;
 {$ELSE}
 if rm = rmDefault then
 exit;
+{$IFDEF GL2}
+hglMatrixMode(MATRIX_PROJECTION);
+hglTranslatef(-stereoDepth, 0, 0);
+hglMatrixMode(MATRIX_MODELVIEW);
+{$ELSE}
 glMatrixMode(GL_PROJECTION);
 glTranslatef(-stereoDepth, 0, 0);
 glMatrixMode(GL_MODELVIEW);
-stereoDepth:= 0;
+{$ENDIF}
-{$ENDIF}
+cStereoDepth:= 0;
-end;
+{$ENDIF}
+end;
 procedure RenderWorldEdge(Lag: Longword);
 var
 VertexBuffer: array [0..3] of TVertex2f;
 c1, c2: LongWord; // couple of colours for edges
 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 glColor4ub($FF, $FF, $FF, $FF); // must not be Tint() as color array seems to stay active and color reset is required
 glEnable(GL_TEXTURE_2D);
 // I'd still like to have things happen to the border when a wrap or bounce just occurred, based on a timer
 if WorldEdge = weBounce then
 begin
 // could maybe alternate order of these on a bounce, or maybe drop the outer ones.
 if LeftImpactTimer mod 2 = 0 then
 begin
 h:= 0;
 if not hasGone then
 for i:= 0 to cMaxHHIndex do
 begin
 inc(h, Hedgehogs[i].HealthBarHealth);
 if (h < TeamHealthBarHealth) and (Hedgehogs[i].HealthBarHealth > 0) then
 DrawTexture(15 + h * TeamHealthBarWidth div TeamHealthBarHealth, cScreenHeight + DrawHealthY + smallScreenOffset + 1, SpritesData[sprSlider].Texture);
 end;
 // draw ai kill counter for gfAISurvival
 if (GameFlags and gfAISurvival) <> 0 then
 DrawVisualGears(4);
 if (cReducedQuality and rq2DWater) = 0 then
 begin
 // Waves
 DrawWater(255, SkyOffset);
 ChangeDepth(RM, -cStereo_Water_distant);
 DrawWaves( 1,  0 - WorldDx div 32, - cWaveHeight + offsetY div 35, 64);
 ChangeDepth(RM, -cStereo_Water_distant);
 DrawWaves( -1,  25 + WorldDx div 25, - cWaveHeight + offsetY div 38, 48);
 ChangeDepth(RM, -cStereo_Water_distant);
 changeDepth(RM, cStereo_Land);
 DrawVisualGears(5);
 DrawLand(WorldDx, WorldDy);
 DrawWater(255, 0);
+(*
+// Attack bar
+if CurrentTeam <> nil then
+case AttackBar of
+//1: begin
+//r:= StuffPoz[sPowerBar];
+//{$WARNINGS OFF}
+//r.w:= (CurrentHedgehog^.Gear^.Power * 256) div cPowerDivisor;
+//{$WARNINGS ON}
+//DrawSpriteFromRect(r, cScreenWidth - 272, cScreenHeight - 48, 16, 0, Surface);
+//end;
+2: with CurrentHedgehog^ do
+begin
+tdx:= hwSign(Gear^.dX) * Sin(Gear^.Angle * Pi / cMaxAngle);
+tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle);
+for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do
+DrawSprite(sprPower,
+hwRound(Gear^.X) + GetLaunchX(CurAmmoType, hwSign(Gear^.dX), Gear^.Angle) + LongInt(round(WorldDx + tdx * (24 + i * 2))) - 16,
+hwRound(Gear^.Y) + GetLaunchY(CurAmmoType, Gear^.Angle) + LongInt(round(WorldDy + tdy * (24 + i * 2))) - 16,
+i)
+end
+end;
+*)
 DrawVisualGears(1);
 DrawGears;
 DrawVisualGears(6);
 begin
 if ReadyTimeLeft <> 0 then
 i:= Succ(Pred(ReadyTimeLeft) div 1000)
 else
 i:= Succ(Pred(TurnTimeLeft) div 1000);
 if i>99 then
 t:= 112
 else if i>9 then
 t:= 96
 else
 AMAnimStartTime:= RealTicks
 else
 AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime));
 AMState:= AMShowingUp;
 end;
-if not(bShowAmmoMenu) and ((AMstate = AMShowing) or (AMState = AMShowingUp)) then
+if (not bShowAmmoMenu) and ((AMstate = AMShowing) or (AMState = AMShowingUp)) then
 begin
 if (AMState = AMShowing) then
 AMAnimStartTime:= RealTicks
 else
 AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime));
 AMState:= AMHiding;
 end;
 if bShowAmmoMenu or (AMState = AMHiding) then
 ShowAmmoMenu;
 // Cursor
 if isCursorVisible and bShowAmmoMenu then
 DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8);
 // Chat
 DrawChat;
 // various captions
 if fastUntilLag then
 DrawTextureCentered(0, (cScreenHeight shr 1), SyncTexture);
 if isPaused then
 t:= i mod 60;
 s:= inttostr(t) + ':' + s;
 if t < 10 then
 s:= '0' + s;
 s:= inttostr(i div 60) + ':' + s;
 tmpSurface:= TTF_RenderUTF8_Blended(Fontz[fnt16].Handle, Str2PChar(s), cWhiteColorChannels);
 tmpSurface:= doSurfaceConversion(tmpSurface);
 FreeTexture(timeTexture);
 timeTexture:= Surface2Tex(tmpSurface, false);
 SDL_FreeSurface(tmpSurface)
 if GameState = gsConfirm then
 DrawTextureCentered(0, (cScreenHeight shr 1)-40, ConfirmTexture);
 if ScreenFade <> sfNone then
 begin
-if not isFirstFrame then
+if (not isFirstFrame) then
 case ScreenFade of
 sfToBlack, sfToWhite:     if ScreenFadeValue + Lag * ScreenFadeSpeed < sfMax then
 inc(ScreenFadeValue, Lag * ScreenFadeSpeed)
 else
 ScreenFadeValue:= sfMax;
 VertexBuffer[3].Y:= cScreenHeight;
 glDisable(GL_TEXTURE_2D);
 glVertexPointer(2, GL_FLOAT, 0, @VertexBuffer[0]);
-glDrawArrays(GL_TRIANGLE_FAN, 0, Length(VertexBuffer));
+glDrawArrays(GL_TRIANGLE_FAN, 0, High(VertexBuffer) - Low(VertexBuffer) + 1);
 glEnable(GL_TEXTURE_2D);
 untint;
 if not isFirstFrame and ((ScreenFadeValue = 0) or (ScreenFadeValue = sfMax)) then
 ScreenFade:= sfNone
 SDL_FreeSurface(tmpSurface)
 end;
 DrawTexture( -(cScreenWidth shr 1) + 50, 20, recTexture);
 // draw red circle
 glDisable(GL_TEXTURE_2D);
 Tint($FF, $00, $00, Byte(Round(127*(1 + sin(SDL_GetTicks()*0.007)))));
 glBegin(GL_POLYGON);
 for i:= 0 to 20 do
 glVertex2f(-(cScreenWidth shr 1) + 30 + sin(i*2*Pi/20)*10, 35 + cos(i*2*Pi/20)*10);
 glEnd();
 // Cursor
 if isCursorVisible then
 begin
-if not bShowAmmoMenu then
+if (not bShowAmmoMenu) then
 begin
 if not CurrentTeam^.ExtDriven then TargetCursorPoint:= CursorPoint;
 with CurrentHedgehog^ do
 if (Gear <> nil) and ((Gear^.State and gstHHChooseTarget) <> 0) then
 begin
 DrawSprite(PosSprite, TargetCursorPoint.X - (SpritesData[PosSprite].Width shr 1), cScreenHeight - TargetCursorPoint.Y - (SpritesData[PosSprite].Height shr 1),i);
 end;
 DrawSprite(sprArrow, TargetCursorPoint.X, cScreenHeight - TargetCursorPoint.Y, (RealTicks shr 6) mod 8)
 end
 end;
-isFirstFrame:= false;
+isFirstFrame:= false
 end;
 var PrevSentPointTime: LongWord = 0;
 procedure MoveCamera;
 if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu) and autoCameraOn)) and cHasFocus and (GameState <> gsConfirm) then
 uCursor.updatePosition();
 {$ENDIF}
 z:= round(200/zoom);
 inbtwnTrgtAttks := (CurrentHedgehog <> nil) and ((Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget) <> 0) and ((GameFlags and gfInfAttack) <> 0);
-if autoCameraOn and not PlacingHogs and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) and not inbtwnTrgtAttks then
+if autoCameraOn and (not PlacingHogs) and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) and (not inbtwnTrgtAttks) then
 if ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then
 begin
 FollowGear:= nil;
 prevPoint:= CursorPoint;
 exit
 {$ELSE}
 amNumOffsetX:= 0;
 {$ENDIF}
 {$ENDIF}
 if CursorPoint.X < AmmoRect.x + amNumOffsetX + 3 then//check left
 CursorPoint.X:= AmmoRect.x + amNumOffsetX + 3;
 if CursorPoint.X > AmmoRect.x + AmmoRect.w - 3 then//check right
 CursorPoint.X:= AmmoRect.x + AmmoRect.w - 3;
 if CursorPoint.Y > cScreenHeight - AmmoRect.y -amNumOffsetY - 1 then//check top
 CursorPoint.Y:= cScreenHeight - AmmoRect.y - amNumOffsetY - 1;
 exit;
 {$ENDIF}
 {$IFDEF USE_VIDEO_RECORDING}
 // do not change volume during prerecording as it will affect sound in video file
-if not flagPrerecording then
+if (not flagPrerecording) then
 {$ENDIF}
 begin
-if not cHasFocus then DampenAudio()
+if (not cHasFocus) then DampenAudio()
 else UndampenAudio();
 end;
 end;
 procedure SetUtilityWidgetState(ammoType: TAmmoType);
 if(CurrentHedgehog <> nil)then
 if (Ammoz[ammoType].Ammo.Propz and ammoprop_Timerable) <> 0 then
 begin
 utilityWidget.sprite:= sprTimerButton;
 animateWidget(@utilityWidget, true, true);
 end
 else if (Ammoz[ammoType].Ammo.Propz and ammoprop_NeedTarget) <> 0 then
 begin
 utilityWidget.sprite:= sprTargetButton;
 animateWidget(@utilityWidget, true, true);
 end
 begin
 with widget^ do
 begin
 show:= showWidget;
 if fade then fadeAnimStart:= RealTicks;
 with moveAnim do
 begin
 animate:= true;
 startTime:= RealTicks;
 source.x:= source.x xor target.x; //swap source <-> target

changeset 10015	4feced261c68
parent 10009	88929358d2e1
parent 9954	bf51bc7e2808
child 10040	4ac87acbaed9