-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from alja/zshape-final
Add ZShape object and material for optimized rendering of digits
- Loading branch information
Showing
12 changed files
with
1,180 additions
and
4 deletions.
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
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
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 |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| import {CustomShaderMaterial} from './CustomShaderMaterial.js'; | ||
| import {Color} from "../math/Color.js"; | ||
| import {FRONT_AND_BACK_SIDE} from '../constants.js'; | ||
| import {Int32Attribute} from "../core/BufferAttribute.js"; | ||
|
|
||
| export class ZShapeBasicMaterial extends CustomShaderMaterial { | ||
|
|
||
| /** | ||
| * WARNING: | ||
| * - constructor does not pass arguments to parent class | ||
| * - evades "custom" in shader name by setting programName after super | ||
| */ | ||
| constructor(args = {}){ | ||
| super(); | ||
|
|
||
| this.type = "ZShapeBasicMaterial"; | ||
| this.programName = "basic_zshape"; | ||
|
|
||
| // Uniforms aspect and viewport set by MeshRenderer based on actual viewport | ||
| this.setUniform("ShapeSize", "ShapeSize" in args ? args.ShapeSize : [1.0, 1.0, 1.0]); | ||
|
|
||
| this.color = args.color ? args.color : new Color(Math.random() * 0xffffff); | ||
| this.emissive = args.emissive ? args.emissive : new Color(Math.random() * 0xffffff); | ||
| this.diffuse = args.diffuse ? args.diffuse : new Color(Math.random() * 0xffffff); | ||
|
|
||
| this.side = args.side ? args.side : FRONT_AND_BACK_SIDE; | ||
| // this._specular = new Color(Math.random() * 0xffffff); | ||
| this._specular = new Color(0.5 * 0xffffff); | ||
| this._shininess = 64; | ||
| } | ||
|
|
||
| set specular(val) { | ||
| this._specular = val; | ||
|
|
||
| // Notify onChange subscriber | ||
| if (this._onChangeListener) { | ||
| var update = {uuid: this._uuid, changes: {specular: this._specular.getHex()}}; | ||
| this._onChangeListener.materialUpdate(update) | ||
| } | ||
| } | ||
| set shininess(val) { | ||
| this._shininess = val; | ||
|
|
||
| // Notify onChange subscriber | ||
| if (this._onChangeListener) { | ||
| var update = {uuid: this._uuid, changes: {shininess: this._shininess}}; | ||
| this._onChangeListener.materialUpdate(update) | ||
| } | ||
| } | ||
|
|
||
| get specular() { return this._specular; } | ||
| get shininess() { return this._shininess; } | ||
|
|
||
| clone_for_picking() { | ||
| let o = new ZShapeBasicMaterial( { | ||
| ShapeSize: this.getUniform("ShapeSize"), | ||
| color: this.color, emissive: this.emissive, diffuse: this.diffuse, | ||
| side: this.side | ||
| } ); | ||
| if (this.hasSBFlag("SCALE_PER_INSTANCE")) o.addSBFlag("SCALE_PER_INSTANCE"); | ||
| if (this.hasSBFlag("MAT4_PER_INSTANCE")) o.addSBFlag("MAT4_PER_INSTANCE"); | ||
| for (const m of this.maps) o.addMap(m); | ||
| o._instanceData = this._instanceData; | ||
| o.addSBFlag('PICK_MODE_UINT'); | ||
| o.setUniform("u_PickInstance", false); | ||
| return o; | ||
| } | ||
|
|
||
| clone_for_outline() { | ||
| let o = new ZShapeBasicMaterial( { | ||
| ShapeSize: this.getUniform("ShapeSize"), | ||
| color: this.color, emissive: this.emissive, diffuse: this.diffuse, | ||
| side: this.side | ||
| } ); | ||
| if (this.hasSBFlag("SCALE_PER_INSTANCE")) o.addSBFlag("SCALE_PER_INSTANCE"); | ||
| if (this.hasSBFlag("MAT4_PER_INSTANCE")) o.addSBFlag("MAT4_PER_INSTANCE"); | ||
| for (const m of this.maps) o.addMap(m); | ||
| o._instanceData = this._instanceData; | ||
| o.addSBFlag('OUTLINE'); | ||
| o.setUniform("u_OutlineGivenInstances", false); | ||
| o.setAttribute("a_OutlineInstances", Int32Attribute([0], 1, 0x7fffffff)); | ||
| return o; | ||
| } | ||
|
|
||
| get color() { return this._color; } | ||
| set color(val) { | ||
| this._color = val; | ||
|
|
||
| // Notify onChange subscriber | ||
| if (this._onChangeListener) { | ||
| var update = {uuid: this._uuid, changes: {color: this._color.getHex()}}; | ||
| this._onChangeListener.materialUpdate(update) | ||
| } | ||
| } | ||
|
|
||
| get emissive() { return this._emissive; } | ||
| set emissive(val) { | ||
| this._emissive = val; | ||
|
|
||
| // Notify onChange subscriber | ||
| if (this._onChangeListener) { | ||
| var update = {uuid: this._uuid, changes: {emissive: this._emissive.getHex()}}; | ||
| this._onChangeListener.materialUpdate(update) | ||
| } | ||
| } | ||
| get diffuse() { return this._diffuse; } | ||
| set diffuse(val) { | ||
| this._diffuse = val; | ||
|
|
||
| // Notify onChange subscriber | ||
| if (this._onChangeListener) { | ||
| var update = {uuid: this._uuid, changes: {diffuse: this._diffuse.getHex()}}; | ||
| this._onChangeListener.materialUpdate(update) | ||
| } | ||
| } | ||
|
|
||
| // Outline - setup / reset for instance list outlining. | ||
| // To be called on outline version (with OUTLINE SB-flag). | ||
| outline_instances_setup(instance_list) { | ||
| this.setUniform("u_OutlineGivenInstances", true); | ||
| let buf_attr = this.getAttribute("a_OutlineInstances"); | ||
| buf_attr.array = new Int32Array(instance_list); | ||
| buf_attr.divisor = 1; | ||
| // leaks buffers in gl-attrib-manager | ||
| // this.setAttribute("a_OutlineInstances", Int32Attribute(instance_list, 1, 1)); | ||
| } | ||
| outline_instances_reset() { | ||
| this.setUniform("u_OutlineGivenInstances", false); | ||
| let buf_attr = this.getAttribute("a_OutlineInstances"); | ||
| buf_attr.array = new Int32Array([0]); | ||
| buf_attr.divisor = 0x7fffffff; | ||
| // leaks buffers in gl-attrib-manager | ||
| // this.setAttribute("a_OutlineInstances", Int32Attribute([0], 1, 0x7fffffff)); | ||
| } | ||
|
|
||
|
|
||
| update(data) { | ||
| super.update(data); | ||
|
|
||
| for (let prop in data) { | ||
| switch (prop) { | ||
| case "color": | ||
| this._color = data.color; | ||
| delete data.color; | ||
| break; | ||
| case "emissive": | ||
| this._emissive = data.emissive; | ||
| delete data.emissive; | ||
| break; | ||
| case "diffuse": | ||
| this._diffuse = data.diffuse; | ||
| delete data.diffuse; | ||
| break; | ||
| case "specular": | ||
| this._specular.setHex(data.specular); | ||
| delete data.specular; | ||
| break; | ||
| case "shininess": | ||
| this._shininess = data.shininess; | ||
| delete data.shininess; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.