bkaradzic 13 лет назад
Родитель
Сommit
cedfee113d

+ 1 - 1
examples/06-bump/vs_bump.sc

@@ -27,7 +27,7 @@ void main()
 
 	vec3 viewNormal = normalize(mul(u_view, vec4(wnormal, 0.0) ).xyz);
 	vec3 viewTangent = normalize(mul(u_view, vec4(wtangent, 0.0) ).xyz);
-	vec3 viewBitangent = cross(viewNormal, viewTangent) * a_tangent.w;
+	vec3 viewBitangent = cross(viewNormal, viewTangent) * tangent.w;
 	mat3 tbn = mat3(viewTangent, viewBitangent, viewNormal);
 
 	v_wpos = wpos;

BIN
examples/runtime/shaders/dx11/vs_bump.bin


BIN
examples/runtime/shaders/dx9/vs_bump.bin


BIN
examples/runtime/shaders/gles/vs_bump.bin


BIN
examples/runtime/shaders/glsl/vs_bump.bin


BIN
tools/bin/geometryc.exe


+ 2 - 2
tools/geometryc/geometryc.cpp

@@ -377,7 +377,7 @@ int main(int _argc, const char* _argv[])
 	cmdLine.hasArg(packNormal, '\0', "packnormal");
 
 	uint32_t packUv = 0;
-	cmdLine.hasArg(packNormal, '\0', "packuv");
+	cmdLine.hasArg(packUv, '\0', "packuv");
 	
 	bool ccw = cmdLine.hasArg("ccw");
 	bool flipV = cmdLine.hasArg("flipv");
@@ -710,7 +710,7 @@ int main(int _argc, const char* _argv[])
 			decl.add(bgfx::Attrib::Normal, 3, bgfx::AttribType::Float);
 			if (hasTangent)
 			{
-				decl.add(bgfx::Attrib::Tangent, 3, bgfx::AttribType::Float);
+				decl.add(bgfx::Attrib::Tangent, 4, bgfx::AttribType::Float);
 			}
 			break;