diff options
Diffstat (limited to '3rdparty/bgfx/examples/01-cubes')
-rw-r--r-- | 3rdparty/bgfx/examples/01-cubes/cubes.cpp | 28 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/01-cubes/fs_cubes.sc | 4 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/01-cubes/makefile | 4 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/01-cubes/screenshot.png | bin | 159938 -> 142521 bytes | |||
-rw-r--r-- | 3rdparty/bgfx/examples/01-cubes/vs_cubes.sc | 4 |
5 files changed, 24 insertions, 16 deletions
diff --git a/3rdparty/bgfx/examples/01-cubes/cubes.cpp b/3rdparty/bgfx/examples/01-cubes/cubes.cpp index faa098ecb1a..a178f7379fd 100644 --- a/3rdparty/bgfx/examples/01-cubes/cubes.cpp +++ b/3rdparty/bgfx/examples/01-cubes/cubes.cpp @@ -1,6 +1,6 @@ /* - * Copyright 2011-2018 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 "common.h" @@ -19,17 +19,17 @@ struct PosColorVertex static void init() { - ms_decl + ms_layout .begin() .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) .end(); }; - static bgfx::VertexDecl ms_decl; + static bgfx::VertexLayout ms_layout; }; -bgfx::VertexDecl PosColorVertex::ms_decl; +bgfx::VertexLayout PosColorVertex::ms_layout; static PosColorVertex s_cubeVertices[] = { @@ -125,8 +125,8 @@ BX_STATIC_ASSERT(BX_COUNTOF(s_ptState) == BX_COUNTOF(s_ptNames) ); class ExampleCubes : public entry::AppI { public: - ExampleCubes(const char* _name, const char* _description) - : entry::AppI(_name, _description) + ExampleCubes(const char* _name, const char* _description, const char* _url) + : entry::AppI(_name, _description, _url) , m_pt(0) , m_r(true) , m_g(true) @@ -147,6 +147,9 @@ public: bgfx::Init init; init.type = args.m_type; init.vendorId = args.m_pciId; + init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); + init.platformData.ndt = entry::getNativeDisplayHandle(); + init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; @@ -170,7 +173,7 @@ public: m_vbh = bgfx::createVertexBuffer( // Static data can be passed with bgfx::makeRef bgfx::makeRef(s_cubeVertices, sizeof(s_cubeVertices) ) - , PosColorVertex::ms_decl + , PosColorVertex::ms_layout ); // Create static index buffer for triangle list rendering. @@ -265,7 +268,7 @@ public: ImGui::Checkbox("Write A", &m_a); ImGui::Text("Primitive topology:"); - ImGui::Combo("", (int*)&m_pt, s_ptNames, BX_COUNTOF(s_ptNames) ); + ImGui::Combo("##topology", (int*)&m_pt, s_ptNames, BX_COUNTOF(s_ptNames) ); ImGui::End(); @@ -362,4 +365,9 @@ public: } // namespace -ENTRY_IMPLEMENT_MAIN(ExampleCubes, "01-cubes", "Rendering simple static mesh."); +ENTRY_IMPLEMENT_MAIN( + ExampleCubes + , "01-cubes" + , "Rendering simple static mesh." + , "https://bkaradzic.github.io/bgfx/examples.html#cubes" + ); diff --git a/3rdparty/bgfx/examples/01-cubes/fs_cubes.sc b/3rdparty/bgfx/examples/01-cubes/fs_cubes.sc index 99ec64685ad..8ea959c83db 100644 --- a/3rdparty/bgfx/examples/01-cubes/fs_cubes.sc +++ b/3rdparty/bgfx/examples/01-cubes/fs_cubes.sc @@ -1,8 +1,8 @@ $input v_color0 /* - * Copyright 2011-2018 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 "../common/common.sh" diff --git a/3rdparty/bgfx/examples/01-cubes/makefile b/3rdparty/bgfx/examples/01-cubes/makefile index 171709170a4..19c81e43692 100644 --- a/3rdparty/bgfx/examples/01-cubes/makefile +++ b/3rdparty/bgfx/examples/01-cubes/makefile @@ -1,6 +1,6 @@ # -# Copyright 2011-2018 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 # BGFX_DIR=../.. diff --git a/3rdparty/bgfx/examples/01-cubes/screenshot.png b/3rdparty/bgfx/examples/01-cubes/screenshot.png Binary files differindex 0e80d2cb02b..1b6c7c9fab3 100644 --- a/3rdparty/bgfx/examples/01-cubes/screenshot.png +++ b/3rdparty/bgfx/examples/01-cubes/screenshot.png diff --git a/3rdparty/bgfx/examples/01-cubes/vs_cubes.sc b/3rdparty/bgfx/examples/01-cubes/vs_cubes.sc index 906372cb0f8..d80005d4652 100644 --- a/3rdparty/bgfx/examples/01-cubes/vs_cubes.sc +++ b/3rdparty/bgfx/examples/01-cubes/vs_cubes.sc @@ -2,8 +2,8 @@ $input a_position, a_color0 $output v_color0 /* - * Copyright 2011-2018 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 "../common/common.sh" |