summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/ps/particle_system.cpp
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2023-01-04 23:29:18 -0500
committer GitHub <noreply@github.com>2023-01-04 23:29:18 -0500
commit94b1e168b2b97b48b81f7a8f64406b0a6f64184e (patch)
treef57362a0fa01bfe8f0ad75a447c4c9e10bc15756 /3rdparty/bgfx/examples/common/ps/particle_system.cpp
parent5581eaa50a42256242f32569f59ce10d70ddd8c2 (diff)
Revert "Update BGFX, BX and BIMG (#10750)" (#10787)
This reverts commit 5581eaa50a42256242f32569f59ce10d70ddd8c2 due to link failure on macOS.
Diffstat (limited to '3rdparty/bgfx/examples/common/ps/particle_system.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/ps/particle_system.cpp20
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 721779f1123..cbcf2b874b0 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-2022 Branimir Karadzic. All rights reserved.
- * License: https://github.com/bkaradzic/bgfx/blob/master/LICENSE
+ * Copyright 2011-2021 Branimir Karadzic. All rights reserved.
+ * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
*/
#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(bx::Aabb) );
+ bx::memSet(&m_aabb, 0, sizeof(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);
- bx::Aabb aabb =
+ 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;
- bx::Aabb m_aabb;
+ 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(isValid(_handle)
+ BX_ASSERT(m_emitterAlloc.isValid(_handle.idx)
, "destroyEmitter handle %d is not valid."
, _handle.idx
);
@@ -643,9 +643,9 @@ namespace ps
}
}
- void getAabb(EmitterHandle _handle, bx::Aabb& _outAabb)
+ void getAabb(EmitterHandle _handle, Aabb& _outAabb)
{
- BX_ASSERT(isValid(_handle)
+ BX_ASSERT(m_emitterAlloc.isValid(_handle.idx)
, "getAabb handle %d is not valid."
, _handle.idx
);
@@ -654,7 +654,7 @@ namespace ps
void destroyEmitter(EmitterHandle _handle)
{
- BX_ASSERT(isValid(_handle)
+ BX_ASSERT(m_emitterAlloc.isValid(_handle.idx)
, "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, bx::Aabb& _outAabb)
+void psGetAabb(EmitterHandle _handle, Aabb& _outAabb)
{
s_ctx.getAabb(_handle, _outAabb);
}