hedgewars-draft: comparison hedgewars/uWorld.pas

equal deleted inserted replaced

-:d24257910f8d
+:aaefa587e277
 , uTextures
 , uRender
 , uCaptions
 , uCursor
 , uCommands
-, uMobile
+{$IFDEF USE_VIDEO_RECORDING}
-{$IFDEF USE_VIDEO_RECORDING}
 , uVideoRec
 {$ENDIF}
 {$IFDEF GL2}
 , uMatrix
 {$ENDIF}
 ;
 missionTimer: LongInt;
 stereoDepth: GLfloat;
 isFirstFrame: boolean;
 AMAnimType: LongInt;
 recTexture: PTexture;
+AmmoMenuTex     : PTexture;
+HorizontOffset: LongInt;
+cOffsetY: LongInt;
+AFRToggle: Boolean;
 const cStereo_Sky           = 0.0500;
 cStereo_Horizon       = 0.0250;
 cStereo_MidDistance   = 0.0175;
 cStereo_Water_distant = 0.0125;
 cStereo_Land          = 0.0075;
 cStereo_Water_near    = 0.0025;
 cStereo_Outside       = -0.0400;
+AMAnimDuration = 200;
+AMHidden    = 0;//AMState values
+AMShowingUp = 1;
+AMShowing   = 2;
+AMHiding    = 3;
+AMTypeMaskX     = $00000001;
+AMTypeMaskY     = $00000002;
+AMTypeMaskAlpha = $00000004;
+AMTypeMaskSlide = $00000008;
+{$IFDEF MOBILE}
+AMSlotSize = 48;
+AMTITLE    = 30;
+{$ELSE}
+AMSlotSize = 32;
+{$ENDIF}
+AMSlotPadding = (AMSlotSize - 32) shr 1;
+cSendCursorPosTime = 50;
+cCursorEdgesDist   = 100;
 // helper functions to create the goal/game mode string
 function AddGoal(s: ansistring; gf: longword; si: TGoalStrId; i: LongInt): ansistring;
 var t: ansistring;
 begin
 procedure InitTouchInterface;
 begin
 {$IFDEF USE_TOUCH_INTERFACE}
 //positioning of the buttons
-buttonScale:= uMobile.getScreenDPI/cDefaultZoomLevel;
+buttonScale:= mobileRecord.getScreenDPI()/cDefaultZoomLevel;
 with JumpWidget do
 begin
 show:= true;
 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;
 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;
 {$ENDIF}
 end;
 procedure DrawWater(Alpha: byte; OffsetY: LongInt);
 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;
 r.y:= OffsetY + WorldDy + cWaterLine;
 if WorldDy < trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine then
 begin
 if r.y < 0 then
 r.y:= 0;
 glDisable(GL_TEXTURE_2D);
 VertexBuffer[0].X:= -lw;
 VertexBuffer[0].Y:= r.y;
 VertexBuffer[1].X:= lw;
 VertexBuffer[1].Y:= r.y;
 if cStereoMode = smNone then
 begin
 glClear(GL_COLOR_BUFFER_BIT);
 DrawWorldStereo(Lag, rmDefault)
 end
-{$IFNDEF S3D_DISABLED}
+{$IFDEF USE_S3D_RENDERING}
 else if (cStereoMode = smAFR) then
 begin
 AFRToggle:= (not AFRToggle);
 glClear(GL_COLOR_BUFFER_BIT);
 if AFRToggle then
 {$ENDIF}
 end;
 procedure ChangeDepth(rm: TRenderMode; d: GLfloat);
 begin
-{$IFDEF S3D_DISABLED}
+{$IFNDEF USE_S3D_RENDERING}
 rm:= rm; d:= d; // avoid hint
 exit;
 {$ELSE}
 d:= d / 5;
 if rm = rmDefault then
 glTranslatef(d, 0, 0);
 glMatrixMode(GL_MODELVIEW);
 {$ENDIF}
 {$ENDIF}
 end;
 procedure ResetDepth(rm: TRenderMode);
 begin
-{$IFNDEF S3D_DISABLED}
+{$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);
 {$ENDIF}
 cStereoDepth:= 0;
 {$ENDIF}
 end;
 procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
 var i, t, h: LongInt;
 r: TSDL_Rect;
 tdx, tdy: Double;
 s: shortstring;
 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);
 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
 if (AMState = AMShowing) then
 AMAnimStartTime:= RealTicks
 else
 AMAnimStartTime:= RealTicks - (AMAnimDuration - (RealTicks - AMAnimStartTime));
 AMState:= AMHiding;
 end;
 if bShowAmmoMenu or (AMState = AMHiding) then
 ShowAmmoMenu;
 // Cursor
 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)
 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();
 {$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;
 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

branch	webgl
changeset 8330	aaefa587e277
parent 8099	a7f02b902b6f
parent 8204	9a6030d96273
child 8444	75db7bb8dce8