From dce2f18e6169ee24b409c9d50e2cd2cc77940f99 Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Tue, 15 Jan 2019 18:19:12 +0800 Subject: [PATCH] more topology support in raycast --- cocos/3d/assets/mesh.ts | 3 +- cocos/renderer/scene/camera.ts | 4 +- cocos/renderer/scene/render-scene.ts | 63 +++++++++++++++++++++------- playground/simple.html | 14 +++++-- 4 files changed, 63 insertions(+), 21 deletions(-) diff --git a/cocos/3d/assets/mesh.ts b/cocos/3d/assets/mesh.ts index 66f46ddc51..60b4b345f0 100644 --- a/cocos/3d/assets/mesh.ts +++ b/cocos/3d/assets/mesh.ts @@ -281,9 +281,10 @@ export interface IMeshStruct { } // for raycast purpose +export type IBArray = Uint8Array | Uint16Array | Uint32Array; export interface IGeometricInfo { positions: Float32Array; - indices: Uint16Array; + indices: IBArray; doubleSided?: boolean; } diff --git a/cocos/renderer/scene/camera.ts b/cocos/renderer/scene/camera.ts index 9b549e644e..78f73acd3f 100644 --- a/cocos/renderer/scene/camera.ts +++ b/cocos/renderer/scene/camera.ts @@ -265,9 +265,7 @@ export class Camera { /** * transform a screen position to a world space ray */ - public screenPointToRay (x: number, y: number, out: ray): ray { - out = out || ray.create(); - + public screenPointToRay (out: ray, x: number, y: number): ray { const cx = this._viewport.x * this._width; const cy = this._viewport.y * this._height; const cw = this._viewport.width * this._width; diff --git a/cocos/renderer/scene/render-scene.ts b/cocos/renderer/scene/render-scene.ts index d1a8caa0cc..5ea66042b7 100644 --- a/cocos/renderer/scene/render-scene.ts +++ b/cocos/renderer/scene/render-scene.ts @@ -1,6 +1,7 @@ +import { IBArray } from '../../3d/assets/mesh'; import { intersect, ray, triangle } from '../../3d/geom-utils'; import { RecyclePool } from '../../3d/memop'; -import { _createSceneFun, Root } from '../../core/root'; +import { Root } from '../../core/root'; import { mat4, vec3 } from '../../core/vmath'; import { GFXPrimitiveMode } from '../../gfx/define'; import { Layers } from '../../scene-graph/layers'; @@ -176,19 +177,7 @@ export class RenderScene { const subModel = m.subMeshData; if (!subModel || !subModel.geometricInfo) { continue; } const { positions: vb, indices: ib, doubleSided: sides } = subModel.geometricInfo; - // narrowphase - distance = Infinity; - for (let j = 0; j < ib.length; j += 3) { - const i0 = ib[j] * 3; - const i1 = ib[j + 1] * 3; - const i2 = ib[j + 2] * 3; - vec3.set(tri.a, vb[i0], vb[i0 + 1], vb[i0 + 2]); - vec3.set(tri.b, vb[i1], vb[i1 + 1], vb[i1 + 2]); - vec3.set(tri.c, vb[i2], vb[i2 + 1], vb[i2 + 2]); - const dist = intersect.ray_triangle(modelRay, tri, sides); - if (dist <= 0 || dist > distance) { continue; } - distance = dist; - } + narrowphase(vb, ib, subModel.primitiveMode, sides); if (distance < Infinity) { const r = pool.add(); r.node = node; @@ -210,3 +199,49 @@ const pool = new RecyclePool(() => { return { node: null, distance: Infinity }; }, 8); const results: IRaycastResult[] = []; + +const narrowphase = (vb: Float32Array, ib: IBArray, pm: GFXPrimitiveMode, sides?: boolean) => { + distance = Infinity; + if (pm === GFXPrimitiveMode.TRIANGLE_LIST) { + const cnt = ib.length; + for (let j = 0; j < cnt; j += 3) { + const i0 = ib[j] * 3; + const i1 = ib[j + 1] * 3; + const i2 = ib[j + 2] * 3; + vec3.set(tri.a, vb[i0], vb[i0 + 1], vb[i0 + 2]); + vec3.set(tri.b, vb[i1], vb[i1 + 1], vb[i1 + 2]); + vec3.set(tri.c, vb[i2], vb[i2 + 1], vb[i2 + 2]); + const dist = intersect.ray_triangle(modelRay, tri, sides); + if (dist <= 0 || dist > distance) { continue; } + distance = dist; + } + } else if (pm === GFXPrimitiveMode.TRIANGLE_STRIP) { + const cnt = ib.length - 2; + let rev = 0; + for (let j = 0; j < cnt; j += 1) { + const i0 = ib[j - rev] * 3; + const i1 = ib[j + rev + 1] * 3; + const i2 = ib[j + 2] * 3; + vec3.set(tri.a, vb[i0], vb[i0 + 1], vb[i0 + 2]); + vec3.set(tri.b, vb[i1], vb[i1 + 1], vb[i1 + 2]); + vec3.set(tri.c, vb[i2], vb[i2 + 1], vb[i2 + 2]); + rev = ~rev; + const dist = intersect.ray_triangle(modelRay, tri, sides); + if (dist <= 0 || dist > distance) { continue; } + distance = dist; + } + } else if (pm === GFXPrimitiveMode.TRIANGLE_FAN) { + const cnt = ib.length - 1; + const i0 = ib[0] * 3; + vec3.set(tri.a, vb[i0], vb[i0 + 1], vb[i0 + 2]); + for (let j = 1; j < cnt; j += 1) { + const i1 = ib[j] * 3; + const i2 = ib[j + 1] * 3; + vec3.set(tri.b, vb[i1], vb[i1 + 1], vb[i1 + 2]); + vec3.set(tri.c, vb[i2], vb[i2 + 1], vb[i2 + 2]); + const dist = intersect.ray_triangle(modelRay, tri, sides); + if (dist <= 0 || dist > distance) { continue; } + distance = dist; + } + } +}; diff --git a/playground/simple.html b/playground/simple.html index b85312a16e..adb6516f7d 100644 --- a/playground/simple.html +++ b/playground/simple.html @@ -31,9 +31,9 @@