lore-engine - npm Package Compare versions

Comparing version 1.0.18 to 1.0.19

.vscode/settings.json

@@ -0,0 +0,0 @@ {

app.js

@@ -0,0 +0,0 @@ //@ts-check

doc/all.md

@@ -0,0 +0,0 @@ [![view on npm](http://img.shields.io/npm/v/example.svg)](https://www.npmjs.org/package/example)

doc/scripts/linenumber.js

@@ -0,0 +0,0 @@ /*global document */

doc/scripts/prettify/Apache-License-2.0.txt

@@ -0,0 +0,0 @@

doc/scripts/prettify/lang-css.js

 PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\f\r ]+/,null," \t\r\n"]],[["str",/^"(?:[^\n\f\r"\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*"/,null],["str",/^'(?:[^\n\f\r'\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*'/,null],["lang-css-str",/^url\(([^"')]*)\)/i],["kwd",/^(?:url|rgb|!important|@import|@page|@media|@charset|inherit)(?=[^\w-]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*)\s*:/i],["com",/^\/\*[^*]*\*+(?:[^*/][^*]*\*+)*\//],["com",
 /^(?:<\!--|--\>)/],["lit",/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],["lit",/^#[\da-f]{3,6}/i],["pln",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i],["pun",/^[^\s\w"']+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[["kwd",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[["str",/^[^"')]+/]]),["css-str"]);

doc/scripts/prettify/prettify.js

@@ -0,0 +0,0 @@ var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;

example/flybrain1.js

@@ -0,0 +0,0 @@ (function () {

example/flybrain2.js

@@ -0,0 +0,0 @@ (function () {

example/flybrain3.js

@@ -0,0 +0,0 @@ (function() {

example/larva_2d.js

@@ -0,0 +0,0 @@ (function() {

example/larva.js

@@ -0,0 +0,0 @@ (function() {

gulpfile.js

@@ -22,5 +22,2 @@ var fs = require('fs');
 
-gulp.task('default', ['build', 'doc', 'md']);
-
-
 function compile(watch) {
@@ -73,31 +70,46 @@ var bundler = watchify(browserify('./app.js', {
 gulp.task('build', function () {
-  return compile();
+  return new Promise(function(resolve, reject) {
+    compile();
+    resolve();
+  })
 });
 
 gulp.task('watch', function () {
-  return watch();
+  return new Promise(function(resolve, reject) {
+    watch();
+    resolve();
+  });
 });
 
 gulp.task('doc', function (cb) {
-  var config = require('./jsdocConfig.json');
-  gulp.src(['README.md', './src/*.js'], {
-      read: false
-    })
-    .pipe(jsdoc(config, cb))
+  return new Promise(function(resolve, reject) {
+    var config = require('./jsdocConfig.json');
+    gulp.src(['README.md', './src/*.js'], {
+        read: false
+      })
+      .pipe(jsdoc(config, cb))
+    
+    resolve();
+  });
 });
 
 gulp.task('md', function (cb) {
-  var config = require('./jsdocConfig.json');
-  gulp.src('./src/*.js')
-    .pipe(concat('all.md'))
-    .pipe(gulpJsdoc2md({
-      template: fs.readFileSync('./readme.hbs', 'utf8')
-    }))
-    .on('error', function (err) {
-      gutil.log(gutil.colors.red('jsdoc2md failed'), err.message);
-    })
-    .pipe(rename(function (path) {
-      path.extname = '.md';
-    }))
-    .pipe(gulp.dest('doc'));
-});
+  return new Promise(function(resolve, reject) {
+    var config = require('./jsdocConfig.json');
+    gulp.src('./src/*.js')
+      .pipe(concat('all.md'))
+      .pipe(gulpJsdoc2md({
+        template: fs.readFileSync('./readme.hbs', 'utf8')
+      }))
+      .on('error', function (err) {
+        gutil.log(gutil.colors.red('jsdoc2md failed'), err.message);
+      })
+      .pipe(rename(function (path) {
+        path.extname = '.md';
+      }))
+      .pipe(gulp.dest('doc'));
+    resolve();
+  });
+});
+
+gulp.task('default', gulp.series('build', 'doc', 'md'));

jsdocConfig.json

@@ -0,0 +0,0 @@ {

package.json

 {
   "name": "lore-engine",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "A WebGL based 3D data visualization engine.",
@@ -21,21 +21,21 @@ "main": "./app.js",
   "devDependencies": {
-    "babel-core": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "babelify": "^8.0.0",
-    "browserify": "^16.1.1",
-    "docdash": "^0.4.0",
-    "gulp": "^3.9.1",
-    "gulp-babel-minify": "^0.3.0",
-    "gulp-concat": "^2.6.1",
+    "babel-core": ">=6.26.3",
+    "babel-preset-env": ">=1.7.0",
+    "babelify": "^10.0.0",
+    "browserify": ">=16.2.3",
+    "docdash": "^1.0.3",
+    "gulp": "^4.0.0",
+    "gulp-babel-minify": "^0.5.0",
+    "gulp-concat": ">=2.6.1",
     "gulp-exit": "0.0.2",
-    "gulp-jsdoc-to-markdown": "^1.2.2",
-    "gulp-jsdoc3": "^2.0.0",
-    "gulp-rename": "^1.2.2",
-    "gulp-sourcemaps": "^2.6.4",
-    "vinyl-buffer": "^1.0.1",
-    "vinyl-source-stream": "^2.0.0",
-    "watchify": "^3.11.0",
-    "webpack-stream": "^4.0.3"
+    "gulp-jsdoc-to-markdown": ">=1.2.2",
+    "gulp-jsdoc3": ">=2.0.0",
+    "gulp-rename": ">=1.4.0",
+    "gulp-sourcemaps": "^2.6.5",
+    "vinyl-buffer": ">=1.0.1",
+    "vinyl-source-stream": ">=2.0.0",
+    "watchify": "^3.11.1",
+    "webpack-stream": "^5.2.1"
   },
   "private": false
 }

README.md

@@ -6,3 +6,3 @@ ![Lore](https://github.com/reymond-group/lore/blob/master/logo.png?raw=true)
 # Lore
-Current Version: 1.0.18 ([Godzilla](https://youtu.be/RTzb-sduiWc))
+Current Version: 1.0.17 ([Godzilla](https://youtu.be/RTzb-sduiWc))
 
@@ -9,0 +9,0 @@ ### Teasers

src/Cameras/index.js

@@ -0,0 +0,0 @@ const CameraBase = require('./CameraBase');

src/Cameras/OrthographicCamera.js

@@ -0,0 +0,0 @@ //@ts-check

src/Cameras/PerspectiveCamera.js

@@ -0,0 +0,0 @@ //@ts-check

src/Controls/ControlsBase.js

@@ -0,0 +0,0 @@ //@ts-check

src/Controls/FirstPersonControls.js

@@ -0,0 +0,0 @@ //@ts-check

src/Controls/index.js

@@ -0,0 +0,0 @@ const ControlsBase = require('./ControlsBase');

src/Core/DrawModes.js

@@ -0,0 +0,0 @@ //@ts-check

src/Core/Effect.js

@@ -0,0 +0,0 @@ //@ts-check

src/Core/Geometry.js

@@ -0,0 +0,0 @@ //@ts-check

src/Core/Graph.js

@@ -0,0 +0,0 @@ //@ts-check

src/Core/index.js

@@ -0,0 +0,0 @@ const Attribute = require('./Attribute');

src/Core/Node.js

@@ -0,0 +0,0 @@ //@ts-check

src/Core/Renderer.js

@@ -0,0 +0,0 @@ //@ts-check

src/Core/Shader.js

@@ -0,0 +0,0 @@ //@ts-check

src/Core/Tree.js

@@ -0,0 +0,0 @@ //@ts-check

src/Core/Uniform.js

@@ -0,0 +0,0 @@ //@ts-check

src/Filters/FilterBase.js

@@ -0,0 +0,0 @@ //@ts-check

src/Filters/index.js

@@ -0,0 +0,0 @@ const FilterBase = require('./FilterBase');

src/Filters/InRangeFilter.js

@@ -0,0 +0,0 @@ //@ts-check

src/Helpers/AABBHelper.js

@@ -0,0 +0,0 @@ //@ts-check

src/Helpers/CoordinatesHelper.js

@@ -0,0 +0,0 @@ //@ts-check

src/Helpers/HelperBase.js

@@ -0,0 +0,0 @@ //@ts-check

src/Helpers/index.js

@@ -0,0 +0,0 @@ const AABBHelper = require('./AABBHelper');

src/Helpers/OctreeHelper.js

@@ -0,0 +0,0 @@ //@ts-check

src/Helpers/PointHelper.js

@@ -202,2 +202,24 @@ //@ts-check
   /**
+   * Set the positions (XYZ), the color (RGB) and size (S) of the points.
+   * 
+   * @param {Number[]|Array|Float32Array} x An array containing the x components.
+   * @param {Number[]|Array|Float32Array} y An array containing the y components.
+   * @param {Number[]|Array|Float32Array} z An array containing the z components.
+   * @param {String} hex A hex value.
+   * @param {Number} [s=1.0] The size of the points.
+   * @returns {PointHelper} Itself.
+   */
+  setXYZHexS(x, y, z, hex, s = 1.0) {
+    const length = x.length;
+    let c = new Float32Array(length);
+    let floatColor = Color.hexToFloat(hex);
+    for (var i = 0; i < length; i++) {
+      c[i] = floatColor;
+    }
+
+    this._setValues(x, y, z, c, s);
+    return this;
+  }
+
+  /**
    * Set the positions (XYZ), the hue (H) and size (S) of the points.
@@ -204,0 +226,0 @@ *

src/Helpers/TreeHelper.js

@@ -5,2 +5,3 @@ //@ts-check
 const DrawModes = require('../Core/DrawModes')
+const Color = require('../Core/Color');
 const Utils = require('../Utils/Utils');
@@ -33,3 +34,4 @@
 
-  setPositionsXYZ(x, y, z, length) {
+  setPositionsXYZ(x, y, z) {
+    const length = x.length;
     let positions = new Float32Array(length * 3);
@@ -48,3 +50,106 @@
 
+  /**
+   * Set the positions (XYZ), the color (RGB) and size (S) of the points.
+   * 
+   * @param {Number[]|Array|Float32Array} x An array containing the x components.
+   * @param {Number[]|Array|Float32Array} y An array containing the y components.
+   * @param {Number[]|Array|Float32Array} z An array containing the z components.
+   * @param {Number[]|Array|Float32Array} r An array containing the r components.
+   * @param {Number[]|Array|Float32Array} g An array containing the g components.
+   * @param {Number[]|Array|Float32Array} b An array containing the b components.
+   * @param {Number} [s=1.0] The size of the points.
+   * @returns {TreeHelper} Itself.
+   */
+  setXYZRGBS(x, y, z, r, g, b, s = 1.0) {
+    const length = r.length;
+    let c = new Float32Array(length);
+
+    for (var i = 0; i < length; i++) {
+      c[i] = Color.rgbToFloat(r[i], g[i], b[i]);
+    }
+
+    this._setValues(x, y, z, c, s);
+    return this;
+  }
+
+  /**
+   * Set the positions (XYZ), the color (RGB) and size (S) of the points.
+   * 
+   * @param {Number[]|Array|Float32Array} x An array containing the x components.
+   * @param {Number[]|Array|Float32Array} y An array containing the y components.
+   * @param {Number[]|Array|Float32Array} z An array containing the z components.
+   * @param {String} hex A hex value.
+   * @param {Number} [s=1.0] The size of the points.
+   * @returns {TreeHelper} Itself.
+   */
+  setXYZHexS(x, y, z, hex, s = 1.0) {
+    const length = x.length;
+    let c = new Float32Array(length);
+    let floatColor = Color.hexToFloat(hex);
+    for (var i = 0; i < length; i++) {
+      c[i] = floatColor;
+    }
+
+    this._setValues(x, y, z, c, s);
+    return this;
+  }
+
+  /**
+   * Set the positions (XYZ), the hue (H) and size (S) of the points.
+   * 
+   * @param {Number[]|Array|Float32Array} x An array containing the x components.
+   * @param {Number[]|Array|Float32Array} y An array containing the y components.
+   * @param {Number[]|Array|Float32Array} z An array containing the z components.
+   * @param {Number[]|Array|Float32Array|Number} [h=1.0] The hue as a number or an array.
+   * @param {Number[]|Array|Float32Array|Number} [s=1.0] The size of the points.
+   * @returns {TreeHelper} Itself.
+   */
+  setXYZHS(x, y, z, h = 1.0, s = 1.0) {
+    const length = x.length;
+    let c = new Float32Array(length);
+    
+    if (typeof h !== 'number') {
+      for (var i = 0; i < length; i++) {
+        c[i] = Color.hslToFloat(h[i]);
+      }
+    } else if (typeof h) {
+      h = Color.hslToFloat(h);
+      for (var i = 0; i < length; i++) {
+        c[i] = h;
+      }
+    }
+
+    this._setValues(x, y, z, c, s);
+    return this;
+  }
+
+  // TODO: Get rid of saturation
+  _setValues(x, y, z, c, s) {
+    let length = this.getMaxLength(x, y, z);
+    let saturation = new Float32Array(length);
+
+    for (var i = 0; i < length; i++) {
+      saturation[i] = 0.0;
+    }
+
+    if (typeof s === 'number') {
+      let tmpSize = new Float32Array(length);
+      for (var i = 0; i < length; i++) {
+        tmpSize[i] = s;
+      }
+      s = tmpSize;
+    }
+
+    this.setPositionsXYZ(x, y, z);
+    this.setHSSFromArrays(c, saturation, s);
+
+    // TODO: Check why the projection matrix update is needed
+    this.renderer.camera.updateProjectionMatrix();
+    this.renderer.camera.updateViewMatrix();
+
+    return this;
+  }
+
   setPositionsXYZHSS(x, y, z, hue, saturation, size) {
+    console.warn('The method "setPositionsXYZHSS" is marked as deprecated.');
     let length = this.getMaxLength(x, y, z);
@@ -135,3 +240,29 @@
 
+  /**
+   * Set the HSS values.
+   * 
+   * @param {Number[]|Array|Float32Array} hue An array of hue values.
+   * @param {Number[]|Array|Float32Array} saturation An array of saturation values.
+   * @param {Number[]|Array|Float32Array} size An array of size values.
+   */
+  setHSSFromArrays(hue, saturation, size) {
+    let length = hue.length;
+    let c = new Float32Array(length * 3);
+    let index = 0;
 
+    if (hue.length !== length && saturation.length !== length && size.length !== length) {
+      throw 'Hue, saturation and size have to be arrays of length "length" (' + length + ').';
+    }
+
+    for (let i = 0; i < length * 3; i += 3) {
+      c[i] = hue[index];
+      c[i + 1] = saturation[index];
+      c[i + 2] = size[index];
+
+      index++;
+    }
+
+    this.setColors(c);
+  }
+
   addFilter(name, filter) {
@@ -138,0 +269,0 @@ filter.setGeometry(this.geometry);

src/IO/CsvFileReader.js

@@ -0,0 +0,0 @@ //@ts-check

src/IO/FileReaderBase.js

@@ -0,0 +0,0 @@ //@ts-check

src/IO/index.js

@@ -0,0 +0,0 @@ const CsvFileReader = require('./CsvFileReader');

src/IO/MatrixFileReader.js

@@ -0,0 +0,0 @@ //@ts-check

src/Lore.js

@@ -0,0 +0,0 @@ const Core = require('./Core');

src/Math/index.js

@@ -0,0 +0,0 @@ const Matrix3f = require('./Matrix3f');

src/Math/Matrix3f.js

@@ -0,0 +0,0 @@ //@ts-check

src/Math/Matrix4f.js

@@ -0,0 +0,0 @@ //@ts-check

src/Math/ProjectionMatrix.js

@@ -0,0 +0,0 @@ //@ts-check

src/Math/Quaternion.js

@@ -0,0 +0,0 @@ //@ts-check

src/Math/RadixSort.js

@@ -0,0 +0,0 @@ //@ts-check

src/Math/Ray.js

@@ -0,0 +0,0 @@ //@ts-check

src/Math/SphericalCoords.js

@@ -0,0 +0,0 @@ //@ts-check

src/Math/Statistics.js

@@ -0,0 +0,0 @@ //@ts-check

src/Shaders/Circle.js

@@ -0,0 +0,0 @@ const Shader = require('../Core/Shader')

src/Shaders/Coordinates.js

@@ -0,0 +0,0 @@ const Shader = require('../Core/Shader')

src/Shaders/Default.js

@@ -0,0 +0,0 @@ const Shader = require('../Core/Shader')

src/Shaders/DefaultAnimated.js

@@ -0,0 +0,0 @@ const Shader = require('../Core/Shader')

src/Shaders/DefaultEffect.js

@@ -0,0 +0,0 @@ const Shader = require('../Core/Shader')

src/Shaders/FXAAEffect.js

@@ -0,0 +0,0 @@ const Shader = require('../Core/Shader')

src/Shaders/index.js

@@ -0,0 +0,0 @@ var circle = require('./Circle');

src/Shaders/SimpleSphere.js

@@ -0,0 +0,0 @@ const Shader = require('../Core/Shader')

src/Shaders/SmoothCircle.js

@@ -6,3 +6,3 @@ const Shader = require('../Core/Shader')
                                                  cutoff: new Uniform('cutoff', 0.0, 'float'),
-                                                 clearColor: new Uniform('clearColor', [1.0, 1.0, 1.0, 1.0], 'float_vec4'),
+                                                 clearColor: new Uniform('clearColor', [0.0, 0.0, 0.0, 1.0], 'float_vec4'),
                                                  fogDensity: new Uniform('fogDensity', 6.0, 'float') }, [
@@ -9,0 +9,0 @@ 'uniform float size;',

src/Shaders/Sphere.js

@@ -0,0 +0,0 @@ const Shader = require('../Core/Shader')

src/Shaders/Tree.js

@@ -0,0 +0,0 @@ const Shader = require('../Core/Shader')

src/Spice/AABB.js

@@ -0,0 +0,0 @@ //@ts-check

src/Spice/index.js

@@ -0,0 +0,0 @@ const AABB = require('./AABB');

src/Spice/Octree.js

@@ -0,0 +0,0 @@ //@ts-check

src/Spice/Raycaster.js

@@ -0,0 +0,0 @@ //@ts-check

src/Utils/index.js

@@ -0,0 +0,0 @@ const Utils = require('./Utils');

src/Utils/Utils.js

@@ -0,0 +0,0 @@ //@ts-check

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Number of package files

187

increased by1.63%

Lines of code

20442

increased by3.18%

Worsened metrics

Total package byte prevSize

42291345

decreased by-3.53%

No dependency changes