Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ concurrency:
cancel-in-progress: false

env:
MOONBIT_VERSION: 0.10.19+bee578715
MOONBIT_VERSION: 0.10.21+06da1ed44

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
permissions: {}

env:
MOONBIT_VERSION: 0.10.19+bee578715
MOONBIT_VERSION: 0.10.21+06da1ed44

jobs:
publish:
Expand Down
30 changes: 15 additions & 15 deletions diff/addons/gltf/ktx2_diff/tools/ktx2_loader.template.mbt
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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) => {
Expand All @@ -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))
Expand All @@ -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]
Expand Down Expand Up @@ -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 {
Expand All @@ -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))
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
)
Expand Down
2 changes: 0 additions & 2 deletions src/addons/environments/moon.pkg
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 0 additions & 2 deletions src/addons/libs/moon.pkg
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {
"moonbit-community/three/core",
"moonbit-community/three/math",
"moonbit-community/three/renderers/webgl",
"moonbitlang/core/double",
}

Expand Down
34 changes: 16 additions & 18 deletions src/addons/loaders/draco_loader.mbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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",
Expand Down Expand Up @@ -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,
Expand All @@ -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
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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..<attributes.length() {
let data = attributes[i]
let name : String = data.get("name").cast()
Expand All @@ -441,9 +441,7 @@ fn DRACOLoader::create_geometry(
)
} else {
let buffer = @core.InterleavedBuffer::new(array.cast(), stride)
@core.GeometryAttribute::Interleaved(
@core.InterleavedBufferAttribute::new(buffer, item_size, 0),
)
Interleaved(@core.InterleavedBufferAttribute::new(buffer, item_size, 0))
}
if name == "color" {
self.assign_vertex_color_space(attribute, vertex_color_space)
Expand Down Expand Up @@ -488,7 +486,7 @@ fn DRACOLoader::load_library(
response_type : String,
) -> @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
Expand Down Expand Up @@ -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 {
Expand Down
Loading
Loading