Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

more fixes

Browse source
This commit is contained in:
SamGondelman 2018-09-27 14:18:43 -07:00
parent 840a87464c
commit e069817978
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu/src/gpu/TextureTable.slh
View file

@ -22,7 +22,7 @@ struct GPUTextureTable {
#define tableTex(name, slot) sampler2D(name._textures[slot].xy)
#define tableTexMinLod(name, slot) float(name._textures[slot].z)
#define tableTexValue(name, slot, uv) tableTexValueLod(tableTex(matTex, albedoMap), tableTexMinLod(matTex, albedoMap), uv)
#define tableTexValue(name, slot, uv) tableTexValueLod(tableTex(matTex, slot), tableTexMinLod(matTex, slot), uv)
vec4 tableTexValueLod(sampler2D sampler, float minLod, vec2 uv) {
float queryLod = textureQueryLod(sampler, uv).x;

2
libraries/graphics/src/graphics/BufferViewHelpers.cpp
View file

@ -38,7 +38,7 @@ QMap<QString,int> ATTRIBUTES{
{"position", gpu::Stream::POSITION },
{"normal", gpu::Stream::NORMAL },
{"color", gpu::Stream::COLOR },
{"tangent", gpu::Stream::TEXCOORD0 },
{"tangent", gpu::Stream::TANGENT },
{"skin_cluster_index", gpu::Stream::SKIN_CLUSTER_INDEX },
{"skin_cluster_weight", gpu::Stream::SKIN_CLUSTER_WEIGHT },
{"texcoord0", gpu::Stream::TEXCOORD0 },

2
libraries/graphics/src/graphics/MaterialTextures.slh
View file

@ -208,7 +208,7 @@ float fetchScatteringMap(vec2 uv) {
<@if occlusion@>
float <$occlusion$> = (((<$matKey$> & OCCLUSION_MAP_BIT) != 0) ? fetchOcclusionMap(<$texcoord1$>) : 1.0);
<@endif@>
<@if lightmapVal@>
<@if lightmap@>
vec3 <$lightmap$> = fetchLightmapMap(<$texcoord1$>);
<@endif@>
<@endfunc@>

2
libraries/render-utils/src/model_lightmap.slf
View file

@ -42,7 +42,7 @@ void main(void) {
packDeferredFragmentLightmap(
normalize(_normalWS),
evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedo.a),
evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedoTex.a),
albedo,
roughness,
metallic,

2
libraries/render-utils/src/model_lightmap_fade.slf
View file

@ -51,7 +51,7 @@ void main(void) {
packDeferredFragmentLightmap(
normalize(_normalWS),
evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedo.a),
evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedoTex.a),
albedo,
roughness,
metallic,

2
libraries/render-utils/src/model_lightmap_normal_map.slf
View file

@ -47,7 +47,7 @@ void main(void) {
packDeferredFragmentLightmap(
normalize(fragNormal),
evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedo.a),
evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedoTex.a),
albedo,
roughness,
metallic,

2
libraries/render-utils/src/model_lightmap_normal_map_fade.slf
View file

@ -56,7 +56,7 @@ void main(void) {
packDeferredFragmentLightmap(
normalize(fragNormal),
evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedo.a),
evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedoTex.a),
albedo,
roughness,
metallic,