Skip to content

Commit 74f31f3

Browse files
fix ex 20
1 parent 162f2d6 commit 74f31f3

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

examples_tests/20.Megatexture/main.cpp

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ R"(
4747
#endif
4848
#define _NBL_FRAG_SET3_BINDINGS_DEFINED_
4949
50-
struct PCstruct
50+
struct MaterialParams
5151
{
5252
vec3 Ka;
5353
vec3 Kd;
@@ -64,14 +64,29 @@ struct PCstruct
6464
float Ni;
6565
uint extra; //flags copied from MTL metadata
6666
};
67-
#define nbl_glsl_MaterialParametersStruct PCstruct
68-
#define _NBL_FRAG_MATERIAL_PARAMETERS_STRUCT_DEFINED_
69-
7067
layout (push_constant) uniform Block {
71-
nbl_glsl_MaterialParametersStruct params;
68+
MaterialParams params;
7269
} PC;
7370
#define _NBL_FRAG_PUSH_CONSTANTS_DEFINED_
7471
72+
#include <nbl/builtin/glsl/loader/mtl/common.glsl>
73+
nbl_glsl_MTLMaterialParameters nbl_glsl_getMaterialParameters() // this function is for MTL's shader only
74+
{
75+
MaterialParams params = PC.params;
76+
77+
nbl_glsl_MTLMaterialParameters mtl_params;
78+
mtl_params.Ka = params.Ka;
79+
mtl_params.Kd = params.Kd;
80+
mtl_params.Ks = params.Ks;
81+
mtl_params.Ke = params.Ke;
82+
mtl_params.Ns = params.Ns;
83+
mtl_params.d = params.d;
84+
mtl_params.Ni = params.Ni;
85+
mtl_params.extra = params.extra;
86+
return mtl_params;
87+
}
88+
#define _NBL_FRAG_GET_MATERIAL_PARAMETERS_FUNCTION_DEFINED_
89+
7590
#ifndef _NO_UV
7691
uint nbl_glsl_VT_layer2pid(in uint layer)
7792
{

0 commit comments

Comments
 (0)