Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Opt subdivsion sphere #1935

Merged
merged 4 commits into from
Jan 2, 2024
Merged

Opt subdivsion sphere #1935

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f681a9f
refactor: opt subdivison sphere
GuoLei1990 Dec 29, 2023
550edef
refactor: opt ocde
GuoLei1990 Dec 29, 2023
8766544
refactor: opt code
GuoLei1990 Dec 29, 2023
90c01a9
refactor: opt code
GuoLei1990 Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 26 additions & 46 deletions packages/core/src/mesh/PrimitiveMesh.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import { Buffer } from "../graphic/Buffer";
import { ModelMesh } from "./ModelMesh";
import {
CapsuleRestoreInfo,
SubdivisionSurfaceSphereRestoreInfo,
ConeRestoreInfo,
CuboidRestoreInfo,
CylinderRestoreInfo,
PlaneRestoreInfo,
PrimitiveMeshRestorer,
SphereRestoreInfo,
SubdivisionSurfaceSphereRestoreInfo,
TorusRestoreInfo
} from "./PrimitiveMeshRestorer";
import { VertexAttribute } from "./enums/VertexAttribute";
Expand Down Expand Up @@ -371,18 +371,35 @@ export class PrimitiveMesh {
for (let i = 0; i < cellsCount; i++) {
const idx = 4 * i;

indices[offset] = cells[idx];
indices[offset + 1] = cells[idx + 1];
indices[offset + 2] = cells[idx + 2];
let indexA = cells[idx];
let indexB = cells[idx + 1];
let indexC = cells[idx + 2];
let indexD = cells[idx + 3];

// Handle seam by replacing vertex index to seam vertex index if necessary
const floatIndexA = 8 * indexA;
const floatIndexB = 8 * indexB;
const floatIndexC = 8 * indexC;
const floatIndexD = 8 * indexD;

// If center Z is negative
if (vertices[floatIndexA + 2] + vertices[floatIndexB + 2] + vertices[floatIndexC + 2] < 0) {
vertices[floatIndexA + 6] === 0 && (indexA = seamVertices[indexA]);
vertices[floatIndexB + 6] === 0 && (indexB = seamVertices[indexB]);
vertices[floatIndexC + 6] === 0 && (indexC = seamVertices[indexC]);
vertices[floatIndexD + 6] === 0 && (indexD = seamVertices[indexD]);
}

indices[offset] = indexA;
indices[offset + 1] = indexB;
indices[offset + 2] = indexC;

this._replaceSeamUV(indices, vertices, offset, seamVertices);
this._generateAndReplacePoleUV(indices, vertices, offset, poleOffset);

indices[offset + 3] = cells[idx];
indices[offset + 4] = cells[idx + 2];
indices[offset + 5] = cells[idx + 3];
indices[offset + 3] = indexA;
indices[offset + 4] = indexC;
indices[offset + 5] = indexD;

this._replaceSeamUV(indices, vertices, offset + 3, seamVertices);
this._generateAndReplacePoleUV(indices, vertices, offset + 3, poleOffset);

offset += 6;
Expand Down Expand Up @@ -604,43 +621,6 @@ export class PrimitiveMesh {
}
}

/**
* Duplicate vertices whose uv normal is flipped and adjust their UV coordinates.
*/
private static _replaceSeamUV(
indices: Uint16Array | Uint32Array,
vertices: Float32Array,
offset: number,
seamVertices: Record<number, number>
) {
const vertexA = 8 * indices[offset];
const vertexB = 8 * indices[offset + 1];
const vertexC = 8 * indices[offset + 2];

const vertexAU = vertices[vertexA + 6];
const vertexAV = vertices[vertexA + 7];

const vertexBU = vertices[vertexB + 6];
const vertexBV = vertices[vertexB + 7];

const vertexCU = vertices[vertexC + 6];
const vertexCV = vertices[vertexC + 7];

const z = (vertexBU - vertexAU) * (vertexCV - vertexAV) - (vertexBV - vertexAV) * (vertexCU - vertexAU);

if (z > 0) {
if (vertexAU === 0) {
indices[offset] = seamVertices[indices[offset]];
}
if (vertexBU === 0) {
indices[offset + 1] = seamVertices[indices[offset + 1]];
}
if (vertexCU === 0) {
indices[offset + 2] = seamVertices[indices[offset + 2]];
}
}
}

/**
* Duplicate vertices at the poles and adjust their UV coordinates.
*/
Expand Down