kscience/visionforge
8
1
Fork 1
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
Alexander Nozik 2019-04-05 22:13:45 +03:00
parent 2de0404a03
commit 894dc7ba07
2 changed files with 9 additions and 1894 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1886
dataforge-vis-spatial-js/src/main/resources/JSRootCore.js_mod
View File

File diff suppressed because it is too large Load Diff

17
dataforge-vis-spatial-js/src/main/resources/JSRootGeoBase.js
View File

@ -3046,7 +3046,7 @@ ClonedNodes.prototype.BuildShapes = function (lst, limit, timelimit) {
res = {done: false, shapes: 0, faces: 0, notusedshapes: 0}; res = {done: false, shapes: 0, faces: 0, notusedshapes: 0};
for (var n = 0; n < lst.length; ++n) { for (var n = 0; n < lst.length; ++n) {
var item = lst[n]; let item = lst[n];
// if enough faces are produced, nothing else is required // if enough faces are produced, nothing else is required
if (res.done) { if (res.done) {
@ -3070,7 +3070,7 @@ ClonedNodes.prototype.BuildShapes = function (lst, limit, timelimit) {
if (res.faces >= limit) { if (res.faces >= limit) {
res.done = true; res.done = true;
} else if ((created > 0.01 * lst.length) && (timelimit !== undefined)) { } else if ((created > 0.01 * lst.length) && (timelimit !== undefined)) {
var tm2 = new Date().getTime(); let tm2 = new Date().getTime();
if (tm2 - tm1 > timelimit) return res; if (tm2 - tm1 > timelimit) return res;
} }
} }
@ -3415,7 +3415,7 @@ export function build(obj, opt) {
opt.res_mesh = opt.res_faces = 0; opt.res_mesh = opt.res_faces = 0;
var shape = null; let shape = null;
if (('fShapeBits' in obj) && ('fShapeId' in obj)) { if (('fShapeBits' in obj) && ('fShapeId' in obj)) {
shape = obj; shape = obj;
@ -3434,8 +3434,9 @@ export function build(obj, opt) {
obj = null; obj = null;
} }
if (opt.composite && shape && (shape._typename === 'TGeoCompositeShape') && shape.fNode) if (opt.composite && shape && (shape._typename === 'TGeoCompositeShape') && shape.fNode) {
obj = buildCompositeVolume(shape); obj = buildCompositeVolume(shape);
}
// if (!obj && shape) // if (!obj && shape)
// obj = extend(JSROOT.Create("TEveGeoShapeExtract"), // obj = extend(JSROOT.Create("TEveGeoShapeExtract"),
@ -3469,13 +3470,13 @@ export function build(obj, opt) {
clones.BuildShapes(shapes, opt.numfaces); clones.BuildShapes(shapes, opt.numfaces);
var toplevel = new THREE.Object3D(); let toplevel = new THREE.Object3D();
for (var n = 0; n < draw_nodes.length; ++n) { for (let n = 0; n < draw_nodes.length; ++n) {
var entry = draw_nodes[n]; let entry = draw_nodes[n];
if (entry.done) continue; if (entry.done) continue;
var shape = shapes[entry.shapeid]; let shape = shapes[entry.shapeid];
if (!shape.ready) { if (!shape.ready) {
console.warn('shape marked as not ready when should'); console.warn('shape marked as not ready when should');
break; break;