Skip to content

When copying the old buffer value, if the old value is undefined (o… #321

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

Merged
llsansun merged 2 commits into from
Sep 2, 2026
Merged

When copying the old buffer value, if the old value is undefined (o… #321

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d4786
When copying the old buffer value, if the old value is `undefined` (o…
llsansun Sep 2, 2026
1a541fb
opt
llsansun Sep 2, 2026
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
7 changes: 4 additions & 3 deletions cocos/terrain/terrain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,11 +1815,11 @@ export class Terrain extends Component {
* @zh 获得纹理层
*/
public getLayer (id: number): TerrainLayer | null {
if (id === -1) {
if (id === -1 || id === undefined) {
return null;
}

return this._layerList[id];
return this._layerList[id] ?? null;

@star-e star-e Sep 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

polyfill of ?? will increase code size a bit.

The following code might have smaller size.

const v = this._layerList[id];
return v !== undefined ? v | null;

}

/**
Expand Down Expand Up @@ -2584,7 +2584,8 @@ export class Terrain extends Component {
const index1 = j * this.blockCount[0] + i;

for (let l = 0; l < TERRAIN_MAX_BLEND_LAYERS; ++l) {
layerBuffer[index0 * TERRAIN_MAX_BLEND_LAYERS + l] = this._layerBuffer[index1 * TERRAIN_MAX_BLEND_LAYERS + l];
const oldVal = this._layerBuffer[index1 * TERRAIN_MAX_BLEND_LAYERS + l];
layerBuffer[index0 * TERRAIN_MAX_BLEND_LAYERS + l] = oldVal !== undefined ? oldVal : -1;
}
}
}
Expand Down
Loading