summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/03-raymarch
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/bgfx/examples/03-raymarch')
-rw-r--r--3rdparty/bgfx/examples/03-raymarch/fs_raymarching.sc2
-rw-r--r--3rdparty/bgfx/examples/03-raymarch/makefile2
-rw-r--r--3rdparty/bgfx/examples/03-raymarch/raymarch.cpp27
-rw-r--r--3rdparty/bgfx/examples/03-raymarch/vs_raymarching.sc2
4 files changed, 18 insertions, 15 deletions
diff --git a/3rdparty/bgfx/examples/03-raymarch/fs_raymarching.sc b/3rdparty/bgfx/examples/03-raymarch/fs_raymarching.sc
index 4266eac2aac..feb8d5d0d05 100644
--- a/3rdparty/bgfx/examples/03-raymarch/fs_raymarching.sc
+++ b/3rdparty/bgfx/examples/03-raymarch/fs_raymarching.sc
@@ -1,7 +1,7 @@
$input v_color0, v_texcoord0
/*
- * 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
*/
diff --git a/3rdparty/bgfx/examples/03-raymarch/makefile b/3rdparty/bgfx/examples/03-raymarch/makefile
index 171709170a4..ef9203197d7 100644
--- a/3rdparty/bgfx/examples/03-raymarch/makefile
+++ b/3rdparty/bgfx/examples/03-raymarch/makefile
@@ -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
#
diff --git a/3rdparty/bgfx/examples/03-raymarch/raymarch.cpp b/3rdparty/bgfx/examples/03-raymarch/raymarch.cpp
index a07e018485e..cbd39a1c495 100644
--- a/3rdparty/bgfx/examples/03-raymarch/raymarch.cpp
+++ b/3rdparty/bgfx/examples/03-raymarch/raymarch.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
*/
@@ -21,7 +21,7 @@ struct PosColorTexCoord0Vertex
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)
@@ -29,17 +29,17 @@ struct PosColorTexCoord0Vertex
.end();
}
- static bgfx::VertexDecl ms_decl;
+ static bgfx::VertexLayout ms_layout;
};
-bgfx::VertexDecl PosColorTexCoord0Vertex::ms_decl;
+bgfx::VertexLayout PosColorTexCoord0Vertex::ms_layout;
void renderScreenSpaceQuad(uint8_t _view, bgfx::ProgramHandle _program, float _x, float _y, float _width, float _height)
{
bgfx::TransientVertexBuffer tvb;
bgfx::TransientIndexBuffer tib;
- if (bgfx::allocTransientBuffers(&tvb, PosColorTexCoord0Vertex::ms_decl, 4, &tib, 6) )
+ if (bgfx::allocTransientBuffers(&tvb, PosColorTexCoord0Vertex::ms_layout, 4, &tib, 6) )
{
PosColorTexCoord0Vertex* vertex = (PosColorTexCoord0Vertex*)tvb.data;
@@ -102,8 +102,8 @@ void renderScreenSpaceQuad(uint8_t _view, bgfx::ProgramHandle _program, float _x
class ExampleRaymarch : public entry::AppI
{
public:
- ExampleRaymarch(const char* _name, const char* _description)
- : entry::AppI(_name, _description)
+ ExampleRaymarch(const char* _name, const char* _description, const char* _url)
+ : entry::AppI(_name, _description, _url)
{
}
@@ -224,11 +224,9 @@ public:
float mtxInv[16];
bx::mtxInverse(mtxInv, mtx);
- float lightDirModel[4] = { -0.4f, -0.5f, -1.0f, 0.0f };
- float lightDirModelN[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
- bx::vec3Norm(lightDirModelN, lightDirModel);
float lightDirTime[4];
- bx::vec4MulMtx(lightDirTime, lightDirModelN, mtxInv);
+ const bx::Vec3 lightDirModelN = bx::normalize(bx::Vec3{-0.4f, -0.5f, -1.0f});
+ bx::store(lightDirTime, bx::mul(lightDirModelN, mtxInv) );
lightDirTime[3] = time;
bgfx::setUniform(u_lightDirTime, lightDirTime);
@@ -266,4 +264,9 @@ public:
} // namespace
-ENTRY_IMPLEMENT_MAIN(ExampleRaymarch, "03-raymarch", "Updating shader uniforms.");
+ENTRY_IMPLEMENT_MAIN(
+ ExampleRaymarch
+ , "03-raymarch"
+ , "Updating shader uniforms."
+ , "https://bkaradzic.github.io/bgfx/examples.html#raymarch"
+ );
diff --git a/3rdparty/bgfx/examples/03-raymarch/vs_raymarching.sc b/3rdparty/bgfx/examples/03-raymarch/vs_raymarching.sc
index 264d8b9cae2..9f72b916051 100644
--- a/3rdparty/bgfx/examples/03-raymarch/vs_raymarching.sc
+++ b/3rdparty/bgfx/examples/03-raymarch/vs_raymarching.sc
@@ -2,7 +2,7 @@ $input a_position, a_color0, a_texcoord0
$output v_color0, v_texcoord0
/*
- * 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
*/