Skip to content

Make gl-cone3d mesh code reusable for gl-streamtube3d #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 16, 2019
Merged

Make gl-cone3d mesh code reusable for gl-streamtube3d #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cbe3459
refactor shader code
archmoj Oct 15, 2019
a8bd034
no need for normals
archmoj Oct 15, 2019
5ed7350
init centralized mesh function for cone and streamtube
archmoj Oct 15, 2019
c7ff355
drop unused contours
archmoj Oct 16, 2019
2b5120b
no need for lines and points
archmoj Oct 16, 2019
d4a3030
remove unused texture argument as well as vertexUVs, cellUVs and cell…
archmoj Oct 16, 2019
289cf77
uninsatll unused deps
archmoj Oct 16, 2019
bb698b7
use streamtube naming instead of tube
archmoj Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions cone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module.exports = function(vectorfield, bounds) {
positions: [],
vertexIntensity: [],
vertexIntensityBounds: vectorfield.vertexIntensityBounds,
vertexNormals: [],
vectors: [],
cells: [],
coneOffset: vectorfield.coneOffset,
Expand Down Expand Up @@ -79,9 +78,6 @@ module.exports = function(vectorfield, bounds) {
}
geo.vectorScale = vectorScale;

var nml = vec3.create();
vec3.set(nml, 0, 1, 0); // not clear why using this direction?!

var coneScale = vectorfield.coneSize || 0.5;

if (vectorfield.absoluteConeSize) {
Expand Down Expand Up @@ -114,9 +110,6 @@ module.exports = function(vectorfield, bounds) {
geo.vertexIntensity.push(intensity, intensity, intensity);
geo.vertexIntensity.push(intensity, intensity, intensity);

geo.vertexNormals.push(nml, nml, nml);
geo.vertexNormals.push(nml, nml, nml);

var m = geo.positions.length;
geo.cells.push([m-6, m-5, m-4], [m-3, m-2, m-1]);
}
Expand All @@ -125,4 +118,11 @@ module.exports = function(vectorfield, bounds) {
return geo;
};

module.exports.createConeMesh = require('./lib/conemesh');
var shaders = require('./lib/shaders');
module.exports.createMesh = require('./lib/conemesh');
module.exports.createConeMesh = function(gl, params) {
return module.exports.createMesh(gl, params, {
shaders: shaders,
traceType: 'cone'
});
}
Loading