Skip to content

Commit 98cc4d5

Browse files
yvonnexiongyvonnexiong
committed
Move Fresnel section
inside Fraction. Change Transparency title -> Diffuse Alpha
1 parent acb0903 commit 98cc4d5

3 files changed

Lines changed: 89 additions & 51 deletions

File tree

‎css/mock3d.css‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ label{margin-bottom:0;}
4545
font-size: 10px;
4646
margin-top: 10px;
4747
margin-bottom: 10px;
48+
color:#AEAEAE;
4849
}
4950

5051
.main {
@@ -246,6 +247,39 @@ label{margin-bottom:0;}
246247
}
247248

248249

250+
251+
#refractionControl .fresnel_container{
252+
margin: 20px 0px;
253+
margin-bottom: -5px;
254+
}
255+
256+
#refractionControl .fresnel_container .fresnelPanel{
257+
display: block;
258+
padding-left: 0;
259+
margin-right: -21px;
260+
margin-bottom: 20px;
261+
margin-left: -20px;
262+
}
263+
264+
#refractionControl .fresnel_container .myFresnelTitle{
265+
display: block;
266+
background:#ccc;
267+
color:#500000;
268+
height: 28px;
269+
line-height: 8px;
270+
font-size: 12px;
271+
font-weight: 300;
272+
text-align: center;
273+
padding: 10px 20px;
274+
}
275+
276+
#refractionControl .fresnel_container .fresnelBox{
277+
padding: 10px 20px;
278+
279+
}
280+
281+
282+
249283
#lights_container{
250284
margin: 20px 0px;
251285
margin-bottom: -5px;

‎index.html‎

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ <h6>Style Control</h6>
674674
<!--Additional Alpha Control-->
675675
<li class="panel">
676676
<a class="myControlTitle collapsed" data-toggle="collapse" data-parent = "#accordion_R" href="#alphaControl">
677-
Transparency
677+
Diffuse Alpha
678678
</a>
679679
<div id = "alphaControl" class= "inCollapse collapse">
680680
<div class="imgbox_container">
@@ -753,6 +753,48 @@ <h6>Background image</h6>
753753
<input id="refr_BGdis_slider" data-slider-id='customSlider' type="text" />
754754
</div>
755755
</div>
756+
<div class = "fresnel_container">
757+
<div class = "fresnelPanel">
758+
<div class = "myFresnelTitle">
759+
FRESNEL CONTROL
760+
</div>
761+
<div class = "fresnelBox">
762+
<div class="checkbox">
763+
<label>
764+
<span class = "h6 inlineBlock"> Check Fresnel </span>
765+
<div class = "checkbox_container pull-right">
766+
<input type="checkbox" id ="checkFresnelSelect">
767+
<div class = "pseudoCheckbox"></div>
768+
</div>
769+
</label>
770+
</div>
771+
<div >
772+
<span class="h6 inlineBlock"> Fresnel Control </span>
773+
<div class="pull-right">
774+
<input type="text" class="form-control mytextbox text-center" id="fresnel_intensity_val">
775+
</div>
776+
<div class="slider_box">
777+
<input id="fresnel_intensity_slider" data-slider-id='customSlider' type="text" />
778+
</div>
779+
<div>
780+
<div class = "h7 inlineBlock">Full Refract</div>
781+
<div class = "h7 pull-right">Full Reflect</div>
782+
</div>
783+
</div>
784+
<div>
785+
<h6>Fresnel Position</h6>
786+
<div class="slider_box">
787+
<input id="fresnelControl_slider" data-slider-id='customSlider' type="text" class=" span2" value="" />
788+
</div>
789+
<div>
790+
<div class = "h7 inlineBlock">Center</div>
791+
<div class = "h7 pull-right">Edge</div>
792+
</div>
793+
</div>
794+
</div>
795+
796+
</div>
797+
</div>
756798
<!-- <div class="slider_container">
757799
<span class="h6 inlineBlock"> Translucency </span>
758800
<div class="pull-right">
@@ -853,43 +895,6 @@ <h6>Foreground image</h6>
853895
</div> -->
854896
</div>
855897
</li>
856-
<!--Fresnel-->
857-
<li class="panel">
858-
<a class="myControlTitle collapsed" data-toggle="collapse" data-parent = "#accordion_R" href="#fresnelControl">
859-
Fresnel
860-
</a>
861-
<div id = "fresnelControl" class= "inCollapse collapse">
862-
<div class="checkbox">
863-
<label>
864-
<span class = "h6 inlineBlock"> check Fresnel </span>
865-
<div class = "checkbox_container pull-right">
866-
<input type="checkbox" id ="checkFresnelSelect">
867-
<div class = "pseudoCheckbox"></div>
868-
</div>
869-
</label>
870-
</div>
871-
<div class="slider_container">
872-
<span class="h6 inlineBlock"> Fresnel Control </span>
873-
<div class="slider_box">
874-
<input id="fresnel_intensity_slider" data-slider-id='customSlider' type="text" />
875-
</div>
876-
<div>
877-
<div class = "h7 inlineBlock">Full Refract</div>
878-
<div class = "h7 pull-right">Full Reflect</div>
879-
</div>
880-
</div>
881-
<div>
882-
<h6>Fresnel Position</h6>
883-
<div class="slider_box">
884-
<input id="fresnelControl_slider" data-slider-id='customSlider' type="text" class=" span2" value="" />
885-
</div>
886-
<div>
887-
<div class = "h7 inlineBlock">center</div>
888-
<div class = "h7 pull-right">edge</div>
889-
</div>
890-
</div>
891-
</div>
892-
</li>
893898
<!--Ambient Occlusion-->
894899
<!-- <li class="panel">
895900
<a class = "myControlTitle collapsed" data-toggle="collapse" data-parent = "#accordion_R" href="#aoControl">

‎sliders.js‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,6 @@ $(document).ready(function () {
5555
bindSliderValParam (alphaInBlue_slider, alphaInBlue_val, "alphaB");
5656

5757

58-
/**Fresnel**/
59-
var fresnel_intensity_slider = $("#fresnel_intensity_slider");
60-
var fresnel_intensity_val = $("#fresnel_intensity_val");
61-
fresnel_intensity_slider.attr("data-slider-min", -1).attr("data-slider-max", 1).attr("data-slider-step", 0.01).attr("data-slider-value", fresnelIntensity).attr("data-slider-tooltip","hide").slider({});
62-
bindSliderValParam (fresnel_intensity_slider, fresnel_intensity_val, "fresnelIntensity");
63-
64-
$("#fresnelControl_slider").slider({ min: 0, max: 1, value: [fresnelB, fresnelC], step: 0.01, focus: true });
65-
$("#fresnelControl_slider").on("slide", function(slideEvt) {
66-
fresnelB = slideEvt.value[0];
67-
fresnelC = slideEvt.value[1];
68-
});
69-
7058
/**Shadow**/
7159
$("#sha_sampleSize_slider").slider({min: 0, max: 1, value: 1, step: 0.01, focus: true});
7260
$("#sha_numberOfSample_slider").slider({min: 0, max: 1, value: 1, step: 0.01, focus: true});
@@ -91,10 +79,21 @@ $(document).ready(function () {
9179

9280

9381

82+
/**Fresnel**/
83+
84+
var fresnel_intensity_slider = $("#fresnel_intensity_slider");
85+
var fresnel_intensity_val = $("#fresnel_intensity_val");
86+
fresnel_intensity_slider.attr("data-slider-min", -1).attr("data-slider-max", 1).attr("data-slider-step", 0.01).attr("data-slider-value", fresnelIntensity).attr("data-slider-tooltip","hide").slider({});
87+
bindSliderValParam (fresnel_intensity_slider, fresnel_intensity_val, "fresnelIntensity");
9488

89+
$("#fresnelControl_slider").slider({ min: 0, max: 1, value: [fresnelB, fresnelC], step: 0.01, focus: true });
90+
$("#fresnelControl_slider").on("slide", function(slideEvt) {
91+
fresnelB = slideEvt.value[0];
92+
fresnelC = slideEvt.value[1];
93+
});
9594

9695

97-
$("#translucency_slider").slider({min: 0, max: 1, value: 1, step: 0.01, focus: true});
96+
//$("#translucency_slider").slider({min: 0, max: 1, value: 1, step: 0.01, focus: true});
9897

9998
/**Reflection**/
10099

0 commit comments

Comments
 (0)