-
Notifications
You must be signed in to change notification settings - Fork 299
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
Feature - CDF in invlerp if only 3D view shown of image layer #592
Merged
jbms
merged 44 commits into
google:master
from
MetaCell:feature/histogram-in-vr-invlerp
Jun 11, 2024
Merged
Changes from all commits
Commits
Show all changes
44 commits
Select commit
Hold shift + click to select a range
a79e6be
refactor: move histogram shader code to cdf.ts
seankmartin c326b7b
Revert "refactor: move histogram shader code to cdf.ts"
seankmartin 1b1b731
feat: grab global histogram specs from VR layer
seankmartin dc621ee
temp: clear all histogram buffers as demo
seankmartin 42c0219
feat: use VR layer visibility to also control hist showing
seankmartin 3e8e46f
feat: only do VR hist drawing if no slice views
seankmartin ecf2cef
temp: shader for 3d invlerp
seankmartin 448f277
temp: more progress
seankmartin b5ccff6
temp: minimal shader to debug with
seankmartin b62c8cb
revert: remove in vertex
seankmartin 3043740
temp: compiling vertex shader for data access
seankmartin aca897a
temp: simple buffer output hist
seankmartin f6b231c
fix: volume chunks work ok
seankmartin 01574db
fix: working hist for one chunk
seankmartin 034be6d
fix: drawing works but very slow. Multi-pass probably better but then…
seankmartin ce05ebf
fix: working histogram 3d
seankmartin 6d1db25
fix: histogram data display of off invlerp range
seankmartin 04828d8
feat: work towards multi-channel multi-invlerp support
seankmartin 17eab67
fix: VR tool from Python
seankmartin 4b1e654
fix: VR sample works for multi-invlerp
seankmartin ae7bf33
fix: VR max projection works with data sampling
seankmartin 3370b78
feat: add ability to only activate chunk textures
seankmartin 99c939c
fix: more error checking in VR layer for histograms
seankmartin 93c592e
chore: add comment
seankmartin d8e414c
feat: detect camera move in perspective panel
seankmartin c302233
refactor: rename code snippets in chunk
seankmartin b29b501
refactor: rename variable
seankmartin d3b274b
refactor: clarify volume rendering code with histograms
seankmartin 537be3a
fix: change histogram debug default to false
seankmartin 706be23
fix: correct fragment shader for regular chunk render
seankmartin e53325e
chore: add comment
seankmartin 951f6e3
Merge branch 'master' into feature/histogram-in-vr-invlerp
seankmartin b7aac11
feat: allow render context to know camera move
seankmartin 8b58e74
debug: add frame rate monitor to help compare performance
seankmartin 645df6c
debug: track time for VR render
seankmartin c85a779
feat: faster histogram rendering by avoiding shader and buffer flippign
seankmartin 31ff284
Merge branch 'feature/detect-camera-movement-perspective-panel' into …
seankmartin 1298951
feat: don't render 3d histogram if camera movement
seankmartin dc9276f
refactor: clarify chunk info storage for histograms
seankmartin 3fc067d
feat: variable samples for each histogram based on size and chunk amount
seankmartin 7226cf0
refactor: clean up for review
seankmartin 3b7c241
refactor: improve vertex shader tabbing
seankmartin 5b68ae0
Merge branch 'master' into feature/histogram-in-vr-invlerp
seankmartin 2ebc60f
fix: re-enable depth test on restore buffers
seankmartin 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
This file contains 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 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 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 |
---|---|---|
|
@@ -165,6 +165,7 @@ export abstract class RenderedDataPanel extends RenderedPanel { | |
pickRequestPending = false; | ||
|
||
private mouseStateForcer = () => this.blockOnPickRequest(); | ||
protected isMovingToMousePosition: boolean = false; | ||
|
||
inputEventMap: EventActionMap; | ||
|
||
|
@@ -616,7 +617,9 @@ export abstract class RenderedDataPanel extends RenderedPanel { | |
registerActionListener(element, "move-to-mouse-position", () => { | ||
const { mouseState } = this.viewer; | ||
if (mouseState.updateUnconditionally()) { | ||
this.isMovingToMousePosition = true; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. as discussed in the meeting, it would be better for this to be more global than a single RenderedDataPanel |
||
this.navigationState.position.value = mouseState.position; | ||
this.isMovingToMousePosition = false; | ||
} | ||
}); | ||
|
||
|
This file contains 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 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can use lodash debounce for this