Merge branch 'codex/fix-typo--ray.bodymergingthis--to--ray.bodymergingobj'

ricktu288 · ricktu288 · commit b0138c64322e · 2025-07-11T19:55:49.000-04:00
diff --git a/src/core/sceneObjs/glass/CustomGlass.js b/src/core/sceneObjs/glass/CustomGlass.js
@@ -258,7 +258,7 @@ class CustomGlass extends LineObjMixin(BaseGlass) {
       };
     }
 
-    return this.refract(ray, rayIndex, incidentPoint, incidentData.normal, n1, surfaceMergingObjs, ray.bodyMergingthis);
+    return this.refract(ray, rayIndex, incidentPoint, incidentData.normal, n1, surfaceMergingObjs, ray.bodyMergingObj);
   }
 
   getIncidentData(ray) {
diff --git a/src/core/sceneObjs/glass/Glass.js b/src/core/sceneObjs/glass/Glass.js
@@ -466,7 +466,7 @@ class Glass extends BaseGlass {
       };
     }
 
-    return this.refract(ray, rayIndex, incidentPoint, incidentData.normal, n1, surfaceMergingObjs, ray.bodyMergingthis);
+    return this.refract(ray, rayIndex, incidentPoint, incidentData.normal, n1, surfaceMergingObjs, ray.bodyMergingObj);
   }
 
   getIncidentType(ray) {

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ class CustomGlass extends LineObjMixin(BaseGlass) {`
`258`	`258`	`};`
`259`	`259`	`}`
`260`	`260`
`261`		`- return this.refract(ray, rayIndex, incidentPoint, incidentData.normal, n1, surfaceMergingObjs, ray.bodyMergingthis);`
	`261`	`+ return this.refract(ray, rayIndex, incidentPoint, incidentData.normal, n1, surfaceMergingObjs, ray.bodyMergingObj);`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`getIncidentData(ray) {`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ class Glass extends BaseGlass {`
`466`	`466`	`};`
`467`	`467`	`}`
`468`	`468`
`469`		`- return this.refract(ray, rayIndex, incidentPoint, incidentData.normal, n1, surfaceMergingObjs, ray.bodyMergingthis);`
	`469`	`+ return this.refract(ray, rayIndex, incidentPoint, incidentData.normal, n1, surfaceMergingObjs, ray.bodyMergingObj);`
`470`	`470`	`}`
`471`	`471`
`472`	`472`	`getIncidentType(ray) {`