From ee59e537b1c493ee9a2fbb94d688ffea6f2bad3e Mon Sep 17 00:00:00 2001 From: szapp Date: Sun, 29 Oct 2017 13:36:31 +0100 Subject: [PATCH] Adjust debug visualization to changes in Draw3D --- _work/data/Scripts/Content/GFA/_intern/aimRay.d | 8 ++++---- _work/data/Scripts/Content/GFA/_intern/criticalHit.d | 8 ++++---- _work/data/Scripts/Content/GFA/_intern/rangedShooting.d | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_work/data/Scripts/Content/GFA/_intern/aimRay.d b/_work/data/Scripts/Content/GFA/_intern/aimRay.d index 1f85377..c161752 100644 --- a/_work/data/Scripts/Content/GFA/_intern/aimRay.d +++ b/_work/data/Scripts/Content/GFA/_intern/aimRay.d @@ -302,7 +302,7 @@ func int GFA_AimRay(var int distance, var int focusType, var int vobPtr, var int subf(intersection[2], f5), addf(intersection[0], f5), addf(intersection[1], f5), - addf(intersection[2], f5), -1); + addf(intersection[2], f5)); // Trace ray trajectory UpdateLine3(GFA_DebugTRTrj, @@ -311,15 +311,15 @@ func int GFA_AimRay(var int distance, var int focusType, var int vobPtr, var int traceRayVec[2], addf(traceRayVec[0], traceRayVec[3]), addf(traceRayVec[1], traceRayVec[4]), - addf(traceRayVec[2], traceRayVec[5]), -1); + addf(traceRayVec[2], traceRayVec[5])); // Focus vob bounding box if (foundVob) { - UpdateBBoxAddr(GFA_DebugTRBBoxVob, foundVob+zCVob_bbox3D_offset, -1); + UpdateBBoxAddr(GFA_DebugTRBBoxVob, foundVob+zCVob_bbox3D_offset); } else { const int QUARTER_BBOX_SIZE = sizeof_zTBBox3D/4; var int empty[QUARTER_BBOX_SIZE]; - UpdateBBoxAddr(GFA_DebugTRBBoxVob, _@(empty), -1); + UpdateBBoxAddr(GFA_DebugTRBBoxVob, _@(empty)); }; }; }; diff --git a/_work/data/Scripts/Content/GFA/_intern/criticalHit.d b/_work/data/Scripts/Content/GFA/_intern/criticalHit.d index 57e97b0..c1f3405 100644 --- a/_work/data/Scripts/Content/GFA/_intern/criticalHit.d +++ b/_work/data/Scripts/Content/GFA/_intern/criticalHit.d @@ -135,14 +135,14 @@ func int GFA_CH_DetectIntersectionWithNode(var int npcPtr, var string nodeName, // Debug visualization if (BBoxVisible(GFA_DebugWSBBox)) { - UpdateBBoxAddr(GFA_DebugWSBBox, bboxPtr, -1); + UpdateBBoxAddr(GFA_DebugWSBBox, bboxPtr); }; // Prevent debug drawing of oriented bounding box if (OBBoxVisible(GFA_DebugWSOBBox)) { const int QUARTER_BBOX_SIZE = sizeof_zTBBox3D/4; var int emptyBBox[QUARTER_BBOX_SIZE]; - UpdateOBBoxAddr(GFA_DebugWSOBBox, _@(emptyBBox), -1); + UpdateOBBoxAddr(GFA_DebugWSOBBox, _@(emptyBBox)); }; // Detect collision @@ -210,14 +210,14 @@ func int GFA_CH_DetectIntersectionWithNode(var int npcPtr, var string nodeName, // Debug visualization if (OBBoxVisible(GFA_DebugWSOBBox)) { - UpdateOBBoxAddr(GFA_DebugWSOBBox, obboxPtr, -1); + UpdateOBBoxAddr(GFA_DebugWSOBBox, obboxPtr); }; // Prevent debug drawing of bounding box if (BBoxVisible(GFA_DebugWSBBox)) { const int QUARTER_OBBOX_SIZE = sizeof_zCOBBox3D/4; var int emptyOBBox[QUARTER_OBBOX_SIZE]; - UpdateBBoxAddr(GFA_DebugWSBBox, _@(emptyOBBox), -1); + UpdateBBoxAddr(GFA_DebugWSBBox, _@(emptyOBBox)); }; // Detect collision diff --git a/_work/data/Scripts/Content/GFA/_intern/rangedShooting.d b/_work/data/Scripts/Content/GFA/_intern/rangedShooting.d index 79b87c7..4a1c50e 100644 --- a/_work/data/Scripts/Content/GFA/_intern/rangedShooting.d +++ b/_work/data/Scripts/Content/GFA/_intern/rangedShooting.d @@ -712,7 +712,7 @@ func int GFA_RefinedProjectileCollisionCheck(var int vobPtr, var int arrowAI) { GFA_CollTrj[2], addf(GFA_CollTrj[0], GFA_CollTrj[3]), addf(GFA_CollTrj[1], GFA_CollTrj[4]), - addf(GFA_CollTrj[2], GFA_CollTrj[5]), -1); + addf(GFA_CollTrj[2], GFA_CollTrj[5])); }; return +hit;