hedgewars: comparison hedgewars/uWorld.pas

equal deleted inserted replaced

-:f7a199346c3e
+:7705784902e1
 CountTicks: Longword;
 prevPoint{, prevTargetPoint}: TPoint;
 amSel: TAmmoType = amNothing;
 missionTex: PTexture;
 missionTimer: LongInt;
-stereoDepth: GLfloat;
 isFirstFrame: boolean;
 AMAnimType: LongInt;
 recTexture: PTexture;
 AmmoMenuTex     : PTexture;
 HorizontOffset: LongInt;
 d:= d / 5;
 if rm = rmDefault then
 exit
 else if rm = rmLeftEye then
 d:= -d;
-stereoDepth:= stereoDepth + d;
+cStereoDepth:= cStereoDepth + d;
 openglTranslProjMatrix(d, 0, 0);
 {$ENDIF}
 end;
 procedure ResetDepth(rm: TRenderMode);
 begin
 rm:= rm; // avoid hint
 {$IFDEF USE_S3D_RENDERING}
 if rm = rmDefault then
 exit;
-openglTranslProjMatrix(-stereoDepth, 0, 0);
+openglTranslProjMatrix(-cStereoDepth, 0, 0);
 cStereoDepth:= 0;
 {$ENDIF}
 end;
-procedure RenderWorldEdge(Lag: Longword);
+procedure RenderWorldEdge;
 var
 //VertexBuffer: array [0..3] of TVertex2f;
 tmp, w: LongInt;
 rect: TSDL_Rect;
 //c1, c2: LongWord; // couple of colours for edges
 begin
 (* I think for a bounded world, will fill the left and right areas with black or something. Also will probably want various border effects/animations based on border type.  Prob also, say, trigger a border animation timer on an impact. *)
 rect.y:= ViewTopY;
 rect.h:= ViewHeight;
-tmp:= leftX + WorldDx;
+tmp:= LongInt(leftX) + WorldDx;
 w:= tmp - ViewLeftX;
 if w > 0 then
 begin
 rect.w:= w;
 DrawRect(rect, $30, $30, $30, $40, true);
 if WorldEdge = weBounce then
 DrawLineOnScreen(tmp - 1, ViewTopY, tmp - 1, ViewBottomY, 2, $54, $54, $FF, $FF);
 end;
-tmp:= rightX + WorldDx;
+tmp:= LongInt(rightX) + WorldDx;
 w:= ViewRightX - tmp;
 if w > 0 then
 begin
 rect.w:= w;
 end;
 var preShiftWorldDx: LongInt;
-procedure ShiftWorld(Dir: LongInt; Flip: Boolean);
+procedure ShiftWorld(Dir: LongInt); inline;
 begin
 preShiftWorldDx:= WorldDx;
+WorldDx:= WorldDx + Dir * LongInt(playWidth);
-if Flip then
-begin
+end;
-WorldDx:= -WorldDx - playWidth - Dir * playWidth;
-openglPushMatrix();
+procedure UnshiftWorld(); inline;
-openglScalef(-1, 1, 1);
-end
-else
-WorldDx:= WorldDx + Dir * playWidth;
-end;
-procedure UnshiftWorld(Dir: LongInt; Flip: Boolean);
 begin
 WorldDx:= preShiftWorldDx;
-if Flip then
-openglPopMatrix();
 end;
 procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
 var i, t: LongInt;
 r: TSDL_Rect;
 tdx, tdy: Double;
 s: shortstring;
 offsetX, offsetY, screenBottom: LongInt;
 VertexBuffer: array [0..3] of TVertex2f;
-replicateToLeft, replicateToRight, tmp, flip: boolean;
+replicateToLeft, replicateToRight, tmp: boolean;
 begin
-if (WorldEdge <> weWrap) {and (WorldEdge <> weBounce)} then
+if WorldEdge <> weWrap then
 begin
 replicateToLeft := false;
 replicateToRight:= false;
-flip:= false;
 end
 else
 begin
-replicateToLeft := (leftX  + WorldDx > ViewLeftX);
+replicateToLeft := (LongInt(leftX)  + WorldDx > ViewLeftX);
-replicateToRight:= (rightX + WorldDx < ViewRightX);
+replicateToRight:= (LongInt(rightX) + WorldDx < ViewRightX);
-flip:= (WorldEdge = weBounce);
 end;
 ScreenBottom:= (WorldDy - trunc(cScreenHeight/cScaleFactor) - (cScreenHeight div 2) + cWaterLine);
 // note: offsetY is negative!
 DrawVisualGears(5);
 DrawLand(WorldDx, WorldDy);
 if replicateToLeft then
 begin
-ShiftWorld(-1, flip);
+ShiftWorld(-1);
 DrawLand(WorldDx, WorldDy);
-UnshiftWorld(-1, flip);
+UnshiftWorld();
 end;
 if replicateToRight then
 begin
-ShiftWorld(1, flip);
+ShiftWorld(1);
 DrawLand(WorldDx, WorldDy);
-UnshiftWorld(1, flip);
+UnshiftWorld();
 end;
 DrawWater(255, 0, 0);
 (*
 tmp:= bShowFinger;
 bShowFinger:= false;
 if replicateToLeft then
 begin
-ShiftWorld(-1, flip);
+ShiftWorld(-1);
 DrawVisualGears(1);
 DrawGears();
 DrawVisualGears(6);
-UnshiftWorld(-1, flip);
+UnshiftWorld();
 end;
 if replicateToRight then
 begin
-ShiftWorld(1, flip);
+ShiftWorld(1);
 DrawVisualGears(1);
 DrawGears();
 DrawVisualGears(6);
-UnshiftWorld(1, flip);
+UnshiftWorld();
 end;
 bShowFinger:= tmp;
 DrawVisualGears(1);
 // note: negative parallax gears should last very little for a smooth stereo effect
 ChangeDepth(RM, cStereo_Outside);
 if replicateToLeft then
 begin
-ShiftWorld(-1, flip);
+ShiftWorld(-1);
 DrawVisualGears(2);
-UnshiftWorld(-1, flip);
+UnshiftWorld();
 end;
 if replicateToRight then
 begin
-ShiftWorld(1, flip);
+ShiftWorld(1);
 DrawVisualGears(2);
-UnshiftWorld(1, flip);
+UnshiftWorld();
 end;
 DrawVisualGears(2);
 // everything after this ResetDepth will be drawn at screen level (depth = 0)
 // note: everything that needs to be readable should be on this level
 ResetDepth(RM);
 if replicateToLeft then
 begin
-ShiftWorld(-1, flip);
+ShiftWorld(-1);
 DrawVisualGears(3);
-UnshiftWorld(-1, flip);
+UnshiftWorld();
 end;
 if replicateToRight then
 begin
-ShiftWorld(1, flip);
+ShiftWorld(1);
 DrawVisualGears(3);
-UnshiftWorld(1, flip);
+UnshiftWorld();
 end;
 DrawVisualGears(3);
 {$WARNINGS OFF}
 DrawSpriteRotatedF(sprTargetP, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360)
 end
 end;
 {$WARNINGS ON}
-RenderWorldEdge(Lag);
+RenderWorldEdge();
 // this scale is used to keep the various widgets at the same dimension at all zoom levels
 SetScale(cDefaultZoomLevel);
 // Turn time
 DrawSprite(PosSprite, TargetCursorPoint.X - (SpritesData[PosSprite].Width shr 1), cScreenHeight - TargetCursorPoint.Y - (SpritesData[PosSprite].Height shr 1),i);
 Untint();
 end;
 end;
 //DrawSprite(sprArrow, TargetCursorPoint.X, cScreenHeight - TargetCursorPoint.Y, (RealTicks shr 6) mod 8)
-DrawTextureF(SpritesData[sprArrow].Texture, cDefaultZoomLevel / cScaleFactor, TargetCursorPoint.X + round(SpritesData[sprArrow].Width / cScaleFactor), cScreenHeight - TargetCursorPoint.Y + round(SpritesData[sprArrow].Height / cScaleFactor), (RealTicks shr 6) mod 8, 1, SpritesData[sprArrow].Width, SpritesData[sprArrow].Height);
+DrawTextureF(SpritesData[sprArrow].Texture, cDefaultZoomLevel / cScaleFactor, TargetCursorPoint.X + round(SpritesData[sprArrow].Width / cScaleFactor), cScreenHeight + round(SpritesData[sprArrow].Height / cScaleFactor) - TargetCursorPoint.Y, (RealTicks shr 6) mod 8, 1, SpritesData[sprArrow].Width, SpritesData[sprArrow].Height);
 end
 end;
 // debug stuff
 if cViewLimitsDebug then
 end
 else
 begin
 if abs(prevPoint.X - WorldDx - hwRound(FollowGear^.X)) > rightX - leftX - 100 then
 begin
-if (prevPoint.X - WorldDx) * 2 < rightX + leftX then
+if (prevPoint.X - WorldDx) * 2 < LongInt(rightX + leftX) then
 cameraJump:= rightX - leftX
 else
 cameraJump:= leftX - rightX;
 WorldDx:= WorldDx - cameraJump;
 end;
 else UndampenAudio();
 end;
 end;
 procedure updateCursorVisibility;
 begin
 if isPaused or isAFK then
 SDL_ShowCursor(1)
 else
 SDL_ShowCursor(ord(GameState = gsConfirm))
 end;
 prevPoint.X:= 0;
 prevPoint.Y:= 0;
 missionTimer:= 0;
 missionTex:= nil;
 cOffsetY:= 0;
-stereoDepth:= 0;
 AMState:= AMHidden;
 isFirstFrame:= true;
 FillChar(WorldFade, sizeof(WorldFade), 0);
 WorldFade[0].a:= 255;

branch	qmlfrontend
changeset 10515	7705784902e1
parent 10510	9329dab04490
child 10523	00ac079fa51f