From 7377640e36ec191e9148affadefdc817dbbe3270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A4=C3=A4tt=C3=A4=20Antti?= <antti.maatta@qt.io>
Date: Wed, 18 Oct 2017 15:36:03 +0300
Subject: Replace UIC with QT3DS from materials and effectlib

Change-Id: Ifc5b409777a978401bd4179599b27fb4aa611844
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 .../res/effectlib/tessellationPhongCM.glsllib      | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/Runtime/res/effectlib/tessellationPhongCM.glsllib')

diff --git a/src/Runtime/res/effectlib/tessellationPhongCM.glsllib b/src/Runtime/res/effectlib/tessellationPhongCM.glsllib
index f70c72b3..fdbdbc23 100644
--- a/src/Runtime/res/effectlib/tessellationPhongCM.glsllib
+++ b/src/Runtime/res/effectlib/tessellationPhongCM.glsllib
@@ -46,33 +46,33 @@ attribute vec3 varObjPos[];
 varying vec3 varNormalTC[];
 varying vec3 varObjPosTC[];
 
-#if UIC_ENABLE_UV0
+#if QT3DS_ENABLE_UV0
 attribute vec3 varTexCoord0[];
 varying vec3 varTexCoord0TC[];
 #endif
 
-#if UIC_ENABLE_TEXTAN
+#if QT3DS_ENABLE_TEXTAN
 attribute vec3 varTangent[];
 attribute vec3 varObjTangent[];
 varying vec3 varTangentTC[];
 varying vec3 varObjTangentTC[];
 #endif
 
-#if UIC_ENABLE_BINORMAL
+#if QT3DS_ENABLE_BINORMAL
 attribute vec3 varBinormal[];
 attribute vec3 varObjBinormal[];
 varying vec3 varBinormalTC[];
 varying vec3 varObjBinormalTC[];
 #endif
 
-#if UIC_ENABLE_WORLD_POSITION
+#if QT3DS_ENABLE_WORLD_POSITION
 attribute vec3 varWorldPos[];
 varying vec3 varWorldPosTC[];
 #endif
 
 void main() {
 
-#if UIC_ENABLE_WORLD_POSITION
+#if QT3DS_ENABLE_WORLD_POSITION
 	ctWorldPos[0] = varWorldPos[0];
 	ctWorldPos[1] = varWorldPos[1];
 	ctWorldPos[2] = varWorldPos[2];
@@ -87,18 +87,18 @@ void main() {
 	varObjPosTC[gl_InvocationID] = varObjPos[gl_InvocationID];
 	varNormalTC[gl_InvocationID] = varNormal[gl_InvocationID];
 
-#if UIC_ENABLE_UV0
+#if QT3DS_ENABLE_UV0
 	varTexCoord0TC[gl_InvocationID] = varTexCoord0[gl_InvocationID];
 #endif
-#if UIC_ENABLE_TEXTAN
+#if QT3DS_ENABLE_TEXTAN
 	varTangentTC[gl_InvocationID] = varTangent[gl_InvocationID];
 	varObjTangentTC[gl_InvocationID] = varObjTangent[gl_InvocationID];
 #endif
-#if UIC_ENABLE_BINORMAL
+#if QT3DS_ENABLE_BINORMAL
 	varBinormalTC[gl_InvocationID] = varBinormal[gl_InvocationID];
 	varObjBinormalTC[gl_InvocationID] = varObjBinormal[gl_InvocationID];
 #endif
-#if UIC_ENABLE_WORLD_POSITION
+#if QT3DS_ENABLE_WORLD_POSITION
 	varWorldPosTC[gl_InvocationID] = varWorldPos[gl_InvocationID];
 #endif	
 }
@@ -123,26 +123,26 @@ attribute vec3 varObjPosTC[];
 varying vec3 VARYING_NAME(varNormal);
 varying vec3 VARYING_NAME(varObjPos);
 
-#if UIC_ENABLE_UV0
+#if QT3DS_ENABLE_UV0
 attribute vec3 varTexCoord0TC[];
 varying vec3 VARYING_NAME(varTexCoord0);
 #endif
 
-#if UIC_ENABLE_TEXTAN
+#if QT3DS_ENABLE_TEXTAN
 attribute vec3 varTangentTC[];
 attribute vec3 varObjTangentTC[];
 varying vec3 VARYING_NAME(varTangent);
 varying vec3 VARYING_NAME(varObjTangent);
 #endif
 
-#if UIC_ENABLE_BINORMAL
+#if QT3DS_ENABLE_BINORMAL
 attribute vec3 varBinormalTC[];
 attribute vec3 varObjBinormalTC[];
 varying vec3 VARYING_NAME(varBinormal);
 varying vec3 VARYING_NAME(varObjBinormal);
 #endif
 
-#if UIC_ENABLE_WORLD_POSITION
+#if QT3DS_ENABLE_WORLD_POSITION
 attribute vec3 varWorldPosTC[];
 varying vec3 VARYING_NAME(varWorldPos);
 #endif
@@ -155,18 +155,18 @@ void main() {
 	VARYING_NAME(varObjPos) = gl_TessCoord.x * varObjPosTC[0] + gl_TessCoord.y * varObjPosTC[1] + gl_TessCoord.z * varObjPosTC[2];
 	VARYING_NAME(varNormal) = gl_TessCoord.x * varNormalTC[0] + gl_TessCoord.y * varNormalTC[1] + gl_TessCoord.z * varNormalTC[2];
 
-#if UIC_ENABLE_UV0
+#if QT3DS_ENABLE_UV0
 	VARYING_NAME(varTexCoord0) = gl_TessCoord.x * varTexCoord0TC[0] + gl_TessCoord.y * varTexCoord0TC[1] + gl_TessCoord.z * varTexCoord0TC[2];
 #endif	
-#if UIC_ENABLE_TEXTAN
+#if QT3DS_ENABLE_TEXTAN
 	VARYING_NAME(varTangent) = gl_TessCoord.x * varTangentTC[0] + gl_TessCoord.y * varTangentTC[1] + gl_TessCoord.z * varTangentTC[2];
 	VARYING_NAME(varObjTangent) = gl_TessCoord.x * varObjTangentTC[0] + gl_TessCoord.y * varObjTangentTC[1] + gl_TessCoord.z * varObjTangentTC[2];
 #endif
-#if UIC_ENABLE_BINORMAL
+#if QT3DS_ENABLE_BINORMAL
 	VARYING_NAME(varBinormal) = gl_TessCoord.x * varBinormalTC[0] + gl_TessCoord.y * varBinormalTC[1] + gl_TessCoord.z * varBinormalTC[2];
 	VARYING_NAME(varObjBinormal) = gl_TessCoord.x * varObjBinormalTC[0] + gl_TessCoord.y * varObjBinormalTC[1] + gl_TessCoord.z * varObjBinormalTC[2];
 #endif
-#if UIC_ENABLE_WORLD_POSITION
+#if QT3DS_ENABLE_WORLD_POSITION
 	VARYING_NAME(varWorldPos) = gl_TessCoord.x * varWorldPosTC[0] + gl_TessCoord.y * varWorldPosTC[1] + gl_TessCoord.z * varWorldPosTC[2];
 #endif
 
-- 
cgit v1.2.3