Commit cf8a7506 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

1. INFINITY shape handling 2. mymodel -> x3d

parent e6d3d2e3
...@@ -199,7 +199,7 @@ function light_init(){ ...@@ -199,7 +199,7 @@ function light_init(){
var model = $([ var model = $([
'<group>', '<group>',
' <inline name="mymodel" namespacename="mymodel" url="'+model_url+'"></inline>', ' <inline name="x3d" namespacename="x3d" url="'+model_url+'"></inline>',
'</group>' '</group>'
].join('\n')); ].join('\n'));
......
...@@ -65,6 +65,13 @@ function x3dom_getXYPosOr(cnvx,cnvy,round){ ...@@ -65,6 +65,13 @@ function x3dom_getXYPosOr(cnvx,cnvy,round){
var valid_distance = true; var valid_distance = true;
// check infinity shape
if (shootRay.pickPosition != null){
if ($(shootRay.pickObject).hasClass('INFINITY')){
shootRay.pickPosition = null;
}
}
if (shootRay.pickPosition != null){ if (shootRay.pickPosition != null){
var index = Scene.highlighted_marker_index; var index = Scene.highlighted_marker_index;
...@@ -97,9 +104,9 @@ function x3dom_getXYPosOr(cnvx,cnvy,round){ ...@@ -97,9 +104,9 @@ function x3dom_getXYPosOr(cnvx,cnvy,round){
} }
dist_xyz = Math.sqrt(y*y+dist_xz*dist_xz); dist_xyz = Math.sqrt(y*y+dist_xz*dist_xz);
id = $(shootRay.pickObject).attr("id"); id = $(shootRay.pickObject).attr("id");
}else{ }else{
var viewingRay = elem.runtime.getViewingRay(cnvx,cnvy); var viewingRay = elem.runtime.getViewingRay(cnvx,cnvy);
......
...@@ -1242,6 +1242,7 @@ X3DOMObject.displayViewInfo = function(e){ ...@@ -1242,6 +1242,7 @@ X3DOMObject.displayViewInfo = function(e){
var camera = x3dom_getCameraPosOr(true); var camera = x3dom_getCameraPosOr(true);
/* do not convert
//convert to real world coordinates //convert to real world coordinates
var tmp = xyz_to_real_world(mouse.x,mouse.y,mouse.z); var tmp = xyz_to_real_world(mouse.x,mouse.y,mouse.z);
...@@ -1254,6 +1255,7 @@ X3DOMObject.displayViewInfo = function(e){ ...@@ -1254,6 +1255,7 @@ X3DOMObject.displayViewInfo = function(e){
camera.x = tmp.x.toFixed(2); camera.x = tmp.x.toFixed(2);
camera.y = tmp.y.toFixed(2); camera.y = tmp.y.toFixed(2);
camera.z = tmp.z.toFixed(2); camera.z = tmp.z.toFixed(2);
*/
// ?!!! // ?!!!
//Map.marker.setAltitude(camera.y); //Map.marker.setAltitude(camera.y);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment