sheepy-clone: comparison hedgewars/uWorld.pas

equal deleted inserted replaced

-:d5d5e1698554
+:1dedcc37bfe8
 , uTextures
 , uRender
 , uCaptions
 , uCursor
 , uCommands
-, uMobile
 {$IFDEF USE_VIDEO_RECORDING}
 , uVideoRec
 {$ENDIF}
 ;
 tmpSurface: PSDL_Surface;
 fpsTexture: PTexture;
 timeTexture: PTexture;
 FPS: Longword;
 CountTicks: Longword;
-SoundTimerTicks: Longword;
+prevPoint, prevTargetPoint: TPoint;
-prevPoint: TPoint;
 amSel: TAmmoType = amNothing;
 missionTex: PTexture;
 missionTimer: LongInt;
 stereoDepth: GLfloat;
 isFirstFrame: boolean;
 AMAnimType: LongInt;
 recTexture: PTexture;
+AmmoMenuTex     : PTexture;
+HorizontOffset: LongInt;
+cOffsetY: LongInt;
 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;
+{$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
 InitCameraBorders();
 uCursor.init();
 prevPoint.X:= 0;
 prevPoint.Y:= cScreenHeight div 2;
+prevTargetPoint.X:= 0;
+prevTargetPoint.Y:= 0;
 WorldDx:=  -(LAND_WIDTH div 2) + cScreenWidth div 2;
 WorldDy:=  -(LAND_HEIGHT - (playHeight div 2)) + (cScreenHeight div 2);
 //aligns it to the bottom of the screen, minus the border
 SkyOffset:= 0;
 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;
 else
 begin
 AMShiftX:= AMShiftTargetX;
 AMShiftY:= AMShiftTargetY;
 prevPoint:= CursorPoint;
+prevTargetPoint:= TargetCursorPoint;
 AMState:= AMHidden;
 end;
 end;
 DrawTexture(AmmoRect.x + AMShiftX, AmmoRect.y + AMShiftY, AmmoMenuTex);
 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
-DrawWorldStereo(Lag, rmLeftEye)
-else
-DrawWorldStereo(Lag, rmRightEye)
-end
 else if (cStereoMode = smHorizontal) or (cStereoMode = smVertical) then
 begin
 // create left fb
 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framel);
 glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
 {$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
 {$ENDIF}
 end;
 procedure ResetDepth(rm: TRenderMode);
 begin
-{$IFDEF S3D_DISABLED}
+{$IFNDEF USE_S3D_RENDERING}
 rm:= rm; // avoid hint
 exit;
 {$ELSE}
 if rm = rmDefault then
 exit;
 SDL_FreeSurface(tmpSurface)
 end;
 if fpsTexture <> nil then
 DrawTexture((cScreenWidth shr 1) - 60 - offsetY, offsetX, fpsTexture);
 end;
+end;
-// lag warning (?)
-inc(SoundTimerTicks, Lag);
-end;
-if SoundTimerTicks >= 50 then
-begin
-SoundTimerTicks:= 0;
-if cVolumeDelta <> 0 then
-begin
-str(ChangeVolume(cVolumeDelta), s);
-AddCaption(Format(trmsg[sidVolume], s), cWhiteColor, capgrpVolume);
-end;
-if isAudioMuted then
-AddCaption(trmsg[sidMute], cWhiteColor, capgrpVolume)
-end;
 if GameState = gsConfirm then
 DrawTextureCentered(0, (cScreenHeight shr 1), ConfirmTexture);
 if ScreenFade <> sfNone then
 // Cursor
 if isCursorVisible then
 begin
 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
 if (CurAmmoType = amNapalm) or (CurAmmoType = amMineStrike) then
 DrawLine(-3000, topY-300, 7000, topY-300, 3.0, (Team^.Clan^.Color shr 16), (Team^.Clan^.Color shr 8) and $FF, Team^.Clan^.Color and $FF, $FF);
 i:= GetCurAmmoEntry(CurrentHedgehog^)^.Pos;
 with Ammoz[CurAmmoType] do
 if PosCount > 1 then
-DrawSprite(PosSprite, CursorPoint.X - (SpritesData[PosSprite].Width shr 1), cScreenHeight - CursorPoint.Y - (SpritesData[PosSprite].Height shr 1),i);
+DrawSprite(PosSprite, TargetCursorPoint.X - (SpritesData[PosSprite].Width shr 1), cScreenHeight - TargetCursorPoint.Y - (SpritesData[PosSprite].Height shr 1),i);
 end;
-DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8)
+DrawSprite(sprArrow, TargetCursorPoint.X, cScreenHeight - TargetCursorPoint.Y, (RealTicks shr 6) mod 8)
 end
 end;
 isFirstFrame:= false
 end;
 procedure MoveCamera;
 var EdgesDist, wdy, shs,z, amNumOffsetX, amNumOffsetY: LongInt;
 begin
 {$IFNDEF MOBILE}
-if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu))) and cHasFocus and (GameState <> gsConfirm) then
+if (not (CurrentTeam^.ExtDriven and isCursorVisible and (not bShowAmmoMenu) and autoCameraOn)) and cHasFocus and (GameState <> gsConfirm) then
 uCursor.updatePosition();
 {$ENDIF}
 z:= round(200/zoom);
 if not PlacingHogs and (FollowGear <> nil) and (not isCursorVisible) and (not bShowAmmoMenu) and (not fastUntilLag) and autoCameraOn then
 if ((abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y)) > 4) then
 end
 else
 EdgesDist:= cGearScrEdgesDist;
 // this generates the border around the screen that moves the camera when cursor is near it
-if isCursorVisible or ((FollowGear <> nil) and autoCameraOn) then
+if (CurrentTeam^.ExtDriven and isCursorVisible and autoCameraOn) or
+(not CurrentTeam^.ExtDriven and isCursorVisible) or ((FollowGear <> nil) and autoCameraOn) then
 begin
 if CursorPoint.X < - cScreenWidth div 2 + EdgesDist then
 begin
 WorldDx:= WorldDx - CursorPoint.X - cScreenWidth div 2 + EdgesDist;
 CursorPoint.X:= - cScreenWidth div 2 + EdgesDist

branch	physfslayer
changeset 8520	1dedcc37bfe8
parent 8471	7681d14b9f01
child 8675	3fb25201d303