diff options
| author | visil <workregor@mail.ru> | 2023-10-11 23:30:56 +0300 |
|---|---|---|
| committer | visil <workregor@mail.ru> | 2023-10-11 23:30:56 +0300 |
| commit | a350f65bd8cc4ee74ef8586036397d63eb622737 (patch) | |
| tree | 41e6d8da5b4d8ea96e6edce4f4379a89a909f8be | |
| parent | 32ea01632523fef820e28839ef814bf561f28e50 (diff) | |
| -rw-r--r-- | lesson01/.gitignore | 1 | ||||
| -rw-r--r-- | lesson01/Makefile | 4 | ||||
| -rwxr-xr-x | lesson01/a.out | bin | 64272 -> 0 bytes | |||
| -rw-r--r-- | lesson01/main.cpp | 2 | ||||
| -rw-r--r-- | lesson01/shader.vs | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/lesson01/.gitignore b/lesson01/.gitignore new file mode 100644 index 0000000..f47cb20 --- /dev/null +++ b/lesson01/.gitignore @@ -0,0 +1 @@ +*.out diff --git a/lesson01/Makefile b/lesson01/Makefile index d99099b..c95b3d5 100644 --- a/lesson01/Makefile +++ b/lesson01/Makefile @@ -1,2 +1,4 @@ +WIREFRAME?=0 + default: - g++ -DWIREFRAME -I../include -lglfw -lGL -lX11 -lpthread -lXrandr -lXi -ldl main.cpp ../src/glad.c && ./a.out + g++ -DWIREFRAME=${WIREFRAME} -I../include -lglfw -lGL -lX11 -lpthread -lXrandr -lXi -ldl main.cpp ../src/glad.c && ./a.out diff --git a/lesson01/a.out b/lesson01/a.out Binary files differdeleted file mode 100755 index 61431c3..0000000 --- a/lesson01/a.out +++ /dev/null diff --git a/lesson01/main.cpp b/lesson01/main.cpp index 7c4b925..a2d78de 100644 --- a/lesson01/main.cpp +++ b/lesson01/main.cpp @@ -114,7 +114,7 @@ int main() ); glEnableVertexAttribArray(1); - #ifdef WIREFRAME + #if WIREFRAME == 1 glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); #endif diff --git a/lesson01/shader.vs b/lesson01/shader.vs index a2263a1..6634b88 100644 --- a/lesson01/shader.vs +++ b/lesson01/shader.vs @@ -6,6 +6,6 @@ out vec3 ourColor; void main() { - gl_Position = vec4(aPos, 1.0); + gl_Position = vec4(aPos.x, -aPos.y, aPos.z, 1.0); ourColor = aColor; } |