Add alpha/unifrom spec. field to 3dsMax.

ThunderLoom · Jan 12, 2018 · 4206da6 · 4206da6
1 parent c8a7d75
commit 4206da6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/frontends/vray3dsMax/3dsMax/3dsMaxThunderLoom.cpp b/frontends/vray3dsMax/3dsMax/3dsMaxThunderLoom.cpp
@@ -450,7 +450,6 @@ INT_PTR YarnTypeDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				TL_FLOAT_PARAM(yarnsize)\
 				TL_FLOAT_PARAM(psi)\
 				TL_FLOAT_PARAM(alpha)\
-				TL_FLOAT_PARAM(beta)\
 				TL_FLOAT_PARAM(delta_x)\
 				TL_COLOR_PARAM(specular_color)\
 				TL_FLOAT_PARAM(specular_noise)\

diff --git a/frontends/vray3dsMax/3dsMax/resource.h b/frontends/vray3dsMax/3dsMax/resource.h
@@ -76,6 +76,7 @@
 #define IDC_delta_x_EDIT                1034
 #define IDC_delta_x_SPIN                1035
 #define IDC_SIMPLE_EDIT                 1036
+#define IDC_psi_SPIN2                   1036
 #define cs_blend1                       1037
 #define IDC_delta_x_LABEL               1038
 #define ed_texmap_blend_mult1           1039

diff --git a/frontends/vray3dsMax/3dsMax/vrayblinnmtl.rc b/frontends/vray3dsMax/3dsMax/vrayblinnmtl.rc
@@ -123,15 +123,15 @@ BEGIN
     LTEXT           "Angle",IDC_VSCALE_LABEL2,161,29,19,8
 END
 
-IDD_YARN DIALOGEX 0, 0, 219, 44
+IDD_YARN DIALOGEX 0, 0, 219, 57
 STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    CONTROL         "Custom1",IDC_color_SWATCH,"ColorSwatch",0x0,71,3,16,12
+    CONTROL         "Custom1",IDC_color_SWATCH,"ColorSwatch",0x0,70,3,16,12
     CONTROL         "",IDC_YRN_TEX_color_BUTTON,"CustButton",WS_TABSTOP,90,4,14,10
-    CONTROL         "Custom2",IDC_specular_noise_EDIT,"CustEdit",WS_TABSTOP,71,17,26,10
+    CONTROL         "Custom2",IDC_specular_noise_EDIT,"CustEdit",WS_TABSTOP,70,17,27,10
     CONTROL         "Custom3",IDC_specular_noise_SPIN,"SpinnerControl",0x0,97,17,7,10
-    CONTROL         "Custom2",IDC_umax_EDIT,"CustEdit",WS_TABSTOP,71,30,26,10
+    CONTROL         "Custom2",IDC_umax_EDIT,"CustEdit",WS_TABSTOP,70,30,27,10
     CONTROL         "Custom3",IDC_umax_SPIN,"SpinnerControl",0x0,97,30,7,10
     CONTROL         "Custom1",IDC_specular_color_SWATCH,"ColorSwatch",0x0,174,4,16,12
     CONTROL         "Custom2",IDC_YRN_TEX_specular_color_BUTTON,"CustButton",WS_TABSTOP,191,4,12,10
@@ -145,6 +145,9 @@ BEGIN
     LTEXT           "Highlight width",IDC_delta_x_LABEL,112,18,47,8
     LTEXT           "Diffuse color",IDC_STATIC,11,4,40,8
     LTEXT           "Specular noise",IDC_STATIC,11,18,48,8
+    LTEXT           "Uniform spec.",IDC_alpha_LABEL,112,44,44,8
+    CONTROL         "Custom2",IDC_alpha_EDIT,"CustEdit",WS_TABSTOP,174,43,23,10
+    CONTROL         "Custom3",IDC_alpha_SPIN,"SpinnerControl",0x0,197,43,7,10
 END
 
 IDD_YARN_TYPE DIALOGEX 0, 0, 220, 59
@@ -173,6 +176,9 @@ BEGIN
     CONTROL         "Twist",IDC_psi_OVERRIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,30,32,10
     CONTROL         "Custom2",IDC_psi_EDIT,"CustEdit",WS_TABSTOP,176,30,22,10
     CONTROL         "Custom3",IDC_psi_SPIN,"SpinnerControl",0x0,198,30,7,10
+    CONTROL         "Uniform spec.",IDC_alpha_OVERRIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,43,60,10
+    CONTROL         "Custom2",IDC_alpha_EDIT,"CustEdit",WS_TABSTOP,176,43,22,10
+    CONTROL         "Custom3",IDC_alpha_SPIN,"SpinnerControl",0x0,198,43,7,10
 END
 
 
@@ -202,16 +208,16 @@ BEGIN
         LEFTMARGIN, 4
         RIGHTMARGIN, 217
         VERTGUIDE, 11
-        VERTGUIDE, 71
+        VERTGUIDE, 70
         VERTGUIDE, 97
         VERTGUIDE, 112
         VERTGUIDE, 174
         VERTGUIDE, 197
         TOPMARGIN, 4
-        BOTTOMMARGIN, 40
         HORZGUIDE, 9
         HORZGUIDE, 22
         HORZGUIDE, 35
+        HORZGUIDE, 48
     END
 
     IDD_YARN_TYPE, DIALOG