Commit cec02b95 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

1. made a button to play model's src files

parent 522acbce

js/images/baseline_photo_library_black_48dp.png

0 → 100755
+540 B
Loading image diff...

js/images/baseline_slideshow_black_48dp.png

0 → 100755
+376 B
Loading image diff...

js/ui.css

+14 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ html, body, #x3d_wrapper { 
#align_button_location,

#align_tr_button,

#download_button,

#view_src_images_button,

#extra_models_button{

    background-size: 32px 32px;

    background-repeat: no-repeat;
@@ -217,6 +218,11 @@ html, body, #x3d_wrapper { 
    background-size: 26px 26px;

}



#view_src_images_button{

    background-image:url('images/baseline_photo_library_black_48dp.png');

    background-size: 26px 26px;

}



#align_button{

    background-image:url('images/ic_explore_black_48dp_1x.png');

}
@@ -238,6 +244,7 @@ html, body, #x3d_wrapper { 
#align_button_location:hover,

#align_tr_button:hover,

#download_button:hover,

#view_src_images_button:hover,

#extra_models_button:hover{

/*     background-image:url('images/align.png'); */

    background-color: rgba(240,240,240,1);
@@ -408,6 +415,13 @@ html, body, #x3d_wrapper { 
/*   margin-right:2px; */

}



#download_button,

#view_src_images_button{

  display: block;

/*   float:right; */

/*   margin-right:2px; */

}



#model_name{

  width: 200px;

  padding: 0px 5px;

js/ui_init.js

+16 −1
Original line number Diff line number Diff line
@@ -175,7 +175,22 @@ function title_init(){ 
    $("body").append(html);

    */



    $("#lpl").attr("href","playloop.php?interval=200&sufx=D0.0.jpeg&path="+SETTINGS.basepath+"/"+SETTINGS.path+"/"+SETTINGS.version+"/"+SETTINGS.path).css({color:"white"});

    var title_url = "playloop.php?interval=200&sufx=D0.0.jpeg&path="+SETTINGS.basepath+"/"+SETTINGS.path+"/"+SETTINGS.version+"/"+SETTINGS.path;



    //$("#lpl").attr("href",title_url).css({color:"white"});



    $("#view_src_images_button").on('click',function(){

      window.open(title_url,'_blank');

    });



    var pos = $("#download_button").position();

    var width = $("#download_button").width();



    $("#view_src_images_button").css({

      position:"absolute",

      top: pos.top+"px",

      left: -(width+2)+"px"

    });



}

viewer.html

+2 −1
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
        <div id='exit_button' title='Exit to models index'></div>

        <div id='help_button' title='Help'>?</div>

        <div id='download_button' title='Download 3d model (.obj & .x3d formats)'></div>

        <div id='view_src_images_button' title='View/slideshow source images (processed)'></div>

        <div id='menu_button' title='Menu'></div>

        <div id='extra_models_button' title='Load extra models' class='experimental'></div>

        <div id='align_button' title='Run least squares fitting algorithm (Gauss-Newton) for camera heading and location using markers.
@@ -182,7 +183,7 @@ Instructions: 
                <tr>

                    <td>&nbsp;</td>

                </tr>

                <tr> <!-- class='experimental'> -->

                <tr hidden> <!-- class='experimental'> -->

                    <td><a id='lpl' title='Viewer for the almost raw image set used to generate the 3d model' >Set of 4 images</a></td>

                </tr>

                <tr> <!-- class='experimental'> -->