Web3D/trois
1
0
Fork 0
mirror of https://github.com/troisjs/trois.git synced 2024-11-24 04:12:02 +08:00
Code Issues Projects Releases Wiki Activity

Shader texture proof of concept

Browse Source
This commit is contained in:
Sander Moolin 2021-03-15 00:33:27 -04:00
parent bf597573b2
commit 3f40a59b73
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/materials/ShaderMaterial.js
View File

@ -9,6 +9,11 @@ export default {
vertexShader: { type: String, default: defaultVertexShader }, vertexShader: { type: String, default: defaultVertexShader },
fragmentShader: { type: String, default: defaultFragmentShader }, fragmentShader: { type: String, default: defaultFragmentShader },
}, },
provide() {
return {
material: this,
};
},
created() { created() {
this.createMaterial(); this.createMaterial();
['vertexShader', 'fragmentShader'].forEach(p => { ['vertexShader', 'fragmentShader'].forEach(p => {
@ -29,7 +34,7 @@ export default {
}, },
}, },
render() { render() {
return []; return this.$slots.default ? this.$slots.default() : [];
}, },
__hmrId: 'ShaderMaterial', __hmrId: 'ShaderMaterial',
}; };

8
src/materials/Texture.js
View File

@ -25,7 +25,7 @@ export default {
watch(() => this.src, this.refreshTexture); watch(() => this.src, this.refreshTexture);
}, },
unmounted() { unmounted() {
this.material.setTexture(null, this.id); if (this.material && this.material.setTexture) this.material.setTexture(null, this.id);
this.texture.dispose(); this.texture.dispose();
}, },
methods: { methods: {
@ -38,7 +38,11 @@ export default {
}, },
refreshTexture() { refreshTexture() {
this.createTexture(); this.createTexture();
this.material.setTexture(this.texture, this.id); if (this.material && this.material.setTexture) { this.material.setTexture(this.texture, this.id); }
else if (this.material && this.material.material.type === "ShaderMaterial") {
const id = this.id === 'map' ? this.src.replace(/\..*/, '') : this.id;
this.material.uniforms[id] = { value: this.texture };
}
}, },
onLoaded() { onLoaded() {
if (this.onLoad) this.onLoad(); if (this.onLoad) this.onLoad();