summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/06-bump/bump.cpp
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/bgfx/examples/06-bump/bump.cpp')
-rw-r--r--3rdparty/bgfx/examples/06-bump/bump.cpp27
1 files changed, 16 insertions, 11 deletions
diff --git a/3rdparty/bgfx/examples/06-bump/bump.cpp b/3rdparty/bgfx/examples/06-bump/bump.cpp
index 2f299161926..7cf43f504aa 100644
--- a/3rdparty/bgfx/examples/06-bump/bump.cpp
+++ b/3rdparty/bgfx/examples/06-bump/bump.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
*/
@@ -22,7 +22,7 @@ struct PosNormalTangentTexcoordVertex
static void init()
{
- ms_decl
+ ms_layout
.begin()
.add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float)
.add(bgfx::Attrib::Normal, 4, bgfx::AttribType::Uint8, true, true)
@@ -31,10 +31,10 @@ struct PosNormalTangentTexcoordVertex
.end();
}
- static bgfx::VertexDecl ms_decl;
+ static bgfx::VertexLayout ms_layout;
};
-bgfx::VertexDecl PosNormalTangentTexcoordVertex::ms_decl;
+bgfx::VertexLayout PosNormalTangentTexcoordVertex::ms_layout;
static PosNormalTangentTexcoordVertex s_cubeVertices[24] =
{
@@ -85,8 +85,8 @@ static const uint16_t s_cubeIndices[36] =
class ExampleBump : public entry::AppI
{
public:
- ExampleBump(const char* _name, const char* _description)
- : entry::AppI(_name, _description)
+ ExampleBump(const char* _name, const char* _description, const char* _url)
+ : entry::AppI(_name, _description, _url)
{
}
@@ -127,7 +127,7 @@ public:
calcTangents(s_cubeVertices
, BX_COUNTOF(s_cubeVertices)
- , PosNormalTangentTexcoordVertex::ms_decl
+ , PosNormalTangentTexcoordVertex::ms_layout
, s_cubeIndices
, BX_COUNTOF(s_cubeIndices)
);
@@ -135,15 +135,15 @@ public:
// Create static vertex buffer.
m_vbh = bgfx::createVertexBuffer(
bgfx::makeRef(s_cubeVertices, sizeof(s_cubeVertices) )
- , PosNormalTangentTexcoordVertex::ms_decl
+ , PosNormalTangentTexcoordVertex::ms_layout
);
// Create static index buffer.
m_ibh = bgfx::createIndexBuffer(bgfx::makeRef(s_cubeIndices, sizeof(s_cubeIndices) ) );
// Create texture sampler uniforms.
- s_texColor = bgfx::createUniform("s_texColor", bgfx::UniformType::Int1);
- s_texNormal = bgfx::createUniform("s_texNormal", bgfx::UniformType::Int1);
+ s_texColor = bgfx::createUniform("s_texColor", bgfx::UniformType::Sampler);
+ s_texNormal = bgfx::createUniform("s_texNormal", bgfx::UniformType::Sampler);
m_numLights = 4;
u_lightPosRadius = bgfx::createUniform("u_lightPosRadius", bgfx::UniformType::Vec4, m_numLights);
@@ -370,4 +370,9 @@ public:
} // namespace
-ENTRY_IMPLEMENT_MAIN(ExampleBump, "06-bump", "Loading textures.");
+ENTRY_IMPLEMENT_MAIN(
+ ExampleBump
+ , "06-bump"
+ , "Loading textures."
+ , "https://bkaradzic.github.io/bgfx/examples.html#bump"
+ );