From d7ec491d915cb19c85ba2567ed82f1dd0458ed57 Mon Sep 17 00:00:00 2001
From: Andrew Guschin <saintruler@gmail.com>
Date: Tue, 1 Dec 2020 13:32:34 +0400
Subject: =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=88=D0=B5=D1=81=D1=82=D0=BE=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 task06/Geometric3D.txt  |  2 +-
 task06/Guschin/MyForm.h | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'task06')

diff --git a/task06/Geometric3D.txt b/task06/Geometric3D.txt
index 7a218d3..1b705b8 100644
--- a/task06/Geometric3D.txt
+++ b/task06/Geometric3D.txt
@@ -165,7 +165,7 @@ popTransform
 ###########
 ## Клоун ##
 ###########
-model 10 15 20 30
+model 10 15 0 20 30 1
 
 # шляпа
 color 255 255 0
diff --git a/task06/Guschin/MyForm.h b/task06/Guschin/MyForm.h
index 0f17cb8..3f268c9 100644
--- a/task06/Guschin/MyForm.h
+++ b/task06/Guschin/MyForm.h
@@ -59,8 +59,8 @@ namespace Guschin {
             // openFileDialog
             // 
             this->openFileDialog->DefaultExt = L"txt";
-            this->openFileDialog->Filter = L"��������� ����� (*.txt)|*.txt|��� ����� (*.*)|*.*";
-            this->openFileDialog->Title = L"������� ����";
+            this->openFileDialog->Filter = L"��������� ����� (*.txt)|*.txt|��� ����� (*.*)|*.*";
+            this->openFileDialog->Title = L"������� ����";
             // 
             // btnOpen
             // 
@@ -69,7 +69,7 @@ namespace Guschin {
             this->btnOpen->Name = L"btnOpen";
             this->btnOpen->Size = System::Drawing::Size(151, 48);
             this->btnOpen->TabIndex = 0;
-            this->btnOpen->Text = L"�������";
+            this->btnOpen->Text = L"�������";
             this->btnOpen->UseVisualStyleBackColor = true;
             this->btnOpen->Click += gcnew System::EventHandler(this, &MyForm::btnOpen_Click);
             // 
@@ -192,15 +192,15 @@ namespace Guschin {
                 initWorkPars();
                 break;
 
-            case Keys::D3:
-                pType = Perspective;
-                break;
             case Keys::D1:
                 pType = Ortho;
                 break;
             case Keys::D2:
                 pType = Frustum;
                 break;
+            case Keys::D3:
+                pType = Perspective;
+                break;
             case Keys::W:
                 if (Control::ModifierKeys == Keys::Shift) {
                     T = lookAt(vec3(0, 0, -0.1), vec3(0, 0, -0.2), vec3(0, 0.1, 0)) * T;
-- 
cgit v1.2.3