chorama 0.0.0 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/publish.yml +24 -0
- package/.github/workflows/static.yml +22 -53
- package/README.md +3 -1
- package/assets/models/glb/AlphaBlendModeTest.glb +0 -0
- package/assets/models/glb/IridescenceLamp.glb +0 -0
- package/assets/models/glb/teapot.glb +0 -0
- package/astro.config.mjs +9 -21
- package/content/guide/render-targets-and-views.md +3 -4
- package/content/guide/textures-and-assets.md +5 -2
- package/dist/index.module.js +23334 -0
- package/dist/index.module.js.map +1 -0
- package/dist/index.umd.js +23610 -0
- package/dist/index.umd.js.map +1 -0
- package/dist/website/_astro/DocLayout.BsV7p0dY.css +1 -0
- package/dist/website/examples/camera/orthographic/example.html +172 -0
- package/dist/website/examples/camera/orthographic/index.html +124 -0
- package/dist/website/examples/camera/perspective/example.html +190 -0
- package/dist/website/examples/camera/perspective/index.html +142 -0
- package/dist/website/examples/camera/tone_mapping/example.html +238 -0
- package/dist/website/examples/camera/tone_mapping/index.html +190 -0
- package/dist/website/examples/index.html +2 -0
- package/dist/website/examples/lights/directional/example.html +447 -0
- package/dist/website/examples/lights/directional/index.html +399 -0
- package/dist/website/examples/lights/multiple_spot_lights/example.html +356 -0
- package/dist/website/examples/lights/multiple_spot_lights/index.html +308 -0
- package/dist/website/examples/lights/point/example.html +387 -0
- package/dist/website/examples/lights/point/index.html +339 -0
- package/dist/website/examples/lights/spot/example.html +416 -0
- package/dist/website/examples/lights/spot/index.html +368 -0
- package/dist/website/examples/loader/gltf/basic/example.html +129 -0
- package/dist/website/examples/loader/gltf/basic/index.html +81 -0
- package/dist/website/examples/loader/gltf/material/alpha-blend-mode/example.html +131 -0
- package/dist/website/examples/loader/gltf/material/alpha-blend-mode/index.html +83 -0
- package/dist/website/examples/loader/gltf/material/flight_helmet/example.html +162 -0
- package/dist/website/examples/loader/gltf/material/flight_helmet/index.html +114 -0
- package/dist/website/examples/loader/gltf/material/iridescence_lamp/example.html +169 -0
- package/dist/website/examples/loader/gltf/material/iridescence_lamp/index.html +121 -0
- package/dist/website/examples/loader/objloader/example.html +144 -0
- package/dist/website/examples/loader/objloader/index.html +96 -0
- package/dist/website/examples/material/cullface/example.html +163 -0
- package/dist/website/examples/material/cullface/index.html +115 -0
- package/dist/website/examples/material/materials/example.html +175 -0
- package/dist/website/examples/material/materials/index.html +127 -0
- package/dist/website/examples/material/standard/basic/example.html +212 -0
- package/dist/website/examples/material/standard/basic/index.html +164 -0
- package/dist/website/examples/material/standard/reflection_refraction/example.html +241 -0
- package/dist/website/examples/material/standard/reflection_refraction/index.html +193 -0
- package/dist/website/examples/mesh/capsule/example.html +173 -0
- package/dist/website/examples/mesh/capsule/index.html +125 -0
- package/dist/website/examples/mesh/circle/example.html +173 -0
- package/dist/website/examples/mesh/circle/index.html +125 -0
- package/dist/website/examples/mesh/cone/example.html +180 -0
- package/dist/website/examples/mesh/cone/index.html +132 -0
- package/dist/website/examples/mesh/cuboid/example.html +207 -0
- package/dist/website/examples/mesh/cuboid/index.html +159 -0
- package/dist/website/examples/mesh/cylinder/example.html +195 -0
- package/dist/website/examples/mesh/cylinder/index.html +147 -0
- package/dist/website/examples/mesh/dodecahedron/example.html +158 -0
- package/dist/website/examples/mesh/dodecahedron/index.html +110 -0
- package/dist/website/examples/mesh/ellipsoid/example.html +179 -0
- package/dist/website/examples/mesh/ellipsoid/index.html +131 -0
- package/dist/website/examples/mesh/extrude/example.html +169 -0
- package/dist/website/examples/mesh/extrude/index.html +121 -0
- package/dist/website/examples/mesh/frustum/example.html +185 -0
- package/dist/website/examples/mesh/frustum/index.html +137 -0
- package/dist/website/examples/mesh/helix/example.html +184 -0
- package/dist/website/examples/mesh/helix/index.html +136 -0
- package/dist/website/examples/mesh/icosahedron/example.html +158 -0
- package/dist/website/examples/mesh/icosahedron/index.html +110 -0
- package/dist/website/examples/mesh/icosphere/example.html +163 -0
- package/dist/website/examples/mesh/icosphere/index.html +115 -0
- package/dist/website/examples/mesh/lathe/example.html +175 -0
- package/dist/website/examples/mesh/lathe/index.html +127 -0
- package/dist/website/examples/mesh/meshTopology/example.html +210 -0
- package/dist/website/examples/mesh/meshTopology/index.html +162 -0
- package/dist/website/examples/mesh/octahedron/example.html +158 -0
- package/dist/website/examples/mesh/octahedron/index.html +110 -0
- package/dist/website/examples/mesh/plane/example.html +173 -0
- package/dist/website/examples/mesh/plane/index.html +125 -0
- package/dist/website/examples/mesh/prism/example.html +173 -0
- package/dist/website/examples/mesh/prism/index.html +125 -0
- package/dist/website/examples/mesh/pyramid/example.html +172 -0
- package/dist/website/examples/mesh/pyramid/index.html +124 -0
- package/dist/website/examples/mesh/ring/example.html +173 -0
- package/dist/website/examples/mesh/ring/index.html +125 -0
- package/dist/website/examples/mesh/skinning/example.html +187 -0
- package/dist/website/examples/mesh/skinning/index.html +139 -0
- package/dist/website/examples/mesh/terrain/example.html +214 -0
- package/dist/website/examples/mesh/terrain/index.html +166 -0
- package/dist/website/examples/mesh/tetrahedron/example.html +158 -0
- package/dist/website/examples/mesh/tetrahedron/index.html +110 -0
- package/dist/website/examples/mesh/torus/example.html +173 -0
- package/dist/website/examples/mesh/torus/index.html +125 -0
- package/dist/website/examples/mesh/torus-knot/example.html +188 -0
- package/dist/website/examples/mesh/torus-knot/index.html +140 -0
- package/dist/website/examples/mesh/tube/example.html +180 -0
- package/dist/website/examples/mesh/tube/index.html +132 -0
- package/dist/website/examples/mesh/uvsphere/example.html +169 -0
- package/dist/website/examples/mesh/uvsphere/index.html +121 -0
- package/dist/website/examples/mesh/wedge/example.html +168 -0
- package/dist/website/examples/mesh/wedge/index.html +120 -0
- package/dist/website/examples/other/rotatingCube/example.html +142 -0
- package/dist/website/examples/other/rotatingCube/index.html +94 -0
- package/dist/website/examples/other/rotatingSphere/example.html +144 -0
- package/dist/website/examples/other/rotatingSphere/index.html +96 -0
- package/dist/website/examples/rendertarget/basic_canvas/example.html +178 -0
- package/dist/website/examples/rendertarget/basic_canvas/index.html +130 -0
- package/dist/website/examples/rendertarget/depth_texture/example.html +188 -0
- package/dist/website/examples/rendertarget/depth_texture/index.html +140 -0
- package/dist/website/examples/rendertarget/image_target/example.html +196 -0
- package/dist/website/examples/rendertarget/image_target/index.html +148 -0
- package/dist/website/examples/rendertarget/multiple_views/example.html +204 -0
- package/dist/website/examples/rendertarget/multiple_views/index.html +156 -0
- package/dist/website/examples/rendertarget/render_masks/example.html +222 -0
- package/dist/website/examples/rendertarget/render_masks/index.html +174 -0
- package/dist/website/examples/rendertarget/split_screen/example.html +178 -0
- package/dist/website/examples/rendertarget/split_screen/index.html +130 -0
- package/dist/website/examples/rendertarget/split_view/example.html +191 -0
- package/dist/website/examples/rendertarget/split_view/index.html +143 -0
- package/dist/website/examples/skybox/skybox/example.html +162 -0
- package/dist/website/examples/skybox/skybox/index.html +114 -0
- package/dist/website/examples/texture/arrays/example.html +204 -0
- package/dist/website/examples/texture/arrays/index.html +156 -0
- package/dist/website/examples/texture/textureWrap/example.html +169 -0
- package/dist/website/examples/texture/textureWrap/index.html +121 -0
- package/dist/website/examples/transform/propagation/example.html +141 -0
- package/dist/website/examples/transform/propagation/index.html +93 -0
- package/dist/website/guide/api-map/index.html +82 -0
- package/dist/website/guide/camera-and-controls/index.html +62 -0
- package/dist/website/guide/first-scene/index.html +119 -0
- package/dist/website/guide/index.html +58 -0
- package/dist/website/guide/installation/index.html +133 -0
- package/dist/website/guide/materials-and-lighting/index.html +90 -0
- package/dist/website/guide/plugins-and-render-pipeline/index.html +89 -0
- package/dist/website/guide/render-targets-and-views/index.html +95 -0
- package/dist/website/guide/scene-graph-and-transforms/index.html +69 -0
- package/dist/website/guide/textures-and-assets/index.html +85 -0
- package/dist/website/guide/troubleshooting/index.html +39 -0
- package/dist/website/images/disappointed.jpg +0 -0
- package/dist/website/images/skybox/grimmnight_back.png +0 -0
- package/dist/website/images/skybox/grimmnight_bottom.png +0 -0
- package/dist/website/images/skybox/grimmnight_front.png +0 -0
- package/dist/website/images/skybox/grimmnight_left.png +0 -0
- package/dist/website/images/skybox/grimmnight_right.png +0 -0
- package/dist/website/images/skybox/grimmnight_top.png +0 -0
- package/dist/website/images/skybox/miramar_back.png +0 -0
- package/dist/website/images/skybox/miramar_bottom.png +0 -0
- package/dist/website/images/skybox/miramar_front.png +0 -0
- package/dist/website/images/skybox/miramar_left.png +0 -0
- package/dist/website/images/skybox/miramar_right.png +0 -0
- package/dist/website/images/skybox/miramar_top.png +0 -0
- package/dist/website/images/uv.jpg +0 -0
- package/dist/website/index.html +157 -0
- package/dist/website/models/glb/AlphaBlendModeTest.glb +0 -0
- package/dist/website/models/glb/IridescenceLamp.glb +0 -0
- package/dist/website/models/glb/teapot.glb +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_GlassPlasticMat_BaseColor.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_GlassPlasticMat_Normal.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_GlassPlasticMat_OcclusionRoughMetal.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_LeatherPartsMat_BaseColor.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_LeatherPartsMat_Normal.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_LeatherPartsMat_OcclusionRoughMetal.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_LensesMat_BaseColor.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_LensesMat_Normal.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_LensesMat_OcclusionRoughMetal.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_MetalPartsMat_BaseColor.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_MetalPartsMat_Normal.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_MetalPartsMat_OcclusionRoughMetal.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_RubberWoodMat_BaseColor.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_RubberWoodMat_Normal.png +0 -0
- package/dist/website/models/gltf/flight_helmet/FlightHelmet_Materials_RubberWoodMat_OcclusionRoughMetal.png +0 -0
- package/dist/website/models/gltf/flight_helmet/index.bin +0 -0
- package/dist/website/models/gltf/flight_helmet/index.gltf +705 -0
- package/dist/website/models/gltf/object.gltf +23 -0
- package/dist/website/models/gltf/pirate_girl/index.bin +0 -0
- package/dist/website/models/gltf/pirate_girl/index.gltf +2082 -0
- package/dist/website/models/obj/pirate_girl/pirate_girl.obj +18459 -0
- package/dist/website/models/obj/pirate_girl/pirate_girl.png +0 -0
- package/env.d.ts +0 -14
- package/examples/camera/orthographic.js +2 -1
- package/examples/camera/perspective.js +2 -1
- package/examples/camera/tone_mapping.js +187 -0
- package/examples/lights/directional.js +2 -3
- package/examples/lights/multiple_spot_lights.js +2 -1
- package/examples/lights/point.js +2 -3
- package/examples/lights/spot.js +2 -3
- package/examples/loader/{gltfloader.js → gltf/basic.js} +8 -8
- package/examples/loader/gltf/material/alpha-blend-mode.js +80 -0
- package/examples/loader/{gltf_material.js → gltf/material/flight_helmet.js} +8 -8
- package/examples/loader/gltf/material/iridescence_lamp.js +118 -0
- package/examples/loader/objloader.js +9 -11
- package/examples/material/cullface.js +8 -7
- package/examples/material/materials.js +9 -11
- package/examples/material/standard/basic.js +3 -6
- package/examples/material/standard/reflection_refraction.js +190 -0
- package/examples/mesh/capsule.js +122 -0
- package/examples/mesh/circle.js +11 -6
- package/examples/mesh/cone.js +129 -0
- package/examples/mesh/cuboid.js +11 -6
- package/examples/mesh/cylinder.js +11 -6
- package/examples/mesh/dodecahedron.js +107 -0
- package/examples/mesh/ellipsoid.js +128 -0
- package/examples/mesh/extrude.js +118 -0
- package/examples/mesh/frustum.js +134 -0
- package/examples/mesh/helix.js +133 -0
- package/examples/mesh/icosahedron.js +107 -0
- package/examples/mesh/icosphere.js +112 -0
- package/examples/mesh/lathe.js +124 -0
- package/examples/mesh/meshTopology.js +64 -8
- package/examples/mesh/octahedron.js +107 -0
- package/examples/mesh/plane.js +11 -6
- package/examples/mesh/prism.js +122 -0
- package/examples/mesh/pyramid.js +121 -0
- package/examples/mesh/ring.js +122 -0
- package/examples/mesh/skinning.js +8 -8
- package/examples/mesh/terrain.js +163 -0
- package/examples/mesh/tetrahedron.js +107 -0
- package/examples/mesh/torus-knot.js +137 -0
- package/examples/mesh/torus.js +122 -0
- package/examples/mesh/tube.js +129 -0
- package/examples/mesh/uvsphere.js +11 -6
- package/examples/mesh/wedge.js +117 -0
- package/examples/other/rotatingCube.js +9 -11
- package/examples/other/rotatingSphere.js +9 -12
- package/examples/rendertarget/basic_canvas.js +5 -8
- package/examples/rendertarget/depth_texture.js +18 -11
- package/examples/rendertarget/image_target.js +19 -14
- package/examples/rendertarget/multiple_views.js +11 -16
- package/examples/rendertarget/render_masks.js +3 -5
- package/examples/rendertarget/split_screen.js +18 -14
- package/examples/rendertarget/split_view.js +12 -9
- package/examples/skybox/skybox.js +8 -8
- package/examples/texture/arrays.js +9 -12
- package/examples/texture/textureWrap.js +8 -8
- package/examples/transform/propagation.js +9 -11
- package/package.json +18 -12
- package/src/caches/cache.js +121 -182
- package/src/caches/uniformbuffers.js +42 -53
- package/src/constants/texture.js +1 -1
- package/src/content.config.js +1 -0
- package/src/core/layouts/bindgroup.js +167 -0
- package/src/core/layouts/index.js +3 -1
- package/src/core/layouts/pipeline.js +165 -0
- package/src/core/layouts/uniformbuffer.js +11 -3
- package/src/core/resources/gpubuffer.js +23 -2
- package/src/core/resources/gpumesh.js +37 -4
- package/src/core/resources/gpusampler.js +43 -0
- package/src/core/resources/gputexture.js +31 -2
- package/src/core/resources/index.js +4 -2
- package/src/core/resources/newuniformbuffer.js +58 -0
- package/src/core/resources/webglshadermodule.js +58 -0
- package/src/core/shader.js +24 -11
- package/src/core/webgl/bindgroup.js +200 -42
- package/src/core/webgl/descriptors.js +87 -25
- package/src/core/webgl/gpuqueue.js +63 -0
- package/src/core/webgl/index.js +3 -0
- package/src/core/webgl/renderpassencoder.js +703 -16
- package/src/core/webgl/renderpipeline.js +38 -1
- package/src/core/webgl/utils.js +207 -57
- package/src/core/webgl/webglrenderdevice.js +77 -53
- package/src/loader/gltf.js +716 -166
- package/src/loader/texture.js +69 -16
- package/src/loader/utils.js +44 -0
- package/src/material/alphablend.js +21 -0
- package/src/material/basic.js +15 -1
- package/src/material/depth.js +15 -1
- package/src/material/index.js +1 -0
- package/src/material/lambert.js +15 -1
- package/src/material/material.js +49 -7
- package/src/material/normal.js +14 -0
- package/src/material/phong.js +16 -2
- package/src/material/raw.js +21 -2
- package/src/material/standard.js +90 -2
- package/src/mesh/attribute/attribute.js +2 -2
- package/src/mesh/attributedata/separate.js +2 -2
- package/src/mesh/builders/capsule.js +47 -0
- package/src/mesh/builders/cone.js +29 -0
- package/src/mesh/builders/dodecahedron.js +130 -0
- package/src/mesh/builders/ellipsoid.js +65 -0
- package/src/mesh/builders/extrude.js +136 -0
- package/src/mesh/builders/frustum.js +26 -0
- package/src/mesh/builders/geometry.js +121 -0
- package/src/mesh/builders/helix.js +35 -0
- package/src/mesh/builders/icosahedron.js +61 -0
- package/src/mesh/builders/icosphere.js +141 -0
- package/src/mesh/builders/index.js +22 -1
- package/src/mesh/builders/lathe.js +85 -0
- package/src/mesh/builders/octahedron.js +43 -0
- package/src/mesh/builders/polyhedron.js +121 -0
- package/src/mesh/builders/prism.js +19 -0
- package/src/mesh/builders/pyramid.js +90 -0
- package/src/mesh/builders/ring.js +109 -0
- package/src/mesh/builders/surfaces.js +69 -0
- package/src/mesh/builders/terrain.js +80 -0
- package/src/mesh/builders/tetrahedron.js +37 -0
- package/src/mesh/builders/torusknot.js +36 -0
- package/src/mesh/builders/tube.js +209 -0
- package/src/mesh/builders/utils.js +130 -2
- package/src/mesh/builders/wedge.js +22 -0
- package/src/mesh/mesh.js +12 -4
- package/src/objects/camera/camera.js +104 -1
- package/src/objects/light/ambient.js +22 -1
- package/src/objects/light/directional.js +23 -1
- package/src/objects/light/point.js +25 -1
- package/src/objects/light/spot.js +27 -1
- package/src/objects/mesh.js +1 -53
- package/src/plugins/camera/RenderTarget2DPool.js +94 -0
- package/src/plugins/camera/camera.js +14 -6
- package/src/plugins/camera/index.js +2 -0
- package/src/plugins/camera/nodes/canvasblit.js +153 -0
- package/src/plugins/camera/nodes/index.js +4 -1
- package/src/plugins/camera/nodes/opaquepass.js +48 -33
- package/src/plugins/camera/nodes/tonemapping.js +217 -0
- package/src/plugins/camera/nodes/transparentpass.js +87 -0
- package/src/plugins/camera/nodes/{cameraview.js → view.js} +27 -1
- package/src/plugins/camera/resources/cameracolortargets.js +66 -0
- package/src/plugins/camera/resources/canvasblitpipeline.js +6 -0
- package/src/plugins/camera/resources/index.js +3 -0
- package/src/plugins/camera/resources/tonemappingpipeline.js +6 -0
- package/src/plugins/light/light.js +0 -4
- package/src/plugins/meshmaterial/meshmaterial.js +433 -170
- package/src/plugins/meshmaterial/nodes/meshmaterial.js +39 -6
- package/src/plugins/meshmaterial/resources/bonetexture.js +176 -0
- package/src/plugins/meshmaterial/resources/environmentmap.js +44 -0
- package/src/plugins/meshmaterial/resources/index.js +4 -0
- package/src/plugins/meshmaterial/resources/materialuniformbuffers.js +94 -0
- package/src/plugins/meshmaterial/resources/meshmaterialbindgroups.js +40 -0
- package/src/plugins/shadow/nodes/index.js +3 -3
- package/src/plugins/shadow/nodes/{shadowOccluder.js → occluder.js} +13 -19
- package/src/plugins/shadow/nodes/opaquePass.js +110 -0
- package/src/plugins/shadow/shadow.js +0 -5
- package/src/plugins/skeletonhelper/skeletonhelper.js +111 -69
- package/src/plugins/skybox/nodes/skybox.js +230 -38
- package/src/plugins/skybox/resources/skyboxpipeline.js +10 -0
- package/src/plugins/skybox/skybox.js +0 -119
- package/src/renderer/core/index.js +135 -21
- package/src/renderer/plugin.js +0 -20
- package/src/renderer/renderer.js +28 -12
- package/src/rendertarget/canvastarget.js +8 -5
- package/src/rendertarget/image.js +3 -3
- package/src/shader/basicFragment.glsl +12 -4
- package/src/shader/basicVertex.glsl +26 -15
- package/src/shader/blitFragment.glsl +9 -0
- package/src/shader/common/common.glsl +35 -6
- package/src/shader/common/index.js +1 -0
- package/src/shader/common/tonemap.glsl +118 -0
- package/src/shader/debug/skeletonFragment.glsl +0 -2
- package/src/shader/debug/skeletonVertex.glsl +1 -3
- package/src/shader/depthFragment.glsl +0 -3
- package/src/shader/fullscreenVertex.glsl +26 -0
- package/src/shader/index.js +3 -0
- package/src/shader/lambertFragment.glsl +12 -4
- package/src/shader/normalFragment.glsl +0 -3
- package/src/shader/phongFragment.glsl +12 -4
- package/src/shader/skyboxFragment.glsl +5 -5
- package/src/shader/skyboxVertex.glsl +5 -4
- package/src/shader/standardFragment.glsl +74 -17
- package/src/shader/tonemappingFragment.glsl +37 -0
- package/src/texture/sampler.js +101 -21
- package/src/texture/texture.js +252 -48
- package/src/utils/index.js +15 -1
- package/{examples/addons → src/utils}/rendergraph_gui.js +5 -2
- package/examples/mesh/geometries.js +0 -108
- package/scripts/stage-chorama.mjs +0 -29
- package/src/core/resources/framebuffer.js +0 -127
- package/src/plugins/shadow/nodes/shadowOpaquePass.js +0 -73
- package/website/config/index.ts +0 -1
- package/website/config/navigation.ts +0 -53
- package/website/content.config.ts +0 -92
- package/website/layouts/DocLayout.astro +0 -501
- package/website/layouts/Example.astro +0 -91
- package/website/pages/examples/[...slug].astro +0 -77
- package/website/pages/examples/index.astro +0 -98
- package/website/pages/examples/samples/[...slug].astro +0 -17
- package/website/pages/guide/[slug].astro +0 -30
- package/website/pages/guide/index.astro +0 -21
- package/website/pages/index.astro +0 -9
- package/website/plugins/remark-link-base.js +0 -23
- package/website/utils/url.ts +0 -30
- /package/src/plugins/shadow/nodes/{shadow.js → view.js} +0 -0
package/src/loader/texture.js
CHANGED
|
@@ -4,6 +4,7 @@ import { TextureFormat, TextureType, getTextureFormatSize } from '../constants/i
|
|
|
4
4
|
import { Texture } from '../texture/index.js';
|
|
5
5
|
import { assert } from '../utils/index.js';
|
|
6
6
|
import { Loader, OnAssetLoadedStrategy } from './loader.js';
|
|
7
|
+
import { flipImageData } from './utils.js';
|
|
7
8
|
|
|
8
9
|
/**
|
|
9
10
|
* @extends {Loader<Texture,TextureLoadSettings>}
|
|
@@ -19,38 +20,75 @@ export class TextureLoader extends Loader {
|
|
|
19
20
|
* @override
|
|
20
21
|
* @param {ArrayBuffer[]} buffers
|
|
21
22
|
* @param {Texture} destination
|
|
23
|
+
* @param {TextureParseSettings} [settings]
|
|
22
24
|
*/
|
|
23
|
-
async parse(buffers, destination) {
|
|
24
|
-
|
|
25
|
-
const
|
|
26
|
-
|
|
25
|
+
async parse(buffers, destination, settings = {}) {
|
|
26
|
+
const textureFormat = TextureFormat.RGBA8Unorm
|
|
27
|
+
const pixelSize = getTextureFormatSize(textureFormat)
|
|
28
|
+
const {
|
|
29
|
+
flipX = false,
|
|
30
|
+
flipY = false,
|
|
31
|
+
generateMipmaps = false,
|
|
32
|
+
type = destination.type ?? TextureType.Texture2D
|
|
33
|
+
} = settings
|
|
34
|
+
const imagePromises = buffers.map(async (buffer) => {
|
|
35
|
+
const blob = new Blob(
|
|
36
|
+
[buffer],
|
|
37
|
+
settings.mimeType ? { type: settings.mimeType } : undefined
|
|
38
|
+
)
|
|
27
39
|
const bitmap = await createImageBitmap(blob)
|
|
28
40
|
const canvas = new OffscreenCanvas(bitmap.width, bitmap.height)
|
|
29
41
|
const ctx = canvas.getContext('2d')
|
|
30
42
|
|
|
31
|
-
assert(ctx, "Could not
|
|
43
|
+
assert(ctx, "Could not create context to load image.")
|
|
32
44
|
ctx.drawImage(bitmap, 0, 0)
|
|
33
|
-
width = bitmap.width
|
|
34
|
-
height = bitmap.height
|
|
35
45
|
|
|
36
|
-
|
|
46
|
+
const pixels = ctx.getImageData(0, 0, bitmap.width, bitmap.height, {
|
|
37
47
|
colorSpace: "srgb"
|
|
38
48
|
}).data.buffer
|
|
49
|
+
|
|
50
|
+
return {
|
|
51
|
+
width: bitmap.width,
|
|
52
|
+
height: bitmap.height,
|
|
53
|
+
pixels: flipImageData(pixels, bitmap.width, bitmap.height, pixelSize, {
|
|
54
|
+
flipX,
|
|
55
|
+
flipY
|
|
56
|
+
})
|
|
57
|
+
}
|
|
39
58
|
})
|
|
40
|
-
const
|
|
41
|
-
const
|
|
59
|
+
const images = await Promise.all(imagePromises)
|
|
60
|
+
const firstImage = images[0]
|
|
61
|
+
const width = firstImage?.width || 0
|
|
62
|
+
const height = firstImage?.height || 0
|
|
42
63
|
const depth = images.length
|
|
43
|
-
const sliceSize =
|
|
64
|
+
const sliceSize = pixelSize * width * height
|
|
44
65
|
const buffer = new ArrayBuffer(
|
|
45
66
|
sliceSize * depth
|
|
46
67
|
)
|
|
47
68
|
images.forEach((image, i) => {
|
|
48
|
-
|
|
69
|
+
assert(
|
|
70
|
+
image.width === width && image.height === height,
|
|
71
|
+
"Texture images must have matching dimensions."
|
|
72
|
+
)
|
|
73
|
+
const sourceView = new Uint8Array(image.pixels)
|
|
49
74
|
const destView = new Uint8Array(buffer, sliceSize * i, sliceSize)
|
|
50
75
|
destView.set(sourceView)
|
|
51
76
|
})
|
|
52
|
-
|
|
53
|
-
|
|
77
|
+
|
|
78
|
+
const textureData = generateMipmaps
|
|
79
|
+
? Texture.generateMipmaps({
|
|
80
|
+
level0: buffer,
|
|
81
|
+
type,
|
|
82
|
+
format: textureFormat,
|
|
83
|
+
width,
|
|
84
|
+
height,
|
|
85
|
+
depth
|
|
86
|
+
})
|
|
87
|
+
: [buffer]
|
|
88
|
+
|
|
89
|
+
destination.data = textureData
|
|
90
|
+
destination.type = type
|
|
91
|
+
destination.format = textureFormat
|
|
54
92
|
destination.width = width
|
|
55
93
|
destination.height = height
|
|
56
94
|
destination.depth = depth
|
|
@@ -66,7 +104,7 @@ export class TextureLoader extends Loader {
|
|
|
66
104
|
)
|
|
67
105
|
const texture = new Texture({
|
|
68
106
|
...(settings.textureSettings || {}),
|
|
69
|
-
data: pixel.buffer,
|
|
107
|
+
data: [pixel.buffer],
|
|
70
108
|
type: settings.type || TextureType.Texture2D,
|
|
71
109
|
width: 1,
|
|
72
110
|
height: 1,
|
|
@@ -81,5 +119,20 @@ export class TextureLoader extends Loader {
|
|
|
81
119
|
* @typedef TextureLoadSettings
|
|
82
120
|
* @property {string[]} paths
|
|
83
121
|
* @property {TextureType} [type]
|
|
122
|
+
* @property {string} [mimeType]
|
|
123
|
+
* @property {boolean} [flipX]
|
|
124
|
+
* @property {boolean} [flipY]
|
|
125
|
+
* @property {boolean} [generateMipmaps]
|
|
84
126
|
* @property {TextureSettings} [textureSettings]
|
|
85
|
-
*/
|
|
127
|
+
*/
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* @typedef TextureParseSettings
|
|
131
|
+
* @property {string[]} [paths]
|
|
132
|
+
* @property {TextureType} [type]
|
|
133
|
+
* @property {string} [mimeType]
|
|
134
|
+
* @property {boolean} [flipX]
|
|
135
|
+
* @property {boolean} [flipY]
|
|
136
|
+
* @property {boolean} [generateMipmaps]
|
|
137
|
+
* @property {TextureSettings} [textureSettings]
|
|
138
|
+
*/
|
package/src/loader/utils.js
CHANGED
|
@@ -14,3 +14,47 @@ export function arrayBufferToText(buffer) {
|
|
|
14
14
|
const decoder = new TextDecoder('utf-8')
|
|
15
15
|
return decoder.decode(buffer);
|
|
16
16
|
}
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Flips RGBA pixel data horizontally and/or vertically.
|
|
20
|
+
* @param {ArrayBuffer} buffer
|
|
21
|
+
* @param {number} width
|
|
22
|
+
* @param {number} height
|
|
23
|
+
* @param {number} pixelSize
|
|
24
|
+
* @param {{ flipX?: boolean, flipY?: boolean }} [settings]
|
|
25
|
+
* @returns {ArrayBuffer}
|
|
26
|
+
*/
|
|
27
|
+
export function flipImageData(
|
|
28
|
+
buffer,
|
|
29
|
+
width,
|
|
30
|
+
height,
|
|
31
|
+
pixelSize,
|
|
32
|
+
{ flipX = false, flipY = false } = {}
|
|
33
|
+
) {
|
|
34
|
+
if (!flipX && !flipY) {
|
|
35
|
+
return buffer
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
const source = new Uint8Array(buffer)
|
|
39
|
+
const target = new Uint8Array(source.length)
|
|
40
|
+
const rowSize = width * pixelSize
|
|
41
|
+
|
|
42
|
+
for (let y = 0; y < height; y++) {
|
|
43
|
+
const sourceY = flipY ? height - 1 - y : y
|
|
44
|
+
const targetRowOffset = y * rowSize
|
|
45
|
+
const sourceRowOffset = sourceY * rowSize
|
|
46
|
+
|
|
47
|
+
for (let x = 0; x < width; x++) {
|
|
48
|
+
const sourceX = flipX ? width - 1 - x : x
|
|
49
|
+
const sourceOffset = sourceRowOffset + sourceX * pixelSize
|
|
50
|
+
const targetOffset = targetRowOffset + x * pixelSize
|
|
51
|
+
|
|
52
|
+
for (let i = 0; i < pixelSize; i++) {
|
|
53
|
+
const value = source[sourceOffset + i]
|
|
54
|
+
target[targetOffset + i] = value === undefined ? 0 : value
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
return target.buffer
|
|
60
|
+
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export class OpaqueMode {}
|
|
2
|
+
|
|
3
|
+
export class AlphaMaskMode {
|
|
4
|
+
/**
|
|
5
|
+
* @type {number}
|
|
6
|
+
*/
|
|
7
|
+
cutoff
|
|
8
|
+
|
|
9
|
+
constructor(cutoff = 0.5) {
|
|
10
|
+
this.cutoff = cutoff
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Marks materials that should render in the transparent pass.
|
|
16
|
+
*/
|
|
17
|
+
export class TransparentMode {}
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* @typedef {OpaqueMode | AlphaMaskMode | TransparentMode} AlphaBlend
|
|
21
|
+
*/
|
package/src/material/basic.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Material } from "./material.js"
|
|
2
|
+
import { OpaqueMode } from "./alphablend.js"
|
|
2
3
|
import { Color } from "../math/index.js"
|
|
3
4
|
import { basicVertex, basicFragment } from "../shader/index.js"
|
|
4
5
|
import { Texture } from "../texture/index.js"
|
|
@@ -21,6 +22,11 @@ export class BasicMaterial extends Material {
|
|
|
21
22
|
*/
|
|
22
23
|
mainSampler
|
|
23
24
|
|
|
25
|
+
/**
|
|
26
|
+
* @type {import("./alphablend.js").AlphaBlend}
|
|
27
|
+
*/
|
|
28
|
+
alphaBlend = new OpaqueMode()
|
|
29
|
+
|
|
24
30
|
/**
|
|
25
31
|
* @param {BasicMaterialOptions} param0
|
|
26
32
|
*/
|
|
@@ -49,6 +55,14 @@ export class BasicMaterial extends Material {
|
|
|
49
55
|
return basicFragment
|
|
50
56
|
}
|
|
51
57
|
|
|
58
|
+
/**
|
|
59
|
+
* @override
|
|
60
|
+
* @returns {import("./alphablend.js").AlphaBlend}
|
|
61
|
+
*/
|
|
62
|
+
alphaBlendMode() {
|
|
63
|
+
return this.alphaBlend
|
|
64
|
+
}
|
|
65
|
+
|
|
52
66
|
/**
|
|
53
67
|
* @override
|
|
54
68
|
*/
|
|
@@ -72,4 +86,4 @@ export class BasicMaterial extends Material {
|
|
|
72
86
|
* @property {Color} [color]
|
|
73
87
|
* @property {Texture | undefined} [mainTexture]
|
|
74
88
|
* @property {Sampler | undefined} [mainSampler]
|
|
75
|
-
*/
|
|
89
|
+
*/
|
package/src/material/depth.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Material } from "./material.js"
|
|
2
|
+
import { OpaqueMode } from "./alphablend.js"
|
|
2
3
|
import { basicVertex, depthFragment } from "../shader/index.js"
|
|
3
4
|
import { Texture } from "../texture/index.js"
|
|
4
5
|
import { Sampler } from "../texture/sampler.js"
|
|
@@ -20,6 +21,11 @@ export class DepthMaterial extends Material {
|
|
|
20
21
|
*/
|
|
21
22
|
mainSampler
|
|
22
23
|
|
|
24
|
+
/**
|
|
25
|
+
* @type {import("./alphablend.js").AlphaBlend}
|
|
26
|
+
*/
|
|
27
|
+
alphaBlend = new OpaqueMode()
|
|
28
|
+
|
|
23
29
|
/**
|
|
24
30
|
* @param {DepthMaterialOptions} options
|
|
25
31
|
*/
|
|
@@ -48,6 +54,14 @@ export class DepthMaterial extends Material {
|
|
|
48
54
|
return depthFragment
|
|
49
55
|
}
|
|
50
56
|
|
|
57
|
+
/**
|
|
58
|
+
* @override
|
|
59
|
+
* @returns {import("./alphablend.js").AlphaBlend}
|
|
60
|
+
*/
|
|
61
|
+
alphaBlendMode() {
|
|
62
|
+
return this.alphaBlend
|
|
63
|
+
}
|
|
64
|
+
|
|
51
65
|
/**
|
|
52
66
|
* @override
|
|
53
67
|
*/
|
|
@@ -70,4 +84,4 @@ export class DepthMaterial extends Material {
|
|
|
70
84
|
/**
|
|
71
85
|
* @typedef DepthMaterialOptions
|
|
72
86
|
* @property {Texture} depth
|
|
73
|
-
*/
|
|
87
|
+
*/
|
package/src/material/index.js
CHANGED
package/src/material/lambert.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Material } from "./material.js"
|
|
2
|
+
import { OpaqueMode } from "./alphablend.js"
|
|
2
3
|
import { Color } from "../math/index.js"
|
|
3
4
|
import { basicVertex, lambertFragment } from "../shader/index.js"
|
|
4
5
|
import { Texture, Sampler } from "../texture/index.js"
|
|
@@ -19,6 +20,11 @@ export class LambertMaterial extends Material {
|
|
|
19
20
|
*/
|
|
20
21
|
mainSampler
|
|
21
22
|
|
|
23
|
+
/**
|
|
24
|
+
* @type {import("./alphablend.js").AlphaBlend}
|
|
25
|
+
*/
|
|
26
|
+
alphaBlend = new OpaqueMode()
|
|
27
|
+
|
|
22
28
|
/**
|
|
23
29
|
* @param {LambertMaterialOptions} param0
|
|
24
30
|
*/
|
|
@@ -47,6 +53,14 @@ export class LambertMaterial extends Material {
|
|
|
47
53
|
return lambertFragment
|
|
48
54
|
}
|
|
49
55
|
|
|
56
|
+
/**
|
|
57
|
+
* @override
|
|
58
|
+
* @returns {import("./alphablend.js").AlphaBlend}
|
|
59
|
+
*/
|
|
60
|
+
alphaBlendMode() {
|
|
61
|
+
return this.alphaBlend
|
|
62
|
+
}
|
|
63
|
+
|
|
50
64
|
/**
|
|
51
65
|
* @override
|
|
52
66
|
*/
|
|
@@ -70,4 +84,4 @@ export class LambertMaterial extends Material {
|
|
|
70
84
|
* @property {Color} [color]
|
|
71
85
|
* @property {Texture} [mainTexture]
|
|
72
86
|
* @property {Sampler} [mainSampler]
|
|
73
|
-
*/
|
|
87
|
+
*/
|
package/src/material/material.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
/**@import {WebGLRenderPipelineOptions } from '../core/index.js' */
|
|
2
|
-
|
|
3
1
|
import {
|
|
4
2
|
CullFace,
|
|
5
3
|
FrontFaceDirection
|
|
6
4
|
} from "../constants/index.js"
|
|
7
5
|
import { abstractClass, abstractMethod } from "../utils/index.js"
|
|
6
|
+
import { AlphaMaskMode, TransparentMode } from "./alphablend.js"
|
|
8
7
|
import { RawMaterial } from "./raw.js"
|
|
8
|
+
import { BlendParams } from "../core/index.js"
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
11
|
* @abstract
|
|
@@ -25,6 +25,15 @@ export class Material extends RawMaterial {
|
|
|
25
25
|
*/
|
|
26
26
|
depthWrite = true
|
|
27
27
|
|
|
28
|
+
/**
|
|
29
|
+
* Returns the material's alpha classification.
|
|
30
|
+
* @override
|
|
31
|
+
* @returns {import("./alphablend.js").AlphaBlend}
|
|
32
|
+
*/
|
|
33
|
+
alphaBlendMode() {
|
|
34
|
+
abstractMethod(this, Material, "alphaBlendMode")
|
|
35
|
+
}
|
|
36
|
+
|
|
28
37
|
constructor(){
|
|
29
38
|
super()
|
|
30
39
|
abstractClass(this, Material)
|
|
@@ -62,6 +71,9 @@ export class Material extends RawMaterial {
|
|
|
62
71
|
*/
|
|
63
72
|
getPipelineBits() {
|
|
64
73
|
let materialKey = MaterialKey.None
|
|
74
|
+
const alphaBlendMode = this.alphaBlendMode()
|
|
75
|
+
const isTransparent = alphaBlendMode instanceof TransparentMode
|
|
76
|
+
|
|
65
77
|
if (this.cullFace === CullFace.Front) {
|
|
66
78
|
materialKey |= MaterialKey.CullFaceFront
|
|
67
79
|
} else if (this.cullFace === CullFace.Back) {
|
|
@@ -69,26 +81,53 @@ export class Material extends RawMaterial {
|
|
|
69
81
|
} else if (this.cullFace === CullFace.FrontAndBack) {
|
|
70
82
|
materialKey |= MaterialKey.CullFaceBoth
|
|
71
83
|
}
|
|
72
|
-
if (this.depthWrite) {
|
|
84
|
+
if (this.depthWrite && !isTransparent) {
|
|
73
85
|
materialKey |= MaterialKey.DepthWrite
|
|
74
86
|
}
|
|
75
87
|
if (this.frontFace == FrontFaceDirection.CW) {
|
|
76
88
|
materialKey |= MaterialKey.FrontFaceCW
|
|
77
89
|
}
|
|
90
|
+
if (alphaBlendMode instanceof AlphaMaskMode) {
|
|
91
|
+
materialKey |= MaterialKey.AlphaBlendMask
|
|
92
|
+
} else if (isTransparent) {
|
|
93
|
+
materialKey |= MaterialKey.AlphaBlendTransparent
|
|
94
|
+
} else {
|
|
95
|
+
materialKey |= MaterialKey.AlphaBlendOpaque
|
|
96
|
+
}
|
|
78
97
|
|
|
79
98
|
return materialKey
|
|
80
99
|
}
|
|
81
100
|
|
|
82
101
|
/**
|
|
83
102
|
* @override
|
|
84
|
-
* @param {
|
|
103
|
+
* @param {import("./raw.js").MaterialSpecializeDescriptor} descriptor
|
|
85
104
|
*/
|
|
86
105
|
specialize(descriptor) {
|
|
87
|
-
|
|
106
|
+
const alphaBlendMode = this.alphaBlendMode()
|
|
107
|
+
const isTransparent = alphaBlendMode instanceof TransparentMode
|
|
88
108
|
|
|
89
109
|
descriptor.cullFace = this.cullFace
|
|
90
110
|
descriptor.frontFace = this.frontFace
|
|
91
|
-
descriptor.depthWrite = this.depthWrite
|
|
111
|
+
descriptor.depthWrite = isTransparent ? false : this.depthWrite
|
|
112
|
+
|
|
113
|
+
const target = descriptor.fragment?.targets?.[0]
|
|
114
|
+
|
|
115
|
+
if (target) {
|
|
116
|
+
if (isTransparent) {
|
|
117
|
+
target.blend = {
|
|
118
|
+
color: BlendParams.AlphaBlend,
|
|
119
|
+
alpha: BlendParams.AlphaBlend
|
|
120
|
+
}
|
|
121
|
+
} else {
|
|
122
|
+
target.blend = undefined
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
if (alphaBlendMode instanceof AlphaMaskMode) {
|
|
127
|
+
descriptor.fragment?.source?.defines.set("ALPHA_MASK_MODE", "")
|
|
128
|
+
} else {
|
|
129
|
+
descriptor.fragment?.source?.defines.delete("ALPHA_MASK_MODE")
|
|
130
|
+
}
|
|
92
131
|
}
|
|
93
132
|
}
|
|
94
133
|
|
|
@@ -102,5 +141,8 @@ export const MaterialKey = /**@type {const}*/({
|
|
|
102
141
|
CullFaceBack: 2n << 0n,
|
|
103
142
|
CullFaceBoth: 3n << 0n,
|
|
104
143
|
FrontFaceCW: 1n << 2n,
|
|
105
|
-
DepthWrite: 1n << 3n
|
|
144
|
+
DepthWrite: 1n << 3n,
|
|
145
|
+
AlphaBlendOpaque: 0n << 4n,
|
|
146
|
+
AlphaBlendMask: 1n << 4n,
|
|
147
|
+
AlphaBlendTransparent: 2n << 4n
|
|
106
148
|
})
|
package/src/material/normal.js
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import { Material } from "./material.js"
|
|
2
|
+
import { OpaqueMode } from "./alphablend.js"
|
|
2
3
|
import { basicVertex, normalFragment} from "../shader/index.js"
|
|
3
4
|
|
|
4
5
|
export class NormalMaterial extends Material {
|
|
5
6
|
|
|
7
|
+
/**
|
|
8
|
+
* @type {import("./alphablend.js").AlphaBlend}
|
|
9
|
+
*/
|
|
10
|
+
alphaBlend = new OpaqueMode()
|
|
11
|
+
|
|
6
12
|
constructor() {
|
|
7
13
|
super()
|
|
8
14
|
}
|
|
@@ -21,6 +27,14 @@ export class NormalMaterial extends Material {
|
|
|
21
27
|
return normalFragment
|
|
22
28
|
}
|
|
23
29
|
|
|
30
|
+
/**
|
|
31
|
+
* @override
|
|
32
|
+
* @returns {import("./alphablend.js").AlphaBlend}
|
|
33
|
+
*/
|
|
34
|
+
alphaBlendMode() {
|
|
35
|
+
return this.alphaBlend
|
|
36
|
+
}
|
|
37
|
+
|
|
24
38
|
/**
|
|
25
39
|
* @override
|
|
26
40
|
*/
|
package/src/material/phong.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Material } from "./material.js"
|
|
2
|
+
import { OpaqueMode } from "./alphablend.js"
|
|
2
3
|
import { Color } from "../math/index.js"
|
|
3
4
|
import { basicVertex, phongFragment } from "../shader/index.js"
|
|
4
5
|
import { Sampler, Texture } from "../texture/index.js"
|
|
@@ -18,6 +19,11 @@ export class PhongMaterial extends Material {
|
|
|
18
19
|
* @type {Sampler | undefined}
|
|
19
20
|
*/
|
|
20
21
|
mainSampler
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* @type {import("./alphablend.js").AlphaBlend}
|
|
25
|
+
*/
|
|
26
|
+
alphaBlend = new OpaqueMode()
|
|
21
27
|
/**
|
|
22
28
|
* @param {PhongMaterialOptions} param0
|
|
23
29
|
*/
|
|
@@ -50,6 +56,14 @@ export class PhongMaterial extends Material {
|
|
|
50
56
|
return phongFragment
|
|
51
57
|
}
|
|
52
58
|
|
|
59
|
+
/**
|
|
60
|
+
* @override
|
|
61
|
+
* @returns {import("./alphablend.js").AlphaBlend}
|
|
62
|
+
*/
|
|
63
|
+
alphaBlendMode() {
|
|
64
|
+
return this.alphaBlend
|
|
65
|
+
}
|
|
66
|
+
|
|
53
67
|
/**
|
|
54
68
|
* @override
|
|
55
69
|
*/
|
|
@@ -63,7 +77,7 @@ export class PhongMaterial extends Material {
|
|
|
63
77
|
return new Float32Array([
|
|
64
78
|
...color,
|
|
65
79
|
specularShininess,
|
|
66
|
-
specularStrength
|
|
80
|
+
specularStrength,
|
|
67
81
|
]).buffer
|
|
68
82
|
}
|
|
69
83
|
|
|
@@ -83,4 +97,4 @@ export class PhongMaterial extends Material {
|
|
|
83
97
|
* @property {Sampler} [mainSampler]
|
|
84
98
|
* @property {number} [specularShininess]
|
|
85
99
|
* @property {number} [specularStrength]
|
|
86
|
-
*/
|
|
100
|
+
*/
|
package/src/material/raw.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
import { CullFace, FrontFaceDirection } from "../constants/others.js"
|
|
2
2
|
import { Sampler, Texture } from "../texture/index.js"
|
|
3
3
|
import { abstractClass, abstractMethod } from "../utils/index.js"
|
|
4
4
|
|
|
@@ -24,6 +24,13 @@ export class RawMaterial {
|
|
|
24
24
|
abstractMethod(this, RawMaterial, RawMaterial.prototype.fragment.name)
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
+
/**
|
|
28
|
+
* @returns {import("./alphablend.js").AlphaBlend}
|
|
29
|
+
*/
|
|
30
|
+
alphaBlendMode() {
|
|
31
|
+
abstractMethod(this, RawMaterial, "alphaBlendMode")
|
|
32
|
+
}
|
|
33
|
+
|
|
27
34
|
/**
|
|
28
35
|
* @returns {ArrayBuffer}
|
|
29
36
|
*/
|
|
@@ -46,7 +53,19 @@ export class RawMaterial {
|
|
|
46
53
|
}
|
|
47
54
|
|
|
48
55
|
/**
|
|
49
|
-
* @param {
|
|
56
|
+
* @param {MaterialSpecializeDescriptor} _descriptor
|
|
50
57
|
*/
|
|
51
58
|
specialize(_descriptor) { }
|
|
52
59
|
}
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
* Descriptor passed to `specialize()` before shaders are compiled.
|
|
63
|
+
* @typedef MaterialSpecializeDescriptor
|
|
64
|
+
* @property {CullFace} [cullFace]
|
|
65
|
+
* @property {FrontFaceDirection} [frontFace]
|
|
66
|
+
* @property {boolean} [depthWrite]
|
|
67
|
+
* @property {{
|
|
68
|
+
* source?: import("../core/shader.js").Shader,
|
|
69
|
+
* targets?: Array<{ blend?: unknown }>
|
|
70
|
+
* }} [fragment]
|
|
71
|
+
*/
|
package/src/material/standard.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Color } from "../math/index.js";
|
|
2
|
+
import { OpaqueMode } from "./alphablend.js";
|
|
2
3
|
import { basicVertex, standardFragment } from "../shader/index.js";
|
|
3
4
|
import { Sampler, Texture } from "../texture/index.js";
|
|
4
5
|
import { Material } from "./material.js";
|
|
@@ -82,6 +83,46 @@ export class StandardMaterial extends Material {
|
|
|
82
83
|
*/
|
|
83
84
|
emissiveIntensity
|
|
84
85
|
|
|
86
|
+
/**
|
|
87
|
+
* @type {number}
|
|
88
|
+
*/
|
|
89
|
+
reflectionStrength
|
|
90
|
+
|
|
91
|
+
/**
|
|
92
|
+
* @type {number}
|
|
93
|
+
*/
|
|
94
|
+
transmission
|
|
95
|
+
|
|
96
|
+
/**
|
|
97
|
+
* @type {Texture | undefined}
|
|
98
|
+
*/
|
|
99
|
+
transmissionTexture
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* @type {Sampler | undefined}
|
|
103
|
+
*/
|
|
104
|
+
transmissionSampler
|
|
105
|
+
|
|
106
|
+
/**
|
|
107
|
+
* @type {number}
|
|
108
|
+
*/
|
|
109
|
+
thickness
|
|
110
|
+
|
|
111
|
+
/**
|
|
112
|
+
* @type {Texture | undefined}
|
|
113
|
+
*/
|
|
114
|
+
thicknessTexture
|
|
115
|
+
|
|
116
|
+
/**
|
|
117
|
+
* @type {Sampler | undefined}
|
|
118
|
+
*/
|
|
119
|
+
thicknessSampler
|
|
120
|
+
|
|
121
|
+
/**
|
|
122
|
+
* @type {number}
|
|
123
|
+
*/
|
|
124
|
+
ior
|
|
125
|
+
|
|
85
126
|
/**
|
|
86
127
|
* @type {Texture | undefined}
|
|
87
128
|
*/
|
|
@@ -92,6 +133,11 @@ export class StandardMaterial extends Material {
|
|
|
92
133
|
*/
|
|
93
134
|
emissiveSampler
|
|
94
135
|
|
|
136
|
+
/**
|
|
137
|
+
* @type {import("./alphablend.js").AlphaBlend}
|
|
138
|
+
*/
|
|
139
|
+
alphaBlend = new OpaqueMode()
|
|
140
|
+
|
|
95
141
|
/**
|
|
96
142
|
* @param {StandardMaterialOptions} param0
|
|
97
143
|
*/
|
|
@@ -112,6 +158,14 @@ export class StandardMaterial extends Material {
|
|
|
112
158
|
occlusionSampler,
|
|
113
159
|
emissiveColor = new Color(0, 0, 0),
|
|
114
160
|
emissiveIntensity = 1,
|
|
161
|
+
reflectionStrength = 1,
|
|
162
|
+
transmission = 0,
|
|
163
|
+
transmissionTexture,
|
|
164
|
+
transmissionSampler,
|
|
165
|
+
thickness = 0,
|
|
166
|
+
thicknessTexture,
|
|
167
|
+
thicknessSampler,
|
|
168
|
+
ior = 1.5,
|
|
115
169
|
emissiveTexture,
|
|
116
170
|
emissiveSampler
|
|
117
171
|
} = {}) {
|
|
@@ -137,6 +191,14 @@ export class StandardMaterial extends Material {
|
|
|
137
191
|
|
|
138
192
|
this.emissiveColor = emissiveColor;
|
|
139
193
|
this.emissiveIntensity = emissiveIntensity;
|
|
194
|
+
this.reflectionStrength = reflectionStrength;
|
|
195
|
+
this.transmission = transmission;
|
|
196
|
+
this.transmissionTexture = transmissionTexture;
|
|
197
|
+
this.transmissionSampler = transmissionSampler;
|
|
198
|
+
this.thickness = thickness;
|
|
199
|
+
this.thicknessTexture = thicknessTexture;
|
|
200
|
+
this.thicknessSampler = thicknessSampler;
|
|
201
|
+
this.ior = ior;
|
|
140
202
|
this.emissiveTexture = emissiveTexture;
|
|
141
203
|
this.emissiveSampler = emissiveSampler;
|
|
142
204
|
}
|
|
@@ -155,6 +217,14 @@ export class StandardMaterial extends Material {
|
|
|
155
217
|
return standardFragment
|
|
156
218
|
}
|
|
157
219
|
|
|
220
|
+
/**
|
|
221
|
+
* @override
|
|
222
|
+
* @returns {import("./alphablend.js").AlphaBlend}
|
|
223
|
+
*/
|
|
224
|
+
alphaBlendMode() {
|
|
225
|
+
return this.alphaBlend
|
|
226
|
+
}
|
|
227
|
+
|
|
158
228
|
/**
|
|
159
229
|
* @override
|
|
160
230
|
*/
|
|
@@ -165,7 +235,11 @@ export class StandardMaterial extends Material {
|
|
|
165
235
|
roughness,
|
|
166
236
|
occlusionStrength,
|
|
167
237
|
emissiveColor,
|
|
168
|
-
emissiveIntensity
|
|
238
|
+
emissiveIntensity,
|
|
239
|
+
reflectionStrength,
|
|
240
|
+
transmission,
|
|
241
|
+
thickness,
|
|
242
|
+
ior
|
|
169
243
|
} = this
|
|
170
244
|
|
|
171
245
|
return new Float32Array([
|
|
@@ -177,7 +251,11 @@ export class StandardMaterial extends Material {
|
|
|
177
251
|
emissiveColor.r,
|
|
178
252
|
emissiveColor.g,
|
|
179
253
|
emissiveColor.b,
|
|
180
|
-
emissiveIntensity
|
|
254
|
+
emissiveIntensity,
|
|
255
|
+
reflectionStrength,
|
|
256
|
+
transmission,
|
|
257
|
+
thickness,
|
|
258
|
+
ior
|
|
181
259
|
]).buffer
|
|
182
260
|
}
|
|
183
261
|
|
|
@@ -191,6 +269,8 @@ export class StandardMaterial extends Material {
|
|
|
191
269
|
['normal_texture', 0, this.normalTexture, this.normalSampler],
|
|
192
270
|
['metallic_texture', 0, this.metallicTexture, this.metallicSampler],
|
|
193
271
|
['roughness_texture', 0, this.roughnessTexture, this.roughnessSampler],
|
|
272
|
+
['transmission_texture', 0, this.transmissionTexture, this.transmissionSampler],
|
|
273
|
+
['thickness_texture', 0, this.thicknessTexture, this.thicknessSampler],
|
|
194
274
|
['occlusion_texture', 0, this.occlusionTexture, this.occlusionSampler],
|
|
195
275
|
['emissive_texture', 0, this.emissiveTexture, this.emissiveSampler]
|
|
196
276
|
]
|
|
@@ -216,6 +296,14 @@ export class StandardMaterial extends Material {
|
|
|
216
296
|
* @property {Sampler} [occlusionSampler] The sampler for the ambient occlusion texture.
|
|
217
297
|
* @property {Color} [emissiveColor] The color of emissive light emitted by the material.
|
|
218
298
|
* @property {number} [emissiveIntensity] The intensity of the emissive color.
|
|
299
|
+
* @property {number} [reflectionStrength] The strength of the environment reflection contribution.
|
|
300
|
+
* @property {number} [transmission] The strength of the environment refraction contribution.
|
|
301
|
+
* @property {Texture} [transmissionTexture] A texture that modulates transmission by its red channel.
|
|
302
|
+
* @property {Sampler} [transmissionSampler] The sampler for the transmission texture.
|
|
303
|
+
* @property {number} [thickness] The thickness used to attenuate transmission.
|
|
304
|
+
* @property {Texture} [thicknessTexture] A texture that modulates thickness by its red channel.
|
|
305
|
+
* @property {Sampler} [thicknessSampler] The sampler for the thickness texture.
|
|
306
|
+
* @property {number} [ior] The index of refraction used for transmission.
|
|
219
307
|
* @property {Texture} [emissiveTexture] A texture representing the emissive map.
|
|
220
308
|
* @property {Sampler} [emissiveSampler] The sampler for the emissive texture.
|
|
221
309
|
*/
|