Search code, repositories, users, issues, pull requests...

Copy link

Member

@Lpsd Lpsd commented Jan 20, 2021 •

edited

Loading

This allows multiple ignore elements to be passed to processLineOfSight, via table of elements.

It is backwards compatible. If you pass a single element, or nil as ignoredElements it has the same behaviour as before.

processLineOfSight ( float startX, float startY, float startZ, 
 float endX, float endY, float endZ, 
 [ bool checkBuildings = true, 
 bool checkVehicles = true, 
 bool checkPlayers = true, 
 bool checkObjects = true, 
 bool checkDummies = true, 
 bool seeThroughStuff = false, 
 bool ignoreSomeObjectsForCamera = false, 
 bool shootThroughStuff = false, 
 table ignoredElements = nil,
 bool includeWorldModelInformation = false,
 bool bIncludeCarTyres ] )

Partially resolves #1549

I will submit a separate PR for isLineOfSightClear

Lpsd added 7 commits

January 20, 2021 21:20


 Update processLineOfSight to accept variable amount of ignored elements

f012ea2


 Use SetElementCollisionsEnabled

36ef62f


 Add nil check

bf89225


 Fix argument parsing logic issue

879431d


 Addendum to previous commit

45cedf0


 Fix more logic issues

920328f


 Remove bool check that could introduce unwanted behaviour

we shouldn't allow bool to be passed as ignoredElement1

@0xHexadecimal

Copy link

0xHexadecimal commented Jan 20, 2021

Wouldn't it be better to take a table of elements?

elements = {}
processLineOfSight(...,unpack(elements),...) -- can't do this

I suppose you could the put last arguments as the last values in the table.

@Lpsd

Copy link

Member Author

Lpsd commented Jan 20, 2021 •

edited

Loading

I'll add the ability to pass a table, as well as vararg.

Having it at the end would be weird, because we have to keep the original argument order to some extent.


 Add ability to pass table of elements as well as vararg

beb2497

@Lpsd Lpsd added the enhancement label

Jan 20, 2021


 Change wrong argument name in definition

064c998

@Lpsd Lpsd requested a review from patrikjuvonen

January 21, 2021 19:42

Pirulax

Pirulax previously requested changes

Jan 22, 2021

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp Outdated Show resolved Hide resolved

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h Outdated Show resolved Hide resolved

Lpsd added 2 commits

January 22, 2021 16:29


 Change logic of vector removal

15dfec3


 Change declaration

a628f71

@Lpsd Lpsd requested review from Pirulax and removed request for patrikjuvonen

January 22, 2021 16:30

Lpsd added 3 commits

January 22, 2021 16:57


 Fix broken logic in processLineOfSight luadef

86599b3


 Make comments more clear

19b8be8


 Update function syntax comment

16ecd48

We should remove all of these types of comment, they're stupid.

Pirulax

Pirulax reviewed

Mar 19, 2021

Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp Outdated Show resolved Hide resolved

Pirulax

Pirulax reviewed

Mar 19, 2021

Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp Outdated Show resolved Hide resolved

@Pirulax

Copy link

Contributor

Pirulax commented Mar 19, 2021

Other than these comments you're fine imho.

processLineOfSight enhancement #2610


 Merge branch 'master' into lineofsight-fix

f57ee24

@patrikjuvonen patrikjuvonen self-requested a review

August 30, 2021 09:56

@patrikjuvonen patrikjuvonen added this to the Future Release milestone

Aug 30, 2021

@Lpsd Lpsd mentioned this pull request

Apr 28, 2022

Open

1 task

@Pirulax

Copy link

Contributor

Pirulax commented Apr 30, 2022

Time to merge this.
@Lpsd address the comments, and I'll merge it.
I hope you've tested it (But there's really nothing not to work, so)


 Merge remote-tracking branch 'upstream/master' into lineofsight-fix

748b56f


 Remove vararg handling

ae86c2d

@Lpsd

Copy link

Member Author

Lpsd commented Jul 16, 2022

Vararg removed.

Test resource: los.zip

Spawns 50 bin objects in a row. Use command /los <amountToIgnore>

e.g /los 50 should return nil for processLineOfSight in debug output, as you're ignoring all elements
/los 30 will output bin_31, as that's the next object to hit after 30
/los 0 will output bin_1
etc

This resource also tests backwards compatibility by passing nil as ignoredElements if 0 is supplied to the command. It shouldn't raise a warning / error (just like original behaviour).

Pirulax and others added 3 commits

September 11, 2022 17:50

@Pirulax


 Merge branch 'master' into lineofsight-fix

b04cefb


 Merge branch 'master' into lineofsight-fix


 Merge branch 'master' into lineofsight-fix

9ce50a7

@patrikjuvonen patrikjuvonen dismissed Pirulax’s stale review

December 24, 2022 14:50

Stale

patrikjuvonen added 2 commits

December 25, 2022 15:56


 Merge branch 'master' into lineofsight-fix

647f73d


 Merge branch 'master' into lineofsight-fix

0bb8f3a

patrikjuvonen

patrikjuvonen approved these changes

Jan 1, 2023

@Einheit-101

Copy link

Einheit-101 commented Apr 5, 2023

Is there anything left to do here or why is it not merged?

processLineOfSight broken in 1.6 #2971

Copy link

Contributor

patrikjuvonen commented Apr 5, 2023

Is there anything left to do here or why is it not merged?

Nothing left to do here, not merged yet because feature freeze is on (https://discord.com/channels/801330706252038164/801330706252038167/1059094962853130250). Will be merged for 1.6.

@patrikjuvonen patrikjuvonen merged commit 076c7fe into multitheftauto:master

Apr 7, 2023

@TFP-dev TFP-dev mentioned this pull request

Apr 17, 2023

Closed

1 task

patrikjuvonen added a commit that referenced this pull request

Apr 17, 2023