Browse code

Unify lab1 and lab4

Robert Cranston authored on 27/02/2024 02:27:37
Showing 1 changed files
1 1
deleted file mode 100644
... ...
@@ -1,17 +0,0 @@
1
-#version 150
2
-
3
-in vec3 inPosition;
4
-in vec3 inNormal;
5
-in vec2 inTexCoord;
6
-
7
-out vec2 texCoord;
8
-
9
-uniform mat4 projection;
10
-uniform mat4 modelView;
11
-
12
-
13
-void main(void)
14
-{
15
-	gl_Position = projection * modelView * vec4(inPosition, 1.0);
16
-	texCoord    = inTexCoord;
17
-}
Browse code

Refactor source files

Robert Cranston authored on 27/02/2024 02:27:36
Showing 1 changed files
... ...
@@ -1,17 +1,17 @@
1 1
 #version 150
2 2
 
3
-in  vec3 inPosition;
4
-in  vec3 inNormal;
3
+in vec3 inPosition;
4
+in vec3 inNormal;
5 5
 in vec2 inTexCoord;
6
+
6 7
 out vec2 texCoord;
7 8
 
8
-// NY
9
-uniform mat4 projMatrix;
10
-uniform mat4 mdlMatrix;
9
+uniform mat4 projection;
10
+uniform mat4 modelView;
11
+
11 12
 
12 13
 void main(void)
13 14
 {
14
-	mat3 normalMatrix1 = mat3(mdlMatrix);
15
-	texCoord = inTexCoord;
16
-	gl_Position = projMatrix * mdlMatrix * vec4(inPosition, 1.0);
15
+	gl_Position = projection * modelView * vec4(inPosition, 1.0);
16
+	texCoord    = inTexCoord;
17 17
 }
Browse code

Remove executable bit on files

find . -type f -exec chmod -x {} +

Robert Cranston authored on 27/02/2024 02:27:27
Showing 1 changed files
1 1
old mode 100755
2 2
new mode 100644
Browse code

Add cpp-v1

Ingemar Ragnemalm authored on 21/02/2024 20:24:28 • Robert Cranston committed on 21/02/2024 20:24:28
Showing 1 changed files
1 1
new file mode 100755
... ...
@@ -0,0 +1,17 @@
1
+#version 150
2
+
3
+in  vec3 inPosition;
4
+in  vec3 inNormal;
5
+in vec2 inTexCoord;
6
+out vec2 texCoord;
7
+
8
+// NY
9
+uniform mat4 projMatrix;
10
+uniform mat4 mdlMatrix;
11
+
12
+void main(void)
13
+{
14
+	mat3 normalMatrix1 = mat3(mdlMatrix);
15
+	texCoord = inTexCoord;
16
+	gl_Position = projMatrix * mdlMatrix * vec4(inPosition, 1.0);
17
+}