diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95cbbe79c..60c172033 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,7 +92,7 @@ jobs: - name: check es5 run: | npm install -g es-check@7.2.1 - npx es-check --module es5 js/meshopt_decoder.js js/meshopt_encoder.js js/meshopt_simplifier.js js/meshopt_clusterizer.js + npx es-check --module es5 js/meshopt_decoder.mjs js/meshopt_encoder.js js/meshopt_simplifier.js js/meshopt_clusterizer.js npx es-check --module es2020 gltf/library.js gltfpack: diff --git a/CMakeLists.txt b/CMakeLists.txt index 27b804ca1..1fd7bbd5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ if(POLICY CMP0092) cmake_policy(SET CMP0092 NEW) # Enables clean /W4 override for MSVC endif() -project(meshoptimizer VERSION 0.25 LANGUAGES CXX) +project(meshoptimizer VERSION 1.0 LANGUAGES CXX) option(MESHOPT_BUILD_DEMO "Build demo" OFF) option(MESHOPT_BUILD_GLTFPACK "Build gltfpack" OFF) diff --git a/Makefile b/Makefile index 4eea54827..ba67a3185 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ format: formatjs: prettier -w js/*.js gltf/*.js demo/*.html js/*.ts -js: js/meshopt_decoder.cjs js/meshopt_decoder.js js/meshopt_encoder.js js/meshopt_simplifier.js js/meshopt_clusterizer.js +js: js/meshopt_decoder.cjs js/meshopt_decoder.mjs js/meshopt_encoder.js js/meshopt_simplifier.js js/meshopt_clusterizer.js symbols: $(BUILD)/amalgamated.so nm $< -U -g @@ -181,7 +181,7 @@ build/clusterizer.wasm: $(WASM_CLUSTERIZER_SOURCES) @mkdir -p build $(WASMCC) $^ $(WASM_FLAGS) $(patsubst %,$(WASM_EXPORT_PREFIX)=%,$(WASM_CLUSTERIZER_EXPORTS)) -lc -o $@ -js/meshopt_decoder.js: build/decoder_base.wasm build/decoder_simd.wasm tools/wasmpack.py +js/meshopt_decoder.mjs: build/decoder_base.wasm build/decoder_simd.wasm tools/wasmpack.py sed -i "s#Built with clang.*#Built with $$($(WASMCC) --version | head -n 1 | sed 's/\s\+(.*//')#" $@ sed -i "s#Built from meshoptimizer .*#Built from meshoptimizer $$(cat src/meshoptimizer.h | grep -Po '(?<=version )[0-9.]+')#" $@ python3 tools/wasmpack.py patch $@ base $@ echo "if (typeof exports === 'object' && typeof module === 'object') module.exports = MeshoptDecoder;" >>$@ echo "else if (typeof define === 'function' && define['amd']) define([], function () { return MeshoptDecoder; });" >>$@ diff --git a/README.md b/README.md index 21f755634..a0985c12c 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ Two companion projects are developed and distributed alongside the library: [glt meshoptimizer is hosted on GitHub; you can download the latest release using git: ``` -git clone -b v0.25 https://github.com/zeux/meshoptimizer.git +git clone -b v1.0 https://github.com/zeux/meshoptimizer.git ``` -Alternatively you can [download the .zip archive from GitHub](https://github.com/zeux/meshoptimizer/archive/v0.25.zip). +Alternatively you can [download the .zip archive from GitHub](https://github.com/zeux/meshoptimizer/archive/v1.0.zip). The library is also available as a Linux package in several distributions ([ArchLinux](https://aur.archlinux.org/packages/meshoptimizer/), [Debian](https://packages.debian.org/libmeshoptimizer), [FreeBSD](https://www.freshports.org/misc/meshoptimizer/), [Nix](https://mynixos.com/nixpkgs/package/meshoptimizer), [Ubuntu](https://packages.ubuntu.com/libmeshoptimizer)), as well as a [Vcpkg port](https://github.com/microsoft/vcpkg/tree/master/ports/meshoptimizer) (see [installation instructions](https://learn.microsoft.com/en-us/vcpkg/get_started/get-started)) and a [Conan package](https://conan.io/center/recipes/meshoptimizer). diff --git a/demo/index.html b/demo/index.html index 4f9029e0e..0b37f21fa 100644 --- a/demo/index.html +++ b/demo/index.html @@ -49,7 +49,7 @@