From a350f65bd8cc4ee74ef8586036397d63eb622737 Mon Sep 17 00:00:00 2001 From: visil Date: Wed, 11 Oct 2023 23:30:56 +0300 Subject: =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BE?= =?UTF-8?q?=D0=BF=D1=86=D0=B8=D1=8E=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?= =?UTF-8?q?=20WIREFRAME;=20=D1=83=D0=BF=D1=80=D0=B0=D0=B6=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2?= =?UTF-8?q?=D0=BE=D1=80=D0=B0=D1=87=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=D0=BC=20=D1=84=D0=B8=D0=B3=D1=83=D1=80=D1=8B=20=D0=B2=20=D1=88?= =?UTF-8?q?=D0=B5=D0=B9=D0=B4=D0=B5=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lesson01/.gitignore | 1 + lesson01/Makefile | 4 +++- lesson01/a.out | Bin 64272 -> 0 bytes lesson01/main.cpp | 2 +- lesson01/shader.vs | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 lesson01/.gitignore delete mode 100755 lesson01/a.out 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 deleted file mode 100755 index 61431c3..0000000 Binary files a/lesson01/a.out and /dev/null differ 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; } -- cgit v1.2.3