More strict code for checking whether renderdata is valid. (#18584)

This commit is contained in:
GengineJS
2025-04-10 17:04:05 +08:00
committed by GitHub
parent 8b293f1c9c
commit a3be4b8b24
12 changed files with 60 additions and 42 deletions
+1 -1
View File
@@ -48,7 +48,7 @@ class Bmfont extends BmfontUtils implements IAssembler {
tempColor.set(comp.color);
tempColor.a = node._uiProps.opacity * 255;
// Fill All
fillMeshVertices3D(node, renderer, comp.renderData!, tempColor);
fillMeshVertices3D(node, renderer, comp.renderData, tempColor);
}
}
+6 -4
View File
@@ -172,7 +172,8 @@ export class BmfontUtils {
}
updateUVs (label: Label): void {
const renderData = label.renderData!;
const renderData = label.renderData;
if (!renderData) return;
const vData = renderData.chunk.vb;
const vertexCount = renderData.vertexCount;
const stride = renderData.floatStride;
@@ -187,8 +188,8 @@ export class BmfontUtils {
}
updateColor (label: Label): void {
if (JSB) {
const renderData = label.renderData!;
const renderData = label.renderData;
if (JSB && renderData) {
const vertexCount = renderData.vertexCount;
if (vertexCount === 0) return;
const vData = renderData.chunk.vb;
@@ -210,7 +211,8 @@ export class BmfontUtils {
}
protected resetRenderData (comp: Label): void {
const renderData = comp.renderData!;
const renderData = comp.renderData;
if (!renderData) return;
renderData.dataLength = 0;
renderData.resize(0, 0);
}
+2 -2
View File
@@ -56,8 +56,8 @@ class Letter extends LetterFont implements IAssembler {
}
updateColor (label: Label): void {
if (JSB) {
const renderData = label.renderData!;
const renderData = label.renderData;
if (JSB && renderData) {
const vertexCount = renderData.vertexCount;
if (vertexCount === 0) return;
const vData = renderData.chunk.vb;
+2 -1
View File
@@ -76,7 +76,8 @@ export class TTF extends TTFUtils implements IAssembler {
}
fillBuffers (comp: Label, renderer: IBatcher): void {
const renderData = comp.renderData!;
const renderData = comp.renderData;
if (!renderData) return;
const chunk = renderData.chunk;
const dataList: IRenderData[] = renderData.data;
const node = comp.node;
+11 -6
View File
@@ -76,7 +76,8 @@ class BarFilled implements IAssembler {
updateUVs (sprite: Sprite, fillStart: number, fillEnd: number): void {
const spriteFrame = sprite.spriteFrame!;
const renderData = sprite.renderData!;
const renderData = sprite.renderData;
if (!renderData) return;
const vData = renderData.chunk.vb;
// build uvs
@@ -155,7 +156,8 @@ class BarFilled implements IAssembler {
private updateVertexData (sprite: Sprite, fillStart: number, fillEnd: number): void {
const renderData: RenderData | null = sprite.renderData;
const dataList: IRenderData[] = renderData!.data;
if (!renderData) return;
const dataList: IRenderData[] = renderData.data;
const uiTrans = sprite.node._getUITransformComp()!;
const width = uiTrans.width;
const height = uiTrans.height;
@@ -215,9 +217,10 @@ class BarFilled implements IAssembler {
const node = sprite.node;
node.getWorldMatrix(m);
const renderData = sprite.renderData!;
const renderData = sprite.renderData;
if (!renderData) return;
const stride = renderData.floatStride;
const dataList = sprite.renderData!.data;
const dataList = sprite.renderData.data;
const vData = chunk.vb;
let offset = 0;
@@ -236,7 +239,8 @@ class BarFilled implements IAssembler {
}
fillBuffers (sprite: Sprite, renderer: IBatcher): void {
const renderData: RenderData = sprite.renderData!;
const renderData = sprite.renderData;
if (!renderData) return;
const chunk = renderData.chunk;
if (sprite._flagChangedVersion !== sprite.node.flagChangedVersion || renderData.vertDirty) {
this.updateWorldVertexData(sprite, chunk);
@@ -259,7 +263,8 @@ class BarFilled implements IAssembler {
}
updateColor (sprite: Sprite): void {
const renderData = sprite.renderData!;
const renderData = sprite.renderData;
if (!renderData) return;
const vData = renderData.chunk.vb;
const stride = renderData.floatStride;
let colorOffset = 5;
+11 -6
View File
@@ -399,7 +399,8 @@ class RadialFilled implements IAssembler {
fillBuffers (comp: Sprite, renderer: IBatcher): void {
const node = comp.node;
const renderData: RenderData = comp.renderData!;
const renderData = comp.renderData;
if (!renderData) return;
const chunk = renderData.chunk;
if (comp._flagChangedVersion !== node.flagChangedVersion || renderData.vertDirty) {
this.updateWorldVertexAndUVData(comp, chunk);
@@ -423,7 +424,8 @@ class RadialFilled implements IAssembler {
}
private updateWorldUVData (sprite: Sprite): void {
const renderData = sprite.renderData!;
const renderData = sprite.renderData;
if (!renderData) return;
const stride = renderData.floatStride;
const dataList: IRenderData[] = renderData.data;
const vData = renderData.chunk.vb;
@@ -439,9 +441,10 @@ class RadialFilled implements IAssembler {
const node = sprite.node;
node.getWorldMatrix(m);
const renderData = sprite.renderData!;
const renderData = sprite.renderData;
if (!renderData) return;
const stride = renderData.floatStride;
const dataList = sprite.renderData!.data;
const dataList = sprite.renderData.data;
const vData = chunk.vb;
const vertexCount = renderData.vertexCount;
@@ -465,14 +468,16 @@ class RadialFilled implements IAssembler {
// dirty Mark
// the real update uv is on updateWorldUVData
updateUVs (sprite: Sprite): void {
const renderData = sprite.renderData!;
const renderData = sprite.renderData;
if (!renderData) return;
renderData.vertDirty = true;
sprite._markForUpdateRenderData();
}
// fill color here
private updateColorLate (sprite: Sprite): void {
const renderData = sprite.renderData!;
const renderData = sprite.renderData;
if (!renderData) return;
const vData = renderData.chunk.vb;
const stride = renderData.floatStride;
const vertexCount = renderData.vertexCount;
+3 -2
View File
@@ -30,7 +30,8 @@ import { FormatInfos } from '../../gfx';
const _col = new Vec4();
export function fillMeshVertices3D(node: Node, renderer: IBatcher, renderData: RenderData, color: Color): void {
export function fillMeshVertices3D (node: Node, renderer: IBatcher, renderData: RenderData | null, color: Color): void {
if (!renderData) return;
const chunk = renderData.chunk;
const dataList = renderData.data;
const vData = chunk.vb;
@@ -77,7 +78,7 @@ export function fillMeshVertices3D(node: Node, renderer: IBatcher, renderData: R
meshBuffer.setDirty();
}
export function updateOpacity(renderData: RenderData, opacity: number): void {
export function updateOpacity (renderData: RenderData, opacity: number): void {
const vfmt = renderData.vertexFormat;
const vb = renderData.chunk.vb;
let attr; let format; let stride;
+5 -4
View File
@@ -188,7 +188,8 @@ class Simple implements IAssembler {
export const simple = new Simple();
function realTimeTraverse (armature: Armature, parentOpacity: number, worldMat?: Mat4): void {
const rd = _renderData!;
const rd = _renderData;
if (!rd) return;
_vbuf = rd.chunk.vb;
_ibuf = rd.indices!;
@@ -317,7 +318,8 @@ function realTimeTraverse (armature: Armature, parentOpacity: number, worldMat?:
function cacheTraverse (frame: ArmatureFrame | null, parentMat?: Mat4): void {
if (!frame) return;
const segments = frame.segments;
if (segments.length === 0) return;
const rd = _renderData;
if (segments.length === 0 || !rd) return;
let material: MaterialInstance | null = null;
// let offsetInfo;
@@ -335,7 +337,6 @@ function cacheTraverse (frame: ArmatureFrame | null, parentMat?: Mat4): void {
let maxVFOffset = nowColor.vfOffset!;
_handleColor(nowColor, 1.0);
const rd = _renderData!;
const vbuf = rd.chunk.vb;
const ibuf = rd.indices!;
@@ -422,7 +423,7 @@ function updateComponentRenderData (comp: ArmatureDisplay): void {
comp.drawList.reset();
_comp = comp;
_node = comp.node;
_renderData = comp.renderData!;
_renderData = comp.renderData;
_comp = comp;
_handleVal = 0;
_currentMaterial = null;
@@ -79,12 +79,11 @@ class MotionStreakAssembler implements IAssembler {
let vertexCount = 0;
let indexCount = 0;
if (points.length < 2) {
const renderData = comp.renderData;
if (points.length < 2 || !renderData) {
return;
}
const renderData = comp.renderData!;
this.updateRenderDataCache(comp, renderData);
const color = comp.color;
const cr = color.r;
@@ -168,7 +167,8 @@ class MotionStreakAssembler implements IAssembler {
}
private updateWorldVertexAllData (comp: MotionStreak): void {
const renderData = comp.renderData!;
const renderData = comp.renderData;
if (!renderData) return;
const stride = renderData.floatStride;
const dataList = renderData.data;
const vData = renderData.chunk.vb;
@@ -184,7 +184,8 @@ class MotionStreakAssembler implements IAssembler {
}
private createQuadIndices (comp: MotionStreak, indexCount: number): void {
const renderData = comp.renderData!;
const renderData = comp.renderData;
if (!renderData) return;
const chunk = renderData.chunk;
const vid = 0;
const meshBuffer = chunk.meshBuffer;
@@ -219,7 +220,8 @@ class MotionStreakAssembler implements IAssembler {
}
fillBuffers (comp: MotionStreak, renderer: IBatcher): void {
const renderData = comp.renderData!;
const renderData = comp.renderData;
if (!renderData) return;
const chunk = renderData.chunk;
const dataList = renderData.data;
+6 -6
View File
@@ -127,7 +127,8 @@ export const simple = new Simple();
function updateComponentRenderData (comp: Skeleton): void {
comp.drawList.reset();
if (comp.color.a === 0) return;
const rd = comp.renderData;
if (comp.color.a === 0 || !rd) return;
comp._updateColor();
_premultipliedAlpha = comp.premultipliedAlpha;
_useTint = comp.useTint || comp.isAnimationCached();
@@ -136,7 +137,6 @@ function updateComponentRenderData (comp: Skeleton): void {
} else {
realTimeTraverse(comp);
}
const rd = comp.renderData!;
const accessor = _useTint ? _tintAccessor : _accessor;
comp.syncAttachedNode();
if (rd.vertexCount > 0 || rd.indexCount > 0) accessor.getMeshBuffer(rd.chunk.bufferId).setDirty();
@@ -147,9 +147,9 @@ function realTimeTraverse (comp: Skeleton): void {
const model = comp.updateRenderData();
const vc = model.vCount as number;
const ic = model.iCount as number;
if (vc < 1 || ic < 1) return;
const rd = comp.renderData;
if (!rd || vc < 1 || ic < 1) return;
const rd = comp.renderData!;
if (rd.vertexCount !== vc || rd.indexCount !== ic) {
rd.resize(vc, ic);
rd.indices = new Uint16Array(ic);
@@ -269,8 +269,8 @@ function cacheTraverse (comp: Skeleton): void {
const vc = model.vCount as number;
const ic = model.iCount as number;
if (vc < 1 || ic < 1) return;
const rd = comp.renderData!;
const rd = comp.renderData;
if (!rd || vc < 1 || ic < 1) return;
if (rd.vertexCount !== vc || rd.indexCount !== ic) {
rd.resize(vc, ic);
rd.indices = new Uint16Array(ic);
+2 -1
View File
@@ -95,7 +95,8 @@ class Simple implements IAssembler {
// 当前渲染的数据
const data = dataArray[layer._tiledDataArrayIdx] as TiledRenderData;
const renderData = data.renderData!;
const renderData = data.renderData;
if (!renderData) return;
const iBuf = renderData.chunk.meshBuffer.iData;
let indexOffset = renderData.chunk.meshBuffer.indexOffset;
+3 -3
View File
@@ -1562,16 +1562,16 @@ export class TiledLayer extends UIRenderer {
});
} else {
const td = m;
if (td.texture) {
if (td.texture && td.renderData) {
if (!this._drawInfoList[idx]) {
this._drawInfoList[idx] = new RenderDrawInfo();
}
const drawInfo = this._drawInfoList[idx];
td.renderData!.fillDrawInfoAttributes(drawInfo);
td.renderData.fillDrawInfoAttributes(drawInfo);
drawInfo.setTexture(td.texture.getGFXTexture());
drawInfo.setSampler(td.texture.getGFXSampler());
drawInfo.setMaterial(this.getRenderMaterial(0)!);
this.fillIndicesBuffer(td.renderData!, drawInfo);
this.fillIndicesBuffer(td.renderData, drawInfo);
entity.setDynamicRenderDrawInfo(drawInfo, idx);
idx++;
}