Skip to content

Commit 96e28c3

Browse files
authored
Update ThreeJS to v105 (#4151)
* update three-js to v105 * update threejs to v106
1 parent 90582fc commit 96e28c3

4 files changed

Lines changed: 16 additions & 13 deletions

File tree

frontend/javascripts/oxalis/shaders/main_data_fragment.glsl.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,8 @@ void main() {
162162
// Get Color Value(s)
163163
vec3 data_color = vec3(0.0);
164164
vec3 color_value = vec3(0.0);
165-
float fallbackZoomStep;
166165
<% _.each(colorLayerNames, function(name, layerIndex){ %>
167166
168-
fallbackZoomStep = min(<%= name %>_maxZoomStep, zoomStep + 1.0);
169167
// Get grayscale value for <%= name %>
170168
color_value =
171169
getMaybeFilteredColorOrFallback(
@@ -186,8 +184,8 @@ void main() {
186184
<% } else { %>
187185
188186
// Keep the color in bounds of min and max
189-
color_value = clamp(color_value, <%= name %>_min, <%= name %>_max);
190-
// Scale interval between min and max up to interval from 0 to 255
187+
color_value = clamp(color_value, <%= name %>_min, <%= name %>_max);
188+
// Scale interval between min and max up to interval from 0 to 255
191189
color_value = (color_value - <%= name %>_min) / (<%= name %>_max - <%= name %>_min);
192190
<% } %>
193191

frontend/javascripts/oxalis/view/rendering_utils.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ export const setupRenderArea = (
2121
viewportHeight: number,
2222
color: number,
2323
) => {
24-
renderer.setViewport(x, y, viewportWidth, viewportHeight);
25-
renderer.setScissor(x, y, viewportWidth, viewportHeight);
24+
// In WebGLRenderer.setViewport() and WebGLRenderer.setScissor()
25+
// (x, y) is the coordinate of the lower left corner of the rectangular region.
26+
const overallHeight = renderer.domElement.height;
27+
renderer.setViewport(x, overallHeight - y - viewportHeight, viewportWidth, viewportHeight);
28+
renderer.setScissor(x, overallHeight - y - viewportHeight, viewportWidth, viewportHeight);
2629
renderer.setScissorTest(true);
2730
renderer.setClearColor(color, 1);
2831
};
@@ -47,7 +50,7 @@ export function renderToTexture(
4750
width = Math.round(width);
4851
height = Math.round(height);
4952

50-
renderer.setViewport(0, 0, width, height);
53+
renderer.setViewport(0, 0 + height, width, height);
5154
renderer.setScissorTest(false);
5255
renderer.setClearColor(0x000000, 1);
5356

@@ -58,8 +61,10 @@ export function renderToTexture(
5861
// $FlowFixMe plane cannot be arbitraryViewport
5962
SceneController.updateSceneForCam(plane);
6063
}
61-
renderer.render(scene, camera, renderTarget);
64+
renderer.setRenderTarget(renderTarget);
65+
renderer.render(scene, camera);
6266
renderer.readRenderTargetPixels(renderTarget, 0, 0, width, height, buffer);
67+
renderer.setRenderTarget(null);
6368
return buffer;
6469
}
6570

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
"react-virtualized": "^9.20.1",
178178
"redux": "^3.6.0",
179179
"redux-saga": "^1.0.0",
180-
"three": "^0.87.0",
180+
"three": "^0.106.0",
181181
"tween.js": "^16.3.1",
182182
"url-join": "^4.0.0",
183183
"whatwg-fetch": "^1.1.0",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11808,10 +11808,10 @@ text-table@^0.2.0:
1180811808
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
1180911809
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
1181011810

11811-
three@^0.87.0:
11812-
version "0.87.1"
11813-
resolved "https://registry.yarnpkg.com/three/-/three-0.87.1.tgz#466a34edc4543459ced9b9d7d276b65216fe2ba8"
11814-
integrity sha1-Rmo07cRUNFnO2bnX0na2Uhb+K6g=
11811+
three@^0.106.0:
11812+
version "0.106.0"
11813+
resolved "https://registry.yarnpkg.com/three/-/three-0.106.0.tgz#dacd023c2cd1381e566d8561a226ba97b2fcb45f"
11814+
integrity sha512-fUMDenzhJDf+DNLPrQqDTbVYbXb/2Q4Y4EDBsDORS3UIR9GairCpFXzn9uOq+htVyagJGBsBpx8eyKQeXs/9YQ==
1181511815

1181611816
through2-filter@^3.0.0:
1181711817
version "3.0.0"

0 commit comments

Comments
 (0)