Skip to content

Commit 85ccc77

Browse files
committedSep 19, 2023
Merge branch 'main' into heibing/scene
* main: (23 commits) Support entity reference (galacean#1417) feat: log physics version (galacean#1769) Fix Script destroy bug (galacean#1770) Fix collider shape bug (galacean#1768) fix: physics unit test timeout (galacean#1766) Fix `viewportPointToRay` triggers precision issues when the depth value is 1 (galacean#1767) fix: project loader not exported (galacean#1758) "v1.1.0-beta.4" Opt SpriteBatch code (galacean#1760) Fix light shader data abnormal when multiple scenes are activated (galacean#1759) Fix BlendShape anim compatible with multiple SkinMeshRenderer in on… (galacean#1756) refactor: clear code and opt memory (galacean#1757) test: add physx unit timeout (galacean#1755) "v1.1.0-beta.3" Fix charactor controller error (galacean#1754) test: fix unit test timeout "v1.1.0-beta.2" Fix clone error (galacean#1753) Support main thread ktx2 (galacean#1745) "v1.1.0-beta.1" ...
2 parents 8e82490 + 7f45ebc commit 85ccc77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+519
-345
lines changed
 

‎packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@galacean/engine-core",
3-
"version": "1.1.0-alpha.4",
3+
"version": "1.1.0-beta.4",
44
"publishConfig": {
55
"access": "public",
66
"registry": "https://registry.npmjs.org"

‎packages/core/src/Camera.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,13 @@ export class Camera extends Component {
405405
// Use the intersection of the near clipping plane as the origin point.
406406
const origin = this._innerViewportToWorldPoint(point.x, point.y, 0.0, invViewProjMat, out.origin);
407407
// Use the intersection of the far clipping plane as the origin point.
408-
const direction = this._innerViewportToWorldPoint(point.x, point.y, 1.0, invViewProjMat, out.direction);
408+
const direction = this._innerViewportToWorldPoint(
409+
point.x,
410+
point.y,
411+
1 - MathUtil.zeroTolerance,
412+
invViewProjMat,
413+
out.direction
414+
);
409415
Vector3.subtract(direction, origin, direction);
410416
direction.normalize();
411417
return out;

0 commit comments

Comments
 (0)
Please sign in to comment.