-
Notifications
You must be signed in to change notification settings - Fork 42
fix: "Incorrect 2D axes rendering with vertical scaling #1957" #1971
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.
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
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d3f4fd8
fix: "Incorrect 2D axes rendering with vertical scaling #1957"
nilscb c80ac84
Merge branch 'master' into Axes2DVerticalScalingProb
nilscb 688e490
test: update story snapshots
hkfb 08135c4
Merge branch 'master' into Axes2DVerticalScalingProb
nilscb 262cea7
fix: "Incorrect 2D axes rendering with vertical scaling #1957"
nilscb 8774ee6
code comment changes.
nilscb cc373ea
Merge remote-tracking branch 'origin/Axes2DVerticalScalingProb' into …
nilscb 8920c2b
Code comment fix.
nilscb 12c2074
Lint fix
nilscb File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
239 changes: 131 additions & 108 deletions
239
typescript/packages/subsurface-viewer/src/layers/axes2d/axes2DLayer.ts
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 4 additions & 6 deletions
10
typescript/packages/subsurface-viewer/src/layers/axes2d/label-vertex.glsl.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,18 @@ | ||
export default `\ | ||
#version 300 es | ||
#define SHADER_NAME graph-layer-axis-vertex-shader | ||
#define SHADER_NAME axes2d-layer-vertex-shader | ||
|
||
precision highp float; | ||
|
||
in vec3 positions; | ||
in vec3 positions; | ||
|
||
in vec2 vTexCoord; | ||
out vec2 _vTexCoord; | ||
|
||
uniform mat4 projectionMatrix; | ||
|
||
void main(void) { | ||
_vTexCoord = vTexCoord; | ||
|
||
vec3 position_commonspace = positions; // These positions are in view space. | ||
gl_Position = projectionMatrix * vec4(position_commonspace, 1.0); // From viewspace to clip | ||
vec3 position_commonspace = project_position(positions); | ||
gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 1.0)); | ||
} | ||
`; |
2 changes: 1 addition & 1 deletion
2
typescript/packages/subsurface-viewer/src/layers/axes2d/line-fragment.glsl.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
typescript/packages/subsurface-viewer/src/layers/axes2d/line-vertex.glsl.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-52 Bytes
(99%)
...s/__image_snapshots__/subsurfaceviewer-examples--selectable-feature-example.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
BIN
-47 Bytes
(99%)
...xamples/__image_snapshots__/subsurfaceviewer-examples--user-defined-layer-1.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
BIN
-2.86 KB
(99%)
...xamples/__image_snapshots__/subsurfaceviewer-examples--user-defined-layer-2.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
BIN
-3.51 KB
(75%)
...book/examples/__image_snapshots__/subsurfaceviewer-examples-camera--scale-y.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
BIN
-689 Bytes
(100%)
...s/__image_snapshots__/subsurfaceviewer-examples-mutiview--synced-multi-view.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
BIN
+42 Bytes
(100%)
.../__image_snapshots__/subsurfaceviewer-examples-mutiview--view-matrix-margin.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
BIN
-35 Bytes
(100%)
.../examples/__image_snapshots__/subsurfaceviewer-examples-mutiview--view-tabs.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
BIN
+162 Bytes
(100%)
...src/storybook/layers/__image_snapshots__/subsurfaceviewer-axes2dlayer--base.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
BIN
+172 Bytes
(100%)
...mage_snapshots__/subsurfaceviewer-axes2dlayer--colored-text-and-back-ground.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
BIN
-64 Bytes
(100%)
...c/storybook/layers/__image_snapshots__/subsurfaceviewer-axes2dlayer--matrix.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
BIN
+238 Bytes
(100%)
...rybook/layers/__image_snapshots__/subsurfaceviewer-map-layer--map-layer-2-d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.