Compare commits

..

7 Commits

6 changed files with 28 additions and 19 deletions
+11 -6
View File
@@ -126,7 +126,7 @@ export class RenderAdditiveLightQueue {
private declare _lightBuffer: Buffer;
private declare _firstLightBufferView: Buffer;
private declare _lightBufferData: Float32Array;
private _instancedQueues: RenderInstancedQueue[] = [];
private _instancedQueues: (RenderInstancedQueue | undefined)[] = [];
private _lightMeterScale = 10000.0;
constructor (pipeline: PipelineRuntime) {
@@ -151,7 +151,9 @@ export class RenderAdditiveLightQueue {
public clear (): void {
this._instancedQueues.forEach((instancedQueue) => {
instancedQueue.clear();
if (instancedQueue) {
instancedQueue.clear();
}
});
this._instancedQueues.length = 0;
@@ -235,18 +237,21 @@ export class RenderAdditiveLightQueue {
}
this._instancedQueues.forEach((instancedQueue) => {
instancedQueue.uploadBuffers(cmdBuff);
if (instancedQueue) {
instancedQueue.uploadBuffers(cmdBuff);
}
});
}
public recordCommandBuffer (device: Device, renderPass: RenderPass, cmdBuff: CommandBuffer): void {
const globalDSManager: GlobalDSManager = this._pipeline.globalDSManager;
for (let j = 0; j < this._instancedQueues.length; ++j) {
if (!this._instancedQueues[j]) { continue; }
const queue = this._instancedQueues[j];
if (!queue) { continue; }
const light = this._instancedLightPassPool.lights[j];
_dynamicOffsets[0] = this._instancedLightPassPool.dynamicOffsets[j];
const descriptorSet = globalDSManager.getOrCreateDescriptorSet(light);
this._instancedQueues[j].recordCommandBuffer(device, renderPass, cmdBuff, descriptorSet, _dynamicOffsets);
queue.recordCommandBuffer(device, renderPass, cmdBuff, descriptorSet, _dynamicOffsets);
}
for (let i = 0; i < this._lightPasses.length; i++) {
@@ -325,7 +330,7 @@ export class RenderAdditiveLightQueue {
this._instancedQueues.length = lightIdx + 1;
this._instancedQueues[lightIdx] = new RenderInstancedQueue();
}
this._instancedQueues[lightIdx].queue.add(buffer);
this._instancedQueues[lightIdx]!.queue.add(buffer);
} break;
default:
lp!.lights.push(light);
@@ -699,7 +699,7 @@ static bool js_Model_setInstancedAttribute(se::State &s) // NOLINT(readability-i
value[i] = dataVal.toFloat();
}
cobj->setInstancedAttribute(name, value);
cobj->setInstancedAttribute(name, std::move(value));
return true;
}
+7 -7
View File
@@ -1,5 +1,5 @@
/****************************************************************************
Copyright (c) 2022-2025 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2022-2026 Xiamen Yaji Software Co., Ltd.
http://www.cocos.com
@@ -23,11 +23,11 @@ THE SOFTWARE.
****************************************************************************/
#pragma once
#define COCOS_MAJOR_VERSION 3
#define COCOS_MINJOR_VERSION 8
#define COCOS_PATCH_VERSION 8
#define COCOS_VERSION_STRING "3.8.8"
#define COCOS_MAJOR_VERSION 4
#define COCOS_MINJOR_VERSION 0
#define COCOS_PATCH_VERSION 0
#define COCOS_VERSION_STRING "4.0.0"
#define COCOS_VERSION_DEFINED 1
#define COCOS_VERSION 30808
#define COCOS_VERSION 40000
// #define COCOS_PRE_RELEASE "release"
// #define COCOS_PRE_RELEASE "alpha"
@@ -154,13 +154,17 @@ void RenderAdditiveLightQueue::gatherLightPasses(const scene::Camera *camera, gf
_instancedLightPass.dynamicOffsets.emplace_back(_lightBufferStride * l);
}
for (const auto &instancedQueue : _instancedQueues) {
instancedQueue->uploadBuffers(cmdBuffer);
if (instancedQueue) {
instancedQueue->uploadBuffers(cmdBuffer);
}
}
}
void RenderAdditiveLightQueue::clear() {
for (const auto &instancedQueue : _instancedQueues) {
instancedQueue->clear();
if (instancedQueue) {
instancedQueue->clear();
}
}
_instancedQueues.clear();
_lightPasses.clear();
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "cocos-creator",
"version": "4.0.0-alpha.27",
"version": "4.0.0-alpha.28",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cocos-creator",
"version": "4.0.0-alpha.27",
"version": "4.0.0-alpha.28",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "cocos-creator",
"version": "4.0.0-alpha.27",
"version": "4.0.0-alpha.28",
"description": "Cocos Creator is a cross-platform 2D & 3D game engine written in C++ and TypeScript, licensed under MIT.",
"homepage": "http://www.cocos.com",
"license": "MIT",