diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4ad23a..1abf3bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ concurrency: env: # The toolchain the port was last verified with (`moonc -v`); bump it deliberately. - MOONBIT_VERSION: 0.10.19+bee578715 + MOONBIT_VERSION: 0.10.21+06da1ed44 jobs: test: diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index b220249..5815308 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -22,7 +22,7 @@ concurrency: cancel-in-progress: false env: - MOONBIT_VERSION: 0.10.19+bee578715 + MOONBIT_VERSION: 0.10.21+06da1ed44 jobs: build: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index dabdc83..82b3d55 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,7 +16,7 @@ on: permissions: {} env: - MOONBIT_VERSION: 0.10.19+bee578715 + MOONBIT_VERSION: 0.10.21+06da1ed44 jobs: publish: diff --git a/diff/addons/gltf/ktx2_diff/tools/ktx2_loader.template.mbt b/diff/addons/gltf/ktx2_diff/tools/ktx2_loader.template.mbt index 8556b27..376bf3d 100644 --- a/diff/addons/gltf/ktx2_diff/tools/ktx2_loader.template.mbt +++ b/diff/addons/gltf/ktx2_diff/tools/ktx2_loader.template.mbt @@ -173,7 +173,7 @@ pub fn KTX2WorkerConfig::to_js(self : KTX2WorkerConfig) -> @core.JsValue { ///| /// A loader for KTX 2.0 GPU texture containers (Basis Universal and raw formats). pub(all) struct KTX2Loader { - base : @loaders.Loader + base : @base_loaders.Loader mut transcoder_path : String mut transcoder_binary : @core.JsValue mut transcoder_pending : @utils.AddonPromise? @@ -183,9 +183,9 @@ pub(all) struct KTX2Loader { } ///| -pub fn KTX2Loader::new(manager? : @loaders.LoadingManager) -> KTX2Loader { +pub fn KTX2Loader::new(manager? : @base_loaders.LoadingManager) -> KTX2Loader { let loader = { - base: @loaders.Loader::new(manager?), + base: @base_loaders.Loader::new(manager?), transcoder_path: "", transcoder_binary: @core.JsValue::null(), transcoder_pending: None, @@ -203,18 +203,18 @@ pub fn KTX2Loader::new(manager? : @loaders.LoadingManager) -> KTX2Loader { } ///| -pub impl @loaders.LoaderLike for KTX2Loader with fn loader(self) { +pub impl @base_loaders.LoaderLike for KTX2Loader with fn loader(self) { self.base } ///| -pub impl @loaders.LoaderSettings for KTX2Loader +pub impl @base_loaders.LoaderSettings for KTX2Loader ///| -pub extend KTX2Loader with @loaders.LoaderLike::{loader} +pub extend KTX2Loader with @base_loaders.LoaderLike::{loader} ///| -pub extend KTX2Loader with @loaders.LoaderSettings::{ +pub extend KTX2Loader with @base_loaders.LoaderSettings::{ set_cross_origin, set_with_credentials, set_path, @@ -317,7 +317,7 @@ pub fn KTX2Loader::detect_support_webgpu( ///| /// Upstream `loader.loadAsync( url )` of `Loader`. fn ktx2_load_async( - loader : @loaders.FileLoader, + loader : @base_loaders.FileLoader, url : String, ) -> @utils.AddonPromise { @utils.AddonPromise::new((resolve, reject) => { @@ -340,11 +340,11 @@ fn ktx2_json_stringify(table : Map[String, Int32]) -> String { pub fn KTX2Loader::init(self : KTX2Loader) -> @utils.AddonPromise { if self.transcoder_pending is None { let base = self.base - let js_loader = @loaders.FileLoader::new(manager=base.manager) + let js_loader = @base_loaders.FileLoader::new(manager=base.manager) ignore(js_loader.set_priority(base.priority)) ignore(js_loader.set_cache(base.cache)) ignore(js_loader.set_with_credentials(base.with_credentials)) - let binary_loader = @loaders.FileLoader::new(manager=base.manager) + let binary_loader = @base_loaders.FileLoader::new(manager=base.manager) ignore(binary_loader.set_priority(base.priority)) ignore(binary_loader.set_cache(base.cache)) ignore(binary_loader.set_with_credentials(base.with_credentials)) @@ -367,7 +367,7 @@ pub fn KTX2Loader::init(self : KTX2Loader) -> @utils.AddonPromise { } self.transcoder_pending = Some( @utils.AddonPromise::all([js_content, binary_content]).then_(fn( - contents : Array[@core.JsValue], + contents : FixedArray[@core.JsValue], ) { let js_content : String = contents[0].cast() let binary_content = contents[1] @@ -427,7 +427,7 @@ pub fn KTX2Loader::load( self : KTX2Loader, url : String, on_load : (@core.Texture) -> Unit, - on_progress? : (@loaders.ProgressEvent) -> Unit, + on_progress? : (@base_loaders.ProgressEvent) -> Unit, on_error? : (@core.JsValue) -> Unit, ) -> Unit { if self.worker_config is None { @@ -436,7 +436,7 @@ pub fn KTX2Loader::load( ) } let base = self.base - let loader = @loaders.FileLoader::new(manager=base.manager) + let loader = @base_loaders.FileLoader::new(manager=base.manager) ignore(loader.set_priority(base.priority)) ignore(loader.set_cache(base.cache)) ignore(loader.set_path(base.path)) @@ -982,7 +982,7 @@ fn ktx2_create_raw_texture_from_levels( depth=container.pixel_depth, ) } - texture.mipmaps = mipmaps.map(m => @core.TextureImage::DataImage(m)) + texture.mipmaps = mipmaps.map(m => DataImage(m)) texture.min_filter = if use_mipmaps { @core.NearestMipmapNearestFilter } else { @@ -1028,7 +1028,7 @@ fn ktx2_create_raw_texture_from_levels( @core.CompressedCubeTexture::new(faces) } else { @core.CompressedTexture::new( - mipmaps=mipmaps.map(m => @core.TextureImage::DataImage(m)), + mipmaps=mipmaps.map(m => DataImage(m)), width=container.pixel_width, height=container.pixel_height, ) diff --git a/src/addons/environments/moon.pkg b/src/addons/environments/moon.pkg index 060c2f0..1f3f1bf 100644 --- a/src/addons/environments/moon.pkg +++ b/src/addons/environments/moon.pkg @@ -1,9 +1,7 @@ import { "moonbit-community/three/core", "moonbit-community/three/math", - "moonbit-community/three/renderers/webgl", "moonbit-community/three/geometries", - "moonbit-community/three/nodes", } warnings = "-79" diff --git a/src/addons/libs/moon.pkg b/src/addons/libs/moon.pkg index 2da80be..07ee920 100644 --- a/src/addons/libs/moon.pkg +++ b/src/addons/libs/moon.pkg @@ -1,7 +1,5 @@ import { "moonbit-community/three/core", - "moonbit-community/three/math", - "moonbit-community/three/renderers/webgl", "moonbitlang/core/double", } diff --git a/src/addons/loaders/draco_loader.mbt b/src/addons/loaders/draco_loader.mbt index 378d61a..845d657 100644 --- a/src/addons/loaders/draco_loader.mbt +++ b/src/addons/loaders/draco_loader.mbt @@ -165,7 +165,7 @@ fn[V] draco_object(map : Map[String, V]) -> JsValue { ///| /// A loader for the Draco format. pub struct DRACOLoader { - base : @loaders.Loader + base : @base_loaders.Loader decoder_paths : DRACODecoderPaths /// Upstream `decoderConfig`, the plain object sent to the workers. mut decoder_config : JsValue @@ -179,9 +179,9 @@ pub struct DRACOLoader { } ///| -pub fn DRACOLoader::new(manager? : @loaders.LoadingManager) -> DRACOLoader { +pub fn DRACOLoader::new(manager? : @base_loaders.LoadingManager) -> DRACOLoader { { - base: @loaders.Loader::new(manager?), + base: @base_loaders.Loader::new(manager?), decoder_paths: { js: DRACO_LIBS_URL + "draco_wasm_wrapper.js", wasm: DRACO_LIBS_URL + "draco_decoder.wasm", @@ -209,18 +209,18 @@ pub fn DRACOLoader::new(manager? : @loaders.LoadingManager) -> DRACOLoader { } ///| -pub impl @loaders.LoaderLike for DRACOLoader with fn loader(self) { +pub impl @base_loaders.LoaderLike for DRACOLoader with fn loader(self) { self.base } ///| -pub impl @loaders.LoaderSettings for DRACOLoader +pub impl @base_loaders.LoaderSettings for DRACOLoader ///| -pub extend DRACOLoader with @loaders.LoaderLike::{loader} +pub extend DRACOLoader with @base_loaders.LoaderLike::{loader} ///| -pub extend DRACOLoader with @loaders.LoaderSettings::{ +pub extend DRACOLoader with @base_loaders.LoaderSettings::{ set_cross_origin, set_with_credentials, set_path, @@ -238,14 +238,14 @@ pub fn DRACOLoader::set_decoder_path( path : String, ) -> DRACOLoader { let decoder_paths = self.decoder_paths - decoder_paths.js = @loaders.LoaderUtils::resolve_url( + decoder_paths.js = @base_loaders.LoaderUtils::resolve_url( "draco_wasm_wrapper.js", path, ) - decoder_paths.wasm = @loaders.LoaderUtils::resolve_url( + decoder_paths.wasm = @base_loaders.LoaderUtils::resolve_url( "draco_decoder.wasm", path, ) decoder_paths.dep_js = Some( - @loaders.LoaderUtils::resolve_url("draco_decoder.js", path), + @base_loaders.LoaderUtils::resolve_url("draco_decoder.js", path), ) self } @@ -292,11 +292,11 @@ pub fn DRACOLoader::load( self : DRACOLoader, url : String, on_load : (@core.BufferGeometry) -> Unit, - on_progress? : (@loaders.ProgressEvent) -> Unit, + on_progress? : (@base_loaders.ProgressEvent) -> Unit, on_error? : (JsValue) -> Unit, ) -> Unit { let base = self.base - let loader = @loaders.FileLoader::new(manager=base.manager) + let loader = @base_loaders.FileLoader::new(manager=base.manager) loader.set_priority(base.priority) |> ignore loader.set_cache(base.cache) |> ignore loader.set_path(base.path) |> ignore @@ -427,7 +427,7 @@ fn DRACOLoader::create_geometry( geometry.set_index(@core.BufferAttribute::new(index.get("array").cast(), 1)) |> ignore } - let attributes : Array[JsValue] = geometry_data.get("attributes").cast() + let attributes : Array[JsValue] = gltf_array(geometry_data.get("attributes")) for i in 0.. @utils.AddonPromise { let base = self.base - let loader = @loaders.FileLoader::new(manager=base.manager) + let loader = @base_loaders.FileLoader::new(manager=base.manager) loader.set_priority(base.priority) |> ignore loader.set_cache(base.cache) |> ignore loader.set_response_type(response_type) |> ignore @@ -525,7 +523,7 @@ fn DRACOLoader::init_decoder(self : DRACOLoader) -> @utils.AddonPromise { libraries_pending.push(self.load_library(decoder_paths.wasm, "arraybuffer")) } let pending = @utils.AddonPromise::all(libraries_pending).then_(( - libraries : Array[JsValue], + libraries : FixedArray[JsValue], ) => { let js_content : String = libraries[0].cast() if !use_js { diff --git a/src/addons/loaders/exr_loader.mbt b/src/addons/loaders/exr_loader.mbt index 6ed27f6..b76988e 100644 --- a/src/addons/loaders/exr_loader.mbt +++ b/src/addons/loaders/exr_loader.mbt @@ -13,7 +13,7 @@ ///| /// A loader for the OpenEXR texture format. pub(all) struct EXRLoader { - mut base : @loaders.DataTextureLoader + mut base : @base_loaders.DataTextureLoader /// The texture type, `HalfFloatType` (default) or `FloatType`. mut type_ : Int32 /// Texture output format: `RGBAFormat` (default), `RGFormat` or `RedFormat`. @@ -23,32 +23,32 @@ pub(all) struct EXRLoader { } ///| -pub fn EXRLoader::new(manager? : @loaders.LoadingManager) -> EXRLoader { +pub fn EXRLoader::new(manager? : @base_loaders.LoadingManager) -> EXRLoader { let loader : EXRLoader = { - base: @loaders.DataTextureLoader::new(manager?), + base: @base_loaders.DataTextureLoader::new(manager?), type_: @core.HalfFloatType, output_format: @core.RGBAFormat, part: 0, } - loader.base = @loaders.DataTextureLoader::new(manager?, parse=buffer => { + loader.base = @base_loaders.DataTextureLoader::new(manager?, parse=buffer => { loader.parse(buffer) }) loader } ///| -pub impl @loaders.LoaderLike for EXRLoader with fn loader(self) { +pub impl @base_loaders.LoaderLike for EXRLoader with fn loader(self) { self.base.base } ///| -pub impl @loaders.LoaderSettings for EXRLoader +pub impl @base_loaders.LoaderSettings for EXRLoader ///| -pub extend EXRLoader with @loaders.LoaderLike::{loader} +pub extend EXRLoader with @base_loaders.LoaderLike::{loader} ///| -pub extend EXRLoader with @loaders.LoaderSettings::{ +pub extend EXRLoader with @base_loaders.LoaderSettings::{ set_cross_origin, set_with_credentials, set_path, @@ -65,8 +65,8 @@ pub extend EXRLoader with @loaders.LoaderSettings::{ pub fn EXRLoader::load( self : EXRLoader, url : String, - on_load? : (@core.Texture, @loaders.DataTexData) -> Unit, - on_progress? : (@loaders.ProgressEvent) -> Unit, + on_load? : (@core.Texture, @base_loaders.DataTexData) -> Unit, + on_progress? : (@base_loaders.ProgressEvent) -> Unit, on_error? : (@core.JsValue) -> Unit, ) -> @core.Texture { self.base.load(url, on_load?, on_progress?, on_error?) @@ -77,8 +77,8 @@ pub fn EXRLoader::load( pub async fn EXRLoader::load_async( self : EXRLoader, url : String, - on_progress? : (@loaders.ProgressEvent) -> Unit, -) -> @core.Texture raise @loaders.LoaderError { + on_progress? : (@base_loaders.ProgressEvent) -> Unit, +) -> @core.Texture raise @base_loaders.LoaderError { self.base.load_async(url, on_progress?) } @@ -1318,10 +1318,8 @@ priv struct ExrDwaChannel { mut compression : Int32 mut decoded : Bool type_ : Int32 - p_linear : Int32 width : Int32 height : Int32 - mut offset : Int32 } ///| @@ -1760,7 +1758,6 @@ priv enum ExrDecodeKind { /// A channel of a deep part. priv struct ExrDeepChannel { name : String - pixel_type : Int32 bytes_per_sample : Int32 } @@ -1793,7 +1790,6 @@ priv struct ExrDecoder { mut out_line_width : Int32 mut tile_count : Int32 mut deep_channels : Array[ExrDeepChannel] - mut deep_bytes_per_sample : Int32 mut chunk_offsets : Array[Double] mut multi_part : Bool mut decode : ExrDecodeKind @@ -2259,10 +2255,8 @@ fn exr_uncompress_dwa(state : ExrParse, info : ExrDecoder) -> ExrDataView { compression: EXR_UNKNOWN, decoded: false, type_: channel.pixel_type, - p_linear: channel.p_linear, width: info.columns, height: info.lines, - offset: 0, }) } let csc_set : Array[Int32?] = Array::make(16, None) @@ -2281,7 +2275,6 @@ fn exr_uncompress_dwa(state : ExrParse, info : ExrDecoder) -> ExrDataView { if rule.index >= 0 { csc_set[rule.index] = Some(offset) } - cd.offset = offset } } } @@ -3270,7 +3263,7 @@ fn exr_window_size(min : Int32, max : Int32) -> Double { ///| fn ExrParse::setup_decoder( - self : ExrParse, + _self : ExrParse, exr_header : ExrHeader, data_view : ExrDataView, u_int8_array : @core.TypedArray, @@ -3306,7 +3299,6 @@ fn ExrParse::setup_decoder( out_line_width: 0, tile_count: 0, deep_channels: [], - deep_bytes_per_sample: 0, chunk_offsets: [], multi_part: false, decode: Scanline, @@ -3494,7 +3486,6 @@ fn ExrParse::setup_decoder( // Deep format: offset tables are already parsed in the main flow. // Compute per-channel byte sizes for the deep pixel data layout. exr_decoder.deep_channels = [] - let mut deep_bytes_per_sample = 0 for channel in exr_header.channels() { // UINT=0→4bytes, HALF=1→2bytes, FLOAT=2→4bytes let bytes_per_sample = if channel.pixel_type == 0 { @@ -3502,14 +3493,8 @@ fn ExrParse::setup_decoder( } else { channel.pixel_type * 2 } - exr_decoder.deep_channels.push({ - name: channel.name, - pixel_type: channel.pixel_type, - bytes_per_sample, - }) - deep_bytes_per_sample += bytes_per_sample - } - exr_decoder.deep_bytes_per_sample = deep_bytes_per_sample + exr_decoder.deep_channels.push({ name: channel.name, bytes_per_sample, }) + } exr_decoder.chunk_offsets = exr_header.chunk_offsets.unwrap_or([]) exr_decoder.multi_part = exr_header.spec.multi_part exr_decoder.decode = DeepScanline @@ -3587,7 +3572,7 @@ extern "js" fn exr_tex_extra(header : @core.JsValue) -> @core.JsValue = "(h) => pub fn EXRLoader::parse( self : EXRLoader, buffer : @core.JsValue, -) -> @loaders.DataTexData { +) -> @base_loaders.DataTexData { let state = ExrParse::new() // start parsing file [START] let offset = Ref(0) @@ -3689,7 +3674,7 @@ pub fn EXRLoader::parse( } } } - let tex_data = @loaders.DataTexData::new() + let tex_data = @base_loaders.DataTexData::new() tex_data.extra = Some(exr_tex_extra(exr_header.to_js())) tex_data.width = Some(exr_decoder.width) tex_data.height = Some(exr_decoder.height) diff --git a/src/addons/loaders/gltf_extensions.mbt b/src/addons/loaders/gltf_extensions.mbt index 6587c35..f29b934 100644 --- a/src/addons/loaders/gltf_extensions.mbt +++ b/src/addons/loaders/gltf_extensions.mbt @@ -92,7 +92,7 @@ impl GLTFPlugin for GLTFLightsExtension with fn mark_defs(self) { let parser = self.parser let node_defs = gltf_or( self.parser.json.get("nodes"), - JsValue::of(([] : Array[Int32])), + JsValue::of(([] : FixedArray[Int32])), ) for node_index in 0.. { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -465,7 +465,7 @@ impl GLTFPlugin for GLTFMaterialsDiffuseRoughnessExtension with fn get_material_ material_index, ) { gltf_get_material_extension(self.parser, material_index, self.name).map(_ => { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -527,7 +527,7 @@ impl GLTFPlugin for GLTFMaterialsDispersionExtension with fn get_material_type( material_index, ) { gltf_get_material_extension(self.parser, material_index, self.name).map(_ => { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -577,7 +577,7 @@ impl GLTFPlugin for GLTFMaterialsIridescenceExtension with fn get_material_type( material_index, ) { gltf_get_material_extension(self.parser, material_index, self.name).map(_ => { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -656,7 +656,7 @@ impl GLTFPlugin for GLTFMaterialsSheenExtension with fn get_material_type( material_index, ) { gltf_get_material_extension(self.parser, material_index, self.name).map(_ => { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -740,7 +740,7 @@ impl GLTFPlugin for GLTFMaterialsTransmissionExtension with fn get_material_type material_index, ) { gltf_get_material_extension(self.parser, material_index, self.name).map(_ => { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -795,7 +795,7 @@ impl GLTFPlugin for GLTFMaterialsVolumeExtension with fn get_material_type( material_index, ) { gltf_get_material_extension(self.parser, material_index, self.name).map(_ => { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -831,7 +831,7 @@ impl GLTFPlugin for GLTFMaterialsVolumeExtension with fn extend_material_params( ) let color_array = gltf_or( extension.get("attenuationColor"), - JsValue::of([1.0, 1.0, 1.0]), + JsValue::of(([1.0, 1.0, 1.0] : FixedArray[Double])), ) material_params["attenuationColor"] = Color( gltf_color_from_array(color_array), @@ -862,7 +862,7 @@ impl GLTFPlugin for GLTFMaterialsIorExtension with fn get_material_type( material_index, ) { gltf_get_material_extension(self.parser, material_index, self.name).map(_ => { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -911,7 +911,7 @@ impl GLTFPlugin for GLTFMaterialsSpecularExtension with fn get_material_type( material_index, ) { gltf_get_material_extension(self.parser, material_index, self.name).map(_ => { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -944,7 +944,7 @@ impl GLTFPlugin for GLTFMaterialsSpecularExtension with fn extend_material_param } let color_array = gltf_or( extension.get("specularColorFactor"), - JsValue::of([1.0, 1.0, 1.0]), + JsValue::of(([1.0, 1.0, 1.0] : FixedArray[Double])), ) material_params["specularColor"] = Color(gltf_color_from_array(color_array)) if gltf_defined(extension.get("specularColorTexture")) { @@ -983,7 +983,7 @@ impl GLTFPlugin for GLTFMaterialsBumpExtension with fn get_material_type( material_index, ) { gltf_get_material_extension(self.parser, material_index, self.name).map(_ => { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -1043,7 +1043,7 @@ impl GLTFPlugin for GLTFMaterialsAnisotropyExtension with fn get_material_type( material_index, ) { gltf_get_material_extension(self.parser, material_index, self.name).map(_ => { - GLTFMaterialType::MeshPhysicalMaterial + MeshPhysicalMaterial }) } @@ -1385,8 +1385,8 @@ impl GLTFPlugin for GLTFMeshGpuInstancing with fn create_node_mesh( } pending.push(self.parser.create_node_mesh(node_index).unwrap()) Some( - AddonPromise::all(pending).then_(fn(results : Array[JsValue]) { - let node_object : @core.Object3D = results.pop().unwrap().cast() + AddonPromise::all(pending).then_(fn(results : FixedArray[JsValue]) { + let node_object : @core.Object3D = results[results.length() - 1].cast() let meshes = if node_object.is_group() { node_object.children } else { @@ -1511,11 +1511,18 @@ extern "js" fn gltf_object_assign_copy(o : JsValue) -> JsValue = "(o) => Object. ///| /// The order `for ( const k in object )` visits these keys: integer-like keys first, /// ascending, then the others in insertion order. -extern "js" fn gltf_js_key_order(keys : Array[String]) -> Array[String] = +extern "js" fn gltf_js_key_order_fixed( + keys : FixedArray[String], +) -> FixedArray[String] = #|(keys) => { const o = {}; for (const k of keys) o[k] = true; return Object.keys(o); } // --- KHR_binary_glTF ----------------------------------------------------------------- +///| +fn gltf_js_key_order(keys : Array[String]) -> Array[String] { + Array::from_fixed_array(gltf_js_key_order_fixed(FixedArray::from_array(keys))) +} + ///| /// The `.glb` header. pub(all) struct GLTFBinaryHeader { @@ -1728,13 +1735,13 @@ pub fn GLTFTextureTransformExtension::extend_texture( texture.channel = tex_coord.cast() } if gltf_defined(transform.get("offset")) { - texture.offset.from_array(transform.get("offset").cast()) |> ignore + texture.offset.from_array(gltf_array(transform.get("offset"))) |> ignore } if gltf_defined(transform.get("rotation")) { texture.rotation = transform.get("rotation").cast() } if gltf_defined(transform.get("scale")) { - texture.repeat.from_array(transform.get("scale").cast()) |> ignore + texture.repeat.from_array(gltf_array(transform.get("scale"))) |> ignore } if gltf_defined(transform.get("rotation")) { // glTF's KHR_texture_transform order differs from three.js: diff --git a/src/addons/loaders/gltf_interpolant.mbt b/src/addons/loaders/gltf_interpolant.mbt index 96e5078..d52bd3d 100644 --- a/src/addons/loaders/gltf_interpolant.mbt +++ b/src/addons/loaders/gltf_interpolant.mbt @@ -3,9 +3,20 @@ // https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#appendix-c-spline-interpolation ///| -/// A typed array read and written in place as an `Array[Double]` (indexing compiles -/// to `a[ i ]`). -fn gltf_typed_as_array(array : @core.TypedArray) -> Array[Double] = "%identity" +priv struct GltfTypedArrayView { + buf : @core.TypedArray + len : Int32 +} + +///| +fn gltf_typed_array_view(view : GltfTypedArrayView) -> Array[Double] = "%identity" + +///| +/// Shares typed storage through MoonBit's array header; only indexing and length +/// are valid on this fixed-size view. +fn gltf_typed_as_array(array : @core.TypedArray) -> Array[Double] { + gltf_typed_array_view({ buf: array, len: array.length(), }) +} ///| let gltf_interpolant_quaternion : @math.Quaternion = @math.Quaternion::new( @@ -118,7 +129,7 @@ pub fn gltf_cubic_spline_interpolant( } ///| -extern "js" fn gltf_is_float32_array(v : @core.JsValue) -> Bool = "(v) => v instanceof Float32Array" +extern "js" fn gltf_is_float32_array(v : @core.JsValue) -> Bool = "(v) => v.buf instanceof Float32Array" ///| /// `InterpolantFactoryMethodGLTFCubicSpline( result )`, set as a track's diff --git a/src/addons/loaders/gltf_js.mbt b/src/addons/loaders/gltf_js.mbt index 629e4c3..096538b 100644 --- a/src/addons/loaders/gltf_js.mbt +++ b/src/addons/loaders/gltf_js.mbt @@ -25,9 +25,14 @@ fn gltf_defined(value : JsValue) -> Bool { ///| /// The keys `for ( const k in o )` visits. -extern "js" fn gltf_keys(object : JsValue) -> Array[String] = +extern "js" fn gltf_keys_fixed(object : JsValue) -> FixedArray[String] = #|(o) => { const r = []; if (o === undefined || o === null) return r; for (const k in o) r.push(k); return r; } +///| +fn gltf_keys(object : JsValue) -> Array[String] { + Array::from_fixed_array(gltf_keys_fixed(object)) +} + ///| /// `Array.isArray( v )`. extern "js" fn gltf_is_array(value : JsValue) -> Bool = "(v) => Array.isArray(v)" @@ -88,10 +93,6 @@ extern "js" fn gltf_get_uint32( index : Int32, ) -> Double = "(b, o, i) => new DataView(b, o).getUint32(i, true)" -///| -/// `buffer.byteLength`. -extern "js" fn gltf_byte_length(buffer : JsValue) -> Int32 = "(b) => b.byteLength" - ///| /// `buffer.slice( begin, end )` on an `ArrayBuffer`. extern "js" fn gltf_slice( @@ -136,7 +137,12 @@ extern "js" fn gltf_concat_key(a : JsValue, b : JsValue) -> String = "(a, b) => ///| /// `Object.keys( o ).sort()`. -extern "js" fn gltf_sorted_keys(object : JsValue) -> Array[String] = "(o) => Object.keys(o).sort()" +extern "js" fn gltf_sorted_keys_fixed(object : JsValue) -> FixedArray[String] = "(o) => Object.keys(o).sort()" + +///| +fn gltf_sorted_keys(object : JsValue) -> Array[String] { + Array::from_fixed_array(gltf_sorted_keys_fixed(object)) +} ///| /// `getImageURIMimeType( uri )`. @@ -251,7 +257,12 @@ extern "js" fn GltfJsMap::size(self : GltfJsMap) -> Int32 = "(m) => m.size" ///| /// `Array.from( map.values() )`. -extern "js" fn GltfJsMap::values(self : GltfJsMap) -> Array[JsValue] = "(m) => Array.from(m.values())" +extern "js" fn GltfJsMap::values_fixed(self : GltfJsMap) -> FixedArray[JsValue] = "(m) => Array.from(m.values())" + +///| +fn GltfJsMap::values(self : GltfJsMap) -> Array[JsValue] { + Array::from_fixed_array(GltfJsMap::values_fixed(self)) +} ///| /// `sanitizedName in this.nodeNamesUsed` on a plain object, as upstream. @@ -313,3 +324,9 @@ extern "js" fn gltf_uint8_view( ///| /// `res.buffer`. extern "js" fn gltf_buffer_of(value : JsValue) -> JsValue = "(v) => v.buffer" + +///| +/// Copies a plain JS array into a resizable MoonBit array. +fn[T] gltf_array(value : JsValue) -> Array[T] { + Array::from_fixed_array((value.cast() : FixedArray[T])) +} diff --git a/src/addons/loaders/gltf_loader.mbt b/src/addons/loaders/gltf_loader.mbt index a2e4c61..015e6f3 100644 --- a/src/addons/loaders/gltf_loader.mbt +++ b/src/addons/loaders/gltf_loader.mbt @@ -166,7 +166,7 @@ pub struct GLTFResult { ///| /// Loads glTF 2.0 assets (`.gltf` and `.glb`). pub struct GLTFLoader { - base : @loaders.Loader + base : @base_loaders.Loader mut draco_loader : DRACOLoader? mut ktx2_loader : KTX2Loader? mut meshopt_decoder : @core.JsValue? @@ -174,15 +174,15 @@ pub struct GLTFLoader { } ///| -pub impl @loaders.LoaderLike for GLTFLoader with fn loader(self) { +pub impl @base_loaders.LoaderLike for GLTFLoader with fn loader(self) { self.base } ///| -pub impl @loaders.LoaderSettings for GLTFLoader +pub impl @base_loaders.LoaderSettings for GLTFLoader ///| -pub extend GLTFLoader with @loaders.LoaderSettings::{ +pub extend GLTFLoader with @base_loaders.LoaderSettings::{ set_cross_origin, set_with_credentials, set_path, @@ -193,12 +193,12 @@ pub extend GLTFLoader with @loaders.LoaderSettings::{ } ///| -pub extend GLTFLoader with @loaders.LoaderLike::{loader} +pub extend GLTFLoader with @base_loaders.LoaderLike::{loader} ///| -pub fn GLTFLoader::new(manager? : @loaders.LoadingManager) -> GLTFLoader { +pub fn GLTFLoader::new(manager? : @base_loaders.LoadingManager) -> GLTFLoader { let loader = { - base: @loaders.Loader::new(manager?), + base: @base_loaders.Loader::new(manager?), draco_loader: None, ktx2_loader: None, meshopt_decoder: None, @@ -237,7 +237,7 @@ pub fn GLTFLoader::load( self : GLTFLoader, url : String, on_load : (GLTFResult) -> Unit, - on_progress? : (@loaders.ProgressEvent) -> Unit, + on_progress? : (@base_loaders.ProgressEvent) -> Unit, on_error? : (@core.JsValue) -> Unit, ) -> Unit { let base = self.base @@ -245,10 +245,10 @@ pub fn GLTFLoader::load( base.resource_path } else if base.path != "" { // If a base path is set, resources will be relative paths from that plus the relative path of the gltf file - let relative_url = @loaders.LoaderUtils::extract_url_base(url) - @loaders.LoaderUtils::resolve_url(relative_url, base.path) + let relative_url = @base_loaders.LoaderUtils::extract_url_base(url) + @base_loaders.LoaderUtils::resolve_url(relative_url, base.path) } else { - @loaders.LoaderUtils::extract_url_base(url) + @base_loaders.LoaderUtils::extract_url_base(url) } // Tells the LoadingManager to track an extra item, which resolves after @@ -262,7 +262,7 @@ pub fn GLTFLoader::load( base.manager.item_error(url) base.manager.item_end(url) } - let loader = @loaders.FileLoader::new(manager=base.manager) + let loader = @base_loaders.FileLoader::new(manager=base.manager) loader.set_priority(base.priority) |> ignore loader.set_cache(base.cache) |> ignore loader.set_path(base.path) |> ignore @@ -357,8 +357,8 @@ pub fn GLTFLoader::parse( on_load : (GLTFResult) -> Unit, on_error? : (@core.JsValue) -> Unit, ) -> Unit { - let extensions : Map[String, GLTFExtension] = {} - let plugins : Map[String, &GLTFPlugin] = {} + let extensions : Map[String, GLTFExtension] = Map([]) + let plugins : Map[String, &GLTFPlugin] = Map([]) let json = if gltf_is_string(data) { gltf_json_parse(data) } else if gltf_is_array_buffer(data) { @@ -433,7 +433,7 @@ pub fn GLTFLoader::parse( let extension_name : String = gltf_at(extensions_used, i).cast() let extensions_required = gltf_or( json.get("extensionsRequired"), - @core.JsValue::of(([] : Array[String])), + @core.JsValue::of(([] : FixedArray[String])), ) match extension_name { "KHR_materials_unlit" => diff --git a/src/addons/loaders/gltf_loader_wbtest.mbt b/src/addons/loaders/gltf_loader_wbtest.mbt index 9dc3490..43452d9 100644 --- a/src/addons/loaders/gltf_loader_wbtest.mbt +++ b/src/addons/loaders/gltf_loader_wbtest.mbt @@ -3,16 +3,79 @@ // additive clip). Whole-asset loads are compared against upstream by the differential // harness (diff/addons/gltf/gltf_diff). +///| +/// `buffer.byteLength`. +extern "js" fn gltf_byte_length(buffer : JsValue) -> Int32 = "(b) => b.byteLength" + ///| fn gltf_test_json(text : String) -> JsValue { gltf_json_parse(gltf_js_string(text)) } +///| +async test "GLTFLoader parses scene arrays and node transforms" { + let data = JsValue::from_json({ + "asset": { "version": "2.0" }, + "scene": 0, + "scenes": [{ "nodes": [0] }], + "nodes": [ + { + "name": "parent", + "children": [1], + "translation": [1, 2, 3], + "scale": [2, 3, 4], + }, + { + "name": "child", + "matrix": [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 4, 5, 6, 1], + }, + ], + "cameras": [ + { + "type": "perspective", + "perspective": { "yfov": 1, "znear": 0.1, "zfar": 100 }, + }, + ], + }) + let result = @base_loaders.loader_promise(fn(resolve, reject) { + GLTFLoader::new().parse(data, "", resolve, on_error=reject) + }) + assert_eq(result.scenes.length(), 1) + assert_eq(result.animations.length(), 0) + assert_eq(result.cameras.length(), 1) + let parent = result.scene.unwrap().children[0] + assert_eq(parent.position.to_array(), [1.0, 2, 3]) + assert_eq(parent.scale.to_array(), [2.0, 3, 4]) + assert_eq(parent.children[0].position.to_array(), [4.0, 5, 6]) + assert_eq(parent.children[0].matrix_world.elements[12:15].to_owned(), [ + 9.0, 17, 27, + ]) + assert_true(result.parser.associations.entries().length() >= 2) +} + +///| +async test "AddonPromise all preserves mixed values and nested arrays" { + let values = [JsValue::of(1), @utils.AddonPromise::resolve(2).to_js()] + values.push(JsValue::of(99)) + ignore(values.pop()) + let result = @base_loaders.loader_promise(fn(resolve, reject) { + @utils.AddonPromise::all([ + @utils.AddonPromise::all_values(values), + @utils.AddonPromise::all([]), + ]) + .then_(fn(result : FixedArray[JsValue]) { resolve(result) }) + .catch_(fn(error) { reject(error) }) + |> ignore + }) + assert_eq(result[0].to_json(), [1, 2]) + assert_eq(result[1].to_json(), []) +} + ///| test "child credentials" { let loader = GLTFLoader::new() loader.set_with_credentials(true) |> ignore - let captured : Ref[GLTFParser?] = Ref::new(None) + let captured : Ref[GLTFParser?] = Ref(None) let capture = fn(parser) -> &GLTFPlugin { captured.val = Some(parser) GLTFMeshQuantizationTestPlugin::{ } @@ -59,7 +122,7 @@ test "CUBICSPLINE animations can be made additive at an interpolated frame" { cache: "default", with_credentials: false, request_header: {}, - manager: @loaders.default_loading_manager, + manager: @base_loaders.default_loading_manager, ktx2_loader: None, meshopt_decoder: None, }) @@ -91,16 +154,16 @@ test "CUBICSPLINE animations can be made additive at an interpolated frame" { fps=30, ) |> ignore - inspect( + debug_inspect( clip.tracks[0].values.numbers().to_array(), content="[0, 0, 0, -1, -1, -1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0]", ) // the interpolant: halfway along the spline with zero tangents - inspect( + debug_inspect( clip.tracks[0].create_interpolant().evaluate(0.5), content="[0, 0, 0]", ) - inspect(tracks[0].get_interpolation(), content="None") + debug_inspect(tracks[0].get_interpolation(), content="None") } ///| @@ -112,11 +175,11 @@ test "cubic spline quaternion interpolant normalizes" { ] let i = gltf_cubic_spline_interpolant(times, values, 4, quaternion=true) let r = i.evaluate(0.5) - inspect(r, content="[0, 0.7071067811865475, 0, 0.7071067811865475]") + debug_inspect(r, content="[0, 0.7071067811865475, 0, 0.7071067811865475]") let p = gltf_cubic_spline_interpolant(times, values, 4) // without normalization, and written to a Float32Array result buffer - inspect(p.evaluate(0.5), content="[0, 0.5, 0, 0.5]") - inspect(p.evaluate(-1), content="[0, 0, 0, 1]") + debug_inspect(p.evaluate(0.5), content="[0, 0.5, 0, 0.5]") + debug_inspect(p.evaluate(-1), content="[0, 0, 0, 1]") } ///| @@ -138,7 +201,12 @@ test "binary glTF container" { let glb = GLTFBinaryExtension::new(gltf_test_glb("{\"asset\":{}}", 2)) inspect(glb.header.magic, content="glTF") inspect(glb.header.version, content="2") - inspect(glb.content, content="Some({\"asset\":{}})") + debug_inspect( + glb.content, + content=( + #|Some("{\"asset\":{}}") + ), + ) inspect(gltf_byte_length(glb.body.unwrap()), content="8") let error = @utils.addon_try(fn() { ignore(GLTFBinaryExtension::new(gltf_test_glb("{}", 1))) @@ -161,9 +229,11 @@ test "unsupported assets reach onError" { _ => (), on_error=e => errors.push(gltf_string(gltf_error_message(e))), ) - inspect( + debug_inspect( errors, - content="[THREE.GLTFLoader: Unsupported asset. glTF versions >=2.0 are supported.]", + content=( + #|["THREE.GLTFLoader: Unsupported asset. glTF versions >=2.0 are supported."] + ), ) } @@ -196,7 +266,7 @@ test "unique names" { cache: "default", with_credentials: false, request_header: {}, - manager: @loaders.default_loading_manager, + manager: @base_loaders.default_loading_manager, ktx2_loader: None, meshopt_decoder: None, }) @@ -207,7 +277,12 @@ test "unique names" { parser.create_unique_name(JsValue::undefined()), parser.create_unique_name(gltf_js_string("")), ] - inspect(names, content="[a_b, a_b_1, ab, , _1]") + debug_inspect( + names, + content=( + #|["a_b", "a_b_1", "ab", "", "_1"] + ), + ) } ///| @@ -226,5 +301,5 @@ test "texture transform" { assert_false(physical_equal(t, texture)) inspect(t.channel, content="1") inspect(t.matrix_auto_update, content="false") - inspect(t.matrix.elements, content="[2, 0, 0, 0, 4, 0, 0.5, 0.25, 1]") + debug_inspect(t.matrix.elements, content="[2, 0, 0, 0, 4, 0, 0.5, 0.25, 1]") } diff --git a/src/addons/loaders/gltf_parser.mbt b/src/addons/loaders/gltf_parser.mbt index d05369d..05d73ec 100644 --- a/src/addons/loaders/gltf_parser.mbt +++ b/src/addons/loaders/gltf_parser.mbt @@ -12,7 +12,7 @@ pub(all) struct GLTFParserOptions { cache : String with_credentials : Bool request_header : Map[String, String] - manager : @loaders.LoadingManager + manager : @base_loaders.LoadingManager ktx2_loader : KTX2Loader? meshopt_decoder : JsValue? } @@ -20,8 +20,8 @@ pub(all) struct GLTFParserOptions { ///| /// A loader `loadImageSource` can use: `parser.textureLoader` or the KTX2 loader. pub enum GLTFImageLoader { - TextureLoader(@loaders.TextureLoader) - ImageBitmapLoader(@loaders.ImageBitmapLoader) + TextureLoader(@base_loaders.TextureLoader) + ImageBitmapLoader(@base_loaders.ImageBitmapLoader) KTX2Loader(KTX2Loader) } @@ -47,7 +47,7 @@ pub struct GLTFParser { /// Track node names, to ensure no duplicates (a plain JS object, as upstream). node_names_used : JsValue texture_loader : GLTFImageLoader - file_loader : @loaders.FileLoader + file_loader : @base_loaders.FileLoader } ///| @@ -62,7 +62,7 @@ pub fn GLTFParser::new( // Use an ImageBitmapLoader if imageBitmaps are supported. Moves much of the // expensive work of uploading a texture to the GPU off the main thread. let texture_loader = if gltf_use_texture_loader() { - let loader = @loaders.TextureLoader::new(manager=options.manager) + let loader = @base_loaders.TextureLoader::new(manager=options.manager) loader.set_priority(options.priority) |> ignore loader.set_cache(options.cache) |> ignore loader.set_cross_origin(options.cross_origin) |> ignore @@ -70,15 +70,15 @@ pub fn GLTFParser::new( loader.set_request_header(options.request_header) |> ignore GLTFImageLoader::TextureLoader(loader) } else { - let loader = @loaders.ImageBitmapLoader::new(manager=options.manager) + let loader = @base_loaders.ImageBitmapLoader::new(manager=options.manager) loader.set_priority(options.priority) |> ignore loader.set_cache(options.cache) |> ignore loader.set_cross_origin(options.cross_origin) |> ignore loader.set_with_credentials(options.with_credentials) |> ignore loader.set_request_header(options.request_header) |> ignore - GLTFImageLoader::ImageBitmapLoader(loader) + ImageBitmapLoader(loader) } - let file_loader = @loaders.FileLoader::new(manager=options.manager) + let file_loader = @base_loaders.FileLoader::new(manager=options.manager) file_loader.set_priority(options.priority) |> ignore file_loader.set_cache(options.cache) |> ignore file_loader.set_response_type("arraybuffer") |> ignore @@ -195,7 +195,7 @@ pub fn GLTFParser::parse( // Mark the special nodes/meshes in json for efficient parse self.invoke_all(fn(ext) { ext.mark_defs() - None + (None : Unit?) }) |> ignore let chain = AddonPromise::all(self.invoke_all(ext => ext.before_root())) @@ -206,15 +206,15 @@ pub fn GLTFParser::parse( parser.get_dependencies("camera"), ]) }) - .then_(fn(dependencies : Array[JsValue]) { - let scenes : Array[@core.Object3D] = dependencies[0].cast() + .then_(fn(dependencies : FixedArray[JsValue]) { + let scenes : Array[@core.Object3D] = gltf_array(dependencies[0]) let scene_index = gltf_or(json.get("scene"), gltf_js_number(0)) let scene : @core.Object3D? = gltf_at(dependencies[0], scene_index.cast()).cast() let result = { scene, scenes, - animations: dependencies[1].cast(), - cameras: dependencies[2].cast(), + animations: gltf_array(dependencies[1]), + cameras: gltf_array(dependencies[2]), asset: json.get("asset"), parser, user_data: JsValue::object(), @@ -244,7 +244,7 @@ pub fn GLTFParser::parse( ///| /// Marks the special nodes/meshes in json for efficient parse. fn GLTFParser::mark_defs(self : GLTFParser) -> Unit { - let empty = JsValue::of(([] : Array[Int32])) + let empty = JsValue::of(([] : FixedArray[Int32])) let node_defs = gltf_or(self.json.get("nodes"), empty) let skin_defs = gltf_or(self.json.get("skins"), empty) let mesh_defs = gltf_or(self.json.get("meshes"), empty) @@ -439,7 +439,7 @@ pub fn GLTFParser::get_dependencies( let parser = self let defs = gltf_or( self.json.get(type_ + (if type_ == "mesh" { "es" } else { "s" })), - JsValue::of(([] : Array[Int32])), + JsValue::of(([] : FixedArray[Int32])), ) let pending = [] for index in 0.. // KTX2Loader parses the binary image data from bufferView directly (see #35193). @@ -863,7 +863,10 @@ fn GLTFParser::load_image_source( } AddonPromise::resolve(source_uri.val).then_(fn(source_uri : String) { AddonPromise::new(fn(resolve, reject) { - let url = @loaders.LoaderUtils::resolve_url(source_uri, options.path) + let url = @base_loaders.LoaderUtils::resolve_url( + source_uri, + options.path, + ) match loader { ImageBitmapLoader(loader) => loader.load( @@ -1141,7 +1144,7 @@ fn GLTFParser::load_material( let json = self.json let extensions = self.extensions let material_def = gltf_at(json.get("materials"), material_index) - let material_params : GLTFMaterialParams = {} + let material_params : GLTFMaterialParams = Map([]) let material_extensions = gltf_or( material_def.get("extensions"), JsValue::object(), @@ -1443,9 +1446,11 @@ fn GLTFParser::load_mesh(self : GLTFParser, mesh_index : Int32) -> AddonPromise pending.push(material) } pending.push(parser.load_geometries(primitives).to_js()) - AddonPromise::all_values(pending).then_(fn(results : Array[JsValue]) { + AddonPromise::all_values(pending).then_(fn(results : FixedArray[JsValue]) { let materials = results[0:results.length() - 1] - let geometries : Array[@core.BufferGeometry] = results[results.length() - 1].cast() + let geometries : Array[@core.BufferGeometry] = gltf_array( + results[results.length() - 1], + ) let meshes = [] for i in 0.. AddonPromise } else { pending.push(gltf_null_promise()) } - AddonPromise::all(pending).then_(fn(results : Array[JsValue]) { - let inverse_bind_matrices = results.pop().unwrap() - let joint_nodes = results + AddonPromise::all(pending).then_(fn(results : FixedArray[JsValue]) { + let inverse_bind_matrices = results[results.length() - 1] + let joint_nodes = results[0:results.length() - 1] let matrices = if inverse_bind_matrices.is_null() { None } else { @@ -1707,7 +1712,7 @@ fn GLTFParser::load_animation( AddonPromise::all_values(pending_output_accessors), AddonPromise::all_values(pending_samplers), AddonPromise::all_values(pending_targets), - ]).then_(fn(dependencies : Array[Array[JsValue]]) { + ]).then_(fn(dependencies : FixedArray[FixedArray[JsValue]]) { let nodes = dependencies[0] let input_accessors = dependencies[1] let output_accessors = dependencies[2] @@ -1803,7 +1808,7 @@ fn GLTFParser::load_node(self : GLTFParser, node_index : Int32) -> AddonPromise let child_pending = [] let children_def = gltf_or( node_def.get("children"), - JsValue::of(([] : Array[Int32])), + JsValue::of(([] : FixedArray[Int32])), ) for i in 0.. AddonPromise node_pending, AddonPromise::all(child_pending), skeleton_pending, - ]).then_(fn(results : Array[JsValue]) { + ]).then_(fn(results : FixedArray[JsValue]) { let node : @core.Object3D = results[0].cast() - let children : Array[@core.Object3D] = results[1].cast() + let children : Array[@core.Object3D] = gltf_array(results[1]) let skeleton = results[2] if !skeleton.is_null() { let skeleton : @core.Skeleton = skeleton.cast() @@ -1845,7 +1850,9 @@ fn GLTFParser::load_node(self : GLTFParser, node_index : Int32) -> AddonPromise let pivot_child = children[0] // Set pivot on container and adjust transforms - node.pivot = Some(@math.Vector3::new(0, 0, 0).from_array(pivot.cast())) + node.pivot = Some( + @math.Vector3::new(0, 0, 0).from_array(gltf_array(pivot)), + ) // Adjust container position: stored as position + pivot, so subtract pivot node.position.x -= gltf_at(pivot, 0).cast() @@ -1903,7 +1910,7 @@ fn GLTFParser::load_node_shallow( pending.push(promise) } let promise = AddonPromise::all(pending).then_(fn( - objects : Array[@core.Object3D], + objects : FixedArray[@core.Object3D], ) { // .isBone isn't in glTF spec. See ._markDefs let node = if gltf_is_true(node_def.get("isBone")) { @@ -1934,17 +1941,19 @@ fn GLTFParser::load_node_shallow( } if gltf_defined(node_def.get("matrix")) { let matrix = @math.Matrix4::new() - matrix.from_array(node_def.get("matrix").cast()) |> ignore + matrix.from_array(gltf_array(node_def.get("matrix"))) |> ignore node.apply_matrix4(matrix) } else { if gltf_defined(node_def.get("translation")) { - node.position.from_array(node_def.get("translation").cast()) |> ignore + node.position.from_array(gltf_array(node_def.get("translation"))) + |> ignore } if gltf_defined(node_def.get("rotation")) { - node.quaternion.from_array(node_def.get("rotation").cast()) |> ignore + node.quaternion.from_array(gltf_array(node_def.get("rotation"))) + |> ignore } if gltf_defined(node_def.get("scale")) { - node.scale.from_array(node_def.get("scale").cast()) |> ignore + node.scale.from_array(gltf_array(node_def.get("scale"))) |> ignore } } if !parser.associations.has(Object3D(node)) { @@ -1992,13 +2001,13 @@ fn GLTFParser::load_scene( } let node_ids = gltf_or( scene_def.get("nodes"), - JsValue::of(([] : Array[Int32])), + JsValue::of(([] : FixedArray[Int32])), ) let pending = [] for i in 0.. HDRCubeTextureLoader { { - base: @loaders.Loader::new(manager?), + base: @base_loaders.Loader::new(manager?), hdr_loader: HDRLoader::new(), type_: @core.HalfFloatType, } } ///| -pub impl @loaders.LoaderLike for HDRCubeTextureLoader with fn loader(self) { +pub impl @base_loaders.LoaderLike for HDRCubeTextureLoader with fn loader(self) { self.base } ///| -pub impl @loaders.LoaderSettings for HDRCubeTextureLoader +pub impl @base_loaders.LoaderSettings for HDRCubeTextureLoader ///| -pub extend HDRCubeTextureLoader with @loaders.LoaderLike::{loader} +pub extend HDRCubeTextureLoader with @base_loaders.LoaderLike::{loader} ///| -pub extend HDRCubeTextureLoader with @loaders.LoaderSettings::{ +pub extend HDRCubeTextureLoader with @base_loaders.LoaderSettings::{ set_cross_origin, set_with_credentials, set_path, @@ -52,7 +52,7 @@ pub fn HDRCubeTextureLoader::load( self : HDRCubeTextureLoader, urls : Array[String], on_load? : (@core.Texture) -> Unit, - on_progress? : (@loaders.ProgressEvent) -> Unit, + on_progress? : (@base_loaders.ProgressEvent) -> Unit, on_error? : (@core.JsValue) -> Unit, ) -> @core.Texture { let texture = @core.CubeTexture::new() @@ -77,10 +77,10 @@ pub fn HDRCubeTextureLoader::load( fn load_hdr_data( i : Int32, on_load : ((@core.Texture) -> Unit)?, - on_progress : ((@loaders.ProgressEvent) -> Unit)?, + on_progress : ((@base_loaders.ProgressEvent) -> Unit)?, on_error : ((@core.JsValue) -> Unit)?, ) -> Unit { - @loaders.FileLoader::new(manager=scope.base.manager) + @base_loaders.FileLoader::new(manager=scope.base.manager) .set_priority(scope.base.priority) .set_cache(scope.base.cache) .set_path(scope.base.path) @@ -145,9 +145,9 @@ pub fn HDRCubeTextureLoader::set_data_type( pub async fn HDRCubeTextureLoader::load_async( self : HDRCubeTextureLoader, urls : Array[String], - on_progress? : (@loaders.ProgressEvent) -> Unit, -) -> @core.Texture raise @loaders.LoaderError { - @loaders.loader_promise((resolve, reject) => { + on_progress? : (@base_loaders.ProgressEvent) -> Unit, +) -> @core.Texture raise @base_loaders.LoaderError { + @base_loaders.loader_promise((resolve, reject) => { self.load(urls, on_load=resolve, on_progress?, on_error=reject) |> ignore }) } diff --git a/src/addons/loaders/hdr_loader.mbt b/src/addons/loaders/hdr_loader.mbt index 7e664a1..f989c4a 100644 --- a/src/addons/loaders/hdr_loader.mbt +++ b/src/addons/loaders/hdr_loader.mbt @@ -5,36 +5,36 @@ ///| /// A loader for the RGBE HDR texture format. pub(all) struct HDRLoader { - mut base : @loaders.DataTextureLoader + mut base : @base_loaders.DataTextureLoader /// The texture type, `HalfFloatType` (default) or `FloatType`. mut type_ : Int32 } ///| -pub fn HDRLoader::new(manager? : @loaders.LoadingManager) -> HDRLoader { +pub fn HDRLoader::new(manager? : @base_loaders.LoadingManager) -> HDRLoader { let loader : HDRLoader = { - base: @loaders.DataTextureLoader::new(manager?), + base: @base_loaders.DataTextureLoader::new(manager?), type_: @core.HalfFloatType, } - loader.base = @loaders.DataTextureLoader::new(manager?, parse=buffer => { + loader.base = @base_loaders.DataTextureLoader::new(manager?, parse=buffer => { loader.parse(buffer) }) loader } ///| -pub impl @loaders.LoaderLike for HDRLoader with fn loader(self) { +pub impl @base_loaders.LoaderLike for HDRLoader with fn loader(self) { self.base.base } ///| -pub impl @loaders.LoaderSettings for HDRLoader +pub impl @base_loaders.LoaderSettings for HDRLoader ///| -pub extend HDRLoader with @loaders.LoaderLike::{loader} +pub extend HDRLoader with @base_loaders.LoaderLike::{loader} ///| -pub extend HDRLoader with @loaders.LoaderSettings::{ +pub extend HDRLoader with @base_loaders.LoaderSettings::{ set_cross_origin, set_with_credentials, set_path, @@ -51,8 +51,8 @@ pub extend HDRLoader with @loaders.LoaderSettings::{ pub fn HDRLoader::load( self : HDRLoader, url : String, - on_load? : (@core.Texture, @loaders.DataTexData) -> Unit, - on_progress? : (@loaders.ProgressEvent) -> Unit, + on_load? : (@core.Texture, @base_loaders.DataTexData) -> Unit, + on_progress? : (@base_loaders.ProgressEvent) -> Unit, on_error? : (@core.JsValue) -> Unit, ) -> @core.Texture { self.base.load(url, on_load?, on_progress?, on_error?) @@ -63,8 +63,8 @@ pub fn HDRLoader::load( pub async fn HDRLoader::load_async( self : HDRLoader, url : String, - on_progress? : (@loaders.ProgressEvent) -> Unit, -) -> @core.Texture raise @loaders.LoaderError { + on_progress? : (@base_loaders.ProgressEvent) -> Unit, +) -> @core.Texture raise @base_loaders.LoaderError { self.base.load_async(url, on_progress?) } @@ -207,12 +207,13 @@ fn hdr_fgets(buffer : HdrByteArray) -> String? { ///| /// RGBE format header struct. +/// Underscored fields retain upstream metadata that decoding does not consume. priv struct HdrRgbeHeader { mut valid : Int32 mut string : String - mut comments : String - mut programtype : String - mut format : String + mut _comments : String + mut _programtype : String + mut _format : String mut gamma : Double mut exposure : Double mut width : Double @@ -236,9 +237,9 @@ fn hdr_rgbe_read_header(buffer : HdrByteArray) -> HdrRgbeHeader { let header = { valid: 0, string: "", - comments: "", - programtype: "RGBE", - format: "", + _comments: "", + _programtype: "RGBE", + _format: "", gamma: 1.0, exposure: 1.0, width: 0.0, @@ -259,7 +260,7 @@ fn hdr_rgbe_read_header(buffer : HdrByteArray) -> HdrRgbeHeader { hdr_rgbe_error(HDR_RGBE_FORMAT_ERROR, msg="bad initial token") } header.valid = header.valid | HDR_RGBE_VALID_PROGRAMTYPE - header.programtype = hdr_match_group(m, 1) + header._programtype = hdr_match_group(m, 1) header.string += line + "\n" while true { let line = match hdr_fgets(buffer) { @@ -268,7 +269,7 @@ fn hdr_rgbe_read_header(buffer : HdrByteArray) -> HdrRgbeHeader { } header.string += line + "\n" if "#" == hdr_char_at0(line) { - header.comments += line + "\n" + header._comments += line + "\n" continue // comment line } let m = hdr_match(line, gamma_re) @@ -282,7 +283,7 @@ fn hdr_rgbe_read_header(buffer : HdrByteArray) -> HdrRgbeHeader { let m = hdr_match(line, format_re) if !m.is_null() { header.valid = header.valid | HDR_RGBE_VALID_FORMAT - header.format = hdr_match_group(m, 1) //'32-bit_rle_rgbe'; + header._format = hdr_match_group(m, 1) //'32-bit_rle_rgbe'; } let m = hdr_match(line, dimensions_re) if !m.is_null() { @@ -463,7 +464,7 @@ extern "js" fn hdr_new_uint8(buffer : @core.JsValue) -> @core.TypedArray = "(b) pub fn HDRLoader::parse( self : HDRLoader, buffer : @core.JsValue, -) -> @loaders.DataTexData { +) -> @base_loaders.DataTexData { // adapted from http://www.graphics.cornell.edu/~bjw/rgbe.html let byte_array = { bytes: hdr_new_uint8(buffer), pos: 0, } let rgbe_header_info = hdr_rgbe_read_header(byte_array) @@ -502,7 +503,7 @@ pub fn HDRLoader::parse( panic() } } - let tex_data = @loaders.DataTexData::new() + let tex_data = @base_loaders.DataTexData::new() tex_data.width = Some(w.to_int()) tex_data.height = Some(h.to_int()) tex_data.data = Some(data) diff --git a/src/addons/loaders/ktx2_loader.mbt b/src/addons/loaders/ktx2_loader.mbt index 7fffcb7..619df0d 100644 --- a/src/addons/loaders/ktx2_loader.mbt +++ b/src/addons/loaders/ktx2_loader.mbt @@ -173,7 +173,7 @@ pub fn KTX2WorkerConfig::to_js(self : KTX2WorkerConfig) -> @core.JsValue { ///| /// A loader for KTX 2.0 GPU texture containers (Basis Universal and raw formats). pub(all) struct KTX2Loader { - base : @loaders.Loader + base : @base_loaders.Loader mut transcoder_path : String mut transcoder_binary : @core.JsValue mut transcoder_pending : @utils.AddonPromise? @@ -183,9 +183,9 @@ pub(all) struct KTX2Loader { } ///| -pub fn KTX2Loader::new(manager? : @loaders.LoadingManager) -> KTX2Loader { +pub fn KTX2Loader::new(manager? : @base_loaders.LoadingManager) -> KTX2Loader { let loader = { - base: @loaders.Loader::new(manager?), + base: @base_loaders.Loader::new(manager?), transcoder_path: "", transcoder_binary: @core.JsValue::null(), transcoder_pending: None, @@ -203,18 +203,18 @@ pub fn KTX2Loader::new(manager? : @loaders.LoadingManager) -> KTX2Loader { } ///| -pub impl @loaders.LoaderLike for KTX2Loader with fn loader(self) { +pub impl @base_loaders.LoaderLike for KTX2Loader with fn loader(self) { self.base } ///| -pub impl @loaders.LoaderSettings for KTX2Loader +pub impl @base_loaders.LoaderSettings for KTX2Loader ///| -pub extend KTX2Loader with @loaders.LoaderLike::{loader} +pub extend KTX2Loader with @base_loaders.LoaderLike::{loader} ///| -pub extend KTX2Loader with @loaders.LoaderSettings::{ +pub extend KTX2Loader with @base_loaders.LoaderSettings::{ set_cross_origin, set_with_credentials, set_path, @@ -317,7 +317,7 @@ pub fn KTX2Loader::detect_support_webgpu( ///| /// Upstream `loader.loadAsync( url )` of `Loader`. fn ktx2_load_async( - loader : @loaders.FileLoader, + loader : @base_loaders.FileLoader, url : String, ) -> @utils.AddonPromise { @utils.AddonPromise::new((resolve, reject) => { @@ -340,11 +340,11 @@ fn ktx2_json_stringify(table : Map[String, Int32]) -> String { pub fn KTX2Loader::init(self : KTX2Loader) -> @utils.AddonPromise { if self.transcoder_pending is None { let base = self.base - let js_loader = @loaders.FileLoader::new(manager=base.manager) + let js_loader = @base_loaders.FileLoader::new(manager=base.manager) ignore(js_loader.set_priority(base.priority)) ignore(js_loader.set_cache(base.cache)) ignore(js_loader.set_with_credentials(base.with_credentials)) - let binary_loader = @loaders.FileLoader::new(manager=base.manager) + let binary_loader = @base_loaders.FileLoader::new(manager=base.manager) ignore(binary_loader.set_priority(base.priority)) ignore(binary_loader.set_cache(base.cache)) ignore(binary_loader.set_with_credentials(base.with_credentials)) @@ -367,7 +367,7 @@ pub fn KTX2Loader::init(self : KTX2Loader) -> @utils.AddonPromise { } self.transcoder_pending = Some( @utils.AddonPromise::all([js_content, binary_content]).then_(fn( - contents : Array[@core.JsValue], + contents : FixedArray[@core.JsValue], ) { let js_content : String = contents[0].cast() let binary_content = contents[1] @@ -427,7 +427,7 @@ pub fn KTX2Loader::load( self : KTX2Loader, url : String, on_load : (@core.Texture) -> Unit, - on_progress? : (@loaders.ProgressEvent) -> Unit, + on_progress? : (@base_loaders.ProgressEvent) -> Unit, on_error? : (@core.JsValue) -> Unit, ) -> Unit { if self.worker_config is None { @@ -436,7 +436,7 @@ pub fn KTX2Loader::load( ) } let base = self.base - let loader = @loaders.FileLoader::new(manager=base.manager) + let loader = @base_loaders.FileLoader::new(manager=base.manager) ignore(loader.set_priority(base.priority)) ignore(loader.set_cache(base.cache)) ignore(loader.set_path(base.path)) @@ -1372,7 +1372,7 @@ fn ktx2_create_raw_texture_from_levels( depth=container.pixel_depth, ) } - texture.mipmaps = mipmaps.map(m => @core.TextureImage::DataImage(m)) + texture.mipmaps = mipmaps.map(m => DataImage(m)) texture.min_filter = if use_mipmaps { @core.NearestMipmapNearestFilter } else { @@ -1418,7 +1418,7 @@ fn ktx2_create_raw_texture_from_levels( @core.CompressedCubeTexture::new(faces) } else { @core.CompressedTexture::new( - mipmaps=mipmaps.map(m => @core.TextureImage::DataImage(m)), + mipmaps=mipmaps.map(m => DataImage(m)), width=container.pixel_width, height=container.pixel_height, ) diff --git a/src/addons/loaders/moon.pkg b/src/addons/loaders/moon.pkg index 3e5e149..9fa5ade 100644 --- a/src/addons/loaders/moon.pkg +++ b/src/addons/loaders/moon.pkg @@ -2,7 +2,7 @@ import { "moonbit-community/three/core", "moonbit-community/three/math", "moonbit-community/three/renderers/webgl", - "moonbit-community/three/loaders", + "moonbit-community/three/loaders" @base_loaders, "moonbit-community/three/nodes", "moonbit-community/three/animation", "moonbit-community/three/addons/utils", @@ -10,4 +10,12 @@ import { "moonbit-community/three/addons/math" @addon_math, } +import { + "moonbitlang/core/async", +} for "wbtest" + +options( + "allow-experimental-packages": [ "moonbitlang/core/async" ], +) + warnings = "-79" diff --git a/src/addons/loaders/rgbe_loader.mbt b/src/addons/loaders/rgbe_loader.mbt index 856dc92..63eff5a 100644 --- a/src/addons/loaders/rgbe_loader.mbt +++ b/src/addons/loaders/rgbe_loader.mbt @@ -9,7 +9,7 @@ pub type RGBELoader extern "js" fn rgbe_console_warn(message : String) -> Unit = "(m) => console.warn(m)" ///| -pub fn RGBELoader::new(manager? : @loaders.LoadingManager) -> HDRLoader { +pub fn RGBELoader::new(manager? : @base_loaders.LoadingManager) -> HDRLoader { rgbe_console_warn( "RGBELoader has been deprecated. Please use HDRLoader instead.", ) diff --git a/src/addons/loaders/ultra_hdr_loader.mbt b/src/addons/loaders/ultra_hdr_loader.mbt index 96dd0c7..42b262b 100644 --- a/src/addons/loaders/ultra_hdr_loader.mbt +++ b/src/addons/loaders/ultra_hdr_loader.mbt @@ -6,31 +6,31 @@ ///| /// A loader for the Ultra HDR Image Format (JPEG with a gain map). pub(all) struct UltraHDRLoader { - base : @loaders.Loader + base : @base_loaders.Loader /// The texture type, `HalfFloatType` (default) or `FloatType`. mut type_ : Int32 } ///| pub fn UltraHDRLoader::new( - manager? : @loaders.LoadingManager, + manager? : @base_loaders.LoadingManager, ) -> UltraHDRLoader { - { base: @loaders.Loader::new(manager?), type_: @core.HalfFloatType, } + { base: @base_loaders.Loader::new(manager?), type_: @core.HalfFloatType, } } ///| -pub impl @loaders.LoaderLike for UltraHDRLoader with fn loader(self) { +pub impl @base_loaders.LoaderLike for UltraHDRLoader with fn loader(self) { self.base } ///| -pub impl @loaders.LoaderSettings for UltraHDRLoader +pub impl @base_loaders.LoaderSettings for UltraHDRLoader ///| -pub extend UltraHDRLoader with @loaders.LoaderLike::{loader} +pub extend UltraHDRLoader with @base_loaders.LoaderLike::{loader} ///| -pub extend UltraHDRLoader with @loaders.LoaderSettings::{ +pub extend UltraHDRLoader with @base_loaders.LoaderSettings::{ set_cross_origin, set_with_credentials, set_path, @@ -232,9 +232,10 @@ let uhdr_srgb_to_linear : @core.TypedArray = { ///| /// Gain map metadata; `None` is upstream's `null`. +/// `_base_rendition_is_hdr` retains upstream metadata for the parsed descriptor. priv struct UhdrMetadata { mut version : @core.JsValue - mut base_rendition_is_hdr : Bool? + mut _base_rendition_is_hdr : Bool? mut gain_map_min : Double mut gain_map_max : Double mut gamma : Double @@ -257,12 +258,12 @@ priv struct UhdrSection { pub fn UltraHDRLoader::parse( self : UltraHDRLoader, buffer : @core.JsValue, - on_load : (@loaders.DataTexData) -> Unit, + on_load : (@base_loaders.DataTexData) -> Unit, ) -> Unit { // `null` fields: arithmetic reads them as 0 let metadata = { version: @core.JsValue::null(), - base_rendition_is_hdr: None, + _base_rendition_is_hdr: None, gain_map_min: 0.0, gain_map_max: 0.0, gamma: 0.0, @@ -407,7 +408,7 @@ pub fn UltraHDRLoader::parse( primary_image, gainmap_image, (hdr_buffer, width, height) => { - let tex_data = @loaders.DataTexData::new() + let tex_data = @base_loaders.DataTexData::new() tex_data.width = Some(width) tex_data.height = Some(height) tex_data.data = Some(hdr_buffer) @@ -525,7 +526,7 @@ fn UltraHDRLoader::parse_iso_metadata( } // Convert log2 values to linear metadata.version = @core.JsValue::of("1.0") // ISO standard doesn't encode version string, use default - metadata.base_rendition_is_hdr = Some(backward_direction) + metadata._base_rendition_is_hdr = Some(backward_direction) metadata.gain_map_min = gain_map_min metadata.gain_map_max = gain_map_max metadata.gamma = gamma @@ -540,8 +541,8 @@ fn UltraHDRLoader::parse_iso_metadata( pub fn UltraHDRLoader::load( self : UltraHDRLoader, url : String, - on_load? : (@core.Texture, @loaders.DataTexData) -> Unit, - on_progress? : (@loaders.ProgressEvent) -> Unit, + on_load? : (@core.Texture, @base_loaders.DataTexData) -> Unit, + on_progress? : (@base_loaders.ProgressEvent) -> Unit, on_error? : (@core.JsValue) -> Unit, ) -> @core.Texture { let texture = @core.DataTexture::new( @@ -564,7 +565,7 @@ pub fn UltraHDRLoader::load( ) texture.generate_mipmaps = true texture.flip_y = true - let loader = @loaders.FileLoader::new(manager=self.base.manager) + let loader = @base_loaders.FileLoader::new(manager=self.base.manager) loader.set_priority(self.base.priority) |> ignore loader.set_cache(self.base.cache) |> ignore loader.set_response_type("arraybuffer") |> ignore @@ -626,7 +627,7 @@ fn UltraHDRLoader::parse_xmp_metadata( // Gainmap descriptor - defaults from https://developer.android.com/media/platform/hdr-image-format#HDR_gain_map_metadata let gainmap_node = uhdr_first_element(xmp_xml, "rdf:Description") metadata.version = uhdr_get_attribute(gainmap_node, "hdrgm:Version") - metadata.base_rendition_is_hdr = Some( + metadata._base_rendition_is_hdr = Some( uhdr_is_string_true( uhdr_get_attribute(gainmap_node, "hdrgm:BaseRenditionIsHDR"), ), @@ -795,9 +796,9 @@ fn UltraHDRLoader::apply_gainmap_to_sdr( pub async fn UltraHDRLoader::load_async( self : UltraHDRLoader, url : String, - on_progress? : (@loaders.ProgressEvent) -> Unit, -) -> @core.Texture raise @loaders.LoaderError { - @loaders.loader_promise((resolve, reject) => { + on_progress? : (@base_loaders.ProgressEvent) -> Unit, +) -> @core.Texture raise @base_loaders.LoaderError { + @base_loaders.loader_promise((resolve, reject) => { self.load( url, on_load=(texture, _) => resolve(texture), diff --git a/src/addons/math/color_spaces_test.mbt b/src/addons/math/color_spaces_test.mbt index a44d194..36a61d1 100644 --- a/src/addons/math/color_spaces_test.mbt +++ b/src/addons/math/color_spaces_test.mbt @@ -7,7 +7,7 @@ extern "js" fn color_spaces_test_to_fixed3(x : Double) -> String = ///| fn color_spaces_test_define() -> Unit { - @three_math.color_management.define( + @three_math.color_management.define_( Map::from_array([ (@addon_math.DisplayP3ColorSpace, @addon_math.display_p3_color_space_impl), ( diff --git a/src/addons/math/moon.pkg b/src/addons/math/moon.pkg index 911a437..5c502de 100644 --- a/src/addons/math/moon.pkg +++ b/src/addons/math/moon.pkg @@ -1,7 +1,5 @@ import { - "moonbit-community/three/core", "moonbit-community/three/math", - "moonbit-community/three/renderers/webgl", } import { diff --git a/src/addons/objects/objects_webgl_helpers_wbtest.mbt b/src/addons/objects/objects_webgl_helpers_wbtest.mbt index 026f9f3..8d78ec4 100644 --- a/src/addons/objects/objects_webgl_helpers_wbtest.mbt +++ b/src/addons/objects/objects_webgl_helpers_wbtest.mbt @@ -41,26 +41,6 @@ extern "js" fn mock_note( value : @core.JsValue, ) -> Unit = "(gl, l, v) => gl.__note(l, v)" -///| -/// `mock_note` for a number. -fn note_num( - gl : @webgl.WebGL2RenderingContext, - label : String, - value : Double, -) -> Unit { - mock_note(gl, label, @core.JsValue::of(value)) -} - -///| -/// `mock_note` for an integer. -fn note_int( - gl : @webgl.WebGL2RenderingContext, - label : String, - value : Int32, -) -> Unit { - mock_note(gl, label, @core.JsValue::of(value)) -} - ///| /// `mock_note` for a boolean. fn note_bool( @@ -71,29 +51,6 @@ fn note_bool( mock_note(gl, label, @core.JsValue::of(value)) } -///| -/// `mock_note` for a string. -fn note_str( - gl : @webgl.WebGL2RenderingContext, - label : String, - value : String, -) -> Unit { - mock_note(gl, label, @core.JsValue::of(value)) -} - -///| -/// `mock_note` for an optional integer; `None` is noted as `null`. -fn note_opt_int( - gl : @webgl.WebGL2RenderingContext, - label : String, - value : Int32?, -) -> Unit { - match value { - Some(v) => note_int(gl, label, v) - None => mock_note(gl, label, @core.JsValue::null()) - } -} - ///| extern "js" fn diff_enabled() -> Bool = "() => typeof process !== 'undefined' && process.env.WEBGL_DIFF === '1'" @@ -109,27 +66,6 @@ fn emit_log(name : String, gl : @webgl.WebGL2RenderingContext) -> Array[String] mock_log(gl) } -///| -extern "js" fn ffi_mock_animation_context( - module_ : @core.JsValue, - gl : @webgl.WebGL2RenderingContext, -) -> @webgl.AnimationFrameProvider = "(m, gl) => m.createMockAnimationContext(gl)" - -///| -/// A `requestAnimationFrame` provider that records into `gl`'s log. -fn mock_animation_context( - gl : @webgl.WebGL2RenderingContext, -) -> @webgl.AnimationFrameProvider { - ffi_mock_animation_context(mock_module, gl) -} - -///| -/// Runs the pending animation frames with `time`. -extern "js" fn mock_tick( - context : @webgl.AnimationFrameProvider, - time : Double, -) -> Unit = "(c, t) => c.__tick(t)" - ///| extern "js" fn ffi_renderer_common() -> @core.JsValue = #|() => @@ -240,26 +176,6 @@ fn renderer_mock_canvas( ffi_renderer_mock_canvas(renderer_common, gl, width, height) } -///| -/// `canvas.__dispatch( type )`: fires the canvas listeners. -extern "js" fn renderer_canvas_dispatch( - canvas : @webgl.HTMLCanvasElement, - type_ : String, -) -> Unit = "(c, t) => c.__dispatch(t)" - -///| -extern "js" fn renderer_canvas_listener_count( - canvas : @webgl.HTMLCanvasElement, - type_ : String, -) -> Int32 = "(c, t) => c.__listenerCount(t)" - -///| -/// `gl[ key ]`. -extern "js" fn renderer_gl_property( - gl : @webgl.WebGL2RenderingContext, - key : String, -) -> @core.JsValue = "(gl, k) => gl[k]" - ///| /// `new WebGLRenderer( { canvas, context: gl, ... } )`. fn renderer_new( @@ -277,22 +193,3 @@ fn renderer_new( output_buffer_type~, ) } - -///| -fn note_json( - gl : @webgl.WebGL2RenderingContext, - label : String, - value : Json, -) -> Unit { - mock_note(gl, label, @core.JsValue::from_json(value)) -} - -///| -fn v2_json(v : @math.Vector2) -> Json { - Json([v.x, v.y]) -} - -///| -fn v4_json(v : @math.Vector4) -> Json { - Json([v.x, v.y, v.z, v.w]) -} diff --git a/src/addons/tsl/a4_shader_diff_test.mbt b/src/addons/tsl/a4_shader_diff_test.mbt index 3888cdd..7ebc9d1 100644 --- a/src/addons/tsl/a4_shader_diff_test.mbt +++ b/src/addons/tsl/a4_shader_diff_test.mbt @@ -27,9 +27,6 @@ extern "js" fn a4_flow_json( internals : FixedArray[String], ) -> String = "(code, result, vars, uniforms, codes, decl, bindings, internals) => JSON.stringify({ code, result, vars, uniforms, codes, decl, bindings, internals })" -///| -extern "js" fn a4_error_json(message : String) -> String = "(message) => JSON.stringify({ error: message })" - ///| /// The recording mock WebGL 2 context (`createMockGL( { extensions } )`), loaded from /// diff/core/webgl/harness/mock_gl.cjs as upstream_a4.mjs does. diff --git a/src/addons/tsl/a5_harness_test.mbt b/src/addons/tsl/a5_harness_test.mbt index b56739f..f7c703e 100644 --- a/src/addons/tsl/a5_harness_test.mbt +++ b/src/addons/tsl/a5_harness_test.mbt @@ -150,7 +150,7 @@ fn a5_align_counters() -> Unit { @nodes.FnNode::of(f).unwrap().shader_node, ).unwrap().name let mut v = 0 - for c in name.view(start_offset=2) { + for c in name.clamped_view(start=2) { v = v * 10 + (c.to_int() - '0'.to_int()) } v diff --git a/src/addons/tsl/a5_webgl_nodes_handler_test.mbt b/src/addons/tsl/a5_webgl_nodes_handler_test.mbt index c28e74b..3cfd4ca 100644 --- a/src/addons/tsl/a5_webgl_nodes_handler_test.mbt +++ b/src/addons/tsl/a5_webgl_nodes_handler_test.mbt @@ -98,7 +98,7 @@ fn wnh_align(k : Int32) -> Unit { @nodes.FnNode::of(f).unwrap().shader_node, ).unwrap().name let mut v = 0 - for c in name.view(start_offset=2) { + for c in name.clamped_view(start=2) { v = v * 10 + (c.to_int() - '0'.to_int()) } v diff --git a/src/addons/tsl/display_anaglyph_pass_node.mbt b/src/addons/tsl/display_anaglyph_pass_node.mbt index 262a9ac..d6fba4f 100644 --- a/src/addons/tsl/display_anaglyph_pass_node.mbt +++ b/src/addons/tsl/display_anaglyph_pass_node.mbt @@ -267,7 +267,7 @@ pub impl @nodes.NodeClass for AnaglyphPassNode with fn parent(self) { ///| pub impl @nodes.NodeClass for AnaglyphPassNode with fn has_flag(self, flag) { - flag == "isAnaglyphPassNode" || self.stereo.has_flag(flag) + flag == "isAnaglyphPassNode" || @nodes.NodeClass::has_flag(self.stereo, flag) } ///| diff --git a/src/addons/tsl/display_crt.mbt b/src/addons/tsl/display_crt.mbt index bd661ce..c9f6604 100644 --- a/src/addons/tsl/display_crt.mbt +++ b/src/addons/tsl/display_crt.mbt @@ -13,8 +13,8 @@ priv struct CRTModule { let display_crt_module : AddonModule[CRTModule] = AddonModule::new(fn() { load_display_shape() let barrel_uv = @nodes.fn_(fn(inputs, _) { - let curvature = inputs.get(0).or_else(fn() { @nodes.float(0.1) }) - let coord = inputs.get(1).or_else(fn() { @nodes.uv() }) + let curvature = inputs.get(0).unwrap_or_else(fn() { @nodes.float(0.1) }) + let coord = inputs.get(1).unwrap_or_else(fn() { @nodes.uv() }) // Center UV coordinates (-1 to 1) let centered = coord.sub(0.5).mul(2.0) // Calculate squared distance from center @@ -50,7 +50,7 @@ let display_crt_module : AddonModule[CRTModule] = AddonModule::new(fn() { }) let color_bleeding = @nodes.fn_(fn(inputs, _) { let color = addon_arg(inputs, 0) - let amount = inputs.get(1).or_else(fn() { @nodes.float(0.002) }) + let amount = inputs.get(1).unwrap_or_else(fn() { @nodes.float(0.002) }) let input_texture = @nodes.convert_to_texture(color) // Get the original color let original = input_texture.sample(@nodes.screen_uv).rgb() @@ -82,10 +82,10 @@ let display_crt_module : AddonModule[CRTModule] = AddonModule::new(fn() { }) let scanlines = @nodes.fn_(fn(inputs, _) { let color = addon_arg(inputs, 0) - let intensity = inputs.get(1).or_else(fn() { @nodes.float(0.3) }) - let count = inputs.get(2).or_else(fn() { @nodes.float(240.0) }) - let speed = inputs.get(3).or_else(fn() { @nodes.float(0.0) }) - let coord = inputs.get(4).or_else(fn() { @nodes.uv() }) + let intensity = inputs.get(1).unwrap_or_else(fn() { @nodes.float(0.3) }) + let count = inputs.get(2).unwrap_or_else(fn() { @nodes.float(240.0) }) + let speed = inputs.get(3).unwrap_or_else(fn() { @nodes.float(0.0) }) + let coord = inputs.get(4).unwrap_or_else(fn() { @nodes.uv() }) // Animate scanlines scrolling down (like CRT vertical sync roll) let animated_y = coord.y().sub(@nodes.time.mul(speed)) // Create scanline pattern @@ -96,9 +96,9 @@ let display_crt_module : AddonModule[CRTModule] = AddonModule::new(fn() { }) let vignette = @nodes.fn_(fn(inputs, _) { let color = addon_arg(inputs, 0) - let intensity = inputs.get(1).or_else(fn() { @nodes.float(0.4) }) - let smoothness = inputs.get(2).or_else(fn() { @nodes.float(0.5) }) - let coord = inputs.get(3).or_else(fn() { @nodes.uv() }) + let intensity = inputs.get(1).unwrap_or_else(fn() { @nodes.float(0.4) }) + let smoothness = inputs.get(2).unwrap_or_else(fn() { @nodes.float(0.5) }) + let coord = inputs.get(3).unwrap_or_else(fn() { @nodes.uv() }) // Use circle for radial gradient (1.42 ≈ √2 covers full diagonal) let mask = circle().call([@nodes.float(1.42), smoothness, coord]) // Apply vignette: center = 1, edges = (1 - intensity) diff --git a/src/addons/tsl/display_fxaa_node.mbt b/src/addons/tsl/display_fxaa_node.mbt index 5de1968..b2d4a69 100644 --- a/src/addons/tsl/display_fxaa_node.mbt +++ b/src/addons/tsl/display_fxaa_node.mbt @@ -41,7 +41,6 @@ priv struct FXAALuminance { se : @nodes.Node sw : @nodes.Node highest : @nodes.Node - lowest : @nodes.Node contrast : @nodes.Node } @@ -115,7 +114,7 @@ pub impl @nodes.NodeClass for FXAANode with fn setup(self, _, _) { let highest = @nodes.max_of([s, e, n, w, m]) let lowest = @nodes.min_of([s, e, n, w, m]) let contrast = highest.sub(lowest) - { m, n, e, s, w, ne, nw, se, sw, highest, lowest, contrast, } + { m, n, e, s, w, ne, nw, se, sw, highest, contrast, } } let determine_pixel_blend_factor = fn(l : FXAALuminance) { let mut f = @nodes.float(2.0).mul(l.s.add(l.e).add(l.n).add(l.w)) diff --git a/src/addons/tsl/display_lens_dirt.mbt b/src/addons/tsl/display_lens_dirt.mbt index 8fbd0f6..9eebc0c 100644 --- a/src/addons/tsl/display_lens_dirt.mbt +++ b/src/addons/tsl/display_lens_dirt.mbt @@ -10,7 +10,7 @@ let display_lens_dirt_module : AddonModule[LensDirtModule] = AddonModule::new(fn let lens_dirt = @nodes.fn_(fn(inputs, _) { let texture_node = addon_arg(inputs, 0) let dirt_texture_node = addon_arg(inputs, 1) - let intensity = inputs.get(2).or_else(fn() { @nodes.float(1) }) + let intensity = inputs.get(2).unwrap_or_else(fn() { @nodes.float(1) }) let texture_node = @nodes.convert_to_texture(texture_node) let target_uv = match a4_texture_uv_node(texture_node) { Some(n) => n diff --git a/src/addons/tsl/display_oit_pass_node.mbt b/src/addons/tsl/display_oit_pass_node.mbt index 024dff0..93b9a6e 100644 --- a/src/addons/tsl/display_oit_pass_node.mbt +++ b/src/addons/tsl/display_oit_pass_node.mbt @@ -42,12 +42,12 @@ pub impl @nodes.NodeClass for OITPassNode with fn parent(self) { ///| pub impl @nodes.NodeClass for OITPassNode with fn has_flag(self, flag) { - flag == "isOITPassNode" || self.pass.has_flag(flag) + flag == "isOITPassNode" || @nodes.NodeClass::has_flag(self.pass, flag) } ///| pub impl @nodes.NodeClass for OITPassNode with fn children(self, node, out) { - self.pass.children(node, out) + @nodes.NodeClass::children(self.pass, node, out) @nodes.push_child(out, "weightNode", self.weight_node) } @@ -121,7 +121,7 @@ pub impl @nodes.PassNodeClass for OITPassNode with fn set_size( ///| pub impl @nodes.NodeClass for OITPassNode with fn setup(self, node, builder) { - let beauty_node = self.pass.setup(node, builder).unwrap() + let beauty_node = @nodes.NodeClass::setup(self.pass, node, builder).unwrap() // MSAA if builder.renderer.backend.has_flag("isWebGPUBackend") == true { // sample counts must match since the depth buffer is shared @@ -208,7 +208,7 @@ pub impl @nodes.NodeClass for OITPassNode with fn update_before( ///| pub impl @nodes.NodeClass for OITPassNode with fn dispose(self, node) { - self.pass.dispose(node) + @nodes.NodeClass::dispose(self.pass, node) self._oit_render_target.dispose() } diff --git a/src/addons/tsl/display_parallax_barrier_pass_node.mbt b/src/addons/tsl/display_parallax_barrier_pass_node.mbt index faa6b8e..094d8eb 100644 --- a/src/addons/tsl/display_parallax_barrier_pass_node.mbt +++ b/src/addons/tsl/display_parallax_barrier_pass_node.mbt @@ -21,7 +21,8 @@ pub impl @nodes.NodeClass for ParallaxBarrierPassNode with fn has_flag( self, flag, ) { - flag == "isParallaxBarrierPassNode" || self.stereo.has_flag(flag) + flag == "isParallaxBarrierPassNode" || + @nodes.NodeClass::has_flag(self.stereo, flag) } ///| diff --git a/src/addons/tsl/display_pixelation_pass_node.mbt b/src/addons/tsl/display_pixelation_pass_node.mbt index 1c20512..7b28284 100644 --- a/src/addons/tsl/display_pixelation_pass_node.mbt +++ b/src/addons/tsl/display_pixelation_pass_node.mbt @@ -22,7 +22,7 @@ pub impl @nodes.NodeClass for PixelationPassNode with fn parent(self) { ///| pub impl @nodes.NodeClass for PixelationPassNode with fn has_flag(self, flag) { - flag == "isPixelationPassNode" || self.pass.has_flag(flag) + flag == "isPixelationPassNode" || @nodes.NodeClass::has_flag(self.pass, flag) } ///| @@ -31,7 +31,7 @@ pub impl @nodes.NodeClass for PixelationPassNode with fn children( node, out, ) { - self.pass.children(node, out) + @nodes.NodeClass::children(self.pass, node, out) @nodes.push_child(out, "normalEdgeStrength", Some(self.normal_edge_strength)) @nodes.push_child(out, "depthEdgeStrength", Some(self.depth_edge_strength)) } diff --git a/src/addons/tsl/display_recurrent_denoise_node.mbt b/src/addons/tsl/display_recurrent_denoise_node.mbt index 8473dff..5e3a134 100644 --- a/src/addons/tsl/display_recurrent_denoise_node.mbt +++ b/src/addons/tsl/display_recurrent_denoise_node.mbt @@ -42,13 +42,10 @@ priv struct RecurrentDenoiseModule { mut renderer_state : @nodes.RendererState? vogel_disk : @nodes.Node diffuse_color_distance : @nodes.Node - temporal_weight : @nodes.Node get_temporal_variance_factor : @nodes.Node - compute_frustum_size : @nodes.Node compute_hit_dist_factor : @nodes.Node map_ao : @nodes.Node get_specular_dominant_direction : @nodes.Node - specular_lobe_tan_half_angle : @nodes.Node lobe_normal_falloff : @nodes.Node lobe_normal_weight : @nodes.Node plane_distance : @nodes.Node @@ -302,13 +299,10 @@ let display_recurrent_denoise_node_module : AddonModule[RecurrentDenoiseModule] renderer_state: None, vogel_disk, diffuse_color_distance, - temporal_weight, get_temporal_variance_factor, - compute_frustum_size, compute_hit_dist_factor, map_ao, get_specular_dominant_direction, - specular_lobe_tan_half_angle, lobe_normal_falloff, lobe_normal_weight, plane_distance, diff --git a/src/addons/tsl/display_retro_pass_node.mbt b/src/addons/tsl/display_retro_pass_node.mbt index 4150c18..bb22b96 100644 --- a/src/addons/tsl/display_retro_pass_node.mbt +++ b/src/addons/tsl/display_retro_pass_node.mbt @@ -63,7 +63,7 @@ pub impl @nodes.NodeClass for RetroPassNode with fn class_name(_) { ///| /// RetroPassNode has no `static get type()`: PassNode's. pub impl @nodes.NodeClass for RetroPassNode with fn type_name(self) { - self.pass.type_name() + @nodes.NodeClass::type_name(self.pass) } ///| @@ -73,7 +73,7 @@ pub impl @nodes.NodeClass for RetroPassNode with fn parent(self) { ///| pub impl @nodes.NodeClass for RetroPassNode with fn children(self, node, out) { - self.pass.children(node, out) + @nodes.NodeClass::children(self.pass, node, out) @nodes.push_child(out, "affineDistortionNode", self.affine_distortion_node) } @@ -833,7 +833,7 @@ pub impl @nodes.NodeClass for RetroPassNode with fn update_before( ///| pub impl @nodes.NodeClass for RetroPassNode with fn dispose(self, node) { - self.pass.dispose(node) + @nodes.NodeClass::dispose(self.pass, node) for entry in self._material_cache { entry.1.material.dispose() } diff --git a/src/addons/tsl/display_shape.mbt b/src/addons/tsl/display_shape.mbt index f2f0ecd..aa3d27b 100644 --- a/src/addons/tsl/display_shape.mbt +++ b/src/addons/tsl/display_shape.mbt @@ -8,9 +8,9 @@ priv struct ShapeModule { ///| let display_shape_module : AddonModule[ShapeModule] = AddonModule::new(fn() { let circle = @nodes.fn_(fn(inputs, _) { - let scale = inputs.get(0).or_else(fn() { @nodes.float(1.0) }) - let softness = inputs.get(1).or_else(fn() { @nodes.float(0.5) }) - let coord = inputs.get(2).or_else(fn() { @nodes.uv() }) + let scale = inputs.get(0).unwrap_or_else(fn() { @nodes.float(1.0) }) + let softness = inputs.get(1).unwrap_or_else(fn() { @nodes.float(0.5) }) + let coord = inputs.get(2).unwrap_or_else(fn() { @nodes.uv() }) // Center UV coordinates (-0.5 to 0.5) let centered = coord.sub(0.5) // Calculate distance from center (0 at center, ~0.707 at corners) diff --git a/src/addons/tsl/display_ssaa_pass_node.mbt b/src/addons/tsl/display_ssaa_pass_node.mbt index cceda46..1e3062e 100644 --- a/src/addons/tsl/display_ssaa_pass_node.mbt +++ b/src/addons/tsl/display_ssaa_pass_node.mbt @@ -32,12 +32,12 @@ pub impl @nodes.NodeClass for SSAAPassNode with fn parent(self) { ///| pub impl @nodes.NodeClass for SSAAPassNode with fn has_flag(self, flag) { - flag == "isSSAAPassNode" || self.pass.has_flag(flag) + flag == "isSSAAPassNode" || @nodes.NodeClass::has_flag(self.pass, flag) } ///| pub impl @nodes.NodeClass for SSAAPassNode with fn children(self, node, out) { - self.pass.children(node, out) + @nodes.NodeClass::children(self.pass, node, out) @nodes.push_child(out, "sampleWeight", Some(self.sample_weight)) } @@ -230,7 +230,7 @@ pub impl @nodes.NodeClass for SSAAPassNode with fn setup(self, node, builder) { ///| pub impl @nodes.NodeClass for SSAAPassNode with fn dispose(self, node) { - self.pass.dispose(node) + @nodes.NodeClass::dispose(self.pass, node) if self._sample_render_target is Some(target) { target.dispose() } diff --git a/src/addons/tsl/display_stereo_composite_pass_node.mbt b/src/addons/tsl/display_stereo_composite_pass_node.mbt index 6d7d3bb..3bbb2e6 100644 --- a/src/addons/tsl/display_stereo_composite_pass_node.mbt +++ b/src/addons/tsl/display_stereo_composite_pass_node.mbt @@ -63,7 +63,8 @@ pub impl @nodes.NodeClass for StereoCompositePassNode with fn has_flag( self, flag, ) { - flag == "isStereoCompositePassNode" || self.pass.has_flag(flag) + flag == "isStereoCompositePassNode" || + @nodes.NodeClass::has_flag(self.pass, flag) } ///| @@ -110,7 +111,7 @@ pub impl @nodes.NodeClass for StereoCompositePassNode with fn dispose( self, node, ) { - self.pass.dispose(node) + @nodes.NodeClass::dispose(self.pass, node) self._render_target_l.dispose() self._render_target_r.dispose() if self._material is Some(material) { diff --git a/src/addons/tsl/display_stereo_pass_node.mbt b/src/addons/tsl/display_stereo_pass_node.mbt index 61fda25..64d5138 100644 --- a/src/addons/tsl/display_stereo_pass_node.mbt +++ b/src/addons/tsl/display_stereo_pass_node.mbt @@ -26,7 +26,7 @@ pub impl @nodes.NodeClass for StereoPassNode with fn parent(self) { ///| pub impl @nodes.NodeClass for StereoPassNode with fn has_flag(self, flag) { - flag == "isStereoPassNode" || self.pass.has_flag(flag) + flag == "isStereoPassNode" || @nodes.NodeClass::has_flag(self.pass, flag) } ///| diff --git a/src/addons/tsl/math_bayer.mbt b/src/addons/tsl/math_bayer.mbt index 1f23a4c..b0edf06 100644 --- a/src/addons/tsl/math_bayer.mbt +++ b/src/addons/tsl/math_bayer.mbt @@ -41,7 +41,7 @@ let math_bayer_module : AddonModule[BayerModule] = AddonModule::new(fn() { }) let bayer_dither = @nodes.fn_(fn(inputs, _) { let color = addon_arg(inputs, 0) - let steps = inputs.get(1).or_else(fn() { @nodes.float(32.0) }) + let steps = inputs.get(1).unwrap_or_else(fn() { @nodes.float(32.0) }) let screen_pos = @nodes.screen_uv.mul(@nodes.screen_size) let x = @nodes.mod(@nodes.floor(screen_pos.x()), @nodes.float(4.0)) let y = @nodes.mod(@nodes.floor(screen_pos.y()), @nodes.float(4.0)) diff --git a/src/addons/tsl/utils_specular_helpers.mbt b/src/addons/tsl/utils_specular_helpers.mbt index a930187..bca1410 100644 --- a/src/addons/tsl/utils_specular_helpers.mbt +++ b/src/addons/tsl/utils_specular_helpers.mbt @@ -10,14 +10,11 @@ pub const ENV_RAY_LENGTH_THRESHOLD : Double = 1000.0 ///| priv struct SpecularHelpersModule { - sample_ggx_vndf : @nodes.Node d_gtr : @nodes.Node smith_g : @nodes.Node geometry_term : @nodes.Node - ggx_vndf_pdf : @nodes.Node f_schlick : @nodes.Node get_specular_dominant_factor : @nodes.Node - ggx_reflection_struct : @nodes.StructFn ggx_reflection_sample_with_reflectance : @nodes.Node equirect_uv_to_dir : @nodes.Node equirect_dir_pdf : @nodes.Node @@ -176,7 +173,7 @@ let utils_specular_helpers_module : AddonModule[SpecularHelpersModule] = AddonMo fn(inputs, _) { let f0 = addon_arg(inputs, 0) let theta = addon_arg(inputs, 1) - let f90 = inputs.get(2).or_else(fn() { @nodes.float(1) }) + let f90 = inputs.get(2).unwrap_or_else(fn() { @nodes.float(1) }) let one_minus = @nodes.float(1.0).sub(theta).to_var() let one_minus2 = one_minus.mul(one_minus).to_var() let one_minus5 = one_minus2.mul(one_minus2).mul(one_minus).to_var() @@ -340,14 +337,11 @@ let utils_specular_helpers_module : AddonModule[SpecularHelpersModule] = AddonMo layout=addon_short_layout([("pdfA", "float"), ("pdfB", "float")], "float"), ) { - sample_ggx_vndf, d_gtr, smith_g, geometry_term, - ggx_vndf_pdf, f_schlick, get_specular_dominant_factor, - ggx_reflection_struct, ggx_reflection_sample_with_reflectance, equirect_uv_to_dir, equirect_dir_pdf, diff --git a/src/addons/tsl/webgl_nodes_handler.mbt b/src/addons/tsl/webgl_nodes_handler.mbt index 51e8811..a101e53 100644 --- a/src/addons/tsl/webgl_nodes_handler.mbt +++ b/src/addons/tsl/webgl_nodes_handler.mbt @@ -1670,7 +1670,7 @@ pub fn WebGLNodesHandler::collect_uniforms_groups( let uniform = webgl_nodes_handler_node_uniform(node_uniform.node) // `uniform.type`, which WebGLUniformsGroups reads @webgl.set_uniform_type(uniform, node_uniform.type_) - @core.UniformsGroupEntry::Single(uniform) + Single(uniform) }) uniforms_groups.push(group) } diff --git a/src/addons/utils/a6_utils_diff_test.mbt b/src/addons/utils/a6_utils_diff_test.mbt index 19ce94e..ba19912 100644 --- a/src/addons/utils/a6_utils_diff_test.mbt +++ b/src/addons/utils/a6_utils_diff_test.mbt @@ -43,14 +43,26 @@ extern "js" fn a6u_enabled() -> Bool = "() => typeof process !== 'undefined' && extern "js" fn a6u_canon(c : @core.JsValue, value : @core.JsValue) -> String = "(c, v) => c.canon(v)" ///| -extern "js" fn a6u_data_raw( +extern "js" fn a6u_data_raw_fixed( c : @core.JsValue, seed : Int32, n : Int32, scale : Double, offset : Double, float : Bool, -) -> Array[Double] = "(c, s, n, k, o, f) => c.data(s, n, k, o, f)" +) -> FixedArray[Double] = "(c, s, n, k, o, f) => c.data(s, n, k, o, f)" + +///| +fn a6u_data_raw( + c : @core.JsValue, + seed : Int32, + n : Int32, + scale : Double, + offset : Double, + float : Bool, +) -> Array[Double] { + Array::from_fixed_array(a6u_data_raw_fixed(c, seed, n, scale, offset, float)) +} ///| extern "js" fn a6u_rng_raw(c : @core.JsValue, seed : Int32) -> () -> Double = "(c, s) => c.rng(s)" @@ -506,7 +518,7 @@ test "a6 utils: SceneUtils" { a6u_array(attrs["offset"].array()), a6u_array(attrs["weight"].array()), a6u_array(attrs["id4"].array()), - a6u_array(attrs["position"].array())[0:6].to_array(), + a6u_array(attrs["position"].array())[0:6].to_owned(), ]), ) // traverse generators @@ -538,9 +550,9 @@ test "a6 utils: SceneUtils" { let all = names(@utils.traverse_generator(root)) let visible = names(@utils.traverse_visible_generator(root)) let ancestors = names(@utils.traverse_ancestors_generator(c1.children[0])) - let lazy = [] + let traversed_names = [] for o in @utils.traverse_generator(root) { - lazy.push(o.name) + traversed_names.push(o.name) if o.name == "a" { make("a3", Some(a)) |> ignore make("d", Some(root)) |> ignore @@ -563,7 +575,7 @@ test "a6 utils: SceneUtils" { all, visible, ancestors, - lazy, + traversed_names, early, invisible_root, names(@utils.traverse_ancestors_generator(root)), diff --git a/src/addons/utils/addon_promise.mbt b/src/addons/utils/addon_promise.mbt index 6c8f06e..6460518 100644 --- a/src/addons/utils/addon_promise.mbt +++ b/src/addons/utils/addon_promise.mbt @@ -1,7 +1,7 @@ // JS Promise bindings shared by the add-ons that upstream writes as promise chains // (WorkerPool, GLTFLoader, DRACOLoader, KTX2Loader). Each method is one upstream // expression, so `.then` chains take the same microtasks as upstream. Values cross -// as JS values: a MoonBit struct is a JS object, an `Array` a JS array, `None` is +// as JS values: a MoonBit struct is a JS object, a `FixedArray` a JS array, `None` is // `undefined`; `JsValue::null()` stands for upstream's `null`. ///| @@ -98,15 +98,15 @@ pub fn AddonPromise::reject(error : JsValue) -> AddonPromise { } ///| -/// `Promise.all( promises )`; resolves to a JS array, read as `Array[JsValue]`. +/// `Promise.all( promises )`; resolves to a JS array, read as `FixedArray[JsValue]`. pub fn AddonPromise::all(promises : Array[AddonPromise]) -> AddonPromise { - addon_promise_all_raw(JsValue::of(promises)) + addon_promise_all_raw(JsValue::of(FixedArray::from_array(promises))) } ///| /// `Promise.all( values )` where entries may be plain values or promises. pub fn AddonPromise::all_values(values : Array[JsValue]) -> AddonPromise { - addon_promise_all_raw(JsValue::of(values)) + addon_promise_all_raw(JsValue::of(FixedArray::from_array(values))) } ///| diff --git a/src/addons/utils/moon.pkg b/src/addons/utils/moon.pkg index 635719d..578f002 100644 --- a/src/addons/utils/moon.pkg +++ b/src/addons/utils/moon.pkg @@ -2,10 +2,13 @@ import { "moonbit-community/three/core", "moonbit-community/three/math", "moonbit-community/three/renderers/webgl", - "moonbit-community/three/geometries", "moonbit-community/three/nodes", "moonbit-community/three/renderers/webgpu", "moonbit-community/three/animation", } warnings = "-79" + +import { + "moonbit-community/three/geometries", +} for "test" diff --git a/src/addons/utils/sort_utils.mbt b/src/addons/utils/sort_utils.mbt index dec3182..d14cc50 100644 --- a/src/addons/utils/sort_utils.mbt +++ b/src/addons/utils/sort_utils.mbt @@ -10,16 +10,16 @@ const SORT_UTILS_POWER : Int32 = 3 const SORT_UTILS_BIT_MAX : Int32 = 32 ///| -const SORT_UTILS_BIN_BITS : Int32 = 8 // 1 << POWER +const SORT_UTILS_BIN_BITS : Int32 = 1 << SORT_UTILS_POWER ///| -const SORT_UTILS_BIN_SIZE : Int32 = 256 // 1 << BIN_BITS +const SORT_UTILS_BIN_SIZE : Int32 = 1 << SORT_UTILS_BIN_BITS ///| -const SORT_UTILS_BIN_MAX : Int32 = 255 // BIN_SIZE - 1 +const SORT_UTILS_BIN_MAX : Int32 = SORT_UTILS_BIN_SIZE - 1 ///| -const SORT_UTILS_ITERATIONS : Int32 = 4 // BIT_MAX / BIN_BITS +const SORT_UTILS_ITERATIONS : Int32 = SORT_UTILS_BIT_MAX / SORT_UTILS_BIN_BITS ///| /// `bins`: one histogram per depth plus one, shared by every call as upstream's diff --git a/src/animation/animation_js.mbt b/src/animation/animation_js.mbt index 4c5a843..f48c180 100644 --- a/src/animation/animation_js.mbt +++ b/src/animation/animation_js.mbt @@ -1,13 +1,23 @@ // JS helpers shared by the files of this package. Keyframe tracks keep their times and // values in real typed arrays (`@core.TypedArray`), as upstream does, so that writes -// round to Float32. The interpolants of `@math` take `Array[Double]`; on the JS backend -// a MoonBit array is a plain JS array, so a typed array can stand in for one as long as -// only indexing and `length` are used. `typed_as_array` gives that view. +// round to Float32. Interpolants take `Array[Double]`; their views must retain the +// typed backing storage and use MoonBit's array header (`buf`, `len`). + +///| +priv struct AnimationTypedArrayView { + buf : @core.TypedArray + len : Int32 +} + +///| +fn animation_typed_array_view(view : AnimationTypedArrayView) -> Array[Double] = "%identity" ///| /// Views a typed array as an `Array[Double]`, sharing its storage. Only indexing and /// `length()` are valid on the result. -fn typed_as_array(array : @core.TypedArray) -> Array[Double] = "%identity" +fn typed_as_array(array : @core.TypedArray) -> Array[Double] { + animation_typed_array_view({ buf: array, len: array.length(), }) +} ///| /// `new Float32Array( size )` viewed as an `Array[Double]`. diff --git a/src/animation/animation_utils.mbt b/src/animation/animation_utils.mbt index d0086b0..eda5034 100644 --- a/src/animation/animation_utils.mbt +++ b/src/animation/animation_utils.mbt @@ -243,7 +243,9 @@ pub fn make_clip_additive( // Interpolate to the reference value let interpolant = reference_track.create_interpolant() interpolant.evaluate(reference_time) |> ignore - js_result_buffer_slice(@core.JsValue::of(interpolant.result_buffer)) + js_result_buffer_slice( + @core.JsValue::of(FixedArray::from_array(interpolant.result_buffer)), + ) } // Conjugate the quaternion diff --git a/src/animation/keyframe_track_test.mbt b/src/animation/keyframe_track_test.mbt index ee3407f..ccedc0a 100644 --- a/src/animation/keyframe_track_test.mbt +++ b/src/animation/keyframe_track_test.mbt @@ -41,6 +41,21 @@ test "KeyframeTrack: shift" { assert_eq(track.create_interpolant().evaluate(2.5)[0], 0.5) } +///| +test "KeyframeTrack interpolants share samples and round default results to Float32" { + let track = @animation.NumberKeyframeTrack::new(".value", [0, 1], [0, 1]) + let interpolant = track.create_interpolant() + track.times[1] = 2 + track.values.numbers()[1] = 3 + assert_eq(interpolant.evaluate(1)[0], 1.5) + let expected = @core.TypedArray::float32([0.3])[0] + assert_eq(interpolant.evaluate(0.2)[0], expected) + let result = [0.0] + let shared = track.create_interpolant(result~) + assert_true(physical_equal(shared.evaluate(1), result)) + assert_eq(result, [1.5]) +} + ///| test "KeyframeTrack: validate" { let valid_track = @animation.NumberKeyframeTrack::new( diff --git a/src/core/json_fidelity_test.mbt b/src/core/json_fidelity_test.mbt index 46f9d71..ec59f61 100644 --- a/src/core/json_fidelity_test.mbt +++ b/src/core/json_fidelity_test.mbt @@ -40,7 +40,7 @@ test "Material::from_json keeps a null attenuationDistance" { let material = @core.MeshPhysicalMaterial::new() let json = material.to_json() guard json is Object(data) else { abort("not an object") } - inspect(data.get("attenuationDistance"), content="Some(Null)") + debug_inspect(data.get("attenuationDistance"), content="Some(Null)") let back = @core.MeshPhysicalMaterial::new().from_json(json) inspect( back.to_json().stringify().contains("\"attenuationDistance\":null"), @@ -79,14 +79,14 @@ test "lights draw ids in upstream's order: light, target, shadow camera" { abort("not a DirectionalLight") } let camera = directional.as_light().shadow.unwrap().camera - inspect( + debug_inspect( (d.target.id - directional.id, camera.id - directional.id), content="(1, 2)", ) let spot = @core.SpotLight::new() guard spot.as_light().kind is SpotLight(s) else { abort("not a SpotLight") } let camera = spot.as_light().shadow.unwrap().camera - inspect((s.target.id - spot.id, camera.id - spot.id), content="(1, 2)") + debug_inspect((s.target.id - spot.id, camera.id - spot.id), content="(1, 2)") let point = @core.PointLight::new() let camera = point.as_light().shadow.unwrap().camera inspect(camera.id - point.id, content="1") @@ -121,5 +121,5 @@ test "constructors draw uuids in upstream's order" { let sprite_uuids = [data.material.uuid, sprite.uuid] json_fidelity_unseed() assert_eq(directional, expected) - assert_eq(sprite_uuids, expected[0:2].to_array()) + assert_eq(sprite_uuids, expected[0:2].to_owned()) } diff --git a/src/core/material.mbt b/src/core/material.mbt index 1ad1973..8c7ebb8 100644 --- a/src/core/material.mbt +++ b/src/core/material.mbt @@ -31,7 +31,7 @@ pub(all) enum MaterialValue { /// `userData`. Object(JsValue) OnBeforeRender( - (JsValue, Object3D, Object3D, BufferGeometry, Object3D, GeometryGroup?) -> Unit + (JsValue, Object3D, Object3D, BufferGeometry, Object3D, GeometryGroup?) -> Unit, ) OnBeforeCompile((ShaderObject, JsValue) -> Unit) CustomProgramCacheKey(() -> String) diff --git a/src/core/math_bridge.mbt b/src/core/math_bridge.mbt index b2f06be..70b072b 100644 --- a/src/core/math_bridge.mbt +++ b/src/core/math_bridge.mbt @@ -23,35 +23,13 @@ extern "js" fn objects_array_sort(array : JsValue, compare : JsValue) -> Unit = ///| /// `array.sort( compare )`. Core's sorts are unstable or differ on NaN comparisons. fn[T] objects_stable_sort(array : Array[T], compare : (T, T) -> Double) -> Unit { - objects_array_sort(JsValue::of(array), JsValue::of(compare)) + let sorted = FixedArray::from_array(array) + objects_array_sort(JsValue::of(sorted), JsValue::of(compare)) + for i, value in sorted { + array[i] = value + } } -///| -extern "js" fn typed_array_write_elements16( - array : TypedArray, - elements : JsValue, - offset : Int32, -) -> Unit = - #|(a, e, o) => { - #| a[o] = e[0]; a[o + 1] = e[1]; a[o + 2] = e[2]; a[o + 3] = e[3]; - #| a[o + 4] = e[4]; a[o + 5] = e[5]; a[o + 6] = e[6]; a[o + 7] = e[7]; - #| a[o + 8] = e[8]; a[o + 9] = e[9]; a[o + 10] = e[10]; a[o + 11] = e[11]; - #| a[o + 12] = e[12]; a[o + 13] = e[13]; a[o + 14] = e[14]; a[o + 15] = e[15]; - #|} - -///| -extern "js" fn typed_array_read_elements16( - array : TypedArray, - elements : JsValue, - offset : Int32, -) -> Unit = - #|(a, e, o) => { - #| e[0] = a[o]; e[1] = a[o + 1]; e[2] = a[o + 2]; e[3] = a[o + 3]; - #| e[4] = a[o + 4]; e[5] = a[o + 5]; e[6] = a[o + 6]; e[7] = a[o + 7]; - #| e[8] = a[o + 8]; e[9] = a[o + 9]; e[10] = a[o + 10]; e[11] = a[o + 11]; - #| e[12] = a[o + 12]; e[13] = a[o + 13]; e[14] = a[o + 14]; e[15] = a[o + 15]; - #|} - ///| /// `matrix.toArray( array, offset )` for a typed array. Allocates nothing. fn typed_array_write_matrix4( @@ -59,7 +37,9 @@ fn typed_array_write_matrix4( matrix : @math.Matrix4, offset : Int32, ) -> Unit { - typed_array_write_elements16(array, JsValue::of(matrix.elements), offset) + for i in 0..<16 { + array[offset + i] = matrix.elements[i] + } } ///| @@ -69,7 +49,9 @@ fn typed_array_read_matrix4( matrix : @math.Matrix4, offset : Int32, ) -> @math.Matrix4 { - typed_array_read_elements16(array, JsValue::of(matrix.elements), offset) + for i in 0..<16 { + matrix.elements[i] = array[offset + i] + } matrix } @@ -377,7 +359,7 @@ pub fn frustum_array_set_from_array_camera( ) -> @math.FrustumArray { guard camera_array.kind is Camera( - { kind: PerspectiveCamera({ array_camera: Some(array_camera), .. }), .. } + { kind: PerspectiveCamera({ array_camera: Some(array_camera), .. }), .. }, ) else { abort("FrustumArray.setFromArrayCamera: not an ArrayCamera") } diff --git a/src/extras/image_utils_test.mbt b/src/extras/image_utils_test.mbt index 5be91ee..aad18c6 100644 --- a/src/extras/image_utils_test.mbt +++ b/src/extras/image_utils_test.mbt @@ -12,7 +12,9 @@ extern "js" fn fround(x : Double) -> Double = "Math.fround" ///| test "ImageUtils srgb_to_linear converts data images into a new object" { - let image = image_with_data(@core.JsValue::of([0.5, 1.0])) + let image = image_with_data( + @core.JsValue::of(([0.5, 1.0] : FixedArray[Double])), + ) let result = @extras.ImageUtils::srgb_to_linear(image) assert_false(result.strict_equal(image)) assert_eq(image_first_value(result), fround(@math.srgb_to_linear(0.5))) diff --git a/src/extras/path.mbt b/src/extras/path.mbt index 1cc5298..8ac9658 100644 --- a/src/extras/path.mbt +++ b/src/extras/path.mbt @@ -475,7 +475,7 @@ pub fn Path::compute_frenet_frames( ///| pub fn Path::clone(self : Path) -> Path { - Path::{ curve: self.curve.clone(), } + { curve: self.curve.clone(), } } ///| diff --git a/src/extras/shape.mbt b/src/extras/shape.mbt index db999e3..9eca21b 100644 --- a/src/extras/shape.mbt +++ b/src/extras/shape.mbt @@ -128,7 +128,7 @@ pub fn Shape::set_holes(self : Shape, holes : Array[Path]) -> Unit { ///| /// The upcast to `Path`, sharing this shape's state. pub fn Shape::to_path(self : Shape) -> Path { - Path::{ curve: self.curve, } + { curve: self.curve, } } ///| @@ -333,7 +333,7 @@ pub fn Shape::compute_frenet_frames( ///| pub fn Shape::clone(self : Shape) -> Shape { - Shape::{ curve: self.curve.clone(), } + { curve: self.curve.clone(), } } ///| diff --git a/src/extras/shape_utils.mbt b/src/extras/shape_utils.mbt index 200b2c9..f0c7f8d 100644 --- a/src/extras/shape_utils.mbt +++ b/src/extras/shape_utils.mbt @@ -78,5 +78,9 @@ extern "js" fn extras_js_sort( ///| /// JS `Array.prototype.sort`, which fixes the order an inconsistent comparator gives. fn[T] extras_sort_by(array : Array[T], compare : (T, T) -> Double) -> Unit { - extras_js_sort(@core.JsValue::of(array), @core.JsValue::of(compare)) + let sorted = FixedArray::from_array(array) + extras_js_sort(@core.JsValue::of(sorted), @core.JsValue::of(compare)) + for i, value in sorted { + array[i] = value + } } diff --git a/src/loaders/file_loader_test.mbt b/src/loaders/file_loader_test.mbt index 272ab78..272d039 100644 --- a/src/loaders/file_loader_test.mbt +++ b/src/loaders/file_loader_test.mbt @@ -28,7 +28,7 @@ async test "FileLoader loadAsync rejects with the HTTP error" { ignore(loader.load_async("data:invalid")) "loaded" } catch { - @loaders.LoaderError(_) => "rejected" + LoaderError(_) => "rejected" } assert_eq(result, "rejected") } @@ -71,7 +71,7 @@ async test "BufferGeometryLoader and MaterialLoader loadAsync" { ) "loaded" } catch { - @loaders.LoaderError(_) => "rejected" + LoaderError(_) => "rejected" } assert_eq(bad, "rejected") } diff --git a/src/loaders/object_loader.mbt b/src/loaders/object_loader.mbt index e10674a..548461b 100644 --- a/src/loaders/object_loader.mbt +++ b/src/loaders/object_loader.mbt @@ -1039,12 +1039,12 @@ fn ObjectLoader::parse_object( match background { Number(value, ..) if value == value.floor() && !value.is_inf() => scene.background = object_loader_color(Some(background)).map(color => { - @core.SceneBackground::Color(color) + Color(color) }) background => scene.background = get_texture( json_string(background, "background"), - ).map(texture => @core.SceneBackground::Texture(texture)) + ).map(texture => Texture(texture)) } } if data.get("environment") is Some(environment) { diff --git a/src/math/color_management.mbt b/src/math/color_management.mbt index 03873dc..f33b593 100644 --- a/src/math/color_management.mbt +++ b/src/math/color_management.mbt @@ -147,7 +147,9 @@ pub fn ColorManagement::get_luminance_coefficients( } ///| -pub fn ColorManagement::define( +/// Defines color spaces, retaining the upstream `define` name as an alias. +#alias(define) +pub fn ColorManagement::define_( self : ColorManagement, color_spaces : Map[String, ColorSpaceDefinition], ) -> Unit { @@ -196,7 +198,7 @@ fn create_color_management() -> ColorManagement { let rec709_primaries = [0.640, 0.330, 0.300, 0.600, 0.150, 0.060] let rec709_luminance_coefficients = [0.2126, 0.7152, 0.0722] let d65 = [0.3127, 0.3290] - color_management.define( + color_management.define_( Map::from_array([ ( LinearSRGBColorSpace, diff --git a/src/math/color_management_test.mbt b/src/math/color_management_test.mbt index 7af4cfd..140a0b3 100644 --- a/src/math/color_management_test.mbt +++ b/src/math/color_management_test.mbt @@ -11,7 +11,7 @@ test "ColorManagement: _getMatrix" { Map::from_array([ ( linear_display_p3_color_space, - @math.ColorSpaceDefinition::{ + { primaries: [0.680, 0.320, 0.265, 0.690, 0.150, 0.060], white_point: [0.3127, 0.3290], transfer: @math.LinearTransfer, diff --git a/src/math/json_number_test.mbt b/src/math/json_number_test.mbt index c02d8ab..64c1cac 100644 --- a/src/math/json_number_test.mbt +++ b/src/math/json_number_test.mbt @@ -13,9 +13,9 @@ test "json_number writes non-finite numbers as null, as JSON.stringify" { ///| test "json_to_number reads null as NaN" { - inspect(@math.json_to_number(Json::number(2)), content="Some(2)") + debug_inspect(@math.json_to_number(Json::number(2)), content="Some(2)") assert_true(@math.json_to_number(Json::null()).unwrap().is_nan()) - inspect(@math.json_to_number(Json::string("2")), content="None") + debug_inspect(@math.json_to_number(Json::string("2")), content="None") } ///| diff --git a/src/math/pkg.generated.mbti b/src/math/pkg.generated.mbti index 3a27126..2a19372 100644 --- a/src/math/pkg.generated.mbti +++ b/src/math/pkg.generated.mbti @@ -218,7 +218,8 @@ pub fn ColorManagement::_get_matrix(Self, Matrix3, String, String) -> Matrix3 pub fn ColorManagement::_get_unpack_color_space(Self, color_space? : String) -> String pub fn ColorManagement::color_space_to_working(Self, Color, String) -> Color pub fn ColorManagement::convert(Self, Color, String, String) -> Color -pub fn ColorManagement::define(Self, Map[String, ColorSpaceDefinition]) -> Unit +#alias(define) +pub fn ColorManagement::define_(Self, Map[String, ColorSpaceDefinition]) -> Unit pub fn ColorManagement::get_luminance_coefficients(Self, Vector3, color_space? : String) -> Vector3 pub fn ColorManagement::get_primaries(Self, String) -> Array[Double] pub fn ColorManagement::get_tone_mapping_mode(Self, String) -> String diff --git a/src/nodes/accessors_buffer_attribute_node.mbt b/src/nodes/accessors_buffer_attribute_node.mbt index bac2ec7..16dbfd0 100644 --- a/src/nodes/accessors_buffer_attribute_node.mbt +++ b/src/nodes/accessors_buffer_attribute_node.mbt @@ -214,7 +214,7 @@ pub impl NodeClass for BufferAttributeNode with fn parent(self) { ///| pub impl NodeClass for BufferAttributeNode with fn has_flag(self, flag) { - flag == "isBufferNode" || self.input.has_flag(flag) + flag == "isBufferNode" || NodeClass::has_flag(self.input, flag) } ///| @@ -350,8 +350,7 @@ pub fn BufferAttributeNode::construct( a.kind is (InstancedAttribute | StorageInstancedAttribute), Some(@core.GeometryAttribute::Buffer(a)), ) - Attribute(Interleaved(a)) => - (a.data.usage, false, Some(@core.GeometryAttribute::Interleaved(a))) + Attribute(Interleaved(a)) => (a.data.usage, false, Some(Interleaved(a))) _ => (@core.StaticDrawUsage, false, None) } { diff --git a/src/nodes/accessors_buffer_node.mbt b/src/nodes/accessors_buffer_node.mbt index de8e9ab..cd2298d 100644 --- a/src/nodes/accessors_buffer_node.mbt +++ b/src/nodes/accessors_buffer_node.mbt @@ -21,7 +21,7 @@ pub impl NodeClass for BufferNode with fn parent(self) { ///| pub impl NodeClass for BufferNode with fn has_flag(self, flag) { - flag == "isBufferNode" || self.uniform.has_flag(flag) + flag == "isBufferNode" || NodeClass::has_flag(self.uniform, flag) } ///| diff --git a/src/nodes/accessors_camera.mbt b/src/nodes/accessors_camera.mbt index 0e27e27..94df553 100644 --- a/src/nodes/accessors_camera.mbt +++ b/src/nodes/accessors_camera.mbt @@ -17,7 +17,7 @@ fn camera_get_camera_array( let arrays = match _camera_arrays.get(renderer) { Some(a) => a None => { - let a = {} + let a = Map([]) _camera_arrays.set(renderer, a) a } diff --git a/src/nodes/accessors_cube_texture_node.mbt b/src/nodes/accessors_cube_texture_node.mbt index 0ec3aa7..f5fb901 100644 --- a/src/nodes/accessors_cube_texture_node.mbt +++ b/src/nodes/accessors_cube_texture_node.mbt @@ -21,7 +21,7 @@ pub impl NodeClass for CubeTextureNode with fn parent(self) { ///| pub impl NodeClass for CubeTextureNode with fn has_flag(self, flag) { - flag == "isCubeTextureNode" || self.texture.has_flag(flag) + flag == "isCubeTextureNode" || NodeClass::has_flag(self.texture, flag) } ///| diff --git a/src/nodes/accessors_material_node.mbt b/src/nodes/accessors_material_node.mbt index 2c4fa83..fd74dc4 100644 --- a/src/nodes/accessors_material_node.mbt +++ b/src/nodes/accessors_material_node.mbt @@ -9,7 +9,7 @@ extern "js" fn material_node_sin(x : Double) -> Double = "Math.sin" ///| /// `_propertyCache`: property -> material reference node. -let _material_node_property_cache : Map[String, Node] = {} +let _material_node_property_cache : Map[String, Node] = Map([]) ///| pub(all) struct MaterialNode { diff --git a/src/nodes/accessors_material_reference_node.mbt b/src/nodes/accessors_material_reference_node.mbt index fda1e0e..2f31237 100644 --- a/src/nodes/accessors_material_reference_node.mbt +++ b/src/nodes/accessors_material_reference_node.mbt @@ -19,7 +19,8 @@ pub impl NodeClass for MaterialReferenceNode with fn parent(self) { ///| pub impl NodeClass for MaterialReferenceNode with fn has_flag(self, flag) { - flag == "isMaterialReferenceNode" || self.reference_node.has_flag(flag) + flag == "isMaterialReferenceNode" || + NodeClass::has_flag(self.reference_node, flag) } ///| diff --git a/src/nodes/accessors_model_node.mbt b/src/nodes/accessors_model_node.mbt index 6b081de..09ea7db 100644 --- a/src/nodes/accessors_model_node.mbt +++ b/src/nodes/accessors_model_node.mbt @@ -22,7 +22,7 @@ pub impl NodeClass for ModelNode with fn parent(self) { ///| pub impl NodeClass for ModelNode with fn update(self, node, frame) { self.object3d_node.object3d = frame.object - self.object3d_node.update(node, frame) + NodeClass::update(self.object3d_node, node, frame) } ///| diff --git a/src/nodes/accessors_reference_attribute_node.mbt b/src/nodes/accessors_reference_attribute_node.mbt index 593a127..8d91f56 100644 --- a/src/nodes/accessors_reference_attribute_node.mbt +++ b/src/nodes/accessors_reference_attribute_node.mbt @@ -22,7 +22,7 @@ fn reference_attribute_get_column( let columns = match _reference_attribute_columns.get(attribute) { Some(c) => c None => { - let c = {} + let c = Map([]) _reference_attribute_columns.set(attribute, c) c } @@ -342,7 +342,7 @@ pub impl NodeClass for ReferenceBufferAttributeNode with fn parent(self) { ///| pub impl NodeClass for ReferenceBufferAttributeNode with fn has_flag(self, flag) { flag == "isReferenceBufferAttributeNode" || - self.buffer_attribute.has_flag(flag) + NodeClass::has_flag(self.buffer_attribute, flag) } ///| @@ -351,7 +351,7 @@ pub impl NodeClass for ReferenceBufferAttributeNode with fn children( node, out, ) { - self.buffer_attribute.children(node, out) + NodeClass::children(self.buffer_attribute, node, out) push_child(out, "referenceNode", Some(self.reference_node)) } @@ -366,7 +366,8 @@ pub impl NodeClass for ReferenceBufferAttributeNode with fn setup( node, builder, ) { - self.buffer_attribute.attribute = self.get_object_attribute( + self.buffer_attribute.attribute = BufferAttributeNodeClass::get_object_attribute( + self, node, builder.object, ) diff --git a/src/nodes/accessors_reference_element_node.mbt b/src/nodes/accessors_reference_element_node.mbt index 5be28ec..bdbe843 100644 --- a/src/nodes/accessors_reference_element_node.mbt +++ b/src/nodes/accessors_reference_element_node.mbt @@ -18,12 +18,13 @@ pub impl NodeClass for ReferenceElementNode with fn parent(self) { ///| pub impl NodeClass for ReferenceElementNode with fn has_flag(self, flag) { - flag == "isReferenceElementNode" || self.array_element.has_flag(flag) + flag == "isReferenceElementNode" || + NodeClass::has_flag(self.array_element, flag) } ///| pub impl NodeClass for ReferenceElementNode with fn children(self, node, out) { - self.array_element.children(node, out) + NodeClass::children(self.array_element, node, out) push_child(out, "referenceNode", Some(self.reference_node)) } @@ -51,7 +52,9 @@ pub impl NodeClass for ReferenceElementNode with fn generate( builder, output, ) { - let snippet = self.array_element.generate(node, builder, output).unwrap_or("") + let snippet = NodeClass::generate(self.array_element, node, builder, output).unwrap_or( + "", + ) let array_type = self.reference_node.get_node_type(builder) let element_type = node.get_node_type(builder) Some(builder.format(snippet, array_type, element_type)) diff --git a/src/nodes/accessors_shader_diff_test.mbt b/src/nodes/accessors_shader_diff_test.mbt index 43430d7..67957e1 100644 --- a/src/nodes/accessors_shader_diff_test.mbt +++ b/src/nodes/accessors_shader_diff_test.mbt @@ -11,7 +11,18 @@ extern "js" fn g2_shader_diff_enabled() -> Bool = "() => typeof process !== 'undefined' && process.env.SHADER_DIFF === '1'" ///| -extern "js" fn g2_shader_json( +extern "js" fn g2_shader_json_fixed( + code : String, + result : String, + vars : String, + uniforms : FixedArray[String], + varyings : FixedArray[String], + attributes : FixedArray[String], + values : FixedArray[String], +) -> String = "(code, result, vars, uniforms, varyings, attributes, values) => JSON.stringify({ code, result, vars, uniforms, varyings, attributes, values })" + +///| +fn g2_shader_json( code : String, result : String, vars : String, @@ -19,7 +30,17 @@ extern "js" fn g2_shader_json( varyings : Array[String], attributes : Array[String], values : Array[String], -) -> String = "(code, result, vars, uniforms, varyings, attributes, values) => JSON.stringify({ code, result, vars, uniforms, varyings, attributes, values })" +) -> String { + g2_shader_json_fixed( + code, + result, + vars, + FixedArray::from_array(uniforms), + FixedArray::from_array(varyings), + FixedArray::from_array(attributes), + FixedArray::from_array(values), + ) +} ///| /// JS `String( n )`. diff --git a/src/nodes/accessors_storage_buffer_node.mbt b/src/nodes/accessors_storage_buffer_node.mbt index 5cd0cfd..7d0455a 100644 --- a/src/nodes/accessors_storage_buffer_node.mbt +++ b/src/nodes/accessors_storage_buffer_node.mbt @@ -34,12 +34,12 @@ pub impl NodeClass for StorageBufferNode with fn parent(self) { ///| pub impl NodeClass for StorageBufferNode with fn has_flag(self, flag) { - flag == "isStorageBufferNode" || self.buffer.has_flag(flag) + flag == "isStorageBufferNode" || NodeClass::has_flag(self.buffer, flag) } ///| pub impl NodeClass for StorageBufferNode with fn children(self, node, out) { - self.buffer.children(node, out) + NodeClass::children(self.buffer, node, out) push_child(out, "structTypeNode", self.struct_type_node) } @@ -77,7 +77,7 @@ pub impl NodeClass for StorageBufferNode with fn generate_node_type( ) { match self.struct_type_node { Some(s) => s.get_node_type(builder) - None => self.buffer.generate_node_type(node, builder, output) + None => NodeClass::generate_node_type(self.buffer, node, builder, output) } } @@ -112,7 +112,7 @@ pub impl NodeClass for StorageBufferNode with fn generate( } if builder.is_available("storageBuffer") || builder.is_available("indirectStorageBuffer") { - return self.buffer.generate(node, builder, None) + return NodeClass::generate(self.buffer, node, builder, None) } let (attribute, varying) = StorageBufferNode::get_attribute_data(node) let output = varying.build(builder) diff --git a/src/nodes/accessors_storage_texture3_d_node.mbt b/src/nodes/accessors_storage_texture3_d_node.mbt index 99cbd52..7a2cd4f 100644 --- a/src/nodes/accessors_storage_texture3_d_node.mbt +++ b/src/nodes/accessors_storage_texture3_d_node.mbt @@ -17,7 +17,7 @@ pub impl NodeClass for StorageTexture3DNode with fn parent(self) { ///| pub impl NodeClass for StorageTexture3DNode with fn has_flag(self, flag) { - flag == "isStorageTexture3DNode" || self.storage.has_flag(flag) + flag == "isStorageTexture3DNode" || NodeClass::has_flag(self.storage, flag) } ///| diff --git a/src/nodes/accessors_storage_texture_node.mbt b/src/nodes/accessors_storage_texture_node.mbt index 152454d..00fea7a 100644 --- a/src/nodes/accessors_storage_texture_node.mbt +++ b/src/nodes/accessors_storage_texture_node.mbt @@ -21,18 +21,18 @@ pub impl NodeClass for StorageTextureNode with fn parent(self) { ///| pub impl NodeClass for StorageTextureNode with fn has_flag(self, flag) { - flag == "isStorageTextureNode" || self.texture.has_flag(flag) + flag == "isStorageTextureNode" || NodeClass::has_flag(self.texture, flag) } ///| pub impl NodeClass for StorageTextureNode with fn children(self, node, out) { - self.texture.children(node, out) + NodeClass::children(self.texture, node, out) push_child(out, "storeNode", self.store_node) } ///| pub impl NodeClass for StorageTextureNode with fn setup(self, node, builder) { - self.texture.setup(node, builder) |> ignore + NodeClass::setup(self.texture, node, builder) |> ignore let properties = builder.get_node_properties(node) properties.set_node_or_null("storeNode", self.store_node) // Upstream returns `properties`, which becomes the (non-node) output; the node is @@ -51,7 +51,7 @@ pub impl NodeClass for StorageTextureNode with fn generate( StorageTextureNode::generate_store(node, builder) return Some("") } - self.texture.generate(node, builder, output) + NodeClass::generate(self.texture, node, builder, output) } ///| @@ -214,9 +214,12 @@ pub fn StorageTextureNode::generate_store( let store_node = properties.get_node("storeNode").unwrap() let depth_node = properties.get_node("depthNode") // `super.generate( builder, 'property' )`: TextureNode's generate. - let texture_property = s.texture - .generate(node, builder, Some("property")) - .unwrap_or("") + let texture_property = NodeClass::generate( + s.texture, + node, + builder, + Some("property"), + ).unwrap_or("") let texture = TextureNode::get_value(node) let uv_snippet = uv_node.build( builder, diff --git a/src/nodes/accessors_texture3_d_node.mbt b/src/nodes/accessors_texture3_d_node.mbt index 4054c0c..6286a06 100644 --- a/src/nodes/accessors_texture3_d_node.mbt +++ b/src/nodes/accessors_texture3_d_node.mbt @@ -64,7 +64,7 @@ pub impl NodeClass for Texture3DNode with fn parent(self) { ///| pub impl NodeClass for Texture3DNode with fn has_flag(self, flag) { - flag == "isTexture3DNode" || self.texture.has_flag(flag) + flag == "isTexture3DNode" || NodeClass::has_flag(self.texture, flag) } ///| diff --git a/src/nodes/accessors_texture_node.mbt b/src/nodes/accessors_texture_node.mbt index 94a731b..8a1e072 100644 --- a/src/nodes/accessors_texture_node.mbt +++ b/src/nodes/accessors_texture_node.mbt @@ -232,12 +232,12 @@ pub impl NodeClass for TextureNode with fn parent(self) { ///| pub impl NodeClass for TextureNode with fn has_flag(self, flag) { - flag == "isTextureNode" || self.uniform.has_flag(flag) + flag == "isTextureNode" || NodeClass::has_flag(self.uniform, flag) } ///| pub impl NodeClass for TextureNode with fn children(self, node, out) { - self.uniform.children(node, out) + NodeClass::children(self.uniform, node, out) push_child(out, "uvNode", self.uv_node) push_child(out, "levelNode", self.level_node) push_child(out, "biasNode", self.bias_node) @@ -384,9 +384,12 @@ pub impl NodeClass for TextureNode with fn setup(self, node, builder) { pub impl NodeClass for TextureNode with fn generate(self, node, builder, output) { let texture = TextureNode::get_value(node) let properties = builder.get_node_properties(node) - let texture_property = self.uniform - .generate(node, builder, Some("property")) - .unwrap_or("") + let texture_property = NodeClass::generate( + self.uniform, + node, + builder, + Some("property"), + ).unwrap_or("") if output == Some("samplerComparison") || properties.get_node("compareNode") is Some(_) { // make sure the texture node creates a binding with a comparison sampler @@ -513,7 +516,7 @@ pub impl NodeClass for TextureNode with fn generate(self, node, builder, output) ///| pub impl NodeClass for TextureNode with fn serialize(self, node, data) { - self.uniform.serialize(node, data) + NodeClass::serialize(self.uniform, node, data) // `this.value.toJSON( data.meta ).uuid`: the texture's uuid. data.set("value", @core.JsValue::of(TextureNode::get_value(node).uuid)) data.set("sampler", @core.JsValue::of(self.sampler)) @@ -522,7 +525,7 @@ pub impl NodeClass for TextureNode with fn serialize(self, node, data) { ///| pub impl NodeClass for TextureNode with fn deserialize(self, node, data) { - self.uniform.deserialize(node, data) + NodeClass::deserialize(self.uniform, node, data) let textures = data.get("meta").get("textures") let value = textures.get(data.get("value").cast()) if !value.is_undefined() && !value.is_null() { diff --git a/src/nodes/accessors_uniform_array_node.mbt b/src/nodes/accessors_uniform_array_node.mbt index 64ad4e9..3c5d67a 100644 --- a/src/nodes/accessors_uniform_array_node.mbt +++ b/src/nodes/accessors_uniform_array_node.mbt @@ -19,7 +19,8 @@ pub impl NodeClass for UniformArrayElementNode with fn parent(self) { ///| pub impl NodeClass for UniformArrayElementNode with fn has_flag(self, flag) { - flag == "isArrayBufferElementNode" || self.array_element.has_flag(flag) + flag == "isArrayBufferElementNode" || + NodeClass::has_flag(self.array_element, flag) } ///| @@ -29,7 +30,9 @@ pub impl NodeClass for UniformArrayElementNode with fn generate( builder, output, ) { - let snippet = self.array_element.generate(node, builder, output).unwrap_or("") + let snippet = NodeClass::generate(self.array_element, node, builder, output).unwrap_or( + "", + ) let type_ = node.get_node_type(builder) let padded_type = UniformArrayNode::get_padded_type( self.array_element.node, @@ -80,7 +83,7 @@ pub impl NodeClass for UniformArrayNode with fn parent(self) { ///| pub impl NodeClass for UniformArrayNode with fn has_flag(self, flag) { - flag == "isArrayBufferNode" || self.buffer.has_flag(flag) + flag == "isArrayBufferNode" || NodeClass::has_flag(self.buffer, flag) } ///| @@ -116,7 +119,7 @@ pub impl NodeClass for UniformArrayNode with fn on_update( UniformArrayNode::update_buffer(node) None } - match self.buffer.on_update(node, wrapped, update_type) { + match NodeClass::on_update(self.buffer, node, wrapped, update_type) { Some(n) => Some(n) None => Some(node.on_update_base(wrapped, update_type)) } @@ -147,7 +150,7 @@ pub impl NodeClass for UniformArrayNode with fn setup(self, node, builder) { self.buffer.buffer_type = Some(padded_type) // initialize the buffer values UniformArrayNode::update_buffer(node) - self.buffer.setup(node, builder) + NodeClass::setup(self.buffer, node, builder) } ///| diff --git a/src/nodes/accessors_vertex_color_node.mbt b/src/nodes/accessors_vertex_color_node.mbt index ec0d726..528413a 100644 --- a/src/nodes/accessors_vertex_color_node.mbt +++ b/src/nodes/accessors_vertex_color_node.mbt @@ -19,7 +19,7 @@ pub impl NodeClass for VertexColorNode with fn parent(self) { ///| pub impl NodeClass for VertexColorNode with fn has_flag(self, flag) { - flag == "isVertexColorNode" || self.attribute_node.has_flag(flag) + flag == "isVertexColorNode" || NodeClass::has_flag(self.attribute_node, flag) } ///| @@ -29,10 +29,14 @@ pub impl NodeClass for VertexColorNode with fn generate( builder, output, ) { - let attribute_name = self.get_attribute_name(node, Some(builder)) + let attribute_name = AttributeNodeClass::get_attribute_name( + self, + node, + Some(builder), + ) let geometry_attribute = builder.has_geometry_attribute(attribute_name) if geometry_attribute { - self.attribute_node.generate(node, builder, output) + NodeClass::generate(self.attribute_node, node, builder, output) } else { Some( builder.generate_const( @@ -45,13 +49,13 @@ pub impl NodeClass for VertexColorNode with fn generate( ///| pub impl NodeClass for VertexColorNode with fn serialize(self, node, data) { - self.attribute_node.serialize(node, data) + NodeClass::serialize(self.attribute_node, node, data) data.set("index", @core.JsValue::of(self.index)) } ///| pub impl NodeClass for VertexColorNode with fn deserialize(self, node, data) { - self.attribute_node.deserialize(node, data) + NodeClass::deserialize(self.attribute_node, node, data) self.index = data.get("index").cast() } diff --git a/src/nodes/common_g6_diff_test.mbt b/src/nodes/common_g6_diff_test.mbt index 31e8ba1..e79bca2 100644 --- a/src/nodes/common_g6_diff_test.mbt +++ b/src/nodes/common_g6_diff_test.mbt @@ -48,7 +48,12 @@ extern "js" fn g6_typed_values(typed : @core.TypedArray) -> @core.JsValue = "(t) extern "js" fn g6_byte_length(buffer : @core.JsValue) -> Int32 = "(b) => b.byteLength" ///| -extern "js" fn g6_uint8(values : Array[Int32]) -> @core.TypedArray = "(a) => new Uint8Array( a )" +extern "js" fn g6_uint8_fixed(values : FixedArray[Int32]) -> @core.TypedArray = "(a) => new Uint8Array( a )" + +///| +fn g6_uint8(values : Array[Int32]) -> @core.TypedArray { + g6_uint8_fixed(FixedArray::from_array(values)) +} ///| extern "js" fn g6_array_buffer(n : Int32) -> @core.JsValue = "(n) => new ArrayBuffer( n )" @@ -1074,20 +1079,20 @@ test "g6diff render_scene" { camera.name = "camera" let light = @core.DirectionalLight::new() scene.add(light) |> ignore - let opaque = g6_mesh("opaque", g6_node_material("opaqueMat")) - opaque.position.set(0.0, 0.0, -1.0) |> ignore - opaque.on_before_render = fn(r, s, c, _, m, _) { + let opaque_mesh = g6_mesh("opaque", g6_node_material("opaqueMat")) + opaque_mesh.position.set(0.0, 0.0, -1.0) |> ignore + opaque_mesh.on_before_render = fn(r, s, c, _, m, _) { log.push([ g6j("onBeforeRender"), - g6j(opaque.name), + g6j(opaque_mesh.name), g6j(s.id), g6j(c.id), g6j(m.name), g6j(r.strict_equal(g6j(renderer))), ]) } - opaque.on_after_render = fn(_, _, _, _, m, _) { - log.push([g6j("onAfterRender"), g6j(opaque.name), g6j(m.name)]) + opaque_mesh.on_after_render = fn(_, _, _, _, m, _) { + log.push([g6j("onAfterRender"), g6j(opaque_mesh.name), g6j(m.name)]) } let opaque2 = g6_mesh("opaque2", g6_node_material("opaqueMat2")) opaque2.position.set(0.5, 0.0, -3.0) |> ignore @@ -1151,8 +1156,8 @@ test "g6diff render_scene" { g6_material("invisibleMaterial", fn(m) { m.visible = false }), ) scene.add_all([ - opaque, opaque2, transparent, double_t, backdrop, group, sprite, lod, culled, - hidden, invisible, no_mat, + opaque_mesh, opaque2, transparent, double_t, backdrop, group, sprite, lod, + culled, hidden, invisible, no_mat, ]) |> ignore renderer.render(scene, camera) @@ -1220,7 +1225,11 @@ test "g6diff render_scene" { ortho.position.set(0.0, 0.0, 3.0) |> ignore renderer.render(scene, ortho) log.push( - [g6j("end"), ..g6_info(renderer), g6j(renderer.is_occluded(opaque))], + [ + g6j("end"), + ..g6_info(renderer), + g6j(renderer.is_occluded(opaque_mesh)), + ], ) done() }) @@ -1417,7 +1426,7 @@ test "g6diff background_fog" { extern "js" fn g6_join(typed : @core.TypedArray) -> String = "(t) => Array.from( t ).join( ',' )" ///| -fn g6_empty_fn() -> Node { +fn g6_empty_fn() -> @nodes.Node { @nodes.fn_(fn(_, _) { None }).call([]) } @@ -1573,7 +1582,7 @@ test "g6diff info_dispose" { g6j( match xr_camera.kind { Camera( - { kind: PerspectiveCamera({ array_camera: Some(c), .. }), .. } + { kind: PerspectiveCamera({ array_camera: Some(c), .. }), .. }, ) => c.cameras.length() _ => -1 }, diff --git a/src/nodes/common_nodes_node_library.mbt b/src/nodes/common_nodes_node_library.mbt index 71b782b..756f4bc 100644 --- a/src/nodes/common_nodes_node_library.mbt +++ b/src/nodes/common_nodes_node_library.mbt @@ -3,10 +3,10 @@ // are not ported (lights register their nodes with `Light.registerNode`). ///| -extern "js" fn node_library_assign_fields( +extern "js" fn node_library_assign_fields_fixed( target : @core.Material, source : @core.Material, - skip : Array[String], + skip : FixedArray[String], ) -> Unit = #|(t, s, skip) => { #| for ( const k of Object.keys( s ) ) { @@ -16,6 +16,15 @@ extern "js" fn node_library_assign_fields( #| } #|} +///| +fn node_library_assign_fields( + target : @core.Material, + source : @core.Material, + skip : Array[String], +) -> Unit { + node_library_assign_fields_fixed(target, source, FixedArray::from_array(skip)) +} + ///| /// The node material classes and tone mapping functions of a renderer. pub(all) struct NodeLibrary { diff --git a/src/nodes/common_nodes_node_sampled_texture.mbt b/src/nodes/common_nodes_node_sampled_texture.mbt index 021086a..0ae1da6 100644 --- a/src/nodes/common_nodes_node_sampled_texture.mbt +++ b/src/nodes/common_nodes_node_sampled_texture.mbt @@ -126,7 +126,7 @@ pub impl BindingClass for NodeSampledCubeTexture with fn parent(self) { ///| pub impl BindingClass for NodeSampledCubeTexture with fn has_flag(self, flag) { - flag == "isSampledCubeTexture" || self.parent_.has_flag(flag) + flag == "isSampledCubeTexture" || BindingClass::has_flag(self.parent_, flag) } ///| @@ -167,7 +167,7 @@ pub impl BindingClass for NodeSampledTexture3D with fn parent(self) { ///| pub impl BindingClass for NodeSampledTexture3D with fn has_flag(self, flag) { - flag == "isSampledTexture3D" || self.parent_.has_flag(flag) + flag == "isSampledTexture3D" || BindingClass::has_flag(self.parent_, flag) } ///| diff --git a/src/nodes/common_nodes_node_uniform_buffer.mbt b/src/nodes/common_nodes_node_uniform_buffer.mbt index 343c14f..46c2e81 100644 --- a/src/nodes/common_nodes_node_uniform_buffer.mbt +++ b/src/nodes/common_nodes_node_uniform_buffer.mbt @@ -25,7 +25,7 @@ pub impl BindingClass for NodeUniformBuffer with fn parent(self) { ///| pub impl BindingClass for NodeUniformBuffer with fn has_flag(self, flag) { - flag == "isNodeUniformBuffer" || self.parent_.has_flag(flag) + flag == "isNodeUniformBuffer" || BindingClass::has_flag(self.parent_, flag) } ///| diff --git a/src/nodes/common_nodes_node_uniforms_group.mbt b/src/nodes/common_nodes_node_uniforms_group.mbt index c8344c6..571a483 100644 --- a/src/nodes/common_nodes_node_uniforms_group.mbt +++ b/src/nodes/common_nodes_node_uniforms_group.mbt @@ -23,7 +23,7 @@ pub impl BindingClass for NodeUniformsGroup with fn parent(self) { ///| pub impl BindingClass for NodeUniformsGroup with fn has_flag(self, flag) { - flag == "isNodeUniformsGroup" || self.parent_.has_flag(flag) + flag == "isNodeUniformsGroup" || BindingClass::has_flag(self.parent_, flag) } ///| diff --git a/src/nodes/common_pipeline.mbt b/src/nodes/common_pipeline.mbt index ac58fab..b0a741a 100644 --- a/src/nodes/common_pipeline.mbt +++ b/src/nodes/common_pipeline.mbt @@ -9,13 +9,13 @@ pub(all) enum PipelineKind { /// `RenderObjectPipeline`. RenderObject( vertex_program~ : ProgrammableStage, - fragment_program~ : ProgrammableStage + fragment_program~ : ProgrammableStage, ) /// `ComputePipeline`; `None` is `null`. Compute( compute_program~ : ProgrammableStage, transforms~ : Array[NodeTransform]?, - attributes~ : Array[NodeAttribute]? + attributes~ : Array[NodeAttribute]?, ) } diff --git a/src/nodes/common_quad_mesh.mbt b/src/nodes/common_quad_mesh.mbt index 33d7494..7e6de0c 100644 --- a/src/nodes/common_quad_mesh.mbt +++ b/src/nodes/common_quad_mesh.mbt @@ -84,7 +84,7 @@ pub(all) struct QuadMesh { pub fn QuadMesh::new(material? : @core.Material) -> QuadMesh { let object = @core.Mesh::new( geometry=_quad_mesh_geometry, - material?=material.map(fn(m) { @core.MaterialSlot::Single(m) }), + material?=material.map(fn(m) { Single(m) }), ) object.set_extension(QuadMeshExtension::{ camera: _quad_mesh_camera, }) |> ignore diff --git a/src/nodes/common_renderer.mbt b/src/nodes/common_renderer.mbt index a4bb0fe..114d588 100644 --- a/src/nodes/common_renderer.mbt +++ b/src/nodes/common_renderer.mbt @@ -65,11 +65,19 @@ extern "js" fn renderer_compile_yield(on_done : () -> Unit) -> Unit = #|} ///| -extern "js" fn renderer_promise_all( - promises : Array[@core.JsValue], +extern "js" fn renderer_promise_all_fixed( + promises : FixedArray[@core.JsValue], on_done : () -> Unit, ) -> Unit = "(p, f) => { Promise.all( p ).then( () => f() ); }" +///| +fn renderer_promise_all( + promises : Array[@core.JsValue], + on_done : () -> Unit, +) -> Unit { + renderer_promise_all_fixed(FixedArray::from_array(promises), on_done) +} + ///| extern "js" fn renderer_progress_event( loaded : Int32, diff --git a/src/nodes/common_sampled_texture.mbt b/src/nodes/common_sampled_texture.mbt index 4f79853..a9efe03 100644 --- a/src/nodes/common_sampled_texture.mbt +++ b/src/nodes/common_sampled_texture.mbt @@ -25,7 +25,7 @@ pub impl BindingClass for SampledTexture with fn parent(self) { ///| pub impl BindingClass for SampledTexture with fn has_flag(self, flag) { - flag == "isSampledTexture" || self.parent_.has_flag(flag) + flag == "isSampledTexture" || BindingClass::has_flag(self.parent_, flag) } ///| @@ -107,7 +107,7 @@ pub impl BindingClass for SampledArrayTexture with fn parent(self) { ///| pub impl BindingClass for SampledArrayTexture with fn has_flag(self, flag) { - flag == "isSampledArrayTexture" || self.parent_.has_flag(flag) + flag == "isSampledArrayTexture" || BindingClass::has_flag(self.parent_, flag) } ///| @@ -146,7 +146,7 @@ pub impl BindingClass for Sampled3DTexture with fn parent(self) { ///| pub impl BindingClass for Sampled3DTexture with fn has_flag(self, flag) { - flag == "isSampled3DTexture" || self.parent_.has_flag(flag) + flag == "isSampled3DTexture" || BindingClass::has_flag(self.parent_, flag) } ///| @@ -185,7 +185,7 @@ pub impl BindingClass for SampledCubeTexture with fn parent(self) { ///| pub impl BindingClass for SampledCubeTexture with fn has_flag(self, flag) { - flag == "isSampledCubeTexture" || self.parent_.has_flag(flag) + flag == "isSampledCubeTexture" || BindingClass::has_flag(self.parent_, flag) } ///| diff --git a/src/nodes/common_storage_buffer.mbt b/src/nodes/common_storage_buffer.mbt index 83261fe..7e15496 100644 --- a/src/nodes/common_storage_buffer.mbt +++ b/src/nodes/common_storage_buffer.mbt @@ -19,7 +19,7 @@ pub impl BindingClass for StorageBuffer with fn parent(self) { ///| pub impl BindingClass for StorageBuffer with fn has_flag(self, flag) { - flag == "isStorageBuffer" || self.parent_.has_flag(flag) + flag == "isStorageBuffer" || BindingClass::has_flag(self.parent_, flag) } ///| diff --git a/src/nodes/common_uniform_buffer.mbt b/src/nodes/common_uniform_buffer.mbt index 98be914..c6d6753 100644 --- a/src/nodes/common_uniform_buffer.mbt +++ b/src/nodes/common_uniform_buffer.mbt @@ -18,7 +18,7 @@ pub impl BindingClass for UniformBuffer with fn parent(self) { ///| pub impl BindingClass for UniformBuffer with fn has_flag(self, flag) { - flag == "isUniformBuffer" || self.parent_.has_flag(flag) + flag == "isUniformBuffer" || BindingClass::has_flag(self.parent_, flag) } ///| diff --git a/src/nodes/common_uniforms_group.mbt b/src/nodes/common_uniforms_group.mbt index 1d671a6..2013a94 100644 --- a/src/nodes/common_uniforms_group.mbt +++ b/src/nodes/common_uniforms_group.mbt @@ -37,7 +37,7 @@ pub impl BindingClass for UniformsGroup with fn parent(self) { ///| pub impl BindingClass for UniformsGroup with fn has_flag(self, flag) { - flag == "isUniformsGroup" || self.parent_.has_flag(flag) + flag == "isUniformsGroup" || BindingClass::has_flag(self.parent_, flag) } ///| @@ -51,7 +51,7 @@ pub impl BindingClass for UniformsGroup with fn clear_update_ranges( binding, ) { self._added_indices.clear() - self.parent_.clear_update_ranges(binding) + BindingClass::clear_update_ranges(self.parent_, binding) } ///| @@ -108,13 +108,13 @@ pub impl BindingClass for UniformsGroup with fn update(self, binding) { ///| pub impl BindingClass for UniformsGroup with fn release(self, binding) { - self.parent_.release(binding) + BindingClass::release(self.parent_, binding) self._values = None } ///| pub impl BindingClass for UniformsGroup with fn clone(self, binding) { - let clone = match self.parent() { + let clone = match BindingClass::parent(self) { Some(p) => p.clone(binding) None => binding.clone_base() } diff --git a/src/nodes/common_xr_manager.mbt b/src/nodes/common_xr_manager.mbt index c47af3c..f2cd931 100644 --- a/src/nodes/common_xr_manager.mbt +++ b/src/nodes/common_xr_manager.mbt @@ -76,7 +76,14 @@ extern "js" fn xr_array_unshift( ) -> Unit = "(a, v) => { a.unshift( v ); }" ///| -extern "js" fn xr_array_of(values : Array[@core.JsValue]) -> @core.JsValue = "(a) => Array.from( a )" +extern "js" fn xr_array_of_fixed( + values : FixedArray[@core.JsValue], +) -> @core.JsValue = "(a) => Array.from( a )" + +///| +fn xr_array_of(values : Array[@core.JsValue]) -> @core.JsValue { + xr_array_of_fixed(FixedArray::from_array(values)) +} ///| extern "js" fn xr_array_length(array : @core.JsValue) -> Int32 = "(a) => a.length" @@ -1740,4 +1747,11 @@ fn xr_session(session : @core.JsValue) -> @webgl.XRSession { } ///| -extern "js" fn xr_number_array(array : @core.JsValue) -> Array[Double] = "(a) => Array.from( a )" +extern "js" fn xr_number_array_fixed( + array : @core.JsValue, +) -> FixedArray[Double] = "(a) => Array.from( a )" + +///| +fn xr_number_array(array : @core.JsValue) -> Array[Double] { + Array::from_fixed_array(xr_number_array_fixed(array)) +} diff --git a/src/nodes/core_const_node.mbt b/src/nodes/core_const_node.mbt index c12dd88..e0b6f9e 100644 --- a/src/nodes/core_const_node.mbt +++ b/src/nodes/core_const_node.mbt @@ -18,7 +18,7 @@ pub impl NodeClass for ConstNode with fn parent(self) { ///| pub impl NodeClass for ConstNode with fn has_flag(self, flag) { - flag == "isConstNode" || self.input.has_flag(flag) + flag == "isConstNode" || NodeClass::has_flag(self.input, flag) } ///| @@ -45,13 +45,13 @@ pub impl NodeClass for ConstNode with fn generate(self, node, builder, output) { ///| pub impl NodeClass for ConstNode with fn serialize(self, node, data) { - self.input.serialize(node, data) + NodeClass::serialize(self.input, node, data) data.set("isWeak", @core.JsValue::of(self.is_weak)) } ///| pub impl NodeClass for ConstNode with fn deserialize(self, node, data) { - self.input.deserialize(node, data) + NodeClass::deserialize(self.input, node, data) self.is_weak = const_node_js_is_true(data.get("isWeak")) } diff --git a/src/nodes/core_input_node.mbt b/src/nodes/core_input_node.mbt index ae9d75a..111c6c4 100644 --- a/src/nodes/core_input_node.mbt +++ b/src/nodes/core_input_node.mbt @@ -111,7 +111,7 @@ pub impl NodeClass for InputNode with fn deserialize(self, node, data) { let params : Array[Double] = value.cast() get_value_from_type( input_node_js_to_string(data.get("valueType")), - params.map(fn(p) { TslValue::Number(p) }), + params.map(fn(p) { Number(p) }), ) } else { input_node_js_to_value(value) diff --git a/src/nodes/core_input_node_test.mbt b/src/nodes/core_input_node_test.mbt index ca205b9..244bc1b 100644 --- a/src/nodes/core_input_node_test.mbt +++ b/src/nodes/core_input_node_test.mbt @@ -193,7 +193,7 @@ test "Isolate, Bypass, Assign, Array and Index nodes" { test "OutputStruct, MRT, Struct and StructType nodes" { let os = @nodes.output_struct([c_const(1.0), c_const(2.0)]) assert_eq(c_children(os), ["members[0]:ConstNode", "members[1]:ConstNode"]) - let outputs = Map::new() + let outputs = Map([]) outputs.set("output", c_const(1.0)) outputs.set("emissive", c_const(2.0)) let m = @nodes.mrt(outputs) diff --git a/src/nodes/core_mrt_node.mbt b/src/nodes/core_mrt_node.mbt index 561c78d..abacede 100644 --- a/src/nodes/core_mrt_node.mbt +++ b/src/nodes/core_mrt_node.mbt @@ -45,12 +45,12 @@ pub impl NodeClass for MRTNode with fn parent(self) { ///| pub impl NodeClass for MRTNode with fn has_flag(self, flag) { - flag == "isMRTNode" || self.output_struct.has_flag(flag) + flag == "isMRTNode" || NodeClass::has_flag(self.output_struct, flag) } ///| pub impl NodeClass for MRTNode with fn children(self, node, out) { - self.output_struct.children(node, out) + NodeClass::children(self.output_struct, node, out) push_child_object(out, "outputNodes", self.output_nodes) } @@ -72,7 +72,7 @@ pub impl NodeClass for MRTNode with fn setup(self, node, builder) { members[index] = Some(output_node.convert(type_)) } self.output_struct.members = members - self.output_struct.setup(node, builder) + NodeClass::setup(self.output_struct, node, builder) } ///| diff --git a/src/nodes/core_node.mbt b/src/nodes/core_node.mbt index ccd7c11..891548a 100644 --- a/src/nodes/core_node.mbt +++ b/src/nodes/core_node.mbt @@ -1157,7 +1157,7 @@ pub fn Node::get_node_type_base( let map = match node_data.type_from_output { Some(m) => m None => { - let m = Map::new() + let m = Map([]) node_data.type_from_output = Some(m) m } @@ -1294,7 +1294,7 @@ pub fn Node::analyze_base( let stages = match node_data.stages { Some(s) => s None => { - let s = Map::new() + let s = Map([]) node_data.stages = Some(s) s } @@ -1705,7 +1705,7 @@ pub(all) struct NodeSet { ///| pub fn NodeSet::new() -> NodeSet { - { ids: Map::new(), } + { ids: Map([]), } } ///| diff --git a/src/nodes/core_node_builder.mbt b/src/nodes/core_node_builder.mbt index 3703e31..a709bec 100644 --- a/src/nodes/core_node_builder.mbt +++ b/src/nodes/core_node_builder.mbt @@ -240,7 +240,7 @@ fn _node_builder_create_layout_inputs( layout : FnLayout, values : Array[TslValue], ) -> Map[String, TslValue] { - let inputs : Map[String, TslValue] = Map::new() + let inputs : Map[String, TslValue] = Map([]) for i, input in layout.inputs { inputs.set( input.name, @@ -426,13 +426,13 @@ pub(all) struct NodeContext { ///| pub fn NodeContext::new() -> NodeContext { - { values: Map::new(), } + { values: Map([]), } } ///| /// `{ ...context }`. pub fn NodeContext::copy(self : NodeContext) -> NodeContext { - let values = Map::new() + let values = Map([]) for k, v in self.values { values.set(k, v) } @@ -535,7 +535,7 @@ pub(all) struct NodeProperties { ///| pub fn NodeProperties::new() -> NodeProperties { - let values = Map::new() + let values = Map([]) values.set("outputNode", NodePropertyValue::Null) { values, } } @@ -583,7 +583,7 @@ pub fn NodeProperties::set_node_or_null( ) -> Unit { match node { Some(n) => self.values.set(key, Node(n)) - None => self.values.set(key, NodePropertyValue::Null) + None => self.values.set(key, Null) } } @@ -688,20 +688,20 @@ pub fn NodeData::new() -> NodeData { flow_block: None, assign: None, force_declaration: None, - vars: Map::new(), + vars: Map([]), uniform: None, sub_builds: None, sub_builds_cache: None, overrides: None, varying: None, - sub_build_varyings: Map::new(), + sub_build_varyings: Map([]), code: None, struct_type: None, buffer_attribute: None, cache: None, node_function: None, function_property_name: None, - extra: Map::new(), + extra: Map([]), } } @@ -1478,15 +1478,15 @@ pub fn NodeBuilder::new( } _ => (None, None) } - let flow_nodes : Map[String, Array[Node]] = Map::new() - let flow_code : Map[String, String] = Map::new() - let types : Map[String, Map[String, Node]] = Map::new() - let bindings : Map[String, Map[String, Array[Binding]]] = Map::new() + let flow_nodes : Map[String, Array[Node]] = Map([]) + let flow_code : Map[String, String] = Map([]) + let types : Map[String, Map[String, Node]] = Map([]) + let bindings : Map[String, Map[String, Array[Binding]]] = Map([]) for stage in ["vertex", "fragment", "compute"] { flow_nodes.set(stage, []) flow_code.set(stage, "") - types.set(stage, Map::new()) - bindings.set(stage, Map::new()) + types.set(stage, Map([])) + bindings.set(stage, Map([])) } let stack = StackNode::create() let context = NodeContext::new() @@ -1516,7 +1516,7 @@ pub fn NodeBuilder::new( update_nodes: [], update_before_nodes: [], update_after_nodes: [], - hash_nodes: Map::new(), + hash_nodes: Map([]), observer: None, lights_node: None, environment_node: None, @@ -1533,15 +1533,15 @@ pub fn NodeBuilder::new( structs: StageArrays::new(), types, bindings, - bindings_indexes: Map::new(), + bindings_indexes: Map([]), bind_groups: None, attributes: [], buffer_attributes: [], varyings: [], - codes: Map::new(), - vars: Map::new(), - var_ids: Map::new(), - declarations: Map::new(), + codes: Map([]), + vars: Map([]), + var_ids: Map([]), + declarations: Map([]), flow: FlowData::new(), chaining: [], stack, @@ -1551,7 +1551,7 @@ pub fn NodeBuilder::new( context, cache, global_cache: cache, - flows_data: Map::new(), + flows_data: Map([]), shader_stage: None, build_stage: None, sub_build_layers: [], @@ -2436,7 +2436,7 @@ pub fn NodeBuilder::get_bindings(self : NodeBuilder) -> Array[BindGroup] { match self.bind_groups { Some(groups) => groups None => { - let groups : Map[String, Array[Binding]] = Map::new() + let groups : Map[String, Array[Binding]] = Map([]) for shader_stage in shader_stages { match self.bindings.get(shader_stage) { Some(stage_bindings) => @@ -2784,7 +2784,7 @@ pub fn NodeBuilder::generate_struct( values? : Array[Node?], ) -> String { let snippets = [] - for i, member in members_layout { + for i, member_layout in members_layout { let value = match values { Some(values) => match values.get(i) { @@ -2794,8 +2794,8 @@ pub fn NodeBuilder::generate_struct( None => None } match value { - Some(v) => snippets.push(v.build(self, output=member.type_)) - None => snippets.push(self.generate_const(member.type_)) + Some(v) => snippets.push(v.build(self, output=member_layout.type_)) + None => snippets.push(self.generate_const(member_layout.type_)) } } type_ + "( " + snippets.join(", ") + " )" @@ -2950,7 +2950,7 @@ pub fn NodeBuilder::is_reference(_self : NodeBuilder, type_ : String?) -> Bool { | "cubeTexture" | "storageTexture" | "depthTexture" - | "texture3D" + | "texture3D", ) } @@ -3322,7 +3322,7 @@ pub fn NodeBuilder::get_data_from_node( let node_data = match cache.get_data(node) { Some(d) => d None => { - let d = Map::new() + let d = Map([]) cache.set_data(node, d) d } @@ -3347,7 +3347,7 @@ pub fn NodeBuilder::get_data_from_node( let sub_builds_cache = match data.sub_builds_cache { Some(c) => c None => { - let c = Map::new() + let c = Map([]) data.sub_builds_cache = Some(c) c } @@ -3654,7 +3654,7 @@ pub fn NodeBuilder::register_declaration( let declarations = match self.declarations.get(shader_stage) { Some(d) => d None => { - let d = Map::new() + let d = Map([]) self.declarations.set(shader_stage, d) d } @@ -3850,7 +3850,7 @@ pub fn NodeBuilder::flow_shader_node( let inputs = _node_builder_create_layout_inputs( layout, layout.inputs.map(fn(input) { - TslValue::Node(ParameterNode::new(input.type_, name=input.name)) + Node(ParameterNode::new(input.type_, name=input.name)) }), ) shader.layout = None @@ -3905,7 +3905,7 @@ pub fn NodeBuilder::_get_layout_inputs( let cache = match _node_builder_layout_defaults_cache.get(shader_node) { Some(c) => c None => { - let c = Map::new() + let c = Map([]) _node_builder_layout_defaults_cache.set(shader_node, c) c } @@ -3979,14 +3979,14 @@ pub fn NodeBuilder::_resolve_layout_defaults( parameters.mapi(fn(i, p) { if provided[i] { Node(p) } else { Undefined } }), ), ) - let missing : Map[Int32, Int32] = Map::new() + let missing : Map[Int32, Int32] = Map([]) for i, parameter in parameters { if provided[i] == false { missing.set(parameter.id, i) } } let defaults : Array[Node?] = Array::make(parameters.length(), None) - let visited : Map[Int32, Node] = Map::new() + let visited : Map[Int32, Node] = Map([]) fn walk(a : Node?, b : Node?) -> Bool { match (a, b) { (None, None) => true @@ -4115,9 +4115,9 @@ pub fn NodeBuilder::flow_stages_node( let previous_flow_block = self.flow_block let flow = FlowData::new() self.flow = flow - self.vars = Map::new() - self.var_ids = Map::new() - self.declarations = Map::new() + self.vars = Map([]) + self.var_ids = Map([]) + self.declarations = Map([]) self.cache = NodeCache::new() self.stack = StackNode::create() self.flow_block = None diff --git a/src/nodes/core_node_cache.mbt b/src/nodes/core_node_cache.mbt index aedce37..2c7dcef 100644 --- a/src/nodes/core_node_cache.mbt +++ b/src/nodes/core_node_cache.mbt @@ -16,7 +16,7 @@ pub(all) struct NodeCache { pub fn NodeCache::new(parent? : NodeCache) -> NodeCache { let id = _node_cache_id.val _node_cache_id.val += 1 - { id, nodes_data: Map::new(), parent, } + { id, nodes_data: Map([]), parent, } } ///| diff --git a/src/nodes/core_node_utils.mbt b/src/nodes/core_node_utils.mbt index 04e7bb9..e12749b 100644 --- a/src/nodes/core_node_utils.mbt +++ b/src/nodes/core_node_utils.mbt @@ -370,7 +370,7 @@ pub fn get_value_from_type( } } if type_ == Some("color") { - TslValue::Color(node_utils_new_color(param(0), param(1), param(2))) + Color(node_utils_new_color(param(0), param(1), param(2))) } else if last4 == Some("vec2") { Vector2(@math.Vector2::new(component(0), component(1))) } else if last4 == Some("vec3") { diff --git a/src/nodes/core_override_context_node.mbt b/src/nodes/core_override_context_node.mbt index 94d5d0d..1ee3742 100644 --- a/src/nodes/core_override_context_node.mbt +++ b/src/nodes/core_override_context_node.mbt @@ -18,7 +18,7 @@ pub impl NodeClass for OverrideContextNode with fn parent(self) { ///| pub impl NodeClass for OverrideContextNode with fn has_flag(self, flag) { - flag == "isOverrideContextNode" || self.context.has_flag(flag) + flag == "isOverrideContextNode" || NodeClass::has_flag(self.context, flag) } ///| diff --git a/src/nodes/core_parameter_node.mbt b/src/nodes/core_parameter_node.mbt index b54360d..1cf2ce4 100644 --- a/src/nodes/core_parameter_node.mbt +++ b/src/nodes/core_parameter_node.mbt @@ -18,7 +18,7 @@ pub impl NodeClass for ParameterNode with fn parent(self) { ///| pub impl NodeClass for ParameterNode with fn has_flag(self, flag) { - flag == "isParameterNode" || self.property.has_flag(flag) + flag == "isParameterNode" || NodeClass::has_flag(self.property, flag) } ///| diff --git a/src/nodes/core_uniform_node.mbt b/src/nodes/core_uniform_node.mbt index df0f8b6..30f5873 100644 --- a/src/nodes/core_uniform_node.mbt +++ b/src/nodes/core_uniform_node.mbt @@ -19,12 +19,12 @@ pub impl NodeClass for UniformNode with fn parent(self) { ///| pub impl NodeClass for UniformNode with fn has_flag(self, flag) { - flag == "isUniformNode" || self.input.has_flag(flag) + flag == "isUniformNode" || NodeClass::has_flag(self.input, flag) } ///| pub impl NodeClass for UniformNode with fn children(self, node, out) { - self.input.children(node, out) + NodeClass::children(self.input, node, out) push_child(out, "groupNode", Some(self.group_node)) } @@ -59,7 +59,7 @@ pub impl NodeClass for UniformNode with fn on_update( } None } - match self.input.on_update(node, wrapped, update_type) { + match NodeClass::on_update(self.input, node, wrapped, update_type) { Some(n) => Some(n) None => Some(node.on_update_base(wrapped, update_type)) } diff --git a/src/nodes/display_pass_node.mbt b/src/nodes/display_pass_node.mbt index 56abdf6..48b70be 100644 --- a/src/nodes/display_pass_node.mbt +++ b/src/nodes/display_pass_node.mbt @@ -67,12 +67,12 @@ pub impl NodeClass for PassTextureNode with fn parent(self) { ///| pub impl NodeClass for PassTextureNode with fn has_flag(self, flag) { - flag == "isPassTextureNode" || self.texture.has_flag(flag) + flag == "isPassTextureNode" || NodeClass::has_flag(self.texture, flag) } ///| pub impl NodeClass for PassTextureNode with fn children(self, node, out) { - self.texture.children(node, out) + NodeClass::children(self.texture, node, out) push_child(out, "passNode", Some(self.pass_node)) } @@ -85,7 +85,7 @@ pub impl NodeClass for PassTextureNode with fn is_cacheable(_, _, _) { pub impl NodeClass for PassTextureNode with fn setup(self, node, builder) { let properties = builder.get_node_properties(node) properties.set_node("passNode", self.pass_node) - self.texture.setup(node, builder) + NodeClass::setup(self.texture, node, builder) } ///| @@ -151,7 +151,8 @@ pub impl NodeClass for PassMultipleTextureNode with fn parent(self) { ///| pub impl NodeClass for PassMultipleTextureNode with fn has_flag(self, flag) { - flag == "isPassMultipleTextureNode" || self.pass_texture.has_flag(flag) + flag == "isPassMultipleTextureNode" || + NodeClass::has_flag(self.pass_texture, flag) } ///| @@ -161,7 +162,7 @@ pub impl NodeClass for PassMultipleTextureNode with fn setup( builder, ) { self.update_texture(node) - self.pass_texture.setup(node, builder) + NodeClass::setup(self.pass_texture, node, builder) } ///| diff --git a/src/nodes/display_toon_outline_pass_node.mbt b/src/nodes/display_toon_outline_pass_node.mbt index dc0e996..88ac5eb 100644 --- a/src/nodes/display_toon_outline_pass_node.mbt +++ b/src/nodes/display_toon_outline_pass_node.mbt @@ -26,7 +26,7 @@ pub impl NodeClass for ToonOutlinePassNode with fn parent(self) { ///| pub impl NodeClass for ToonOutlinePassNode with fn children(self, node, out) { - self.pass.children(node, out) + NodeClass::children(self.pass, node, out) push_child(out, "colorNode", Some(self.color_node)) push_child(out, "thicknessNode", Some(self.thickness_node)) push_child(out, "alphaNode", Some(self.alpha_node)) @@ -79,7 +79,7 @@ pub impl NodeClass for ToonOutlinePassNode with fn update_before( ///| pub impl NodeClass for ToonOutlinePassNode with fn dispose(self, node) { - self.pass.dispose(node) + NodeClass::dispose(self.pass, node) self._outline_material.dispose() for entry in self._material_cache { let (original_material, outline_material) = entry diff --git a/src/nodes/display_viewport_texture_node.mbt b/src/nodes/display_viewport_texture_node.mbt index 7354582..9333e79 100644 --- a/src/nodes/display_viewport_texture_node.mbt +++ b/src/nodes/display_viewport_texture_node.mbt @@ -35,7 +35,7 @@ pub impl NodeClass for ViewportTextureNode with fn parent(self) { ///| pub impl NodeClass for ViewportTextureNode with fn has_flag(self, flag) { - flag == "isOutputTextureNode" || self.texture.has_flag(flag) + flag == "isOutputTextureNode" || NodeClass::has_flag(self.texture, flag) } ///| diff --git a/src/nodes/functions_bsdf_brdf_eon.mbt b/src/nodes/functions_bsdf_brdf_eon.mbt index de27a4c..7ffba08 100644 --- a/src/nodes/functions_bsdf_brdf_eon.mbt +++ b/src/nodes/functions_bsdf_brdf_eon.mbt @@ -51,10 +51,12 @@ pub let brdf_eon : Node = module_nodes( let light_direction = inputs.named("lightDirection").unwrap() let diffuse_color = inputs.named("diffuseColor").unwrap() let roughness = inputs.named("roughness").unwrap() - let normal_view = inputs.named("normalView").or_else(fn() { normal_view }) + let normal_view = inputs + .named("normalView") + .unwrap_or_else(fn() { normal_view }) let view_direction = inputs .named("viewDirection") - .or_else(fn() { position_view_direction }) + .unwrap_or_else(fn() { position_view_direction }) let rho = diffuse_color.clamp() let dot_nl = normal_view.dot(light_direction).clamp() let dot_nv = normal_view.dot(view_direction).clamp() diff --git a/src/nodes/functions_bsdf_brdf_ggx.mbt b/src/nodes/functions_bsdf_brdf_ggx.mbt index de01ff6..113ae36 100644 --- a/src/nodes/functions_bsdf_brdf_ggx.mbt +++ b/src/nodes/functions_bsdf_brdf_ggx.mbt @@ -22,10 +22,12 @@ pub let brdf_ggx : Node = module_nodes( let f90 = inputs.named("f90").unwrap() let roughness = inputs.named("roughness").unwrap() let f = inputs.named("f") - let normal_view = inputs.named("normalView").or_else(fn() { normal_view }) + let normal_view = inputs + .named("normalView") + .unwrap_or_else(fn() { normal_view }) let view_direction = inputs .named("viewDirection") - .or_else(fn() { position_view_direction }) + .unwrap_or_else(fn() { position_view_direction }) let use_iridescence = inputs.named("USE_IRIDESCENCE") let use_anisotropy = inputs.named("USE_ANISOTROPY") let alpha = roughness.max(0.045).pow2() diff --git a/src/nodes/functions_physical_lighting_model.mbt b/src/nodes/functions_physical_lighting_model.mbt index 819936b..b9fd8f8 100644 --- a/src/nodes/functions_physical_lighting_model.mbt +++ b/src/nodes/functions_physical_lighting_model.mbt @@ -556,7 +556,7 @@ pub impl LightingModelClass for PhysicalLightingModel with fn start( if self.dispersion { TslValue::Node(dispersion) } else { - TslValue::Null + Null }, ]) context.set("backdrop", Node(backdrop)) diff --git a/src/nodes/g3_lit_shader_diff_test.mbt b/src/nodes/g3_lit_shader_diff_test.mbt index 9feef0e..1112b22 100644 --- a/src/nodes/g3_lit_shader_diff_test.mbt +++ b/src/nodes/g3_lit_shader_diff_test.mbt @@ -626,9 +626,7 @@ fn g3_cube(name : String, pmrem : Bool) -> @core.Texture { t.name = name if pmrem { t.is_pmrem_texture = true - t.mipmaps = [ - @core.TextureImage::DataImage(@core.DataImage::new(width=64, height=64)), - ] + t.mipmaps = [DataImage(@core.DataImage::new(width=64, height=64))] } t } diff --git a/src/nodes/g3_shader_diff_test.mbt b/src/nodes/g3_shader_diff_test.mbt index 883a44b..3ba8b05 100644 --- a/src/nodes/g3_shader_diff_test.mbt +++ b/src/nodes/g3_shader_diff_test.mbt @@ -11,14 +11,31 @@ extern "js" fn g3_shader_diff_enabled() -> Bool = "() => typeof process !== 'undefined' && process.env.SHADER_DIFF === '1'" ///| -extern "js" fn g3_shader_json( +extern "js" fn g3_shader_json_fixed( code : String, result : String, vars : String, - uniforms : Array[String], + uniforms : FixedArray[String], codes : String, ) -> String = "(code, result, vars, uniforms, codes) => JSON.stringify({ code, result, vars, uniforms, codes })" +///| +fn g3_shader_json( + code : String, + result : String, + vars : String, + uniforms : Array[String], + codes : String, +) -> String { + g3_shader_json_fixed( + code, + result, + vars, + FixedArray::from_array(uniforms), + codes, + ) +} + ///| /// `g3ParseFunction` of upstream_g3.mjs, verbatim: `[ name, type, [ [ name, type ] ] ]`. extern "js" fn g3_parse_function(source : String) -> @core.JsValue = diff --git a/src/nodes/g4_shader_diff_test.mbt b/src/nodes/g4_shader_diff_test.mbt index a03a394..dc296c9 100644 --- a/src/nodes/g4_shader_diff_test.mbt +++ b/src/nodes/g4_shader_diff_test.mbt @@ -125,7 +125,7 @@ extern "js" fn g4_js_string(values : @core.JsValue) -> String = "(v) => v.map( S ///| fn g4_vec4(v : @math.Vector4) -> String { - g4_js_string(@core.JsValue::of([v.x, v.y, v.z, v.w])) + g4_js_string(@core.JsValue::of(([v.x, v.y, v.z, v.w] : FixedArray[Double]))) } ///| @@ -160,7 +160,9 @@ fn g4_pass_node_state() -> String { depth.type_.to_string(), rt.texture().type_.to_string(), rt.samples.to_string(), - g4_js_string(@core.JsValue::of([p.get_resolution_scale()])), + g4_js_string( + @core.JsValue::of(([p.get_resolution_scale()] : FixedArray[Double])), + ), physical_equal( p.get_texture_node(name="normal"), p.get_texture_node(name="normal"), @@ -305,14 +307,33 @@ impl @nodes.NodeBuilderClass for G4Builder with fn get_frag_depth(_, _) { } ///| -extern "js" fn g4_json( +extern "js" fn g4_json_fixed( + code : String, + result : String, + vars : String, + uniforms : FixedArray[String], + codes : FixedArray[String], + extra : String, +) -> String = "(code, result, vars, uniforms, codes, extra) => JSON.stringify({ code, result, vars, uniforms, codes, extra })" + +///| +fn g4_json( code : String, result : String, vars : String, uniforms : Array[String], codes : Array[String], extra : String, -) -> String = "(code, result, vars, uniforms, codes, extra) => JSON.stringify({ code, result, vars, uniforms, codes, extra })" +) -> String { + g4_json_fixed( + code, + result, + vars, + FixedArray::from_array(uniforms), + FixedArray::from_array(codes), + extra, + ) +} ///| /// `json.replaceAll( '_' + id, '_#' )`. @@ -428,7 +449,7 @@ fn g4_define_display_p3() -> Unit { 2.4934969, -0.9313836, -0.4027108, -0.8294890, 1.7626641, 0.0236247, 0.0358458, -0.0761724, 0.9568845, ) - @math.color_management.define( + @math.color_management.define_( Map::from_array([ ( "display-p3", diff --git a/src/nodes/g5_shader_diff_test.mbt b/src/nodes/g5_shader_diff_test.mbt index 7519391..066767b 100644 --- a/src/nodes/g5_shader_diff_test.mbt +++ b/src/nodes/g5_shader_diff_test.mbt @@ -12,21 +12,33 @@ extern "js" fn g5_enabled() -> Bool = "() => typeof process !== 'undefined' && process.env.SHADER_DIFF === '1'" ///| -extern "js" fn g5_json( +extern "js" fn g5_json_fixed( code : String, result : String, vars : String, - uniforms : Array[String], - codes : Array[String], + uniforms : FixedArray[String], + codes : FixedArray[String], extra : String, ) -> String = "(code, result, vars, uniforms, codes, extra) => JSON.stringify({ code, result, vars, uniforms, codes, extra })" ///| -extern "js" fn g5_json3( +fn g5_json( code : String, result : String, vars : String, -) -> String = "(code, result, vars) => JSON.stringify({ code, result, vars })" + uniforms : Array[String], + codes : Array[String], + extra : String, +) -> String { + g5_json_fixed( + code, + result, + vars, + FixedArray::from_array(uniforms), + FixedArray::from_array(codes), + extra, + ) +} ///| extern "js" fn g5_json_code(code : String) -> String = "(code) => JSON.stringify({ code })" @@ -37,17 +49,6 @@ extern "js" fn g5_json_code_result(code : String, result : String) -> String = " ///| extern "js" fn g5_js_string(x : Double) -> String = "(x) => String(x)" -///| -/// The normalization of upstream_g5.mjs: uuids replaced by their order of appearance. -extern "js" fn g5_normalize(text : String) -> String = - #|(s) => { - #| const ids = new Map(); - #| return s.replace( /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, ( u ) => { - #| if ( ! ids.has( u ) ) ids.set( u, '#' + ids.size ); - #| return ids.get( u ); - #| } ); - #|} - ///| fn g5_emit(name : String, record : String) -> Unit { if g5_enabled() { diff --git a/src/nodes/gpgpu_workgroup_info_node.mbt b/src/nodes/gpgpu_workgroup_info_node.mbt index 11bbe9f..4167d19 100644 --- a/src/nodes/gpgpu_workgroup_info_node.mbt +++ b/src/nodes/gpgpu_workgroup_info_node.mbt @@ -24,7 +24,8 @@ pub impl NodeClass for WorkgroupInfoElementNode with fn parent(self) { ///| pub impl NodeClass for WorkgroupInfoElementNode with fn has_flag(self, flag) { - flag == "isWorkgroupInfoElementNode" || self.array_element.has_flag(flag) + flag == "isWorkgroupInfoElementNode" || + NodeClass::has_flag(self.array_element, flag) } ///| @@ -40,9 +41,9 @@ pub impl NodeClass for WorkgroupInfoElementNode with fn generate( output, ) { let is_assign_context = builder.is_context_assign() - let mut snippet = self.array_element - .generate(node, builder, None) - .unwrap_or("") + let mut snippet = NodeClass::generate(self.array_element, node, builder, None).unwrap_or( + "", + ) if is_assign_context != true { let type_ = node.get_node_type(builder) snippet = builder.format(snippet, type_, output) diff --git a/src/nodes/lighting_context_node.mbt b/src/nodes/lighting_context_node.mbt index 77b1f36..4178e7b 100644 --- a/src/nodes/lighting_context_node.mbt +++ b/src/nodes/lighting_context_node.mbt @@ -67,7 +67,11 @@ pub impl NodeClass for LightingContextNode with fn parent(self) { ///| pub impl NodeClass for LightingContextNode with fn children(self, node, out) { NodeClass::children(self.context, node, out) - push_children(out, "materialLightings", self.material_lightings.map(Some(_))) + push_children( + out, + "materialLightings", + self.material_lightings.map(child => Some(child)), + ) push_child(out, "backdropNode", self.backdrop_node) push_child(out, "backdropAlphaNode", self.backdrop_alpha_node) } diff --git a/src/nodes/lighting_shadow_base_node.mbt b/src/nodes/lighting_shadow_base_node.mbt index 6e40c5c..adb513a 100644 --- a/src/nodes/lighting_shadow_base_node.mbt +++ b/src/nodes/lighting_shadow_base_node.mbt @@ -125,10 +125,7 @@ fn shadow_base_get_shadow_render_object_function( } }, } - shadow_base_render_object_library.set(keys, ShadowBaseRenderObjectFunction::{ - function, - shadow_type, - }) + shadow_base_render_object_library.set(keys, { function, shadow_type, }) |> ignore function } diff --git a/src/nodes/materials_line2_node_material.mbt b/src/nodes/materials_line2_node_material.mbt index 6a7ece9..cc44a47 100644 --- a/src/nodes/materials_line2_node_material.mbt +++ b/src/nodes/materials_line2_node_material.mbt @@ -520,9 +520,10 @@ pub impl NodeMaterialClass for Line2NodeMaterial with fn get_property( } "alphaToCoverage" => Some(Bool(material.alpha_to_coverage)) _ => - match self.node_slot(name) { + match NodeMaterialClass::node_slot(self, name) { Some(slot) => Some(node_material_slot_value(slot)) - None => BaseNodeMaterial::{ }.get_property(material, name) + None => + NodeMaterialClass::get_property(BaseNodeMaterial::{ }, material, name) } } } diff --git a/src/nodes/materials_line_dashed_node_material.mbt b/src/nodes/materials_line_dashed_node_material.mbt index 9ef40bf..9c6ee3e 100644 --- a/src/nodes/materials_line_dashed_node_material.mbt +++ b/src/nodes/materials_line_dashed_node_material.mbt @@ -85,9 +85,10 @@ pub impl NodeMaterialClass for LineDashedNodeMaterial with fn get_property( match name { "dashOffset" => Some(Number(self.dash_offset)) _ => - match self.node_slot(name) { + match NodeMaterialClass::node_slot(self, name) { Some(slot) => Some(node_material_slot_value(slot)) - None => BaseNodeMaterial::{ }.get_property(material, name) + None => + NodeMaterialClass::get_property(BaseNodeMaterial::{ }, material, name) } } } diff --git a/src/nodes/materials_mesh_lambert_node_material.mbt b/src/nodes/materials_mesh_lambert_node_material.mbt index 5bd2113..6148436 100644 --- a/src/nodes/materials_mesh_lambert_node_material.mbt +++ b/src/nodes/materials_mesh_lambert_node_material.mbt @@ -68,7 +68,7 @@ pub impl NodeMaterialClass for MeshLambertNodeMaterial with fn get_property( ) { match name { "emissiveNode" => Some(node_material_slot_value(self.emissive_node)) - _ => BaseNodeMaterial::{ }.get_property(material, name) + _ => NodeMaterialClass::get_property(BaseNodeMaterial::{ }, material, name) } } diff --git a/src/nodes/materials_mesh_phong_node_material.mbt b/src/nodes/materials_mesh_phong_node_material.mbt index 8528ab0..79b5616 100644 --- a/src/nodes/materials_mesh_phong_node_material.mbt +++ b/src/nodes/materials_mesh_phong_node_material.mbt @@ -74,9 +74,10 @@ pub impl NodeMaterialClass for MeshPhongNodeMaterial with fn get_property( material, name, ) { - match self.node_slot(name) { + match NodeMaterialClass::node_slot(self, name) { Some(slot) => Some(node_material_slot_value(slot)) - None => BaseNodeMaterial::{ }.get_property(material, name) + None => + NodeMaterialClass::get_property(BaseNodeMaterial::{ }, material, name) } } diff --git a/src/nodes/materials_mesh_physical_node_material.mbt b/src/nodes/materials_mesh_physical_node_material.mbt index f6541e4..8a75843 100644 --- a/src/nodes/materials_mesh_physical_node_material.mbt +++ b/src/nodes/materials_mesh_physical_node_material.mbt @@ -54,7 +54,7 @@ pub impl NodeMaterialClass for MeshPhysicalNodeMaterial with fn has_flag( "useTransmission" => self.use_transmission() "useDispersion" => self.use_dispersion() "useRetroreflection" => self.use_retroreflection() - _ => self.standard.has_flag(flag) + _ => NodeMaterialClass::has_flag(self.standard, flag) } } @@ -100,7 +100,7 @@ pub impl NodeMaterialClass for MeshPhysicalNodeMaterial with fn node_slot( return Some(slot.1) } } - self.standard.node_slot(name) + NodeMaterialClass::node_slot(self.standard, name) } ///| @@ -108,7 +108,7 @@ pub impl NodeMaterialClass for MeshPhysicalNodeMaterial with fn own_node_slots( self, out, ) { - self.standard.own_node_slots(out) + NodeMaterialClass::own_node_slots(self.standard, out) out.append(self.own_slots()) } @@ -138,7 +138,7 @@ pub impl NodeMaterialClass for MeshPhysicalNodeMaterial with fn set_node_slot( "dispersionNode" => self.dispersion_node = value "retroreflectivityNode" => self.retroreflectivity_node = value "anisotropyNode" => self.anisotropy_node = value - _ => return self.standard.set_node_slot(name, value) + _ => return NodeMaterialClass::set_node_slot(self.standard, name, value) } true } @@ -157,14 +157,15 @@ pub impl NodeMaterialClass for MeshPhysicalNodeMaterial with fn get_property( | "useAnisotropy" | "useTransmission" | "useDispersion" - | "useRetroreflection" => Some(Bool(self.has_flag(name))) + | "useRetroreflection" => + Some(Bool(NodeMaterialClass::has_flag(self, name))) _ => for slot in self.own_slots() { if slot.0 == name { break Some(node_material_slot_value(slot.1)) } } nobreak { - self.standard.get_property(material, name) + NodeMaterialClass::get_property(self.standard, material, name) } } } @@ -177,7 +178,7 @@ pub impl NodeMaterialClass for MeshPhysicalNodeMaterial with fn copy_members( material, source, ) { - self.standard.copy_members(material, source) + NodeMaterialClass::copy_members(self.standard, material, source) if source.anisotropy() is Some(v) { material.set_anisotropy(v) } @@ -497,7 +498,7 @@ pub impl NodeMaterialClass for MeshPhysicalNodeMaterial with fn setup( sub_build(self.setup_clearcoat_normal(), "NORMAL", type_="vec3") }), ) - self.standard.setup(material, builder) + NodeMaterialClass::setup(self.standard, material, builder) } ///| diff --git a/src/nodes/materials_mesh_sss_node_material.mbt b/src/nodes/materials_mesh_sss_node_material.mbt index cd3fb4c..5853470 100644 --- a/src/nodes/materials_mesh_sss_node_material.mbt +++ b/src/nodes/materials_mesh_sss_node_material.mbt @@ -68,7 +68,7 @@ pub impl LightingModelClass for SSSLightingModel with fn direct( ), ) } - self.physical.direct(model, light_data, builder) + LightingModelClass::direct(self.physical, model, light_data, builder) } ///| @@ -139,7 +139,7 @@ pub impl NodeMaterialClass for MeshSSSNodeMaterial with fn parent(self) { pub impl NodeMaterialClass for MeshSSSNodeMaterial with fn has_flag(self, flag) { match flag { "useSSS" => self.use_sss() - _ => self.physical.has_flag(flag) + _ => NodeMaterialClass::has_flag(self.physical, flag) } } @@ -169,7 +169,7 @@ pub impl NodeMaterialClass for MeshSSSNodeMaterial with fn node_slot(self, name) return Some(slot.1) } } - self.physical.node_slot(name) + NodeMaterialClass::node_slot(self.physical, name) } ///| @@ -177,7 +177,7 @@ pub impl NodeMaterialClass for MeshSSSNodeMaterial with fn own_node_slots( self, out, ) { - self.physical.own_node_slots(out) + NodeMaterialClass::own_node_slots(self.physical, out) out.append(self.own_slots()) } @@ -194,7 +194,7 @@ pub impl NodeMaterialClass for MeshSSSNodeMaterial with fn set_node_slot( "thicknessAttenuationNode" => self.thickness_attenuation_node = value "thicknessPowerNode" => self.thickness_power_node = value "thicknessScaleNode" => self.thickness_scale_node = value - _ => return self.physical.set_node_slot(name, value) + _ => return NodeMaterialClass::set_node_slot(self.physical, name, value) } true } @@ -213,7 +213,7 @@ pub impl NodeMaterialClass for MeshSSSNodeMaterial with fn get_property( break Some(node_material_slot_value(slot.1)) } } nobreak { - self.physical.get_property(material, name) + NodeMaterialClass::get_property(self.physical, material, name) } } } diff --git a/src/nodes/materials_mesh_standard_node_material.mbt b/src/nodes/materials_mesh_standard_node_material.mbt index 4928f3c..8a97d80 100644 --- a/src/nodes/materials_mesh_standard_node_material.mbt +++ b/src/nodes/materials_mesh_standard_node_material.mbt @@ -77,9 +77,10 @@ pub impl NodeMaterialClass for MeshStandardNodeMaterial with fn get_property( material, name, ) { - match self.node_slot(name) { + match NodeMaterialClass::node_slot(self, name) { Some(slot) => Some(node_material_slot_value(slot)) - None => BaseNodeMaterial::{ }.get_property(material, name) + None => + NodeMaterialClass::get_property(BaseNodeMaterial::{ }, material, name) } } diff --git a/src/nodes/materials_mesh_toon_node_material.mbt b/src/nodes/materials_mesh_toon_node_material.mbt index cf32931..7bc9af4 100644 --- a/src/nodes/materials_mesh_toon_node_material.mbt +++ b/src/nodes/materials_mesh_toon_node_material.mbt @@ -66,9 +66,10 @@ pub impl NodeMaterialClass for MeshToonNodeMaterial with fn get_property( material, name, ) { - match self.node_slot(name) { + match NodeMaterialClass::node_slot(self, name) { Some(slot) => Some(node_material_slot_value(slot)) - None => BaseNodeMaterial::{ }.get_property(material, name) + None => + NodeMaterialClass::get_property(BaseNodeMaterial::{ }, material, name) } } diff --git a/src/nodes/materials_points_node_material.mbt b/src/nodes/materials_points_node_material.mbt index 3ae9574..e9b359b 100644 --- a/src/nodes/materials_points_node_material.mbt +++ b/src/nodes/materials_points_node_material.mbt @@ -50,7 +50,7 @@ pub impl NodeMaterialClass for PointsNodeMaterial with fn parent(self) { pub impl NodeMaterialClass for PointsNodeMaterial with fn has_flag(self, flag) { flag == "isPointsNodeMaterial" || flag == "isPointsMaterial" || - self.sprite.has_flag(flag) + NodeMaterialClass::has_flag(self.sprite, flag) } ///| @@ -62,7 +62,7 @@ pub impl NodeMaterialClass for PointsNodeMaterial with fn construct(_) { pub impl NodeMaterialClass for PointsNodeMaterial with fn node_slot(self, name) { match name { "sizeNode" => Some(self.size_node) - _ => self.sprite.node_slot(name) + _ => NodeMaterialClass::node_slot(self.sprite, name) } } @@ -71,7 +71,7 @@ pub impl NodeMaterialClass for PointsNodeMaterial with fn own_node_slots( self, out, ) { - self.sprite.own_node_slots(out) + NodeMaterialClass::own_node_slots(self.sprite, out) out.push(("sizeNode", self.size_node)) } @@ -83,7 +83,7 @@ pub impl NodeMaterialClass for PointsNodeMaterial with fn set_node_slot( ) { match name { "sizeNode" => self.size_node = value - _ => return self.sprite.set_node_slot(name, value) + _ => return NodeMaterialClass::set_node_slot(self.sprite, name, value) } true } @@ -97,7 +97,7 @@ pub impl NodeMaterialClass for PointsNodeMaterial with fn get_property( match name { "sizeNode" => Some(node_material_slot_value(self.size_node)) "alphaToCoverage" => Some(Bool(material.alpha_to_coverage)) - _ => self.sprite.get_property(material, name) + _ => NodeMaterialClass::get_property(self.sprite, material, name) } } @@ -133,7 +133,7 @@ pub fn PointsNodeMaterial::setup_vertex_sprite( let scale_node = self.sprite.scale_node let size_node = self.size_node let size_attenuation = SpriteNodeMaterial::size_attenuation(material) - let mut mvp = self.sprite.setup_vertex(material, builder) + let mut mvp = NodeMaterialClass::setup_vertex(self.sprite, material, builder) // skip further processing if the material is not a node material if builder_material.is_node_material() != true { return mvp @@ -181,7 +181,7 @@ pub impl NodeMaterialClass for PointsNodeMaterial with fn setup_vertex( builder, ) { if node_material_builder_object(builder).is_points() { - self.sprite.setup_vertex(material, builder) + NodeMaterialClass::setup_vertex(self.sprite, material, builder) } else { self.setup_vertex_sprite(material, builder) } diff --git a/src/nodes/materials_sprite_node_material.mbt b/src/nodes/materials_sprite_node_material.mbt index 7bbd72b..7861ad1 100644 --- a/src/nodes/materials_sprite_node_material.mbt +++ b/src/nodes/materials_sprite_node_material.mbt @@ -75,9 +75,10 @@ pub impl NodeMaterialClass for SpriteNodeMaterial with fn get_property( "sizeAttenuation" => Some(Bool(SpriteNodeMaterial::size_attenuation(material))) _ => - match self.node_slot(name) { + match NodeMaterialClass::node_slot(self, name) { Some(slot) => Some(node_material_slot_value(slot)) - None => BaseNodeMaterial::{ }.get_property(material, name) + None => + NodeMaterialClass::get_property(BaseNodeMaterial::{ }, material, name) } } } diff --git a/src/nodes/materials_volume_node_material.mbt b/src/nodes/materials_volume_node_material.mbt index 2284897..37ec498 100644 --- a/src/nodes/materials_volume_node_material.mbt +++ b/src/nodes/materials_volume_node_material.mbt @@ -71,9 +71,10 @@ pub impl NodeMaterialClass for VolumeNodeMaterial with fn get_property( match name { "steps" => Some(Number(self.steps)) _ => - match self.node_slot(name) { + match NodeMaterialClass::node_slot(self, name) { Some(slot) => Some(node_material_slot_value(slot)) - None => BaseNodeMaterial::{ }.get_property(material, name) + None => + NodeMaterialClass::get_property(BaseNodeMaterial::{ }, material, name) } } } diff --git a/src/nodes/pmrem_node.mbt b/src/nodes/pmrem_node.mbt index 5a0e03f..9eb89c1 100644 --- a/src/nodes/pmrem_node.mbt +++ b/src/nodes/pmrem_node.mbt @@ -238,11 +238,11 @@ fn PMREMNode::update_before_state( } else { let generator = match (self._generator, self._webgl_generator) { (Some(g), _) => PMREMNodeGenerator::Renderer(g) - (None, Some(g)) => PMREMNodeGenerator::WebGL(g) + (None, Some(g)) => WebGL(g) (None, None) => { let g = PMREMGenerator::new(renderer) self._generator = Some(g) - PMREMNodeGenerator::Renderer(g) + Renderer(g) } } pmrem = pmrem_node_get_pmrem_from_texture(texture, renderer, generator) diff --git a/src/nodes/shader_diff_test.mbt b/src/nodes/shader_diff_test.mbt index 5f8dbb1..0853a38 100644 --- a/src/nodes/shader_diff_test.mbt +++ b/src/nodes/shader_diff_test.mbt @@ -8,13 +8,23 @@ extern "js" fn shader_diff_enabled() -> Bool = "() => typeof process !== 'undefined' && process.env.SHADER_DIFF === '1'" ///| -extern "js" fn shader_json( +extern "js" fn shader_json_fixed( code : String, result : String, vars : String, - uniforms : Array[String], + uniforms : FixedArray[String], ) -> String = "(code, result, vars, uniforms) => JSON.stringify({ code, result, vars, uniforms })" +///| +fn shader_json( + code : String, + result : String, + vars : String, + uniforms : Array[String], +) -> String { + shader_json_fixed(code, result, vars, FixedArray::from_array(uniforms)) +} + ///| /// `record( builder, flow )` of upstream.mjs. fn shader_record(b : @nodes.NodeBuilder, flow : @nodes.FlowData) -> String { @@ -120,7 +130,7 @@ fn shader_scenarios() -> Array[(String, () -> @nodes.Node)] { "fn_default_parameter", fn() { @nodes.fn_(fn(inputs, _) { - let a = inputs.get(0).or_else(fn() { @nodes.float(7) }) + let a = inputs.get(0).unwrap_or_else(fn() { @nodes.float(7) }) Some(a.to_var(name="d")) }).call([]) }, diff --git a/src/nodes/tsl_fn_layout_names_test.mbt b/src/nodes/tsl_fn_layout_names_test.mbt index ac3964f..9dbaaf2 100644 --- a/src/nodes/tsl_fn_layout_names_test.mbt +++ b/src/nodes/tsl_fn_layout_names_test.mbt @@ -35,10 +35,17 @@ test "library Fns take upstream's names and leave the user counter alone" { let shader = @nodes.ShaderNodeInternal::of( @nodes.FnNode::of(library).unwrap().shader_node, ).unwrap() - tsl_inspect(shader.layout.unwrap().type_, content="Some(vec3)") - tsl_inspect( + debug_inspect( + shader.layout.unwrap().type_, + content=( + #|Some("vec3") + ), + ) + debug_inspect( @nodes.FnNode::of(library).unwrap().shader_node.node_type, - content="Some(vec3)", + content=( + #|Some("vec3") + ), ) tsl_inspect(g4_layout_number(user2) - g4_layout_number(user1), content="1") // user functions count on from the 130 names upstream's library takes @@ -54,10 +61,15 @@ test "the ported library Fns of nodes/display have their names" { for s in display { assert_true(s.3 >= 1) } - tsl_inspect( + debug_inspect( status[39], content=( - #|(nodes/display/ToneMappingFunctions.js:RRTAndODTFit, fn39, display_tone_mapping_functions.mbt, 2) + #|( + #| "nodes/display/ToneMappingFunctions.js:RRTAndODTFit", + #| "fn39", + #| "display_tone_mapping_functions.mbt", + #| 2, + #|) ), ) } diff --git a/src/nodes/utils_reflector_node.mbt b/src/nodes/utils_reflector_node.mbt index 00c3c7c..f1e2e40 100644 --- a/src/nodes/utils_reflector_node.mbt +++ b/src/nodes/utils_reflector_node.mbt @@ -88,7 +88,7 @@ pub impl NodeClass for ReflectorNode with fn parent(self) { ///| pub impl NodeClass for ReflectorNode with fn has_flag(self, flag) { - self.texture.has_flag(flag) + NodeClass::has_flag(self.texture, flag) } ///| diff --git a/src/nodes/utils_rtt_node.mbt b/src/nodes/utils_rtt_node.mbt index aea9e15..15833d9 100644 --- a/src/nodes/utils_rtt_node.mbt +++ b/src/nodes/utils_rtt_node.mbt @@ -35,12 +35,12 @@ pub impl NodeClass for RTTNode with fn parent(self) { ///| pub impl NodeClass for RTTNode with fn has_flag(self, flag) { - flag == "isRTTNode" || self.texture.has_flag(flag) + flag == "isRTTNode" || NodeClass::has_flag(self.texture, flag) } ///| pub impl NodeClass for RTTNode with fn children(self, node, out) { - self.texture.children(node, out) + NodeClass::children(self.texture, node, out) push_child(out, "node", Some(self.node)) } diff --git a/src/renderers/gpu/gpu_bindings_test.mbt b/src/renderers/gpu/gpu_bindings_test.mbt index 152156d..f98df9c 100644 --- a/src/renderers/gpu/gpu_bindings_test.mbt +++ b/src/renderers/gpu/gpu_bindings_test.mbt @@ -215,7 +215,7 @@ test "promise methods call back synchronously against the mock" { events.push("messages: \{info.messages().length()}") }) let pipeline_desc = @gpu.GPURenderPipelineDescriptor::default() - pipeline_desc.layout = Some(@gpu.GPUPipelineLayoutOrAuto::Auto) + pipeline_desc.layout = Some(Auto) pipeline_desc.vertex = Some( @gpu.GPUVertexState::new(module_=shader, entry_point="main"), ) diff --git a/src/renderers/webgl/webgl_morphtargets.mbt b/src/renderers/webgl/webgl_morphtargets.mbt index 6a5e4d0..ddbe8a6 100644 --- a/src/renderers/webgl/webgl_morphtargets.mbt +++ b/src/renderers/webgl/webgl_morphtargets.mbt @@ -167,7 +167,7 @@ pub fn WebGLMorphtargets::update( let uniforms = program.get_uniforms() match object.kind { Mesh( - { kind: InstancedMesh({ morph_texture: Some(morph_texture), .. }), .. } + { kind: InstancedMesh({ morph_texture: Some(morph_texture), .. }), .. }, ) => uniforms.set_value( gl, diff --git a/src/renderers/webgl/webgl_programs.mbt b/src/renderers/webgl/webgl_programs.mbt index 2ce5f43..ffa436b 100644 --- a/src/renderers/webgl/webgl_programs.mbt +++ b/src/renderers/webgl/webgl_programs.mbt @@ -505,7 +505,7 @@ pub fn WebGLPrograms::get_parameters( ImageArray(images) => match images[0] { DataImage({ mipmaps: Some(mipmaps), .. }) => - Some(mipmaps.map(fn(m) { @core.TextureImage::DataImage(m) })) + Some(mipmaps.map(fn(m) { DataImage(m) })) TextureImage(t) => Some(t.mipmaps) _ => abort("WebGLPrograms: compressed cube face without mipmaps") } diff --git a/src/renderers/webgl/webgl_renderer.mbt b/src/renderers/webgl/webgl_renderer.mbt index d4b1b9e..6a58be8 100644 --- a/src/renderers/webgl/webgl_renderer.mbt +++ b/src/renderers/webgl/webgl_renderer.mbt @@ -1298,7 +1298,7 @@ pub fn WebGLRenderer::render_buffer_direct( self.indexed_buffer_renderer.set_index(attribute) RendererDraw::DrawElements(self.indexed_buffer_renderer) } - None => RendererDraw::DrawArrays(self.buffer_renderer) + None => DrawArrays(self.buffer_renderer) } // if object.is_mesh() { @@ -1733,7 +1733,7 @@ pub fn WebGLRenderer::render( { kind: PerspectiveCamera({ array_camera: Some(array_camera), .. }), .. - } + }, ) => { let cameras = array_camera.cameras if transmissive_objects.length() > 0 { diff --git a/src/renderers/webgl/webgl_textures.mbt b/src/renderers/webgl/webgl_textures.mbt index accc497..e5e3aa8 100644 --- a/src/renderers/webgl/webgl_textures.mbt +++ b/src/renderers/webgl/webgl_textures.mbt @@ -272,7 +272,7 @@ fn textures_image_mipmaps( match image { DataImage(d) => match d.mipmaps { - Some(mipmaps) => mipmaps.map(m => @core.TextureImage::DataImage(m)) + Some(mipmaps) => mipmaps.map(m => DataImage(m)) None => [] } TextureImage(texture) => texture.mipmaps diff --git a/src/renderers/webgl/webgl_uniforms.mbt b/src/renderers/webgl/webgl_uniforms.mbt index fac665e..5d6073a 100644 --- a/src/renderers/webgl/webgl_uniforms.mbt +++ b/src/renderers/webgl/webgl_uniforms.mbt @@ -248,13 +248,13 @@ fn webgl_uniforms_flatten( if a.length() > 0 && !a[0].is_nan() { return GLData::to_gl_data(a) } else { - a.map(fn(x) { @core.UniformValue::Number(x) }) + a.map(fn(x) { Number(x) }) } TypedArray(t) => if t.length() > 0 && !t[0].is_nan() { return @core.JsValue::of(t) } else { - t.to_array().map(fn(x) { @core.UniformValue::Number(x) }) + t.to_array().map(fn(x) { Number(x) }) } _ => abort("WebGLUniforms: flatten: unsupported uniform value") } diff --git a/src/renderers/webgl/webgl_uniforms_groups.mbt b/src/renderers/webgl/webgl_uniforms_groups.mbt index 61b903a..4df7f54 100644 --- a/src/renderers/webgl/webgl_uniforms_groups.mbt +++ b/src/renderers/webgl/webgl_uniforms_groups.mbt @@ -173,8 +173,7 @@ fn webgl_uniforms_groups_array_items( ) -> Array[@core.UniformValue]? { match value { Array(items) => Some(items) - Numbers(numbers) => - Some(numbers.map(fn(n) { @core.UniformValue::Number(n) })) + Numbers(numbers) => Some(numbers.map(fn(n) { Number(n) })) _ => None } } diff --git a/src/renderers/webgl/webxr_depth_sensing.mbt b/src/renderers/webgl/webxr_depth_sensing.mbt index adf883b..a47947c 100644 --- a/src/renderers/webgl/webxr_depth_sensing.mbt +++ b/src/renderers/webgl/webxr_depth_sensing.mbt @@ -78,7 +78,7 @@ pub fn WebXRDepthSensing::get_mesh( if self.mesh is None { let first = match camera_xr.kind { Camera( - { kind: PerspectiveCamera({ array_camera: Some(array), .. }), .. } + { kind: PerspectiveCamera({ array_camera: Some(array), .. }), .. }, ) => array.cameras[0] _ => abort("WebXRDepthSensing.getMesh: cameraXR is not an ArrayCamera") } diff --git a/src/renderers/webgl_fallback/g10_diff_test.mbt b/src/renderers/webgl_fallback/g10_diff_test.mbt index 27c6341..7f88dee 100644 --- a/src/renderers/webgl_fallback/g10_diff_test.mbt +++ b/src/renderers/webgl_fallback/g10_diff_test.mbt @@ -65,7 +65,6 @@ extern "js" fn g10_make_canvas( priv struct G10Context { renderer : @nodes.Renderer gl : @webgl.WebGL2RenderingContext - canvas : @core.JsValue } ///| @@ -104,7 +103,7 @@ fn g10_make_renderer( ) renderer.library = g10_standard_node_library() renderer.init() - { renderer, gl, canvas, } + { renderer, gl, } } ///| @@ -157,7 +156,7 @@ fn g10_scenario_async( ///| test "g10diff init_basic" { g10_scenario("init_basic", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() g10_note( gl, "coordinateSystem", @@ -180,7 +179,7 @@ test "g10diff init_basic" { ///| test "g10diff render_basic" { g10_scenario("render_basic", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() scene.add(g10_box(g10_basic(0xff0000))) |> ignore renderer.render(scene, g10_camera()) @@ -222,7 +221,7 @@ fn g10_shadow(light : @core.Object3D) -> @core.LightShadow { ///| test "g10diff init_options" { g10_scenario("init_options", fn() { - let { renderer, gl, .. } = g10_make_renderer( + let { renderer, gl, } = g10_make_renderer( parameters=g10_params([ ("antialias", @core.JsValue::of(true)), ("stencil", @core.JsValue::of(true)), @@ -258,7 +257,7 @@ test "g10diff init_options" { ///| test "g10diff init_no_extensions" { g10_scenario("init_no_extensions", fn() { - let { renderer, gl, .. } = g10_make_renderer( + let { renderer, gl, } = g10_make_renderer( mock="{\"extensions\":[]}", parameters=g10_params([ ("reversedDepthBuffer", @core.JsValue::of(true)), @@ -292,7 +291,7 @@ test "g10diff init_no_extensions" { ///| test "g10diff materials_unlit" { g10_scenario("materials_unlit", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() let m0 = g10_basic(0x00ff00) m0.transparent = true @@ -348,7 +347,7 @@ test "g10diff materials_unlit" { ///| test "g10diff materials_lit" { g10_scenario("materials_lit", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() scene.add( @core.AmbientLight::new( @@ -414,7 +413,7 @@ test "g10diff materials_lit" { ///| test "g10diff shadows" { g10_scenario("shadows", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() renderer.shadow_map.enabled = true let scene = @core.Scene::new() let dir = @core.DirectionalLight::new( @@ -446,7 +445,7 @@ test "g10diff shadows" { ///| test "g10diff shadows_point" { g10_scenario("shadows_point", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() renderer.shadow_map.enabled = true let scene = @core.Scene::new() let point = @core.PointLight::new( @@ -495,7 +494,7 @@ fn g10_basic_color_node(node : @nodes.Node) -> @core.Material { ///| test "g10diff textures_formats" { g10_scenario("textures_formats", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() let t0 = g10_data_texture( @core.TypedArray::uint8(16), @@ -563,7 +562,7 @@ test "g10diff textures_formats" { ///| test "g10diff textures_kinds" { g10_scenario("textures_kinds", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() let face = fn() -> @core.TextureImage { DataImage( @@ -638,7 +637,7 @@ test "g10diff textures_kinds" { ///| test "g10diff render_targets" { g10_scenario("render_targets", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() g10_add_box(scene, g10_basic(0x336699)) |> ignore let rt = @core.RenderTarget::new(width=8, height=8, depth_buffer=true) @@ -666,7 +665,7 @@ extern "js" fn g10_array_from(a : @core.TypedArray) -> @core.JsValue = "(a) => A ///| test "g10diff render_targets_mrt" { g10_scenario("render_targets_mrt", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() g10_add_box(scene, @nodes.MeshStandardNodeMaterial::new()) |> ignore scene.add( @@ -704,7 +703,7 @@ test "g10diff render_targets_mrt" { ///| test "g10diff copies" { g10_scenario("copies", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() g10_add_box(scene, @nodes.MeshBasicNodeMaterial::new()) |> ignore renderer.render(scene, g10_camera()) @@ -750,7 +749,7 @@ test "g10diff copies" { ///| test "g10diff geometry_kinds" { g10_scenario("geometry_kinds", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() let inst = @core.InstancedMesh::new( geometry=@geometries.BoxGeometry::new(), @@ -827,7 +826,7 @@ test "g10diff batched_mesh" { out.get_error() |> ignore g10_ffi_clear(out) for mock in ["{}", "{\"extensions\":[\"EXT_color_buffer_float\"]}"] { - let { renderer, gl, .. } = g10_make_renderer(mock~) + let { renderer, gl, } = g10_make_renderer(mock~) let scene = @core.Scene::new() let batched = @core.BatchedMesh::new( 4, @@ -860,7 +859,7 @@ extern "js" fn g10_float32_array_from(buffer : @core.JsValue) -> @core.JsValue = ///| test "g10diff compute_transform_feedback" { g10_scenario("compute_transform_feedback", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let a = @nodes.StorageBufferAttribute::from_array( @core.TypedArray::float32(8), 1, @@ -893,7 +892,7 @@ test "g10diff compute_transform_feedback" { ///| test "g10diff compute_then_render" { g10_scenario("compute_then_render", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let offsets = @nodes.StorageInstancedBufferAttribute::from_array( @core.TypedArray::float32(3 * 3), 3, @@ -924,7 +923,7 @@ test "g10diff compute_then_render" { ///| test "g10diff queries" { g10_scenario("queries", fn() { - let { renderer, gl, .. } = g10_make_renderer( + let { renderer, gl, } = g10_make_renderer( parameters=g10_params([("trackTimestamp", @core.JsValue::of(true))]), mock="{\"extensions\":[\"EXT_color_buffer_float\",\"WEBGL_multi_draw\",\"EXT_disjoint_timer_query_webgl2\",\"KHR_parallel_shader_compile\"],\"queries\":{\"available\":true,\"result\":0}}", ) @@ -992,7 +991,7 @@ fn g10_cube_texture() -> @core.Texture { ///| test "g10diff background_environment" { g10_scenario("background_environment", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() let data = scene.as_scene() data.background = Some(Color(@math.Color::from_hex(0x112233))) @@ -1015,7 +1014,7 @@ test "g10diff background_environment" { /// A known foundation difference: see scenarios.mjs. test "g10diff background_cube" { g10_scenario("background_cube", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() scene.as_scene().background = Some(Texture(g10_cube_texture())) g10_add_box(scene, @nodes.MeshBasicNodeMaterial::new()) |> ignore @@ -1027,7 +1026,7 @@ test "g10diff background_cube" { ///| test "g10diff fog_tone_mapping" { g10_scenario("fog_tone_mapping", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() renderer.tone_mapping = @core.ACESFilmicToneMapping renderer.tone_mapping_exposure = 1.5 let scene = @core.Scene::new() @@ -1059,7 +1058,7 @@ test "g10diff fog_tone_mapping" { ///| test "g10diff post_processing" { g10_scenario("post_processing", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() g10_add_box(scene, g10_basic(0x00ff00)) |> ignore let cam = g10_camera() @@ -1075,7 +1074,7 @@ test "g10diff post_processing" { ///| test "g10diff clear_resize_dispose" { g10_scenario("clear_resize_dispose", fn() { - let { renderer, gl, .. } = g10_make_renderer( + let { renderer, gl, } = g10_make_renderer( parameters=g10_params([("stencil", @core.JsValue::of(true))]), stencil=true, ) @@ -1110,7 +1109,7 @@ test "g10diff clear_resize_dispose" { ///| test "g10diff cube_render_target" { g10_scenario("cube_render_target", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() g10_add_box(scene, @nodes.MeshBasicNodeMaterial::new()) |> ignore let crt = @nodes.CubeRenderTarget::new(size=8) @@ -1129,7 +1128,7 @@ test "g10diff cube_render_target" { /// A known difference outside this package: see scenarios.mjs. test "g10diff environment_cube" { g10_scenario("environment_cube", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() scene.as_scene().environment = Some(g10_cube_texture()) g10_add_box(scene, @nodes.MeshStandardNodeMaterial::new()) |> ignore @@ -1141,7 +1140,7 @@ test "g10diff environment_cube" { ///| test "g10diff compute_pbo_render" { g10_scenario("compute_pbo_render", fn() { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let data = @nodes.StorageBufferAttribute::from_array( @core.TypedArray::float32(6), 1, @@ -1169,7 +1168,7 @@ test "g10diff compute_pbo_render" { ///| test "g10diff compile_async_parallel" { g10_scenario_async("compile_async_parallel", fn(done) { - let { renderer, gl, .. } = g10_make_renderer() + let { renderer, gl, } = g10_make_renderer() let scene = @core.Scene::new() g10_add_box(scene, @nodes.MeshPhongNodeMaterial::new()) |> ignore scene.add( diff --git a/src/renderers/webgl_fallback/utils_web_gl_timestamp_query_pool.mbt b/src/renderers/webgl_fallback/utils_web_gl_timestamp_query_pool.mbt index 28814e6..57fdd8e 100644 --- a/src/renderers/webgl_fallback/utils_web_gl_timestamp_query_pool.mbt +++ b/src/renderers/webgl_fallback/utils_web_gl_timestamp_query_pool.mbt @@ -99,7 +99,7 @@ pub impl @nodes.TimestampQueryPoolClass for WebGLTimestampQueryPool with fn allo return None } if base.current_query_index + 2 > base.max_queries { - self.resolve_queries_async(base, fn(_) { }) + @nodes.TimestampQueryPoolClass::resolve_queries_async(self, base, fn(_) { }) base.current_query_index = 0 base.query_offsets.clear() self.query_states.clear() diff --git a/src/renderers/webgl_fallback/web_gl_backend.mbt b/src/renderers/webgl_fallback/web_gl_backend.mbt index 03bcb1d..d775179 100644 --- a/src/renderers/webgl_fallback/web_gl_backend.mbt +++ b/src/renderers/webgl_fallback/web_gl_backend.mbt @@ -1046,10 +1046,7 @@ pub impl @nodes.BackendClass for WebGLBackend with fn compute( } let vao_gpu = self.vertex_array_utils .unwrap() - .get_vao( - @core.JsValue::of(pipeline), - attributes.map(fn(a) { @core.GeometryAttribute::Buffer(a) }), - ) + .get_vao(@core.JsValue::of(pipeline), attributes.map(fn(a) { Buffer(a) })) state.set_vertex_state(Some(vao_gpu)) |> ignore state.use_program(Some(program_gpu)) |> ignore self._bind_uniforms(bindings) diff --git a/src/renderers/webgpu/nodes_wgsl_node_function_test.mbt b/src/renderers/webgpu/nodes_wgsl_node_function_test.mbt index c54b73c..00e4c87 100644 --- a/src/renderers/webgpu/nodes_wgsl_node_function_test.mbt +++ b/src/renderers/webgpu/nodes_wgsl_node_function_test.mbt @@ -5,10 +5,10 @@ test "WGSLNodeFunction parses a declaration" { ) inspect(f.name, content="scale") inspect(f.type_, content="vec3") - inspect( + debug_inspect( f.inputs.map(fn(i) { i.name + ":" + i.type_ }), content=( - #|[a:float, b:vec3, t:texture, p:pointer] + #|["a:float", "b:vec3", "t:texture", "p:pointer"] ), ) inspect( @@ -45,7 +45,12 @@ test "WGSLNodeBuilder types and methods" { inspect(b.get_type("mat3"), content="mat3x3") inspect(b.get_type("custom"), content="custom") inspect(b.get_bitcast_method("uint"), content="bitcast") - inspect(b.get_ternary("c", "a", "b"), content="Some(select( b, a, c ))") + debug_inspect( + b.get_ternary("c", "a", "b"), + content=( + #|Some("select( b, a, c )") + ), + ) inspect(b.get_method("dFdy"), content="- dpdy") inspect(b.get_float_packing_method("snorm"), content="pack2x16snorm") inspect(b.is_reserved_keyword("main"), content="true") diff --git a/src/renderers/webgpu/web_gpu_backend.mbt b/src/renderers/webgpu/web_gpu_backend.mbt index a8e9439..81c3c82 100644 --- a/src/renderers/webgpu/web_gpu_backend.mbt +++ b/src/renderers/webgpu/web_gpu_backend.mbt @@ -320,7 +320,6 @@ priv struct WebGPUTextureViewInfo { ///| /// `descriptorBase` of a render target's cached render pass descriptors. priv struct WebGPUDescriptorBase { - texture_views : Array[WebGPUTextureViewInfo] color_attachments : Array[@gpu.GPURenderPassColorAttachment] descriptor : @gpu.GPURenderPassDescriptor mut depth_stencil_attachment : @gpu.GPURenderPassDepthStencilAttachment? @@ -1092,7 +1091,6 @@ fn WebGPUBackend::_get_render_pass_descriptor( color_attachments.push(attachment) } let base = { - texture_views, color_attachments, descriptor: @gpu.GPURenderPassDescriptor::default(), depth_stencil_attachment: None, diff --git a/src/renderers/webgpu/web_gpu_backend_draw.mbt b/src/renderers/webgpu/web_gpu_backend_draw.mbt index faca73e..9dc79cb 100644 --- a/src/renderers/webgpu/web_gpu_backend_draw.mbt +++ b/src/renderers/webgpu/web_gpu_backend_draw.mbt @@ -65,7 +65,7 @@ pub impl @nodes.BackendClass for WebGPUBackend with fn compute( if dispatch_size is None { dispatch_size = match compute.dispatch_size { Some(d) => Some(d) - None => compute.count.map(fn(c) { @nodes.ComputeDispatchSize::Count(c) }) + None => compute.count.map(fn(c) { Count(c) }) } } let dispatch : Array[Int32] = match dispatch_size {