diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2017-10-19 13:38:56 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-10-24 13:23:59 +0000 |
| commit | ac48b3f2ddd7879433ccc49d7e7d12f35fc351b5 (patch) | |
| tree | 898b5e64e47fed3e5eb1d8eb672cd27c9f1360d5 /src/Runtime/res | |
| parent | 2e96295db042e301c9367c441d8132813689ee4c (diff) | |
Rename uicDefaultxxx glsllib files to defaultxxx
Task-number: QT3DS-18
Change-Id: Ib48b07e03eba774deb1eb2d35044de127bcf0b19
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/res')
| -rw-r--r-- | src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib (renamed from src/Runtime/res/effectlib/uicDefaultMaterialFileBumpTexture.glsllib) | 0 | ||||
| -rw-r--r-- | src/Runtime/res/effectlib/defaultMaterialFileDisplacementTexture.glsllib (renamed from src/Runtime/res/effectlib/uicDefaultMaterialFileDisplacementTexture.glsllib) | 0 | ||||
| -rw-r--r-- | src/Runtime/res/effectlib/defaultMaterialFileNormalTexture.glsllib (renamed from src/Runtime/res/effectlib/uicDefaultMaterialFileNormalTexture.glsllib) | 0 | ||||
| -rw-r--r-- | src/Runtime/res/effectlib/fileDisplacementTexture.glsllib | 2 | ||||
| -rw-r--r-- | src/Runtime/res/effectlib/gles2/tangentSpaceNormalTexture.glsllib | 2 | ||||
| -rw-r--r-- | src/Runtime/res/effectlib/tangentSpaceNormalTexture.glsllib | 2 |
6 files changed, 3 insertions, 3 deletions
diff --git a/src/Runtime/res/effectlib/uicDefaultMaterialFileBumpTexture.glsllib b/src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib index 6901ace0..6901ace0 100644 --- a/src/Runtime/res/effectlib/uicDefaultMaterialFileBumpTexture.glsllib +++ b/src/Runtime/res/effectlib/defaultMaterialFileBumpTexture.glsllib diff --git a/src/Runtime/res/effectlib/uicDefaultMaterialFileDisplacementTexture.glsllib b/src/Runtime/res/effectlib/defaultMaterialFileDisplacementTexture.glsllib index 4c9af3fc..4c9af3fc 100644 --- a/src/Runtime/res/effectlib/uicDefaultMaterialFileDisplacementTexture.glsllib +++ b/src/Runtime/res/effectlib/defaultMaterialFileDisplacementTexture.glsllib diff --git a/src/Runtime/res/effectlib/uicDefaultMaterialFileNormalTexture.glsllib b/src/Runtime/res/effectlib/defaultMaterialFileNormalTexture.glsllib index 70ab52bc..70ab52bc 100644 --- a/src/Runtime/res/effectlib/uicDefaultMaterialFileNormalTexture.glsllib +++ b/src/Runtime/res/effectlib/defaultMaterialFileNormalTexture.glsllib diff --git a/src/Runtime/res/effectlib/fileDisplacementTexture.glsllib b/src/Runtime/res/effectlib/fileDisplacementTexture.glsllib index eb379a3f..15aa645f 100644 --- a/src/Runtime/res/effectlib/fileDisplacementTexture.glsllib +++ b/src/Runtime/res/effectlib/fileDisplacementTexture.glsllib @@ -60,7 +60,7 @@ vec3 fileDisplacementTexture( in sampler2D sampler, in float factor, in int disp //default material path version -vec3 uicDefaultMaterialFileDisplacementTexture( in sampler2D sampler, in float factor, vec2 texCoord, in vec3 normal, vec3 pos ) +vec3 defaultMaterialFileDisplacementTexture( in sampler2D sampler, in float factor, vec2 texCoord, in vec3 normal, vec3 pos ) { return fileDisplacementTexture( sampler, factor, mono_luminance , textureCoordinateInfo( vec3( texCoord.x, texCoord.y, 0.0 ), vec3(1.0, 0.0, 0.0), vec3(0.0, 1.0, 0.0) ) diff --git a/src/Runtime/res/effectlib/gles2/tangentSpaceNormalTexture.glsllib b/src/Runtime/res/effectlib/gles2/tangentSpaceNormalTexture.glsllib index 93e560fd..daae4014 100644 --- a/src/Runtime/res/effectlib/gles2/tangentSpaceNormalTexture.glsllib +++ b/src/Runtime/res/effectlib/gles2/tangentSpaceNormalTexture.glsllib @@ -85,7 +85,7 @@ vec3 tangentSpaceNormalTexture( in sampler2D tex, in float factor, in bool flipT //Simpler version built to run from UIC image data //In our case, we have already generated the texture coordinate x,y position //TODO - figure out if we need to manipulate tangent_u, tangent_v. -vec3 uicDefaultMaterialFileNormalTexture( in sampler2D sampler, in float factor, vec2 texCoord, vec3 tangent, vec3 binormal ) +vec3 defaultMaterialFileNormalTexture( in sampler2D sampler, in float factor, vec2 texCoord, vec3 tangent, vec3 binormal ) { // factor should be in [0,1] range return tangentSpaceNormalTexture( sampler, clamp(factor, 0.0, 1.0), false, false diff --git a/src/Runtime/res/effectlib/tangentSpaceNormalTexture.glsllib b/src/Runtime/res/effectlib/tangentSpaceNormalTexture.glsllib index 296f6226..1fcc4290 100644 --- a/src/Runtime/res/effectlib/tangentSpaceNormalTexture.glsllib +++ b/src/Runtime/res/effectlib/tangentSpaceNormalTexture.glsllib @@ -79,7 +79,7 @@ vec3 tangentSpaceNormalTexture( in sampler2D tex, in float factor, in bool flipT //Simpler version built to run from UIC image data //In our case, we have already generated the texture coordinate x,y position //TODO - figure out if we need to manipulate tangent_u, tangent_v. -vec3 uicDefaultMaterialFileNormalTexture( in sampler2D sampler, in float factor, vec2 texCoord, vec3 tangent, vec3 binormal ) +vec3 defaultMaterialFileNormalTexture( in sampler2D sampler, in float factor, vec2 texCoord, vec3 tangent, vec3 binormal ) { // factor should be in [0,1] range return tangentSpaceNormalTexture( sampler, clamp(factor, 0.0, 1.0), false, false |