@@ -18,7 +18,7 @@ export class SightHandler {
1818 static advancedLosTestVisibility ( sourceToken , tokenOrPoint , source , type = "sight" ) {
1919 const angleTest = this . testInAngle ( sourceToken , tokenOrPoint , source ) ;
2020 if ( ! angleTest ) return false ;
21- return ! this . advancedLosTestInLos ( sourceToken , tokenOrPoint , type ) ;
21+ return ! this . advancedLosTestInLos ( sourceToken , tokenOrPoint , type , source ) ;
2222 const inLOS = ! this . advancedLosTestInLos ( sourceToken , tokenOrPoint , type ) ;
2323 if ( sourceToken . vision . los === source ) return inLOS ;
2424 const inRange = this . tokenInRange ( sourceToken , tokenOrPoint ) ;
@@ -58,15 +58,15 @@ export class SightHandler {
5858 return tokenCorners ;
5959 }
6060
61- static advancedLosTestInLos ( sourceToken , tokenOrPoint , type = "sight" ) {
62- if ( ! ( tokenOrPoint instanceof Token ) || CONFIG . Levels . settings . get ( "preciseTokenVisibility" ) === false ) return this . checkCollision ( sourceToken , tokenOrPoint , type ) ;
61+ static advancedLosTestInLos ( sourceToken , tokenOrPoint , type = "sight" , source ) {
62+ if ( ! ( tokenOrPoint instanceof Token ) || CONFIG . Levels . settings . get ( "preciseTokenVisibility" ) === false ) return this . checkCollision ( sourceToken , tokenOrPoint , type , { sourcePolygon : source } ) ;
6363 const sourceCenter = {
6464 x : sourceToken . vision . x ,
6565 y : sourceToken . vision . y ,
6666 z : sourceToken . losHeight ,
6767 } ;
6868 for ( let point of this . getTestPoints ( tokenOrPoint ) ) {
69- let collision = this . testCollision ( sourceCenter , point , type , { source : sourceToken , target : tokenOrPoint } ) ;
69+ let collision = this . testCollision ( sourceCenter , point , type , { source : sourceToken , target : tokenOrPoint , sourcePolygon : source } ) ;
7070 if ( ! collision ) return collision ;
7171 }
7272 return true ;
@@ -319,6 +319,7 @@ export class SightHandler {
319319 **/
320320
321321 static testCollision ( p0 , p1 , type = "sight" , options = { } ) {
322+ debugger
322323 if ( canvas ?. scene ?. flags [ "levels-3d-preview" ] ?. object3dSight ) {
323324 if ( ! game . Levels3DPreview ?. _active ) return true ;
324325 return game . Levels3DPreview . interactionManager . computeSightCollision ( p0 , p1 , type ) ;
@@ -337,6 +338,7 @@ export class SightHandler {
337338
338339 const TYPE = type == "sight" ? 0 : type == "sound" ? 2 : type == "light" ? 3 : 1 ;
339340 const ALPHATTHRESHOLD = type == "sight" ? 0.99 : 0.1 ;
341+ const IGNOREDARKNESS = ! options ?. sourcePolygon ?. config ?. includeDarkness ;
340342 //If the point are on the same Z axis return the 3d wall test
341343 if ( z0 == z1 ) {
342344 return walls3dTest . bind ( this ) ( ) ;
@@ -417,7 +419,7 @@ export class SightHandler {
417419 let terrainWalls = 0 ;
418420 for ( const [ k , edge ] of canvas . edges ) {
419421 if ( this . shouldIgnoreWall ( edge . object , TYPE , options ) ) continue ;
420-
422+ if ( IGNOREDARKNESS && edge . type === "darkness" ) continue ;
421423 let isTerrain = ( TYPE === 0 && edge . sight === CONST . WALL_SENSE_TYPES . LIMITED ) || ( TYPE === 1 && edge . move === CONST . WALL_MOVEMENT_TYPES . LIMITED ) || ( TYPE === 2 && edge . sound === CONST . WALL_MOVEMENT_TYPES . LIMITED ) || ( TYPE === 3 && edge . light === CONST . WALL_MOVEMENT_TYPES . LIMITED ) ;
422424
423425 //declare points in 3d space of the rectangle created by the wall
@@ -481,7 +483,7 @@ export class SightHandler {
481483 * @param {String } type - "sight" or "move"/"collision" or "sound" or "light" (defaults to "sight")
482484 * @returns {Boolean } returns the collision point if a collision is detected, flase if it's not
483485 **/
484- static checkCollision ( tokenOrPoint1 , tokenOrPoint2 , type = "sight" ) {
486+ static checkCollision ( tokenOrPoint1 , tokenOrPoint2 , type = "sight" , options = { } ) {
485487 const p0 =
486488 tokenOrPoint1 instanceof Token
487489 ? {
@@ -498,6 +500,6 @@ export class SightHandler {
498500 z : tokenOrPoint2 . losHeight ,
499501 }
500502 : tokenOrPoint2 ;
501- return this . testCollision ( p0 , p1 , type , { source : tokenOrPoint1 , target : tokenOrPoint2 } ) ;
503+ return this . testCollision ( p0 , p1 , type , { source : tokenOrPoint1 , target : tokenOrPoint2 , ... options } ) ;
502504 }
503505}
0 commit comments