Feature/sof 6814 #131
Merged
Feature/sof 6814 #131
Conversation
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
src/mixins/labels.js
Outdated
| map: texture, | ||
| transparent: true, | ||
| depthFunc: THREE.LessEqualDepth, | ||
| depthTest: true, |
src/settings.js
Outdated
| @@ -45,7 +45,7 @@ export default { | |||
| labelPointsConfig: { | |||
| size: 1.5, | |||
| depthTest: true, | |||
| depthFunc: THREE.NotEqualDepth, | |||
| depthFunc: THREE.LessEqualDepth, | |||
There was a problem hiding this comment.
Do we need to modify this??
There was a problem hiding this comment.
For points it should be as it was before, I'll revert
src/wave.js
Outdated
| @@ -322,12 +323,13 @@ export class Wave extends mix(WaveBase).with( | |||
| this.drawBoundaries(); | |||
| if (this.isDrawBondsEnabled) this.drawBonds(); | |||
| this.render(); | |||
| this.createLabelSpritesAsPoints(); | |||
| if (this.fastLabelsRender) this.createLabelsAsPoints(); | |||
There was a problem hiding this comment.
Let's have this logic instead a function createLabels and abstract it from here
src/mixins/labels.js
Outdated
| } | ||
| }); | ||
| this.structureGroup.add(this.labelsGroup); | ||
| this.render(); |
There was a problem hiding this comment.
Per my comment below this.render() should go to createLabels function
src/wave.js
Outdated
| this.refillChosenAtoms(); | ||
| } | ||
|
|
||
| render() { | ||
| this.adjustLabelsToCameraPosition(this.scene, this.camera); | ||
| if (this.settings.labelsConfig.areSpritesUsed) this.adjustLabelsToCameraPosition(); |
There was a problem hiding this comment.
Move this to create labels?
There was a problem hiding this comment.
No. Looked at it again. Adjustment should happen on render() after the camera moved, not when the labels are created.
There was a problem hiding this comment.
Let's move the if statement to the function itself
timurbazhirov
approved these changes
Aug 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Made elements labels to be 3D aware and occluded by atoms, removed useless code.