Commit 3870060b authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

Merge branch 'master' into 'gulp' 

# Conflicts:
#   index.html
#   js/ui_init.js
#   js/x3dom_init.js
#   test.html
parents f47abc96 2d563289

js/ui.css

+4 −3
Original line number Original line Diff line number Diff line 
body{

body{

  user-select: none;

  padding: 0px;

  padding: 0px;

  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;

  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;

  margin: 0px;

  margin: 0px;

js/x3dom_init.js

+54 −40
Original line number Original line Diff line number Diff line
@@ -711,6 +711,7 @@ X3DOMObject.Marker.prototype._registerEvents = function(){ 




    marker.on('mousedown',function(e){

    marker.on('mousedown',function(e){





        var self = this;

        var elem = $(this).parent().parent().parent();

        var elem = $(this).parent().parent().parent();

        var index = parseInt($(elem).attr("id").substr(PREFIX.length));

        var index = parseInt($(elem).attr("id").substr(PREFIX.length));
@@ -727,6 +728,13 @@ X3DOMObject.Marker.prototype._registerEvents = function(){ 
        Scene.element.addEventListener('mousemove',X3DOMObject.Marker.mouseMove,true);

        Scene.element.addEventListener('mousemove',X3DOMObject.Marker.mouseMove,true);

        Scene.element.addEventListener('mouseup',X3DOMObject.Marker.mouseUp,true);

        Scene.element.addEventListener('mouseup',X3DOMObject.Marker.mouseUp,true);





        // check for button released outside the window

        $(window).on('mouseover.drag_marker',function(e) {

            if (e && e.buttons===0 && Scene.markerToDrag) {

                X3DOMObject.Marker.mouseUp.apply(self,[event]);

            }

        });

                

    });

    });





    marker.on('mouseup',function(e){

    marker.on('mouseup',function(e){
@@ -752,8 +760,10 @@ X3DOMObject.Marker.mouseUp = function(){ 
    }

    }

    */

    */

    

    

    Scene.markerToDrag=null;

    Scene.element.removeEventListener('mouseup',X3DOMObject.Marker.mouseUp,true);    

    Scene.element.removeEventListener('mouseup',X3DOMObject.Marker.mouseUp,true);    

    Scene.element.removeEventListener('mousemove',X3DOMObject.Marker.mouseMove,true);

    Scene.element.removeEventListener('mousemove',X3DOMObject.Marker.mouseMove,true);

    $(window).off('.drag_marker');

    

    

    Scene.draggedTransformNode = null;

    Scene.draggedTransformNode = null;

    Scene.draggingUpVec        = null;

    Scene.draggingUpVec        = null;
@@ -768,6 +778,8 @@ X3DOMObject.Marker.mouseUp = function(){ 
// from https://x3dom.org/x3dom/example/MovingObjectsWithDOMEvents.html

// from https://x3dom.org/x3dom/example/MovingObjectsWithDOMEvents.html

X3DOMObject.Marker.dragStart = function(elem){

X3DOMObject.Marker.dragStart = function(elem){





    Scene.markerToDrag=elem;



    // move up from <shape> to <transform>

    // move up from <shape> to <transform>

    var transformNode = $(elem).parent();

    var transformNode = $(elem).parent();

    var tr0 = $(transformNode).attr("translation");

    var tr0 = $(transformNode).attr("translation");
@@ -825,7 +837,9 @@ X3DOMObject.Marker.mouseMove = function(event){ 
        if (!SETTINGS.slidingdrag){

        if (!SETTINGS.slidingdrag){

            X3DOMObject.Marker.drag(event.offsetX - Scene.lastMouseX, event.offsetY - Scene.lastMouseY);

            X3DOMObject.Marker.drag(event.offsetX - Scene.lastMouseX, event.offsetY - Scene.lastMouseY);

        }else{

        }else{

            Scene.markerToDrag.isPickable=false;

            var sr = Scene.element.runtime.shootRay(event.clientX,event.clientY);

            var sr = Scene.element.runtime.shootRay(event.clientX,event.clientY);

            Scene.markerToDrag.isPickable=true;

            if (sr.pickObject != null){

            if (sr.pickObject != null){

                if (!$(sr.pickObject).hasClass("shapemarker")){

                if (!$(sr.pickObject).hasClass("shapemarker")){

                    var sphere = Scene.draggedTransformNode.parent().parent();

                    var sphere = Scene.draggedTransformNode.parent().parent();
@@ -1205,42 +1219,42 @@ X3DOMObject.displayViewInfo = function(e){ 
    //Map.marker.setAltitude(camera.y);

    //Map.marker.setAltitude(camera.y);

    //Map.marker.setElevation(camera.e*Math.PI/180);

    //Map.marker.setElevation(camera.e*Math.PI/180);





    var msg = [

    var msg = `

'<table>',

<table>

'<tr>',

<tr>

'    <td></td>',

    <td></td>

'    <td colspan="3" align="center">position, m</td>',

    <td colspan='3' align='center'>position, m</td>

'    <td colspan="3" align="center">orientation, &deg;</td>',

    <td colspan='3' align='center'>orientation, &deg;</td>

'</tr>',

</tr>

'<tr>',

<tr>

'    <th></th>',

    <th></th>

'    <th style="width:60px;">x</th>',

    <th style='width:60px;'>x</th>

'    <th style="width:60px;">y</th>',

    <th style='width:60px;'>y</th>

'    <th style="width:60px;">z</th>',

    <th style='width:60px;'>z</th>

'    <th>azimuth</th>',

    <th>azimuth</th>

'    <th>elevation</th>',

    <th>elevation</th>

'    <th>skew</th>',

    <th>skew</th>

'</tr>',

</tr>

'<tr>',

<tr>

'    <td>mouse</td>',

    <td>mouse</td>

'    <td>'+mouse.x+'</td>',

    <td>`+mouse.x+`</td>

'    <td>'+mouse.y+'</td>',

    <td>`+mouse.y+`</td>

'    <td>'+mouse.z+'</td>',

    <td>`+mouse.z+`</td>

'    <td>'+mouse.a+'</td>',

    <td>`+mouse.a+`</td>

'    <td>'+mouse.e+'</td>',

    <td>`+mouse.e+`</td>

'    <td>'+mouse.s+'</td>',

    <td>`+mouse.s+`</td>

'</tr>',

</tr>

'<tr>',

<tr>

'    <td>camera</td>',

    <td>camera</td>

'    <td>'+camera.x+'</td>',

    <td>`+camera.x+`</td>

'    <td>'+camera.y+'</td>',

    <td>`+camera.y+`</td>

'    <td>'+camera.z+'</td>',

    <td>`+camera.z+`</td>

'    <td>'+camera.a+'</td>',

    <td>`+camera.a+`</td>

'    <td>'+camera.e+'</td>',

    <td>`+camera.e+`</td>

'    <td>'+camera.s+'</td>',

    <td>`+camera.s+`</td>

'</tr>',

</tr>

'</table>'

</table>

].join('\n');

`;





    if (SETTINGS.viewinfo){

    if (SETTINGS.viewinfo){

        ui_showMessage("window-viewinfo",msg);

        ui_showMessage("window-viewinfo",msg);

js/ui_functions.js

+7 −7

File changed.

Contains only whitespace changes.

test_nomap_vr.html

+27 −27

File changed.

Contains only whitespace changes.

js/index.css

+1 −1

File changed.

Contains only whitespace changes.

js/index.js

+44 −44

File changed.

Contains only whitespace changes.

js/leaflet/leaflet.camera-view-marker.js

+114 −114

File changed.

Contains only whitespace changes.

js/map.css

+1 −1

File changed.

Contains only whitespace changes.

js/map.js

+19 −19

File changed.

Contains only whitespace changes.

js/ui_help.js

+5 −5

File changed.

Contains only whitespace changes.

js/util_functions.js

+20 −20

File changed.

Contains only whitespace changes.

js/leaflet/leaflet.camera-view-marker-controls.js

+23 −23

File changed.

Contains only whitespace changes.

js/leaflet/leaflet.camera-view-marker.measure.js

+87 −87

File changed.

Contains only whitespace changes.

js/nomap_vr_init.js

+20 −20

File changed.

Contains only whitespace changes.

js/ui_align.js

+14 −14

File changed.

Contains only whitespace changes.

js/ui_menu.js

+17 −17

File changed.

Contains only whitespace changes.

js/x3dom/x3dom.css

+9 −9

File changed.

Contains only whitespace changes.

js/x3l.js

+13 −13

File changed.

Contains only whitespace changes.

test_nomap.html

+4 −4

File changed.

Contains only whitespace changes.

js/x3dom_functions.js

+131 −131

File changed.

Contains only whitespace changes.

js/leaflet/L.extra.js

+9 −9

File changed.

Contains only whitespace changes.

js/leaflet_init.js

+20 −20

File changed.

Contains only whitespace changes.

js/nomap_init.js

+21 −21

File changed.

Contains only whitespace changes.