Compare commits

..

15 Commits

Author SHA1 Message Date
hyde zhou 3aeb193d42 bump version to 4.0.0-alpha.28 (#226) 2026-07-24 17:30:01 +08:00
Cocos Robot c4e4790ee6 [ci skip][AUTO]: Automated code generating update: 8e77b19f89 (#218) (#219) 2026-07-24 16:49:29 +08:00
troublemaker52025 143af30cf2 feat(legacy): optmize render-additive-light-queue.ts code (#212) 2026-07-21 16:56:11 +08:00
hyde zhou d6ff23fed4 Revert "fix: use PR_TOKEN for create-pull-request fork collab permission (#216)" (#218) 2026-07-21 16:41:03 +08:00
Copilot 84e8d4ebf7 fix: use PR_TOKEN for create-pull-request fork collab permission (#216) 2026-07-21 16:01:42 +08:00
Copilot f2b9936033 fix: replace fish9167/create-pull-request@v3 to resolve token permission error in autogen-code job (#215) 2026-07-21 14:48:19 +08:00
troublemaker52025 129eb437ad fix(legacy): GPU Instancec memory leak in C++ (#211) 2026-07-21 10:56:43 +08:00
hyde zhou c58c893334 bump version to 4.0.0-alpha.27 (#210) 2026-07-20 16:38:33 +08:00
zxx43 ab982aec68 fix index buffer access bug (#205) 2026-07-20 14:14:38 +08:00
徐兵 2d2bbe6731 Use TONE_MAPPING_ACES constant for CC_TONE_MAPPING_TYPE check, skip ACESToneMap in linear mode. (#196) 2026-07-20 14:13:02 +08:00
hyde zhou 187387b03f fix eventWebGLContextLost (#206) 2026-07-20 10:04:57 +08:00
zxx43 661253a521 fix particle trail crash bug (#201) 2026-07-20 09:55:24 +08:00
troublemaker52025 b6d0f02e88 fix(SRP): use lightIdx instead of loop index l in GPU instancing forw… (#198) 2026-07-20 09:52:57 +08:00
troublemaker52025 dd1b155d3a fix(legacy): custom attribute that set format error (#207) 2026-07-20 09:49:10 +08:00
troublemaker52025 df96ee85f3 fix(SRP): crash when native OpenAL is unavailable (#195) 2026-07-15 16:45:36 +08:00
24 changed files with 220 additions and 98 deletions
+8 -2
View File
@@ -165,6 +165,10 @@ export class StaticVBAccessor extends BufferAccessor {
errorID(9004, byteLength);
return null;
}
if (vertexCount > 65536) { // Vertex count must less than 65536 for index is uint16 (0 to 65535)
errorID(9004, byteLength);
return null;
}
let buf: MeshBuffer = null!;
let freeList: IFreeEntry[];
let bid = 0;
@@ -176,9 +180,11 @@ export class StaticVBAccessor extends BufferAccessor {
freeList = this._freeLists[i];
// Loop entries
for (let e = 0; e < freeList.length; ++e) {
const freeEntry = freeList[e];
const vertexOffset: number = freeEntry.offset / this.vertexFormatBytes;
// Found suitable free entry
if (freeList[e].length >= byteLength) {
entry = freeList[e];
if (freeEntry.length >= byteLength && vertexOffset + (vertexCount - 1) <= 65535) {
entry = freeEntry;
bid = i;
eid = e;
break;
+1 -1
View File
@@ -185,7 +185,7 @@ export class WebGL2Swapchain extends Swapchain {
self._canvas = info.windowHandle;
self._webGL2ContextLostHandler = self._onWebGLContextLost.bind(self);
self._canvas.addEventListener(eventWebGLContextLost, self._onWebGLContextLost);
self._canvas.addEventListener(eventWebGLContextLost, self._webGL2ContextLostHandler);
const { instance } = WebGL2DeviceManager;
const { gl, capabilities } = instance;
+2 -2
View File
@@ -233,8 +233,8 @@ export class ParticleSystem extends ModelRenderer {
public startLifetime = new CurveRange();
/**
* @en Particle system duration time.
* @zh 粒子系统运行时间。
* @en Particle system emitter duration time.
* @zh 粒子系统发射器运行时间。
*/
@serializable
@displayOrder(0)
+4 -1
View File
@@ -377,7 +377,10 @@ export default class TrailModule {
if (this.lifeTime.getMax() < 1.0) {
warnID(6036);
}
this._trailNum = Math.ceil(psTime * Math.ceil(this.lifeTime.getMax()) * 60 * (psRate * duration + burstCount));
let pCount: number = psRate * duration; // potential particle count
pCount = ps.prewarm ? pCount * 2 : pCount; // if prewarm we need double space
pCount = pCount > ps.capacity ? ps.capacity : pCount; // max particle count is less/equal than capacity
this._trailNum = Math.ceil(psTime * Math.ceil(this.lifeTime.getMax()) * 60 * (pCount + burstCount));
this._trailSegments = new Pool(
(): TrailSegment => new TrailSegment(10),
Math.ceil(psRate * duration),
+29 -26
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;
@@ -196,7 +198,7 @@ export class RenderAdditiveLightQueue {
this._lightCulling(model, validPunctualLights);
if (!_lightIndices.length && validPunctualLights.length > 0) { continue; }
if (!_lightIndices.length) { continue; }
for (let j = 0; j < subModels.length; j++) {
const lightPassIdx = _lightPassIndices[j];
@@ -219,15 +221,14 @@ export class RenderAdditiveLightQueue {
public gatherLightPasses (camera: Camera, cmdBuff: CommandBuffer, passLayout = 'default'): void {
this.clear();
const validPunctualLights = this._pipeline.pipelineSceneData.validPunctualLights;
if (!validPunctualLights.length) {
this._bindForwardAddLight(validPunctualLights, passLayout);
return;
}
this._updateUBOs(camera, cmdBuff);
this._updateLightDescriptorSet(camera, cmdBuff);
const validPunctualLights = this._pipeline.pipelineSceneData.validPunctualLights;
if (!validPunctualLights.length) { return; }
this._bindForwardAddLight(validPunctualLights, passLayout);
// only for instanced and batched, no light culling applied
for (let l = 0; l < validPunctualLights.length; l++) {
const light = validPunctualLights[l];
@@ -236,17 +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) {
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++) {
@@ -318,11 +323,14 @@ export class RenderAdditiveLightQueue {
if (((visibility & model.node.layer) === model.node.layer)) {
switch (batchingScheme) {
case BatchingSchemes.INSTANCING: {
const buffer = pass.getInstancedBuffer(l);
const buffer = pass.getInstancedBuffer(lightIdx);
buffer.merge(subModel, lightPassIdx);
buffer.dynamicOffsets[0] = this._lightBufferStride;
if (!this._instancedQueues[l]) { this._instancedQueues[l] = new RenderInstancedQueue(); }
this._instancedQueues[l].queue.add(buffer);
buffer.dynamicOffsets[0] = this._lightBufferStride * lightIdx;
if (this._instancedQueues.length <= lightIdx || !this._instancedQueues[lightIdx]) {
this._instancedQueues.length = lightIdx + 1;
this._instancedQueues[lightIdx] = new RenderInstancedQueue();
}
this._instancedQueues[lightIdx]!.queue.add(buffer);
} break;
default:
lp!.lights.push(light);
@@ -370,9 +378,6 @@ export class RenderAdditiveLightQueue {
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 1] = packing;
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 2] = 0.0;
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 3] = 0.0;
// Reserve sphere light shadow interface
Color.toArray(this._shadowUBO, shadowInfo.shadowColor, UBOShadowEnum.SHADOW_COLOR_OFFSET);
break;
}
case LightType.SPOT: {
@@ -437,8 +442,6 @@ export class RenderAdditiveLightQueue {
this._shadowUBO[UBOShadowEnum.SHADOW_PROJ_INFO_OFFSET + 2] = 1.0 / matShadowProj.m00;
this._shadowUBO[UBOShadowEnum.SHADOW_PROJ_INFO_OFFSET + 3] = 1.0 / matShadowProj.m05;
Color.toArray(this._shadowUBO, shadowInfo.shadowColor, UBOShadowEnum.SHADOW_COLOR_OFFSET);
// Spot light sampler binding
if (shadowFrameBufferMap.has(light)) {
const texture = shadowFrameBufferMap.get(light)?.colorTextures[0];
@@ -463,15 +466,15 @@ export class RenderAdditiveLightQueue {
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 1] = packing;
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 2] = 0.0;
this._shadowUBO[UBOShadowEnum.SHADOW_LIGHT_PACKING_NBIAS_NULL_INFO_OFFSET + 3] = 0.0;
// Reserve point light shadow interface
Color.toArray(this._shadowUBO, shadowInfo.shadowColor, UBOShadowEnum.SHADOW_COLOR_OFFSET);
break;
}
default:
}
globalDSManager.update();
cmdBuff.updateBuffer(descriptorSet.getBuffer(UBOShadow.BINDING)!, this._shadowUBO);
Color.toArray(this._shadowUBO, shadowInfo.shadowColor, UBOShadowEnum.SHADOW_COLOR_OFFSET);
descriptorSet.update();
cmdBuff.updateBuffer(descriptorSet.getBuffer(UBOShadow.BINDING)!, this._shadowUBO.buffer, this._shadowUBO.byteLength);
}
}
@@ -627,6 +630,6 @@ export class RenderAdditiveLightQueue {
}
}
cmdBuff.updateBuffer(this._lightBuffer, this._lightBufferData);
cmdBuff.updateBuffer(this._lightBuffer, this._lightBufferData.buffer as ArrayBuffer, this._lightBufferData.byteLength);
}
}
@@ -10,7 +10,7 @@ vec3 HDRToLDR(vec3 color)
#endif
{
// linear exposure has already applied to light intensity
#if CC_TONE_MAPPING_TYPE == HDR_TONE_MAPPING_ACES
#if CC_TONE_MAPPING_TYPE == TONE_MAPPING_ACES
color.rgb = ACESToneMap(color.rgb);
#endif
}
@@ -79,8 +79,12 @@ vec4 saturate(vec4 value) { return clamp(value, vec4(0.0), vec4(1.0)); }
#define IS_RANGED_DIRECTIONAL_LIGHT(light_type) equalf_lowp(light_type, LIGHT_TYPE_RANGED_DIRECTIONAL)
// CC_TONE_MAPPING_TYPE Values
#define TONE_MAPPING_ACES 0
#define TONE_MAPPING_LINEAR 1
#ifndef TONE_MAPPING_ACES
#define TONE_MAPPING_ACES 0
#endif
#ifndef TONE_MAPPING_LINEAR
#define TONE_MAPPING_LINEAR 1
#endif
// Material
#define SURFACES_MAX_TRANSMIT_DEPTH_VALUE 999999.0
@@ -7,7 +7,7 @@ vec4 CCFragOutput (vec4 color) {
#if CC_USE_RGBE_OUTPUT
color = packRGBE(color.rgb);
#elif !CC_USE_FLOAT_OUTPUT
#if CC_USE_HDR && CC_TONE_MAPPING_TYPE == HDR_TONE_MAPPING_ACES
#if CC_USE_HDR && CC_TONE_MAPPING_TYPE == TONE_MAPPING_ACES
color.rgb = ACESToneMap(color.rgb);
#endif
color.rgb = LinearToSRGB(color.rgb);
+3 -1
View File
@@ -70,7 +70,9 @@ CCProgram smaa-edge-fs %{
vec3 ToLDR(vec3 color) {
#if CC_USE_HDR
color *= cc_exposure.x * FP_SCALE_INV;
color = ACESToneMap(color);
#if CC_TONE_MAPPING_TYPE == TONE_MAPPING_ACES
color = ACESToneMap(color);
#endif
color = LinearToSRGB(color);
#endif
return color;
@@ -55,7 +55,9 @@ CCProgram tonemap-fs %{
vec3 ToLDR(vec3 color) {
#if CC_USE_HDR
color *= cc_exposure.x * FP_SCALE_INV;
color = ACESToneMap(color);
#if CC_TONE_MAPPING_TYPE == TONE_MAPPING_ACES
color = ACESToneMap(color);
#endif
color = LinearToSRGB(color);
#endif
return color;
+5 -1
View File
@@ -185,7 +185,11 @@ Mesh::ICreateInfo MeshUtils::createMeshInfo(const IGeometry &geometry, const ccs
if (geometry.customAttributes.has_value()) {
for (const auto &ca : geometry.customAttributes.value()) {
const auto &info = gfx::GFX_FORMAT_INFOS[static_cast<uint32_t>(attr->format)];
if (ca.values.empty()) {
CC_LOG_WARNING("Custom attribute %s has no values, skipped.", ca.attr.name.c_str());
continue;
}
const auto &info = gfx::GFX_FORMAT_INFOS[static_cast<uint32_t>(ca.attr.format)];
attributes.emplace_back(ca.attr);
vertCount = std::max(vertCount, static_cast<uint32_t>(std::floor(ca.values.size() / info.count)));
channels.emplace_back(Channel{stride, ca.values, ca.attr});
+47 -5
View File
@@ -68,6 +68,9 @@ unsigned int AudioEngine::sMaxInstances = MAX_AUDIOINSTANCES;
AudioEngine::ProfileHelper *AudioEngine::sDefaultProfileHelper = nullptr;
ccstd::unordered_map<int, AudioEngine::AudioInfo> AudioEngine::sAudioIDInfoMap;
AudioEngineImpl *AudioEngine::sAudioEngineImpl = nullptr;
// Decoder-only fallback instance, defined here to keep AudioDecoderManager
// initialization separate from OpenAL initialization.
AudioEngineImpl *AudioEngine::sDecoderImpl = nullptr;
float AudioEngine::sVolumeFactor = 1.0F;
events::EnterBackground::Listener AudioEngine::sOnPauseListenerID;
@@ -156,6 +159,9 @@ void AudioEngine::end() {
delete sAudioEngineImpl;
sAudioEngineImpl = nullptr;
delete sDecoderImpl;
sDecoderImpl = nullptr;
delete sDefaultProfileHelper;
sDefaultProfileHelper = nullptr;
@@ -587,12 +593,48 @@ bool AudioEngine::isEnabled() {
return sIsEnabled;
}
PCMHeader AudioEngine::getPCMHeader(const char *url) {
lazyInit();
return sAudioEngineImpl->getPCMHeader(url);
AudioEngineImpl *AudioEngine::getDecoderImpl() {
if (AudioEngine::sAudioEngineImpl != nullptr) {
return AudioEngine::sAudioEngineImpl;
}
// Try full init first; if it succeeds we get OpenAL + decoder.
AudioEngine::lazyInit();
if (AudioEngine::sAudioEngineImpl != nullptr) {
return AudioEngine::sAudioEngineImpl;
}
// On oalsoft platforms, PCM decoding via AudioDecoderManager works
// independently of OpenAL — create a decoder-only fallback instance.
// On Android/OpenHarmony and Apple, AudioEngineImpl::getPCMHeader/
// getOriginalPCMBuffer dereferences _audioPlayerProvider/_engineEngine
// which are only set up by init(). Returning nullptr here lets callers
// fail gracefully instead of crashing.
#if CC_PLATFORM == CC_PLATFORM_WINDOWS || CC_PLATFORM == CC_PLATFORM_OHOS || \
CC_PLATFORM == CC_PLATFORM_LINUX || CC_PLATFORM == CC_PLATFORM_QNX
if (AudioEngine::sDecoderImpl == nullptr) {
AudioEngine::sDecoderImpl = ccnew AudioEngineImpl();
AudioEngineImpl::initDecoder();
}
return AudioEngine::sDecoderImpl;
#else
return nullptr;
#endif
}
PCMHeader AudioEngine::getPCMHeader(const char *url) {
AudioEngineImpl *impl = AudioEngine::getDecoderImpl();
if (impl == nullptr) {
CC_LOG_WARNING("AudioEngine::getPCMHeader: audio engine unavailable, url: %s", url);
return {};
}
return impl->getPCMHeader(url);
}
ccstd::vector<uint8_t> AudioEngine::getOriginalPCMBuffer(const char *url, uint32_t channelID) {
lazyInit();
return sAudioEngineImpl->getOriginalPCMBuffer(url, channelID);
AudioEngineImpl *impl = AudioEngine::getDecoderImpl();
if (impl == nullptr) {
CC_LOG_WARNING("AudioEngine::getOriginalPCMBuffer: audio engine unavailable, url: %s", url);
return {};
}
return impl->getOriginalPCMBuffer(url, channelID);
}
} // namespace cc
@@ -426,6 +426,12 @@ void AudioEngineImpl::onResume() {
}
}
bool AudioEngineImpl::initDecoder() {
// On Android the decoder infrastructure is set up by init().
// This method exists so AudioEngine.cpp compiles uniformly across all platforms.
return true;
}
PCMHeader AudioEngineImpl::getPCMHeader(const char *url) {
PCMHeader header{};
ccstd::string fileFullPath = FileUtils::getInstance()->fullPathForFilename(url);
@@ -55,6 +55,7 @@ public:
~AudioEngineImpl() override;
bool init();
static bool initDecoder();
int play2d(const ccstd::string &filePath, bool loop, float volume);
void setVolume(int audioID, float volume);
void setLoop(int audioID, bool loop);
@@ -43,6 +43,7 @@ public:
~AudioEngineImpl();
bool init();
static bool initDecoder();
int play2d(const ccstd::string &fileFullPath, bool loop, float volume);
void setVolume(int audioID, float volume);
void setLoop(int audioID, bool loop);
@@ -632,6 +632,12 @@ bool AudioEngineImpl::checkAudioIdValid(int audioID) {
return _audioPlayers.find(audioID) != _audioPlayers.end();
}
bool AudioEngineImpl::initDecoder() {
// On Apple the decoder infrastructure is set up by init().
// This method exists so AudioEngine.cpp compiles uniformly across all platforms.
return true;
}
PCMHeader AudioEngineImpl::getPCMHeader(const char *url){
PCMHeader header {};
auto itr = _audioCaches.find(url);
+17
View File
@@ -339,6 +339,19 @@ protected:
static void pauseAll(ccstd::vector<int> *pausedAudioIDs);
static void resumeAll(ccstd::vector<int> *pausedAudioIDs);
/**
* @brief Get Audio Decoder
*
* Strategy:
* 1. If the full impl (with OpenAL) is already alive, reuse it (cache + decoder both available).
* 2. If OpenAL init has not been attempted yet, try lazyInit() so that a successful OpenAL
* environment still gets the full impl (keeps _audioCaches coherent with play2d).
* 3. Only fall back to the decoder-only sDecoderImpl when lazyInit() has failed
* (alcOpenDevice returned null, headless / OHOS / CI environments).
* @return The impl instance to use for PCM decoding.
*/
static AudioEngineImpl *getDecoderImpl();
struct ProfileHelper {
AudioProfile profile;
@@ -382,6 +395,10 @@ protected:
static ProfileHelper *sDefaultProfileHelper;
static AudioEngineImpl *sAudioEngineImpl;
// Decoder-only fallback instance used when OpenAL is unavailable.
// getPCMHeader / getOriginalPCMBuffer do not depend on OpenAL and use this
// instance directly instead of going through lazyInit().
static AudioEngineImpl *sDecoderImpl;
class AudioEngineThreadPool;
static AudioEngineThreadPool *sThreadPool;
+41 -22
View File
@@ -62,7 +62,7 @@
// log, CC_LOG_DEBUG aren't threadsafe, since we uses sub threads for parsing pcm data, threadsafe log output
// is needed. Define the following macros (ALOGV, ALOGD, ALOGI, ALOGW, ALOGE) for threadsafe log output.
//IDEA: Move _winLog, winLog to a separated file
// IDEA: Move _winLog, winLog to a separate file
static void _winLog(const char *format, va_list args) {
static const int MAX_LOG_LENGTH = 16 * 1024;
int bufferSize = MAX_LOG_LENGTH;
@@ -153,31 +153,50 @@ AudioEngineImpl::~AudioEngineImpl() {
AudioDecoderManager::destroy();
}
bool AudioEngineImpl::initDecoder() {
return AudioDecoderManager::init();
}
bool AudioEngineImpl::init() {
bool ret = false;
do {
sALDevice = alcOpenDevice(nullptr);
if (sALDevice) {
alGetError();
sALContext = alcCreateContext(sALDevice, nullptr);
alcMakeContextCurrent(sALContext);
alGenSources(MAX_AUDIOINSTANCES, _alSources);
auto alError = alGetError();
if (alError != AL_NO_ERROR) {
CC_LOG_ERROR("%s:generating sources failed! error = %x\n", __FUNCTION__, alError);
break;
}
for (unsigned int src : _alSources) {
_alSourceUsed[src] = false;
}
_scheduler = CC_CURRENT_ENGINE()->getScheduler();
ret = AudioDecoderManager::init();
CC_LOG_DEBUG("OpenAL was initialized successfully!");
if (sALDevice == nullptr) {
// alcGetError(nullptr) is valid when no device is open
ALCenum alcErr = alcGetError(nullptr);
CC_LOG_ERROR("%s: alcOpenDevice failed, ALC error = 0x%x", __FUNCTION__, alcErr);
break;
}
alGetError();
sALContext = alcCreateContext(sALDevice, nullptr);
if (sALContext == nullptr) {
ALCenum alcErr = alcGetError(sALDevice);
CC_LOG_ERROR("%s: alcCreateContext failed, ALC error = 0x%x", __FUNCTION__, alcErr);
break;
}
alcMakeContextCurrent(sALContext);
std::fill(std::begin(_alSources), std::end(_alSources), 0);
alGenSources(MAX_AUDIOINSTANCES, _alSources);
auto alError = alGetError();
if (alError != AL_NO_ERROR) {
CC_LOG_ERROR("%s:generating sources failed! error = %x\n", __FUNCTION__, alError);
alcMakeContextCurrent(nullptr);
alcDestroyContext(sALContext);
sALContext = nullptr;
break;
}
for (unsigned int src : _alSources) {
_alSourceUsed[src] = false;
}
_scheduler = CC_CURRENT_ENGINE()->getScheduler();
ret = initDecoder();
CC_LOG_DEBUG("OpenAL was initialized successfully!");
} while (false);
return ret;
@@ -264,7 +283,7 @@ int AudioEngineImpl::play2d(const ccstd::string &filePath, bool loop, float volu
}
void AudioEngineImpl::play2dImpl(AudioCache *cache, int audioID) {
//Note: It may bn in sub thread or main thread :(
// Note: It may be in sub thread or main thread :(
if (!*cache->_isDestroyed && cache->_state == AudioCache::State::READY) {
_threadMutex.lock();
auto playerIt = _audioPlayers.find(audioID);
@@ -45,6 +45,9 @@ public:
~AudioEngineImpl() override;
bool init();
// Initialize only the PCM decoder subsystem (AudioDecoderManager).
// Does not require an OpenAL device. Safe to call when init() failed.
static bool initDecoder();
int play2d(const ccstd::string &filePath, bool loop, float volume);
void setVolume(int audioID, float volume);
void setLoop(int audioID, bool loop);
@@ -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"
@@ -68,6 +68,7 @@ RenderAdditiveLightQueue::RenderAdditiveLightQueue(RenderPipeline *pipeline) : _
void RenderAdditiveLightQueue::recordCommandBuffer(gfx::Device *device, scene::Camera *camera, gfx::RenderPass *renderPass, gfx::CommandBuffer *cmdBuffer) {
const uint32_t offset = _pipeline->getPipelineUBO()->getCurrentCameraUBOOffset();
for (uint32_t i = 0; i < _instancedQueues.size(); ++i) {
if (!this->_instancedQueues[i]) { continue; }
const auto *light = _instancedLightPass.lights[i];
_dynamicOffsets[0] = _instancedLightPass.dynamicOffsets[i];
auto *globalDescriptorSet = _pipeline->getGlobalDSManager()->getOrCreateDescriptorSet(light);
@@ -109,13 +110,12 @@ void RenderAdditiveLightQueue::gatherLightPasses(const scene::Camera *camera, gf
clear();
_validPunctualLights = _pipeline->getPipelineSceneData()->getValidPunctualLights();
if (_validPunctualLights.empty()) return;
updateUBOs(camera, cmdBuffer);
updateLightDescriptorSet(camera, cmdBuffer);
_validPunctualLights = _pipeline->getPipelineSceneData()->getValidPunctualLights();
if (_validPunctualLights.empty()) return;
const auto &renderObjects = _pipeline->getPipelineSceneData()->getRenderObjects();
for (const auto &renderObject : renderObjects) {
const auto *const model = renderObject.model;
@@ -154,20 +154,19 @@ 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();
for (auto lightPass : _lightPasses) {
lightPass.dynamicOffsets.clear();
lightPass.lights.clear();
}
_lightPasses.clear();
_instancedLightPass.dynamicOffsets.clear();
@@ -212,13 +211,14 @@ void RenderAdditiveLightQueue::addRenderQueue(scene::SubModel *subModel, const s
if ((visibility & model->getNode()->getLayer()) == model->getNode()->getLayer()) {
switch (batchingScheme) {
case scene::BatchingSchemes::INSTANCING: {
auto *buffer = pass->getInstancedBuffer(i);
auto *buffer = pass->getInstancedBuffer(lightIdx);
buffer->merge(subModel, lightPassIdx);
buffer->setDynamicOffset(0, _lightBufferStride);
if (i >= _instancedQueues.size()) {
_instancedQueues.emplace_back(ccnew RenderInstancedQueue());
buffer->setDynamicOffset(0, _lightBufferStride * lightIdx);
if (_instancedQueues.size() <= lightIdx || !_instancedQueues[lightIdx]) {
_instancedQueues.resize(lightIdx + 1);
_instancedQueues[lightIdx] = ccnew RenderInstancedQueue();
}
_instancedQueues[i]->add(buffer);
_instancedQueues[lightIdx]->add(buffer);
} break;
case scene::BatchingSchemes::NONE: {
lightPass.lights.emplace_back(light);
@@ -243,6 +243,7 @@ void RenderAdditiveLightQueue::updateUBOs(const scene::Camera *camera, gfx::Comm
size_t offset = 0;
if (validLightCount > _lightBufferCount) {
_firstLightBufferView->destroy();
_lightBufferCount = nextPow2(static_cast<uint32_t>(validLightCount));
_lightBuffer->resize(utils::toUint(_lightBufferStride * _lightBufferCount));
_lightBufferData.resize(static_cast<size_t>(_lightBufferElementCount) * _lightBufferCount);
@@ -432,7 +433,7 @@ void RenderAdditiveLightQueue::updateLightDescriptorSet(const scene::Camera *cam
memcpy(_shadowUBO.data() + UBOShadow::MAT_LIGHT_VIEW_PROJ_OFFSET, matShadowViewProj.m, sizeof(matShadowViewProj));
// shadow info
float shadowNFLSInfos[4] = {0.1F, spotLight->getRange(), 0.0F, 0.0F};
float shadowNFLSInfos[4] = {0.01F, spotLight->getRange(), 0.0F, 0.0F};
memcpy(_shadowUBO.data() + UBOShadow::SHADOW_NEAR_FAR_LINEAR_SATURATION_INFO_OFFSET, &shadowNFLSInfos, sizeof(shadowNFLSInfos));
const auto &shadowSize = shadowInfo->getSize();
@@ -491,15 +492,17 @@ bool RenderAdditiveLightQueue::getLightPassIndex(const scene::Model *model, ccst
bool hasValidLightPass = false;
for (const auto &subModel : model->getSubModels()) {
int lightPassIndex = 0;
int lightPassIndex = -1; // use -1 to indicate no valid light pass found
int k = 0;
for (const auto &pass : *(subModel->getPasses())) {
if (pass->getPhase() == _phaseID) {
lightPassIndex = k;
hasValidLightPass = true;
break;
}
++lightPassIndex;
++k;
}
lightPassIndices->push_back(lightPassIndex);
lightPassIndices->push_back(static_cast<uint32_t>(lightPassIndex));
}
return hasValidLightPass;
@@ -517,7 +520,7 @@ void RenderAdditiveLightQueue::lightCulling(const scene::Model *model) {
isCulled = cullSpotLight(static_cast<const scene::SpotLight *>(light), model);
break;
case scene::LightType::POINT:
isCulled = cullSphereLight(static_cast<const scene::SphereLight *>(light), model);
isCulled = cullPointLight(static_cast<const scene::PointLight *>(light), model);
break;
case scene::LightType::RANGED_DIRECTIONAL:
isCulled = cullRangedDirLight(static_cast<const scene::RangedDirectionalLight *>(light), model);
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "cocos-creator",
"version": "4.0.0-alpha.26",
"version": "4.0.0-alpha.28",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cocos-creator",
"version": "4.0.0-alpha.26",
"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.26",
"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",