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

testing weights

parent 72e22368

js/align_functions.js

+8 −5
Original line number Original line Diff line number Diff line
@@ -59,8 +59,10 @@ function hll_f_3d_i(i,v){ 
  //var vec = new x3dom.fields.SFVec3f(mark.align.x-base.x,mark.align.y-base.y,mark.align.z-base.z);

  //var vec = new x3dom.fields.SFVec3f(mark.align.x-base.x,mark.align.y-base.y,mark.align.z-base.z);

  var res = Math.atan2(vec.x,-vec.z)*180/Math.PI + v[2];

  var res = Math.atan2(vec.x,-vec.z)*180/Math.PI + v[2];





  if (res> 180) res = res - 360;

  console.log("hll_f_3d_i: "+i+" "+res);

  if (res<-180) res = res + 360;



  //if (res> 180) res = res - 360;

  //if (res<-180) res = res + 360;





  return res;

  return res;

}

}
@@ -282,7 +284,8 @@ function art_l_i(i){ 




function art_w_i(i,v){

function art_w_i(i,v){

  //return 1;

  //return 1;

  return 1/art_l_i(i);

  //return 1/art_l_i(i);

  return art_l_i(i);

}

}





/**

/**
@@ -326,6 +329,6 @@ function art2_l_i(i){ 
}

}





function art2_w_i(i,v){

function art2_w_i(i,v){

  return 1;

  //return 1;

  //return 1/art_l_i(i);

  return 1/art_l_i(i);

}
 
}

js/x3dom_init.js

+5 −0
Original line number Original line Diff line number Diff line
@@ -1464,8 +1464,13 @@ X3DOMObject.displayMarkInfo = function(index){ 




}

}





/*

 * Called on ctrl-click over scene

 */

X3DOMObject.createNewMarker = function(x,y,z){

X3DOMObject.createNewMarker = function(x,y,z){





  console.log("createNewMarker");



  x = parseFloat(x);

  x = parseFloat(x);

  y = parseFloat(y);

  y = parseFloat(y);

  z = parseFloat(z);

  z = parseFloat(z);