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

improve materials

Browse Source
This commit is contained in:
Kevin Levron 2021-04-29 19:26:53 +02:00
parent 73425177e5
commit e174da23c6
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/materials/Material.ts
View File

@ -67,7 +67,7 @@ export default defineComponent({
this.setProp(key, texture, true) this.setProp(key, texture, true)
}, },
addWatchers() { addWatchers() {
['color', 'alphaTest', 'depthTest', 'depthWrite', 'fog', 'opacity', 'side', 'transparent'].forEach(p => { ['color', 'alphaTest', 'blending', 'depthTest', 'depthWrite', 'fog', 'opacity', 'side', 'transparent'].forEach(p => {
// @ts-ignore // @ts-ignore
watch(() => this[p], (value) => { watch(() => this[p], (value) => {
if (p === 'color') { if (p === 'color') {

15
src/materials/ShaderMaterial.ts
View File

@ -1,6 +1,7 @@
import { defineComponent, watch } from 'vue' import { defineComponent, watch } from 'vue'
import { ShaderMaterial } from 'three' import { ShaderMaterial } from 'three'
import Material from './Material' import Material from './Material'
import { propsValues } from '../tools'
const defaultVertexShader = ` const defaultVertexShader = `
varying vec2 vUv; varying vec2 vUv;
@ -26,23 +27,15 @@ export default defineComponent({
}, },
methods: { methods: {
createMaterial() { createMaterial() {
const material = new ShaderMaterial({ const material = new ShaderMaterial(propsValues(this.$props, ['color']));
uniforms: this.uniforms,
vertexShader: this.vertexShader,
fragmentShader: this.fragmentShader,
})
const watchProps = ['vertexShader', 'fragmentShader'] ['vertexShader', 'fragmentShader'].forEach(p => {
watchProps.forEach(p => {
// @ts-ignore // @ts-ignore
watch(() => this[p], (value) => { watch(() => this[p], (value) => { material[p] = value; material.needsUpdate = true })
this.setProp(p, value, true)
})
}) })
return material return material
}, },
addWatchers() {},
}, },
__hmrId: 'ShaderMaterial', __hmrId: 'ShaderMaterial',
}) })