Skip to content

Commit

Permalink
feat(troika-three-text): modifications to the base material are now p…
Browse files Browse the repository at this point in the history
…icked up automatically
  • Loading branch information
lojjic committed Oct 1, 2020
1 parent 2bfaa9c commit fc81d3a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion packages/troika-three-text/src/Text.js
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ class Text extends Mesh {
// lazily on _read_ rather than write to avoid unnecessary wrapping on transient values.
get material() {
let derivedMaterial = this._derivedMaterial
const baseMaterial = this._baseMaterial || defaultMaterial
const baseMaterial = this._baseMaterial || this._defaultMaterial || (this._defaultMaterial = defaultMaterial.clone())
if (!derivedMaterial || derivedMaterial.baseMaterial !== baseMaterial) {
derivedMaterial = this._derivedMaterial = createTextDerivedMaterial(baseMaterial)
// dispose the derived material when its base material is disposed:
Expand Down
1 change: 1 addition & 0 deletions packages/troika-three-text/src/TextDerivedMaterial.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ if (troikaAlphaMult == 0.0) {
*/
export function createTextDerivedMaterial(baseMaterial) {
const textMaterial = createDerivedMaterial(baseMaterial, {
chained: true,
extensions: {derivatives: true},
uniforms: {
uTroikaSDFTexture: {value: null},
Expand Down

0 comments on commit fc81d3a

Please sign in to comment.