Skip to content

Commit 7da5c08

Browse files
committed
world > object
1 parent 288e709 commit 7da5c08

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"gl-select-box": "^1.0.2",
8585
"gl-spikes2d": "^1.0.1",
8686
"gl-streamtube3d": "^1.1.1",
87-
"gl-surface3d": "git://github.com/gl-vis/gl-surface3d.git#7fd01b7ba97bb6b09023bf9f97430081ac72eccc",
87+
"gl-surface3d": "git://github.com/gl-vis/gl-surface3d.git#e67d13b4491a2f18eeb284afc9172f8eee21f62e",
8888
"gl-text": "^1.1.6",
8989
"glslify": "^6.3.1",
9090
"has-hover": "^1.0.1",

src/plots/gl3d/scene.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ function computeTraceBounds(scene, trace, bounds) {
382382
}
383383

384384
if(trace.type === 'surface') {
385-
bounds[0][d] += trace._worldOffset[d];
386-
bounds[1][d] += trace._worldOffset[d];
385+
bounds[0][d] += trace._objectOffset[d];
386+
bounds[1][d] += trace._objectOffset[d];
387387
}
388388
}
389389
}

src/traces/surface/convert.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ proto.update = function(data) {
417417
}
418418

419419
for(i = 0; i < 3; i++) {
420-
data._worldOffset[i] = this.midValues[i] = 0.5 * (this.minValues[i] + this.maxValues[i]);
420+
data._objectOffset[i] = this.midValues[i] = 0.5 * (this.minValues[i] + this.maxValues[i]);
421421
}
422422

423423
for(i = 0; i < 3; i++) {
@@ -534,13 +534,13 @@ proto.update = function(data) {
534534
params.vertexColor = true;
535535
}
536536

537-
params.worldOffset = [
538-
data._worldOffset[0],
539-
data._worldOffset[1],
540-
data._worldOffset[2]
537+
params.objectOffset = [
538+
data._objectOffset[0],
539+
data._objectOffset[1],
540+
data._objectOffset[2]
541541
];
542542

543-
params.worldScale = [
543+
params.objectScale = [
544544
scaleFactor[0],
545545
scaleFactor[1],
546546
scaleFactor[2]

src/traces/surface/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
3535
traceOut._xlength = (Array.isArray(x) && Lib.isArrayOrTypedArray(x[0])) ? z.length : z[0].length;
3636
traceOut._ylength = z.length;
3737

38-
traceOut._worldOffset = [0, 0, 0];
38+
traceOut._objectOffset = [0, 0, 0];
3939

4040
var handleCalendarDefaults = Registry.getComponentMethod('calendars', 'handleTraceDefaults');
4141
handleCalendarDefaults(traceIn, traceOut, ['x', 'y', 'z'], layout);

0 commit comments

Comments
 (0)