Skip to content

Commit f4f2542

Browse files
OmidGhotbiOmidGhotbi
committed
Add support for shadowtransparent
Add support for shadowtransparent and shadow catcher option
1 parent 98ac0fb commit f4f2542

File tree

5 files changed

+165
-0
lines changed

5 files changed

+165
-0
lines changed

‎Lux_Mtl/Lux_Mirror.cpp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ enum
204204
/*light emission params end*/
205205

206206
transparency_map,
207+
transparency_shadow,
208+
bump_offset,
207209
};
208210

209211

@@ -274,6 +276,37 @@ static ParamBlockDesc2 Lux_Mirror_param_blk (
274276
p_ui, Common_Param, TYPE_SPINNER, EDITTYPE_INT, IDC_ID_EDIT, IDC_ID_SPIN, 1,
275277
p_end,
276278

279+
transparency_shadow, _T("Transparent shadow"), TYPE_RGBA, P_ANIMATABLE, IDS_TRANSPARENCY_SHADOW,
280+
p_default, Color(0.0f, 0.0f, 0.0f),
281+
p_ui, Common_Param, TYPE_COLORSWATCH, IDC_TRANSPARENCY_SHADOW_COLOR,
282+
p_end,
283+
284+
bump_offset, _T("Bump ofset"), TYPE_FLOAT, P_ANIMATABLE, IDS_BUMP_OFFSET,
285+
p_default, 0.001f,
286+
p_range, 0.0f, 1.0f,
287+
p_ui, Common_Param, TYPE_SPINNER, EDITTYPE_FLOAT, IDC_BUMP_OFSET_SAMPLE, IDC_BUMP_OFSET_SAMPLE_SPIN, 0.001f,
288+
p_end,
289+
290+
visiable_diff, _T("Visiable diffuse"), TYPE_BOOL, 0, IDS_VISIABLE_DIFFUSE,
291+
p_default, TRUE,
292+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_DIFFUSE_VISIABLE_ENABLE,
293+
p_end,
294+
295+
visiable_specular, _T("Visiable specular"), TYPE_BOOL, 0, IDS_VISIABLE_SPECULAR,
296+
p_default, TRUE,
297+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_SPECULAR_VISIABLE_ENABLE,
298+
p_end,
299+
300+
visiable_glossy, _T("Visiable glossy"), TYPE_BOOL, 0, IDS_VISIABLE_GLOSSY,
301+
p_default, TRUE,
302+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_GLOSSY_VISIABLE_ENABLE,
303+
p_end,
304+
305+
catch_shadow, _T("Shadow catcher"), TYPE_BOOL, 0, IDS_SHADOW_CATCHER,
306+
p_default, FALSE,
307+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_SAHDOW_CATCHER_ENABLE,
308+
p_end,
309+
277310
// Light
278311
emission, _T("emission_color"), TYPE_RGBA, P_ANIMATABLE, IDS_EMISSION,
279312
p_default, Color(0.5f, 0.5f, 0.5f),

‎Lux_Mtl/Lux_Mix.cpp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ enum {
219219
/*light emission params end*/
220220

221221
transparency_map,
222+
transparency_shadow,
223+
bump_offset,
222224
};
223225

224226

@@ -304,6 +306,37 @@ static ParamBlockDesc2 Lux_Mix_param_blk (
304306
p_ui, Common_Param, TYPE_SPINNER, EDITTYPE_INT, IDC_ID_EDIT, IDC_ID_SPIN, 1,
305307
p_end,
306308

309+
transparency_shadow, _T("Transparent shadow"), TYPE_RGBA, P_ANIMATABLE, IDS_TRANSPARENCY_SHADOW,
310+
p_default, Color(0.0f, 0.0f, 0.0f),
311+
p_ui, Common_Param, TYPE_COLORSWATCH, IDC_TRANSPARENCY_SHADOW_COLOR,
312+
p_end,
313+
314+
bump_offset, _T("Bump ofset"), TYPE_FLOAT, P_ANIMATABLE, IDS_BUMP_OFFSET,
315+
p_default, 0.001f,
316+
p_range, 0.0f, 1.0f,
317+
p_ui, Common_Param, TYPE_SPINNER, EDITTYPE_FLOAT, IDC_BUMP_OFSET_SAMPLE, IDC_BUMP_OFSET_SAMPLE_SPIN, 0.001f,
318+
p_end,
319+
320+
visiable_diff, _T("Visiable diffuse"), TYPE_BOOL, 0, IDS_VISIABLE_DIFFUSE,
321+
p_default, TRUE,
322+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_DIFFUSE_VISIABLE_ENABLE,
323+
p_end,
324+
325+
visiable_specular, _T("Visiable specular"), TYPE_BOOL, 0, IDS_VISIABLE_SPECULAR,
326+
p_default, TRUE,
327+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_SPECULAR_VISIABLE_ENABLE,
328+
p_end,
329+
330+
visiable_glossy, _T("Visiable glossy"), TYPE_BOOL, 0, IDS_VISIABLE_GLOSSY,
331+
p_default, TRUE,
332+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_GLOSSY_VISIABLE_ENABLE,
333+
p_end,
334+
335+
catch_shadow, _T("Shadow catcher"), TYPE_BOOL, 0, IDS_SHADOW_CATCHER,
336+
p_default, FALSE,
337+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_SAHDOW_CATCHER_ENABLE,
338+
p_end,
339+
307340
// Light param
308341
emission, _T("emission_color"), TYPE_RGBA, P_ANIMATABLE, IDS_EMISSION,
309342
p_default, Color(0.5f, 0.5f, 0.5f),

‎Lux_Mtl/Lux_Rough_Glass.cpp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ enum
215215
/*light emission params end*/
216216

217217
transparency_map,
218+
transparency_shadow,
219+
bump_offset,
218220
};
219221

220222

@@ -346,6 +348,37 @@ static ParamBlockDesc2 Lux_RoughGlass_param_blk (
346348
p_ui, Common_Param, TYPE_SPINNER, EDITTYPE_INT, IDC_ID_EDIT, IDC_ID_SPIN, 1,
347349
p_end,
348350

351+
transparency_shadow, _T("Transparent shadow"), TYPE_RGBA, P_ANIMATABLE, IDS_TRANSPARENCY_SHADOW,
352+
p_default, Color(0.0f, 0.0f, 0.0f),
353+
p_ui, Common_Param, TYPE_COLORSWATCH, IDC_TRANSPARENCY_SHADOW_COLOR,
354+
p_end,
355+
356+
bump_offset, _T("Bump ofset"), TYPE_FLOAT, P_ANIMATABLE, IDS_BUMP_OFFSET,
357+
p_default, 0.001f,
358+
p_range, 0.0f, 1.0f,
359+
p_ui, Common_Param, TYPE_SPINNER, EDITTYPE_FLOAT, IDC_BUMP_OFSET_SAMPLE, IDC_BUMP_OFSET_SAMPLE_SPIN, 0.001f,
360+
p_end,
361+
362+
visiable_diff, _T("Visiable diffuse"), TYPE_BOOL, 0, IDS_VISIABLE_DIFFUSE,
363+
p_default, TRUE,
364+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_DIFFUSE_VISIABLE_ENABLE,
365+
p_end,
366+
367+
visiable_specular, _T("Visiable specular"), TYPE_BOOL, 0, IDS_VISIABLE_SPECULAR,
368+
p_default, TRUE,
369+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_SPECULAR_VISIABLE_ENABLE,
370+
p_end,
371+
372+
visiable_glossy, _T("Visiable glossy"), TYPE_BOOL, 0, IDS_VISIABLE_GLOSSY,
373+
p_default, TRUE,
374+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_GLOSSY_VISIABLE_ENABLE,
375+
p_end,
376+
377+
catch_shadow, _T("Shadow catcher"), TYPE_BOOL, 0, IDS_SHADOW_CATCHER,
378+
p_default, FALSE,
379+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_SAHDOW_CATCHER_ENABLE,
380+
p_end,
381+
349382
// Light
350383
emission, _T("emission_color"), TYPE_RGBA, P_ANIMATABLE, IDS_EMISSION,
351384
p_default, Color(0.5f, 0.5f, 0.5f),

‎Lux_Mtl/Lux_Rough_Matte.cpp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ enum
207207
/*light emission params end*/
208208

209209
transparency_map,
210+
transparency_shadow,
211+
bump_offset,
210212
};
211213

212214

@@ -290,6 +292,37 @@ static ParamBlockDesc2 Lux_Rough_Matte_param_blk (
290292
p_ui, Common_Param, TYPE_SPINNER, EDITTYPE_INT, IDC_ID_EDIT, IDC_ID_SPIN, 1,
291293
p_end,
292294

295+
transparency_shadow, _T("Transparent shadow"), TYPE_RGBA, P_ANIMATABLE, IDS_TRANSPARENCY_SHADOW,
296+
p_default, Color(0.0f, 0.0f, 0.0f),
297+
p_ui, Common_Param, TYPE_COLORSWATCH, IDC_TRANSPARENCY_SHADOW_COLOR,
298+
p_end,
299+
300+
bump_offset, _T("Bump ofset"), TYPE_FLOAT, P_ANIMATABLE, IDS_BUMP_OFFSET,
301+
p_default, 0.001f,
302+
p_range, 0.0f, 1.0f,
303+
p_ui, Common_Param, TYPE_SPINNER, EDITTYPE_FLOAT, IDC_BUMP_OFSET_SAMPLE, IDC_BUMP_OFSET_SAMPLE_SPIN, 0.001f,
304+
p_end,
305+
306+
visiable_diff, _T("Visiable diffuse"), TYPE_BOOL, 0, IDS_VISIABLE_DIFFUSE,
307+
p_default, TRUE,
308+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_DIFFUSE_VISIABLE_ENABLE,
309+
p_end,
310+
311+
visiable_specular, _T("Visiable specular"), TYPE_BOOL, 0, IDS_VISIABLE_SPECULAR,
312+
p_default, TRUE,
313+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_SPECULAR_VISIABLE_ENABLE,
314+
p_end,
315+
316+
visiable_glossy, _T("Visiable glossy"), TYPE_BOOL, 0, IDS_VISIABLE_GLOSSY,
317+
p_default, TRUE,
318+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_GLOSSY_VISIABLE_ENABLE,
319+
p_end,
320+
321+
catch_shadow, _T("Shadow catcher"), TYPE_BOOL, 0, IDS_SHADOW_CATCHER,
322+
p_default, FALSE,
323+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_SAHDOW_CATCHER_ENABLE,
324+
p_end,
325+
293326
// Light
294327
emission, _T("emission_color"), TYPE_RGBA, P_ANIMATABLE, IDS_EMISSION,
295328
p_default, Color(0.5f, 0.5f, 0.5f),

‎Lux_Mtl/Lux_Velvet.cpp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ enum
212212
/*light emission params end*/
213213

214214
transparency_map,
215+
transparency_shadow,
216+
bump_offset,
215217
};
216218

217219
static ParamBlockDesc2 Lux_Velvet_param_blk (
@@ -331,6 +333,37 @@ static ParamBlockDesc2 Lux_Velvet_param_blk (
331333
p_ui, Common_Param, TYPE_SPINNER, EDITTYPE_INT, IDC_ID_EDIT, IDC_ID_SPIN, 1,
332334
p_end,
333335

336+
transparency_shadow, _T("Transparent shadow"), TYPE_RGBA, P_ANIMATABLE, IDS_TRANSPARENCY_SHADOW,
337+
p_default, Color(0.0f, 0.0f, 0.0f),
338+
p_ui, Common_Param, TYPE_COLORSWATCH, IDC_TRANSPARENCY_SHADOW_COLOR,
339+
p_end,
340+
341+
bump_offset, _T("Bump ofset"), TYPE_FLOAT, P_ANIMATABLE, IDS_BUMP_OFFSET,
342+
p_default, 0.001f,
343+
p_range, 0.0f, 1.0f,
344+
p_ui, Common_Param, TYPE_SPINNER, EDITTYPE_FLOAT, IDC_BUMP_OFSET_SAMPLE, IDC_BUMP_OFSET_SAMPLE_SPIN, 0.001f,
345+
p_end,
346+
347+
visiable_diff, _T("Visiable diffuse"), TYPE_BOOL, 0, IDS_VISIABLE_DIFFUSE,
348+
p_default, TRUE,
349+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_DIFFUSE_VISIABLE_ENABLE,
350+
p_end,
351+
352+
visiable_specular, _T("Visiable specular"), TYPE_BOOL, 0, IDS_VISIABLE_SPECULAR,
353+
p_default, TRUE,
354+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_SPECULAR_VISIABLE_ENABLE,
355+
p_end,
356+
357+
visiable_glossy, _T("Visiable glossy"), TYPE_BOOL, 0, IDS_VISIABLE_GLOSSY,
358+
p_default, TRUE,
359+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_GLOSSY_VISIABLE_ENABLE,
360+
p_end,
361+
362+
catch_shadow, _T("Shadow catcher"), TYPE_BOOL, 0, IDS_SHADOW_CATCHER,
363+
p_default, FALSE,
364+
p_ui, Common_Param, TYPE_SINGLECHEKBOX, IDC_SAHDOW_CATCHER_ENABLE,
365+
p_end,
366+
334367
// Light
335368
emission, _T("emission_color"), TYPE_RGBA, P_ANIMATABLE, IDS_EMISSION,
336369
p_default, Color(0.5f, 0.5f, 0.5f),

0 commit comments

Comments
 (0)