Fix ALS procedural light intensity_scale and add a Compositor light dim-factor for stobes. Amke pointlights non-directional for ALS
This commit is contained in:
parent
d02ce10801
commit
ff3c6f2509
2 changed files with 15 additions and 11 deletions
|
@ -26,9 +26,9 @@
|
||||||
<b>1.0</b>
|
<b>1.0</b>
|
||||||
</specular>
|
</specular>
|
||||||
<attenuation>
|
<attenuation>
|
||||||
<c>1.3</c>
|
<c>1.0</c>
|
||||||
<l>1.5</l>
|
<l>0.7</l>
|
||||||
<q>4</q>
|
<q>1.1</q>
|
||||||
</attenuation>
|
</attenuation>
|
||||||
<inner-angle>0.75</inner-angle>
|
<inner-angle>0.75</inner-angle>
|
||||||
<outer-angle>0.85</outer-angle>
|
<outer-angle>0.85</outer-angle>
|
||||||
|
@ -78,6 +78,7 @@
|
||||||
</animation>
|
</animation>
|
||||||
|
|
||||||
<effect>
|
<effect>
|
||||||
|
<name>Effects/pointlight</name>
|
||||||
<object-name>light</object-name>
|
<object-name>light</object-name>
|
||||||
<inherits-from>Effects/procedural-light</inherits-from>
|
<inherits-from>Effects/procedural-light</inherits-from>
|
||||||
<parameters>
|
<parameters>
|
||||||
|
@ -90,11 +91,11 @@
|
||||||
<light_color_center_r alias="/params/specular/r"/>
|
<light_color_center_r alias="/params/specular/r"/>
|
||||||
<light_color_center_g alias="/params/specular/g"/>
|
<light_color_center_g alias="/params/specular/g"/>
|
||||||
<light_color_center_b alias="/params/specular/b"/>
|
<light_color_center_b alias="/params/specular/b"/>
|
||||||
<intensity_scale alias="/params/power-source"/>
|
<intensity_scale>1.0</intensity_scale>
|
||||||
<pointing_x alias="/params/direction/x"/>
|
<pointing_x alias="/params/direction/x"/>
|
||||||
<pointing_y alias="/params/direction/y"/>
|
<pointing_y alias="/params/direction/y"/>
|
||||||
<pointing_z alias="/params/direction/z"/>
|
<pointing_z alias="/params/direction/z"/>
|
||||||
<is_directional type="bool">true</is_directional>
|
<is_directional type="bool">false</is_directional>
|
||||||
<is_strobe type="bool">false</is_strobe>
|
<is_strobe type="bool">false</is_strobe>
|
||||||
<inner_angle alias="/params/inner-angle"/>
|
<inner_angle alias="/params/inner-angle"/>
|
||||||
<outer_angle alias="/params/outer-angle"/>
|
<outer_angle alias="/params/outer-angle"/>
|
||||||
|
@ -146,6 +147,7 @@
|
||||||
<q alias="/params/attenuation/q"/>
|
<q alias="/params/attenuation/q"/>
|
||||||
</attenuation>
|
</attenuation>
|
||||||
<range-m alias="/params/range-m"/>
|
<range-m alias="/params/range-m"/>
|
||||||
|
<dim-factor><property alias="/params/power-source"/></dim-factor>
|
||||||
</light>
|
</light>
|
||||||
|
|
||||||
</PropertyList>
|
</PropertyList>
|
||||||
|
|
|
@ -26,9 +26,9 @@
|
||||||
<b>1.0</b>
|
<b>1.0</b>
|
||||||
</specular>
|
</specular>
|
||||||
<attenuation>
|
<attenuation>
|
||||||
<c>1.3</c>
|
<c>1.0</c>
|
||||||
<l>1.5</l>
|
<l>0.7</l>
|
||||||
<q>4</q>
|
<q>1.1</q>
|
||||||
</attenuation>
|
</attenuation>
|
||||||
<inner-angle>0.75</inner-angle>
|
<inner-angle>0.75</inner-angle>
|
||||||
<outer-angle>0.85</outer-angle>
|
<outer-angle>0.85</outer-angle>
|
||||||
|
@ -80,6 +80,7 @@
|
||||||
</animation>
|
</animation>
|
||||||
|
|
||||||
<effect>
|
<effect>
|
||||||
|
<name>Effects/spotlight</name>
|
||||||
<object-name>light</object-name>
|
<object-name>light</object-name>
|
||||||
<inherits-from>Effects/procedural-light</inherits-from>
|
<inherits-from>Effects/procedural-light</inherits-from>
|
||||||
<parameters>
|
<parameters>
|
||||||
|
@ -92,7 +93,7 @@
|
||||||
<light_color_center_r alias="/params/specular/r"/>
|
<light_color_center_r alias="/params/specular/r"/>
|
||||||
<light_color_center_g alias="/params/specular/g"/>
|
<light_color_center_g alias="/params/specular/g"/>
|
||||||
<light_color_center_b alias="/params/specular/b"/>
|
<light_color_center_b alias="/params/specular/b"/>
|
||||||
<intensity_scale alias="/params/power-source"/>
|
<intensity_scale>1.0</intensity_scale>
|
||||||
<pointing_x alias="/params/direction/x"/>
|
<pointing_x alias="/params/direction/x"/>
|
||||||
<pointing_y alias="/params/direction/y"/>
|
<pointing_y alias="/params/direction/y"/>
|
||||||
<pointing_z alias="/params/direction/z"/>
|
<pointing_z alias="/params/direction/z"/>
|
||||||
|
@ -150,6 +151,7 @@
|
||||||
<spot-cutoff alias="/params/spot-cutoff"/>
|
<spot-cutoff alias="/params/spot-cutoff"/>
|
||||||
<spot-exponent alias="/params/spot-exponent"/>
|
<spot-exponent alias="/params/spot-exponent"/>
|
||||||
<range-m alias="/params/range-m"/>
|
<range-m alias="/params/range-m"/>
|
||||||
|
<dim-factor><property alias="/params/power-source"/></dim-factor>
|
||||||
</light>
|
</light>
|
||||||
|
|
||||||
</PropertyList>
|
</PropertyList>
|
||||||
|
|
Loading…
Add table
Reference in a new issue