Skip to content
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

Generalize meshes #817

Merged
merged 10 commits into from
Jun 29, 2018
+900 −495
Merged

Generalize meshes #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f1968c4
Generalize meshes.
manthey Jun 14, 2017
20c91d4
Add more tests.
manthey May 16, 2018
46a2afc
Fix jsdocs and refactor from mixin to subclass.
manthey May 17, 2018
52cc484
Merge branch 'master' into generalize-mesh
manthey May 31, 2018
3c19ba5
Use the utility function for contour point usage.
manthey May 31, 2018
2926b79
Pass the data array to contour accessor functions.
manthey May 31, 2018
f8d06b4
Make createMesh a private function.
manthey Jun 29, 2018
e1d4f81
Move calculating the min and max of an array to a utility function.
manthey Jun 1, 2018
5c00389
Merge pull request #835 from OpenGeoscience/util-min-max
manthey Jun 29, 2018
8499dcc
Merge branch 'master' into generalize-mesh
manthey Jun 29, 2018
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
485 changes: 111 additions & 374 deletions src/contourFeature.js
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 19 additions & 14 deletions src/gl/contourFeature.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ var registerFeature = require('../registry').registerFeature;
var contourFeature = require('../contourFeature');

/**
* Create a new instance of contourFeature
* Create a new instance of contourFeature.
*
* @class
* @alias geo.gl.contourFeature
* @extends geo.contourFeature
* @param {geo.contourFeature.spec} arg
* @returns {geo.gl.contourFeature}
*/
var gl_contourFeature = function (arg) {
Expand Down Expand Up @@ -117,17 +118,23 @@ var gl_contourFeature = function (arg) {
* into the various gl uniforms and buffers.
*/
function createGLContours() {
var contour = m_this.createContours(),
var contour = m_this._createContours(),
numPts = contour.elements.length,
colorTable = [],
i, i3, j, j3,
posBuf, opacityBuf, valueBuf, indicesBuf,
geom = m_mapper.geometryData();

m_minColorUniform.set([contour.minColor.r, contour.minColor.g,
contour.minColor.b, contour.minColor.a]);
m_maxColorUniform.set([contour.maxColor.r, contour.maxColor.g,
contour.maxColor.b, contour.maxColor.a]);
m_minColorUniform.set([
contour.minColor.r,
contour.minColor.g,
contour.minColor.b,
contour.minColor.a]);
m_maxColorUniform.set([
contour.maxColor.r,
contour.maxColor.g,
contour.maxColor.b,
contour.maxColor.a]);
m_stepsUniform.set(contour.colorMap.length);
m_steppedUniform.set(contour.stepped);
for (i = 0; i < contour.colorMap.length; i += 1) {
Expand Down Expand Up @@ -162,7 +169,9 @@ var gl_contourFeature = function (arg) {
}

/**
* Initialize
* Initialize.
*
* @param {geo.contourFeature.spec} arg The contour feature specification.
*/
this._init = function (arg) {
var blend = vgl.blend(),
Expand Down Expand Up @@ -230,9 +239,7 @@ var gl_contourFeature = function (arg) {
};

/**
* Build
*
* @override
* Build.
*/
this._build = function () {
if (m_actor) {
Expand All @@ -246,9 +253,7 @@ var gl_contourFeature = function (arg) {
};

/**
* Update
*
* @override
* Update.
*/
this._update = function () {
s_update.call(m_this);
Expand All @@ -264,7 +269,7 @@ var gl_contourFeature = function (arg) {
};

/**
* Destroy
* Destroy.
*/
this._exit = function () {
m_this.renderer().contextRenderer().removeActor(m_actor);
Expand Down
1 change: 1 addition & 0 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ module.exports = $.extend({
lineFeature: require('./lineFeature'),
map: require('./map'),
mapInteractor: require('./mapInteractor'),
meshFeature: require('./meshFeature'),
object: require('./object'),
osmLayer: require('./osmLayer'),
pathFeature: require('./pathFeature'),
Expand Down
Loading