fixed some issues macos related

PardCode · PardCode · commit 55458988664b · 2022-02-06T15:13:25.000+01:00
diff --git a/Tutorial4_Shaders/Assets/Shaders/BasicShader.frag b/Tutorial4_Shaders/Assets/Shaders/BasicShader.frag
@@ -24,7 +24,7 @@ SOFTWARE.*/
 
 #version 410 core
 
-layout(location = 0) in vec3 inColor;
+layout(location = 0) in vec3 vertOutColor;
 
 
 
@@ -35,5 +35,5 @@ layout(location = 0) out vec4 outColor;
 void main()
 {
 	outColor = vec4(1,1,1,1);
-	outColor.rgb = inColor;
+	outColor.rgb = vertOutColor;
 }
diff --git a/Tutorial4_Shaders/Assets/Shaders/BasicShader.vert b/Tutorial4_Shaders/Assets/Shaders/BasicShader.vert
@@ -28,16 +28,16 @@ layout(location = 0) in vec3 position;
 layout(location = 1) in vec3 color;
 
 
-layout(location = 0) out vec3 outColor;
+layout(location = 0) out vec3 vertOutColor;
 
 void main()
 {
 	gl_Position.xyz = position;
 
 	//if (gl_Position.y>0 && gl_Position.y<1)
-	//	gl_Position.x += 0.5;
+	//	gl_Position.x += 0.25;
 
 	gl_Position.w = 1.0;
 
-	outColor = color;
+	vertOutColor = color;
 }
diff --git a/Tutorial4_Shaders/OpenGLGame.pro b/Tutorial4_Shaders/OpenGLGame.pro
@@ -26,7 +26,7 @@ TEMPLATE = app
 CONFIG += console c++17
 CONFIG -= app_bundle
 CONFIG -= qt
-
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
 
 INCLUDEPATH += OGL3D/include
 INCLUDEPATH += OGL3D/source

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ SOFTWARE.*/`
`24`	`24`
`25`	`25`	`#version 410 core`
`26`	`26`
`27`		`-layout(location = 0) in vec3 inColor;`
	`27`	`+layout(location = 0) in vec3 vertOutColor;`
`28`	`28`
`29`	`29`
`30`	`30`
`@@ -35,5 +35,5 @@ layout(location = 0) out vec4 outColor;`
`35`	`35`	`void main()`
`36`	`36`	`{`
`37`	`37`	`outColor = vec4(1,1,1,1);`
`38`		`- outColor.rgb = inColor;`
	`38`	`+ outColor.rgb = vertOutColor;`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,16 +28,16 @@ layout(location = 0) in vec3 position;`
`28`	`28`	`layout(location = 1) in vec3 color;`
`29`	`29`
`30`	`30`
`31`		`-layout(location = 0) out vec3 outColor;`
	`31`	`+layout(location = 0) out vec3 vertOutColor;`
`32`	`32`
`33`	`33`	`void main()`
`34`	`34`	`{`
`35`	`35`	`gl_Position.xyz = position;`
`36`	`36`
`37`	`37`	`//if (gl_Position.y>0 && gl_Position.y<1)`
`38`		`- // gl_Position.x += 0.5;`
	`38`	`+ // gl_Position.x += 0.25;`
`39`	`39`
`40`	`40`	`gl_Position.w = 1.0;`
`41`	`41`
`42`		`- outColor = color;`
	`42`	`+ vertOutColor = color;`
`43`	`43`	`}`