summaryrefslogtreecommitdiff
path: root/task06
diff options
context:
space:
mode:
Diffstat (limited to 'task06')
-rw-r--r--task06/Geometric3D.txt2
-rw-r--r--task06/Guschin/MyForm.h12
2 files changed, 7 insertions, 7 deletions
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;