diff options
author | 2023-01-05 15:32:40 +0100 | |
---|---|---|
committer | 2023-01-05 09:32:40 -0500 | |
commit | 812e6094f47bb8d1da5a6b421aa4c724cf2035c0 (patch) | |
tree | 0f5bab2fe9393d1f629e9bf63e76cecca74ec0c9 /3rdparty/bgfx/examples/common/ps/particle_system.cpp | |
parent | 4a1b41854bba8fc2567906b88bab8ca81e75d187 (diff) |
Update BGFX, BX and BIMG (#10789)
* Update to bgfx a93a714632b79b5ddbf5c86ac323fa9b76ed3433
Co-authored-by: Бранимир Караџић <branimirkaradzic@gmail.com>
Diffstat (limited to '3rdparty/bgfx/examples/common/ps/particle_system.cpp')
-rw-r--r-- | 3rdparty/bgfx/examples/common/ps/particle_system.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/3rdparty/bgfx/examples/common/ps/particle_system.cpp b/3rdparty/bgfx/examples/common/ps/particle_system.cpp index cbcf2b874b0..721779f1123 100644 --- a/3rdparty/bgfx/examples/common/ps/particle_system.cpp +++ b/3rdparty/bgfx/examples/common/ps/particle_system.cpp @@ -1,6 +1,6 @@ /* - * Copyright 2011-2021 Branimir Karadzic. All rights reserved. - * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause + * Copyright 2011-2022 Branimir Karadzic. All rights reserved. + * License: https://github.com/bkaradzic/bgfx/blob/master/LICENSE */ #include <bgfx/bgfx.h> @@ -190,7 +190,7 @@ namespace ps m_dt = 0.0f; m_uniforms.reset(); m_num = 0; - bx::memSet(&m_aabb, 0, sizeof(Aabb) ); + bx::memSet(&m_aabb, 0, sizeof(bx::Aabb) ); m_rng.reset(); } @@ -329,7 +329,7 @@ namespace ps bx::EaseFn easeBlend = bx::getEaseFunc(m_uniforms.m_easeBlend); bx::EaseFn easeScale = bx::getEaseFunc(m_uniforms.m_easeScale); - Aabb aabb = + bx::Aabb aabb = { { bx::kInfinity, bx::kInfinity, bx::kInfinity }, { -bx::kInfinity, -bx::kInfinity, -bx::kInfinity }, @@ -425,7 +425,7 @@ namespace ps bx::RngMwc m_rng; EmitterUniforms m_uniforms; - Aabb m_aabb; + bx::Aabb m_aabb; Particle* m_particles; uint32_t m_num; @@ -626,7 +626,7 @@ namespace ps void updateEmitter(EmitterHandle _handle, const EmitterUniforms* _uniforms) { - BX_ASSERT(m_emitterAlloc.isValid(_handle.idx) + BX_ASSERT(isValid(_handle) , "destroyEmitter handle %d is not valid." , _handle.idx ); @@ -643,9 +643,9 @@ namespace ps } } - void getAabb(EmitterHandle _handle, Aabb& _outAabb) + void getAabb(EmitterHandle _handle, bx::Aabb& _outAabb) { - BX_ASSERT(m_emitterAlloc.isValid(_handle.idx) + BX_ASSERT(isValid(_handle) , "getAabb handle %d is not valid." , _handle.idx ); @@ -654,7 +654,7 @@ namespace ps void destroyEmitter(EmitterHandle _handle) { - BX_ASSERT(m_emitterAlloc.isValid(_handle.idx) + BX_ASSERT(isValid(_handle) , "destroyEmitter handle %d is not valid." , _handle.idx ); @@ -730,7 +730,7 @@ void psUpdateEmitter(EmitterHandle _handle, const EmitterUniforms* _uniforms) s_ctx.updateEmitter(_handle, _uniforms); } -void psGetAabb(EmitterHandle _handle, Aabb& _outAabb) +void psGetAabb(EmitterHandle _handle, bx::Aabb& _outAabb) { s_ctx.getAabb(_handle, _outAabb); } |