Skip to content

Commit

Permalink
deploy: 9cc8bef
Browse files Browse the repository at this point in the history
  • Loading branch information
rycwo committed Apr 25, 2024
1 parent 440c3cc commit 3a21836
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 2 deletions.
32 changes: 31 additions & 1 deletion metafold-three.js/VolumeRenderPass.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import {
VolumeRenderShader,
ProjectionType_Perspective,
ProjectionType_Orthographic,
Matcap_Disabled,
Matcap_Enabled,
} from "./VolumeRenderShader.js"
import { CompositeShader } from "./CompositeShader.js"

Expand Down Expand Up @@ -46,7 +48,7 @@ class VolumeRenderPass extends Pass {
this.volumeTexture.magFilter = LinearFilter
this.volumeTexture.needsUpdate = true

this.volumeRenderTarget = new WebGLRenderTarget(VOLUME_RENDER_SIZE, VOLUME_RENDER_SIZE)
this.volumeRenderTarget = new WebGLRenderTarget(1024, 1024)
this.volumeRenderTarget.depthTexture = new DepthTexture()
this.volumeRenderMaterial = new ShaderMaterial({
defines: Object.assign({}, VolumeRenderShader.defines),
Expand All @@ -60,6 +62,8 @@ class VolumeRenderPass extends Pass {
this.volumeRenderMaterial.uniforms.shapeData.value = this.volumeTexture
this.volumeRenderMaterial.uniforms.volumeSize.value.copy(size)

this.matcapTexture = null

this.boxGeometry = new BoxGeometry(size.x, size.y, size.z)
this.boxMesh = new Mesh(this.boxGeometry, this.volumeRenderMaterial)
this.boxMesh.matrixAutoUpdate = false
Expand Down Expand Up @@ -99,6 +103,9 @@ class VolumeRenderPass extends Pass {
this.volumeTexture.dispose()
this.volumeRenderTarget.dispose()
this.volumeRenderMaterial.dispose()

if (this.matcapTexture)
this.matcapTexture.dispose()
}

/* eslint no-unused-vars: ["error", { "argsIgnorePattern": "^_" }] */
Expand Down Expand Up @@ -153,6 +160,21 @@ class VolumeRenderPass extends Pass {
this.copyRenderTarget.setSize(width, height)
}

setVolumeTextureSize(width, height) {
this.volumeRenderTarget.setSize(width, height)
}

setMatcapTexture(tex) {
if (tex) {
this.matcapTexture = tex
this.volumeRenderMaterial.uniforms.matcap.value = this.matcapTexture
this.volumeRenderMaterial.uniforms.enableMatcap.value = Matcap_Enabled
} else {
this.volumeRenderMaterial.uniforms.matcap.value = null
this.volumeRenderMaterial.uniforms.enableMatcap.value = Matcap_Disabled
}
}

setVolume(volumeData, { size, resolution }) {
if (resolution.x !== this.volumeTexture.image.width
|| resolution.y !== this.volumeTexture.image.height
Expand Down Expand Up @@ -205,6 +227,14 @@ class VolumeRenderPass extends Pass {
set visible(v) {
this.boxMesh.visible = v
}

get baseColor() {
return this.volumeRenderMaterial.uniforms.baseColor.value
}

set baseColor(c) {
this.volumeRenderMaterial.uniforms.baseColor.value.copy(c)
}
}

export { VolumeRenderPass }
18 changes: 17 additions & 1 deletion metafold-three.js/VolumeRenderShader.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import { Color, Matrix4, Vector3 } from "three"
const ProjectionType_Perspective = 0
const ProjectionType_Orthographic = 1

const Matcap_Disabled = 0
const Matcap_Enabled = 1

const VolumeRenderShader = {
defines: {
// Add compile-time definitions here, e.g.
Expand All @@ -14,6 +17,8 @@ const VolumeRenderShader = {
viewToModelMat: { value: new Matrix4() },
volumeSize: { value: new Vector3() },
baseColor: { value: new Color(0xffffff) },
matcap: { value: null },
enableMatcap: { value: Matcap_Disabled },
projectionType: { value: ProjectionType_Perspective },
},
vertexShader: `
Expand All @@ -28,6 +33,7 @@ void main()
`,
fragmentShader: `
precision highp sampler3D;
precision mediump sampler2D;
uniform sampler3D shapeData;
Expand All @@ -38,6 +44,8 @@ uniform mat4 viewToWorldMat;
uniform mat4 viewToModelMat;
uniform vec3 volumeSize;
uniform vec3 baseColor;
uniform sampler2D matcap;
uniform int enableMatcap;
uniform int projectionType;
in vec3 viewPosition;
Expand Down Expand Up @@ -117,6 +125,8 @@ vec3 colorAt(vec3 p)
{
vec3 norm = normalAt(p);
vec2 uv = (norm).xy * 0.5 + 0.5;
if (enableMatcap != 0)
return baseColor * textureLod(matcap, uv, 0.0).xyz;
return baseColor * vec3(mix(0.2, 0.8, uv.y));
}
Expand Down Expand Up @@ -226,4 +236,10 @@ void main()
`
}

export { VolumeRenderShader, ProjectionType_Perspective, ProjectionType_Orthographic }
export {
VolumeRenderShader,
ProjectionType_Perspective,
ProjectionType_Orthographic,
Matcap_Disabled,
Matcap_Enabled,
}

0 comments on commit 3a21836

Please sign in to comment.