Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small Improvements to Avatar Dissolve #9023

Merged
merged 3 commits into from
Oct 16, 2023
Merged

Small Improvements to Avatar Dissolve #9023

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
532f758
stop duplicating uniform. Remove coloring shader because this is hand…
DanielBelmes Oct 9, 2023
c2312c5
also remove nonUVShader portion
DanielBelmes Oct 9, 2023
158d65c
Merge branch 'dev' into Daniel_Avatar_Dissolve_Improvement
HexaField Oct 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 4 additions & 34 deletions packages/engine/src/avatar/components/AvatarDissolveComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export const AvatarDissolveComponent = defineComponent({
},

createDissolveMaterial(object: Mesh<any, MeshBasicMaterial & ShaderMaterial>): any {
const hasUV = object.geometry.hasAttribute('uv')
HexaField marked this conversation as resolved.
Show resolved Hide resolved
const isShaderMaterial = object.material.type == 'ShaderMaterial'
const material = object.material
const hasTexture = !!material.map
Expand Down Expand Up @@ -99,39 +98,14 @@ export const AvatarDissolveComponent = defineComponent({
})
}

if ('map' in uniforms) {
uniforms['origin_texture'] = uniforms['map']
}

uniforms = UniformsUtils.merge([UniformsLib['lights'], uniforms])

const vertexNonUVShader = `
#include <fog_vertex>
vec2 clipSpace = gl_Position.xy / gl_Position.w;
vUv3 = clipSpace * 0.5 + 0.5;
vPosition = position.y;
`

const vertexUVShader = `
#include <fog_vertex>
vUv3 = uv;
vPosition = position.y;
`

const fragmentColorShader = `
#include <output_fragment>
float offset = vPosition - time;
if(offset > (-0.01 - rand(time) * 0.3)){
gl_FragColor = vec4(color.r, color.g, color.b, 1.0);
gl_FragColor.r = 0.0;
gl_FragColor.g = 1.0;
gl_FragColor.b = 0.0;
}
if(offset > 0.0){
discard;
}
`

let textureShader = `gl_FragColor = textureColor;`
if (hasTexture && (material as any).map.isVideoTexture) {
textureShader = `gl_FragColor = sRGBToLinear(textureColor);`
Expand All @@ -140,7 +114,7 @@ export const AvatarDissolveComponent = defineComponent({
const fragmentTextureShader = `
#include <output_fragment>
float offset = vPosition - time;
vec4 textureColor = texture2D(origin_texture, vUv3);
vec4 textureColor = texture2D(map, vUv3);
${textureShader}
if(offset > (-0.01 - rand(time) * 0.3)){
gl_FragColor.r = 0.0;
Expand All @@ -160,24 +134,20 @@ export const AvatarDissolveComponent = defineComponent({

const fragmentHeaderShader = `
#include <clipping_planes_pars_fragment>
uniform vec3 color;
varying vec2 vUv3;
varying float vPosition;
uniform float time;
uniform sampler2D origin_texture;
uniform sampler2D map;
float rand(float co) { return fract(sin(co*(91.3458)) * 47453.5453); }
vec4 sRGBToLinear( in vec4 value ) {
return vec4( mix( pow( value.rgb * 0.9478672986 + vec3( 0.0521327014 ), vec3( 2.4 ) ), value.rgb * 0.0773993808, vec3( lessThanEqual( value.rgb, vec3( 0.04045 ) ) ) ), value.a );
}
`

vertexShader = vertexShader.replace('#include <clipping_planes_pars_vertex>', vertexHeaderShader)
vertexShader = vertexShader.replace('#include <fog_vertex>', hasUV ? vertexUVShader : vertexNonUVShader)
vertexShader = vertexShader.replace('#include <fog_vertex>', vertexUVShader)
fragmentShader = fragmentShader.replace('#include <clipping_planes_pars_fragment>', fragmentHeaderShader)
fragmentShader = fragmentShader.replace(
'#include <output_fragment>',
hasTexture ? fragmentTextureShader : fragmentColorShader
)
fragmentShader = fragmentShader.replace('#include <output_fragment>', fragmentTextureShader)

if (isShaderMaterial) {
material.vertexShader = vertexShader
Expand Down
Loading