Skip to content

Commit

Permalink
Merge pull request #349 from K3D-tools/devel
Browse files Browse the repository at this point in the history
Additional line when using 'simple' shader in k3d.lines #348
  • Loading branch information
artur-trzesiok authored May 20, 2022
2 parents f3e4c8e + a23e16f commit 64e9f3a
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ cd js
grunt build
npm publish
cd ../docs
make html
make html
2 changes: 1 addition & 1 deletion js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "k3d",
"version": "2.13.0",
"version": "2.13.1",
"description": "3D visualization library",
"author": "k3d team",
"main": "src/index.js",
Expand Down
4 changes: 2 additions & 2 deletions js/src/providers/threejs/objects/LinesSimple.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = {
const colorRange = config.color_range;
const colorMap = (config.color_map && config.color_map.data) || null;
const attr = (config.attribute && config.attribute.data) || null;
const object = new THREE.Line(geometry, material);
const object = new THREE.LineSegments(geometry, material);
const modelMatrix = new THREE.Matrix4();
const vertices = config.vertices.data;
const indices = config.indices.data;
Expand All @@ -31,7 +31,7 @@ module.exports = {
let positions = [];
let attribute = [];
let colors = [];
let jump = config.indices_type == 'segment' ? 2 : 3;
let jump = config.indices_type === 'segment' ? 2 : 3;
let offsets;

let verticesCount = vertices.length / 3;
Expand Down
Binary file modified k3d/test/references/lines_simple_attribute_segment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified k3d/test/references/lines_simple_colors.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "k3d",
"version": "2.13.0",
"version": "2.13.1",
"description": "3D visualization library",
"keywords": [
"jupyter",
Expand Down

0 comments on commit 64e9f3a

Please sign in to comment.