Skip to content

Commit d61cdde

Browse files
Xottab-DUTYXottab-DUTY
committed
xrEProps: Wave Form (ShaderFunction) – done.
1 parent f251384 commit d61cdde

File tree

4 files changed

+105
-113
lines changed

4 files changed

+105
-113
lines changed

‎src/editors/xrECore/Props/GameType.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ System::Void GameType::buttonOk_Click(System::Object^ sender, System::EventArgs^
3030
gameTypes->m_GameType.set(eGameIDArtefactHunt, checkAfHunt->Checked);
3131
gameTypes->m_GameType.set(eGameIDCaptureTheArtefact, checkCTA->Checked);
3232
}
33-
3433
} // namespace Props
3534
} // namespace ECore
3635
} // namespace XRay

‎src/editors/xrECore/Props/NumericVector.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ namespace Props
99
{
1010
bool NumericVector::Run(pcstr title, Fvector* data, int decimal, Fvector* resetValue, Fvector* min, Fvector* max, int* X, int* Y)
1111
{
12-
System::String^ str = gcnew System::String(title);
13-
this->Text = str;
12+
this->Text = gcnew System::String(title);
1413
Value = data;
1514
ResetValue = resetValue;
1615
buttonReset->Enabled = !!resetValue;

‎src/editors/xrECore/Props/ShaderFunction.cpp‎

Lines changed: 64 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,11 @@ System::Void ShaderFunction::ShaderFunction_KeyPress(System::Object^ sender, Sys
6363
{
6464
switch (e->KeyChar)
6565
{
66+
case (Char)Keys::Enter:
67+
buttonOk->PerformClick();
68+
break;
6669
case (Char)Keys::Escape:
67-
buttonCancel_Click(sender, e);
70+
buttonCancel->PerformClick();
6871
break;
6972
}
7073
}
@@ -74,25 +77,15 @@ System::Void ShaderFunction::buttonCancel_Click(System::Object^ sender, System::
7477
CopyMemory(currentFunc, saveFunc, sizeof(WaveForm));
7578
}
7679

77-
System::Void ShaderFunction::numArgX_KeyPress(System::Object^ sender, System::Windows::Forms::KeyPressEventArgs^ e)
78-
{
79-
switch (e->KeyChar)
80-
{
81-
case (Char)Keys::Enter:
82-
UpdateFuncData();
83-
break;
84-
}
85-
}
86-
87-
System::Void ShaderFunction::buttonOk_Click(System::Object^ sender, System::EventArgs^ e)
80+
System::Void ShaderFunction::onAnyValueChanged(System::Object^ sender, System::EventArgs^ e)
8881
{
8982
UpdateFuncData();
9083
}
9184

9285
void ShaderFunction::GetFuncData()
9386
{
9487
bLoadMode = true;
95-
comboFunctions->SelectedValue = GetTokenFromValue(currentFunc->F); // XXX: may not work
88+
comboFunctions->SelectedItem = GetTokenFromValue(currentFunc->F);
9689
numArg1->Value = (Decimal)currentFunc->arg[0];
9790
numArg2->Value = (Decimal)currentFunc->arg[1];
9891
numArg3->Value = (Decimal)currentFunc->arg[2];
@@ -104,7 +97,7 @@ void ShaderFunction::UpdateFuncData()
10497
{
10598
if (bLoadMode)
10699
return;
107-
currentFunc->F = (WaveForm::EFunction)((XRay::Token^)comboFunctions->SelectedValue)->ToInt32();
100+
currentFunc->F = (WaveForm::EFunction)((XRay::Token^)comboFunctions->SelectedItem)->ToInt32();
108101
currentFunc->arg[0] = (float)numArg1->Value;
109102
currentFunc->arg[1] = (float)numArg2->Value;
110103
currentFunc->arg[2] = (float)numArg3->Value;
@@ -127,61 +120,65 @@ void ShaderFunction::UpdateFuncData()
127120

128121
void ShaderFunction::DrawGraph()
129122
{
130-
auto w = pbDraw->Width - 4;
131-
auto h = pbDraw->Height - 4;
132-
133-
// XXX: Draw
134-
//System::Windows::Controls::Canvas canvas;
135-
136-
#if 0 // Taken from xrEProps/ShaderFunction.cpp
137-
int w = imDraw->Width - 4;
138-
int h = imDraw->Height - 4;
139-
140-
TRect r;
141-
r.Left = 0;
142-
r.Top = 0;
143-
r.Right = w + 4;
144-
r.Bottom = h + 4;
145-
TCanvas* C = imDraw->Canvas;
146-
C->Brush->Color = clBlack;
147-
C->FillRect(r);
148-
C->Pen->Color = TColor(0x00006600);
149-
// draw center
150-
C->Pen->Color = clLime;
151-
C->Pen->Style = psDot;
152-
C->MoveTo(2, h / 2 + 2);
153-
C->LineTo(w + 2, h / 2 + 2);
154-
// draw rect
155-
C->Pen->Color = TColor(0x00006600);
156-
C->Pen->Style = psSolid;
157-
C->MoveTo(0, 0);
158-
C->LineTo(w + 3, 0);
159-
C->LineTo(w + 3, h + 3);
160-
C->LineTo(0, h + 3);
161-
C->LineTo(0, 0);
162-
// draw graph
163-
C->Pen->Color = clYellow;
164-
165-
float t_cost = 1.f / w;
166-
float tm = 0;
167-
float y = m_CurFunc->Calculate(tm) - m_CurFunc->arg[0];
168-
float delta = m_CurFunc->arg[1] * 2;
169-
delta = delta ? (h / delta) : 0;
170-
float yy = h - (delta * y + h / 2);
171-
C->MoveTo(2, yy + 2);
172-
for (int t = 1; t < w; t++)
123+
auto w = pbDraw->Width;
124+
auto h = pbDraw->Height;
125+
126+
pbDraw->Image = gcnew Bitmap(w, h);
127+
auto graphics = Graphics::FromImage(pbDraw->Image);
128+
auto pen = gcnew Pen(Brushes::DarkGreen);
129+
130+
// Fill with black
131+
graphics->FillRectangle(Brushes::Black, 0, 0, w, h);
132+
133+
w -= 4;
134+
h -= 4;
135+
136+
// Draw center line
137+
{
138+
pen->DashStyle = Drawing::Drawing2D::DashStyle::Dot;
139+
graphics->DrawLine(pen, Point(2, h / 2 + 2), Point(w + 1, h / 2 + 2));
140+
}
141+
142+
// Draw borders
173143
{
174-
tm = seScale->Value * t * t_cost / (fis_zero(m_CurFunc->arg[3]) ? 1.f : m_CurFunc->arg[3]);
175-
y = m_CurFunc->Calculate(tm) - m_CurFunc->arg[0];
176-
yy = h - (delta * y + h / 2);
177-
C->LineTo(t + 2, yy + 2);
144+
pen->DashStyle = Drawing::Drawing2D::DashStyle::Solid;
145+
graphics->DrawRectangle(pen, 0, 0, w + 3, h + 3);
178146
}
179-
// draw X-axis
180-
C->Pen->Color = clGreen;
181-
float AxisX = h - (delta * (-m_CurFunc->arg[0]) + h / 2);
182-
C->MoveTo(2, AxisX + 2);
183-
C->LineTo(w + 2, AxisX + 2);
184-
#endif
147+
148+
// Draw graph
149+
{
150+
pen->Brush = Brushes::Yellow;
151+
152+
float t_cost = 1.f / w;
153+
float tm = 0;
154+
float y = currentFunc->Calculate(tm) - currentFunc->arg[0];
155+
float delta = currentFunc->arg[1] * 2;
156+
delta = delta ? (h / delta) : 0;
157+
float yy = h - (delta * y + h / 2);
158+
159+
160+
Drawing::Drawing2D::GraphicsPath path;
161+
auto pointFrom = Point(2, yy + 2);
162+
auto pointTo = Point(0, 0);
163+
164+
for (int t = 1; t < w; ++t)
165+
{
166+
tm = (float)numScale->Value * t * t_cost / (fis_zero(currentFunc->arg[3]) ? 1.f : currentFunc->arg[3]);
167+
y = currentFunc->Calculate(tm) - currentFunc->arg[0];
168+
yy = h - (delta * y + h / 2);
169+
pointTo = Point(t + 2, yy + 2);
170+
path.AddLine(pointFrom, pointTo);
171+
pointFrom = pointTo;
172+
}
173+
graphics->DrawPath(pen, %path);
174+
175+
// Draw X-axis
176+
pen->Brush = Brushes::Green;
177+
float AxisX = h - (delta * (-currentFunc->arg[0]) + h / 2);
178+
graphics->DrawLine(pen, Point(2, AxisX + 2), Point(w + 1, AxisX + 2));
179+
}
180+
181+
//pbDraw->Invalidate(); // Redraw everything just in case
185182
}
186183
} // namespace Props
187184
} // namespace ECore

‎src/editors/xrECore/Props/ShaderFunction.h‎

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ public ref class ShaderFunction : public System::Windows::Forms::Form
6262
XRay::Token^ GetTokenFromValue(int val);
6363

6464
private: System::Void ShaderFunction_KeyPress(System::Object^ sender, System::Windows::Forms::KeyPressEventArgs^ e);
65-
private: System::Void numArgX_KeyPress(System::Object^ sender, System::Windows::Forms::KeyPressEventArgs^ e);
66-
private: System::Void buttonOk_Click(System::Object^ sender, System::EventArgs^ e);
65+
private: System::Void onAnyValueChanged(System::Object^ sender, System::EventArgs^ e);
6766
private: System::Void buttonCancel_Click(System::Object^ sender, System::EventArgs^ e);
6867

6968
private: System::Windows::Forms::Label^ label1;
@@ -158,58 +157,58 @@ private: System::Windows::Forms::Button^ buttonCancel;
158157
this->label5->Text = L"Rate (arg4):";
159158
this->numArg1->DecimalPlaces = 5;
160159
this->numArg1->Hexadecimal = false;
161-
this->numArg1->Location = System::Drawing::Point(89, 30);
160+
this->numArg1->Location = System::Drawing::Point(94, 30);
162161
this->numArg1->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 100, 0, 0, 0 });
163162
this->numArg1->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
164163
this->numArg1->MinimumSize = System::Drawing::Size(70, 22);
165164
this->numArg1->Name = L"numArg1";
166-
this->numArg1->Precision = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
165+
this->numArg1->Precision = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 327680 });
167166
this->numArg1->Size = System::Drawing::Size(115, 22);
168167
this->numArg1->TabIndex = 5;
169168
this->numArg1->TextAlign = System::Windows::Forms::HorizontalAlignment::Left;
170169
this->numArg1->Value = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
171-
this->numArg1->KeyPress += gcnew System::Windows::Forms::KeyPressEventHandler(this, &ShaderFunction::numArgX_KeyPress);
170+
this->numArg1->ValueChanged += gcnew System::EventHandler(this, &ShaderFunction::onAnyValueChanged);
172171
this->numArg2->DecimalPlaces = 5;
173172
this->numArg2->Hexadecimal = false;
174-
this->numArg2->Location = System::Drawing::Point(89, 57);
173+
this->numArg2->Location = System::Drawing::Point(94, 57);
175174
this->numArg2->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 100, 0, 0, 0 });
176175
this->numArg2->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
177176
this->numArg2->MinimumSize = System::Drawing::Size(70, 22);
178177
this->numArg2->Name = L"numArg2";
179-
this->numArg2->Precision = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
178+
this->numArg2->Precision = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 327680 });
180179
this->numArg2->Size = System::Drawing::Size(115, 22);
181180
this->numArg2->TabIndex = 6;
182181
this->numArg2->TextAlign = System::Windows::Forms::HorizontalAlignment::Left;
183182
this->numArg2->Value = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
184-
this->numArg2->KeyPress += gcnew System::Windows::Forms::KeyPressEventHandler(this, &ShaderFunction::numArgX_KeyPress);
183+
this->numArg2->ValueChanged += gcnew System::EventHandler(this, &ShaderFunction::onAnyValueChanged);
185184
this->numArg3->DecimalPlaces = 5;
186185
this->numArg3->Hexadecimal = false;
187-
this->numArg3->Location = System::Drawing::Point(89, 84);
186+
this->numArg3->Location = System::Drawing::Point(94, 84);
188187
this->numArg3->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 100, 0, 0, 0 });
189188
this->numArg3->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
190189
this->numArg3->MinimumSize = System::Drawing::Size(70, 22);
191190
this->numArg3->Name = L"numArg3";
192-
this->numArg3->Precision = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
191+
this->numArg3->Precision = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 327680 });
193192
this->numArg3->Size = System::Drawing::Size(115, 22);
194193
this->numArg3->TabIndex = 7;
195194
this->numArg3->TextAlign = System::Windows::Forms::HorizontalAlignment::Left;
196195
this->numArg3->Value = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
197-
this->numArg3->KeyPress += gcnew System::Windows::Forms::KeyPressEventHandler(this, &ShaderFunction::numArgX_KeyPress);
196+
this->numArg3->ValueChanged += gcnew System::EventHandler(this, &ShaderFunction::onAnyValueChanged);
198197
this->numArg4->DecimalPlaces = 5;
199198
this->numArg4->Hexadecimal = false;
200-
this->numArg4->Location = System::Drawing::Point(89, 111);
199+
this->numArg4->Location = System::Drawing::Point(94, 111);
201200
this->numArg4->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 100, 0, 0, 0 });
202201
this->numArg4->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
203202
this->numArg4->MinimumSize = System::Drawing::Size(70, 22);
204203
this->numArg4->Name = L"numArg4";
205-
this->numArg4->Precision = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
204+
this->numArg4->Precision = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 327680 });
206205
this->numArg4->Size = System::Drawing::Size(115, 22);
207206
this->numArg4->TabIndex = 8;
208207
this->numArg4->TextAlign = System::Windows::Forms::HorizontalAlignment::Left;
209208
this->numArg4->Value = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
210-
this->numArg4->KeyPress += gcnew System::Windows::Forms::KeyPressEventHandler(this, &ShaderFunction::numArgX_KeyPress);
209+
this->numArg4->ValueChanged += gcnew System::EventHandler(this, &ShaderFunction::onAnyValueChanged);
211210
this->label6->AutoSize = true;
212-
this->label6->Location = System::Drawing::Point(44, 5);
211+
this->label6->Location = System::Drawing::Point(3, 4);
213212
this->label6->Name = L"label6";
214213
this->label6->Size = System::Drawing::Size(192, 13);
215214
this->label6->TabIndex = 10;
@@ -226,13 +225,14 @@ private: System::Windows::Forms::Button^ buttonCancel;
226225
this->panelLeft->Controls->Add(this->numArg1);
227226
this->panelLeft->Location = System::Drawing::Point(0, 0);
228227
this->panelLeft->Name = L"panelLeft";
229-
this->panelLeft->Size = System::Drawing::Size(205, 140);
228+
this->panelLeft->Size = System::Drawing::Size(210, 140);
230229
this->panelLeft->TabIndex = 11;
231230
this->comboFunctions->FormattingEnabled = true;
232-
this->comboFunctions->Location = System::Drawing::Point(89, 1);
231+
this->comboFunctions->Location = System::Drawing::Point(94, 1);
233232
this->comboFunctions->Name = L"comboFunctions";
234233
this->comboFunctions->Size = System::Drawing::Size(115, 21);
235234
this->comboFunctions->TabIndex = 9;
235+
this->comboFunctions->SelectedValueChanged += gcnew System::EventHandler(this, &ShaderFunction::onAnyValueChanged);
236236
this->panelRight->Controls->Add(this->numScale);
237237
this->panelRight->Controls->Add(this->pbDraw);
238238
this->panelRight->Controls->Add(this->labelEnd);
@@ -241,71 +241,68 @@ private: System::Windows::Forms::Button^ buttonCancel;
241241
this->panelRight->Controls->Add(this->labelCenter);
242242
this->panelRight->Controls->Add(this->labelMax);
243243
this->panelRight->Controls->Add(this->label6);
244-
this->panelRight->Location = System::Drawing::Point(204, 0);
244+
this->panelRight->Location = System::Drawing::Point(209, 0);
245245
this->panelRight->Name = L"panelRight";
246-
this->panelRight->Size = System::Drawing::Size(237, 162);
246+
this->panelRight->Size = System::Drawing::Size(245, 162);
247247
this->panelRight->TabIndex = 12;
248248
this->numScale->DecimalPlaces = 3;
249249
this->numScale->Hexadecimal = false;
250-
this->numScale->Location = System::Drawing::Point(103, 141);
250+
this->numScale->Location = System::Drawing::Point(62, 141);
251251
this->numScale->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 100, 0, 0, 0 });
252-
this->numScale->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
252+
this->numScale->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 131072 });
253253
this->numScale->MinimumSize = System::Drawing::Size(70, 22);
254254
this->numScale->Name = L"numScale";
255-
this->numScale->Precision = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
255+
this->numScale->Precision = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 131072 });
256256
this->numScale->Size = System::Drawing::Size(70, 22);
257257
this->numScale->TabIndex = 18;
258258
this->numScale->TextAlign = System::Windows::Forms::HorizontalAlignment::Left;
259-
this->numScale->Value = System::Decimal(gcnew cli::array< System::Int32 >(4) { 0, 0, 0, 0 });
260-
this->pbDraw->Location = System::Drawing::Point(47, 30);
259+
this->numScale->Value = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 0 });
260+
this->numScale->ValueChanged += gcnew System::EventHandler(this, &ShaderFunction::onAnyValueChanged);
261+
this->pbDraw->Location = System::Drawing::Point(6, 30);
261262
this->pbDraw->Name = L"pbDraw";
262263
this->pbDraw->Size = System::Drawing::Size(186, 110);
263264
this->pbDraw->TabIndex = 17;
264265
this->pbDraw->TabStop = false;
265266
this->labelEnd->AutoSize = true;
266-
this->labelEnd->Location = System::Drawing::Point(189, 143);
267+
this->labelEnd->Location = System::Drawing::Point(148, 143);
267268
this->labelEnd->Name = L"labelEnd";
268269
this->labelEnd->Size = System::Drawing::Size(47, 13);
269270
this->labelEnd->TabIndex = 16;
270271
this->labelEnd->Text = L"1000 ms";
271272
this->labelEnd->TextAlign = System::Drawing::ContentAlignment::TopRight;
272273
this->labelStart->AutoSize = true;
273-
this->labelStart->Location = System::Drawing::Point(44, 143);
274+
this->labelStart->Location = System::Drawing::Point(3, 143);
274275
this->labelStart->Name = L"labelStart";
275276
this->labelStart->Size = System::Drawing::Size(29, 13);
276277
this->labelStart->TabIndex = 14;
277278
this->labelStart->Text = L"0 ms";
278279
this->labelMin->AutoSize = true;
279-
this->labelMin->Location = System::Drawing::Point(17, 127);
280+
this->labelMin->Location = System::Drawing::Point(194, 124);
280281
this->labelMin->Name = L"labelMin";
281-
this->labelMin->Size = System::Drawing::Size(24, 13);
282+
this->labelMin->Size = System::Drawing::Size(46, 13);
282283
this->labelMin->TabIndex = 13;
283-
this->labelMin->Text = L"Min";
284-
this->labelMin->TextAlign = System::Drawing::ContentAlignment::TopRight;
284+
this->labelMin->Text = L"0,00000";
285285
this->labelCenter->AutoSize = true;
286-
this->labelCenter->Location = System::Drawing::Point(3, 75);
286+
this->labelCenter->Location = System::Drawing::Point(194, 78);
287287
this->labelCenter->Name = L"labelCenter";
288-
this->labelCenter->Size = System::Drawing::Size(38, 13);
288+
this->labelCenter->Size = System::Drawing::Size(46, 13);
289289
this->labelCenter->TabIndex = 12;
290-
this->labelCenter->Text = L"Center";
291-
this->labelCenter->TextAlign = System::Drawing::ContentAlignment::TopRight;
290+
this->labelCenter->Text = L"0,00000";
292291
this->labelMax->AutoSize = true;
293-
this->labelMax->Location = System::Drawing::Point(17, 30);
292+
this->labelMax->Location = System::Drawing::Point(194, 33);
294293
this->labelMax->Name = L"labelMax";
295-
this->labelMax->Size = System::Drawing::Size(27, 13);
294+
this->labelMax->Size = System::Drawing::Size(46, 13);
296295
this->labelMax->TabIndex = 11;
297-
this->labelMax->Text = L"Max";
298-
this->labelMax->TextAlign = System::Drawing::ContentAlignment::TopRight;
296+
this->labelMax->Text = L"0,00000";
299297
this->buttonOk->DialogResult = System::Windows::Forms::DialogResult::OK;
300298
this->buttonOk->Location = System::Drawing::Point(0, 140);
301299
this->buttonOk->Name = L"buttonOk";
302-
this->buttonOk->Size = System::Drawing::Size(89, 22);
300+
this->buttonOk->Size = System::Drawing::Size(94, 22);
303301
this->buttonOk->TabIndex = 14;
304302
this->buttonOk->Text = L"Ok";
305303
this->buttonOk->UseVisualStyleBackColor = true;
306-
this->buttonOk->Click += gcnew System::EventHandler(this, &ShaderFunction::buttonOk_Click);
307304
this->buttonCancel->DialogResult = System::Windows::Forms::DialogResult::Cancel;
308-
this->buttonCancel->Location = System::Drawing::Point(88, 140);
305+
this->buttonCancel->Location = System::Drawing::Point(93, 140);
309306
this->buttonCancel->Name = L"buttonCancel";
310307
this->buttonCancel->Size = System::Drawing::Size(116, 22);
311308
this->buttonCancel->TabIndex = 13;
@@ -316,14 +313,14 @@ private: System::Windows::Forms::Button^ buttonCancel;
316313
this->AutoScaleDimensions = System::Drawing::SizeF(6, 13);
317314
this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
318315
this->CancelButton = this->buttonCancel;
319-
this->ClientSize = System::Drawing::Size(441, 162);
316+
this->ClientSize = System::Drawing::Size(454, 162);
320317
this->Controls->Add(this->buttonOk);
321318
this->Controls->Add(this->buttonCancel);
322319
this->Controls->Add(this->panelRight);
323320
this->Controls->Add(this->panelLeft);
324321
this->FormBorderStyle = System::Windows::Forms::FormBorderStyle::FixedToolWindow;
325322
this->Name = L"ShaderFunction";
326-
this->Text = L"ShaderFunction";
323+
this->Text = L"Wave Form";
327324
this->panelLeft->ResumeLayout(false);
328325
this->panelLeft->PerformLayout();
329326
this->panelRight->ResumeLayout(false);

0 commit comments

Comments
 (0)