From 0837e7451a84f95c29dbdb9bd6b8b931fee1635d Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sun, 13 Oct 2019 13:50:38 +0200 Subject: WIP: sync bgfx, bx and bimg with latest upstream (#5723) * Sync with bgfx upstream revision b91d0b6 * Sync with bx upstream revision d60912b * Sync with bimg upstream revision bd81f60 * Add astc-codec decoder * Rename VertexDecl to VertexLayout * Rename UniformType enum Int1 to Sampler. * Add NVN stub * Fix unused-const-variable error on macOS * Drop redundant explicit language parameters buildoptions_cpp are only applied to c++ files and buildoptions_objcpp are only applied to objective c++ files. As such, hardcoding -x offers no benefit while preventing overrides (such as one needed by 3rdparty/bgfx/src/renderer_vk.cpp on macOS) from working. * Re-introduce -x c++ in places where C code is compiled as C++ to prevent clang from throwing a warning * Build bgfx as Objective-C++ on macOS It is needed due to included headers * Enable Direct3D12 and Vulkan bgfx rendering backends * Enable building of spirv shaders * Properly escape /c in cmd call * Comment out dx12 bgfx renderer * Honor VERBOSE setting during shaders build * Only invert hlsl shader XYZ_TO_sRGB matrix for opengl * Add spirv shaders * OpenGL ES needs transposed matrix too * Metal needs transposed matrix as well --- 3rdparty/bgfx/examples/32-particles/particles.cpp | 24 ++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to '3rdparty/bgfx/examples/32-particles/particles.cpp') diff --git a/3rdparty/bgfx/examples/32-particles/particles.cpp b/3rdparty/bgfx/examples/32-particles/particles.cpp index 4736a5da095..e7ee31fd20a 100644 --- a/3rdparty/bgfx/examples/32-particles/particles.cpp +++ b/3rdparty/bgfx/examples/32-particles/particles.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2011-2018 Branimir Karadzic. All rights reserved. + * Copyright 2011-2019 Branimir Karadzic. All rights reserved. * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause */ @@ -229,8 +229,8 @@ struct Emitter class ExampleParticles : public entry::AppI { public: - ExampleParticles(const char* _name, const char* _description) - : entry::AppI(_name, _description) + ExampleParticles(const char* _name, const char* _description, const char* _url) + : entry::AppI(_name, _description, _url) { } @@ -290,8 +290,7 @@ public: cameraCreate(); - const float initialPos[3] = { 0.0f, 2.0f, -12.0f }; - cameraSetPosition(initialPos); + cameraSetPosition({ 0.0f, 2.0f, -12.0f }); cameraSetVerticalAngle(0.0f); m_timeOffset = bx::getHPCounter(); @@ -407,16 +406,14 @@ public: DebugDrawEncoder dde; dde.begin(0); - float center[3] = { 0.0f, 0.0f, 0.0f }; - dde.drawGrid(Axis::Y, center); + dde.drawGrid(Axis::Y, { 0.0f, 0.0f, 0.0f }); - float eye[3]; - cameraGetPosition(eye); + const bx::Vec3 eye = cameraGetPosition(); m_emitter[currentEmitter].update(); psUpdate(deltaTime * timeScale); - psRender(0, view, bx::load(eye) ); + psRender(0, view, eye); if (showBounds) { @@ -455,4 +452,9 @@ public: } // namespace -ENTRY_IMPLEMENT_MAIN(ExampleParticles, "32-particles", "Particles."); +ENTRY_IMPLEMENT_MAIN( + ExampleParticles + , "32-particles" + , "Particles." + , "https://bkaradzic.github.io/bgfx/examples.html#particles" + ); -- cgit v1.2.3-70-g09d2