Skip to content

Commit a06d450

Browse files
authored
v3.3.1 (#1426)
1 parent aea74b5 commit a06d450

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ include(CMakeDependentOption)
3030
# Define Manifold version
3131
set(MANIFOLD_VERSION_MAJOR 3)
3232
set(MANIFOLD_VERSION_MINOR 3)
33-
set(MANIFOLD_VERSION_PATCH 0)
33+
set(MANIFOLD_VERSION_PATCH 1)
3434
set(
3535
MANIFOLD_VERSION
3636
"${MANIFOLD_VERSION_MAJOR}.${MANIFOLD_VERSION_MINOR}.${MANIFOLD_VERSION_PATCH}"

bindings/wasm/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/wasm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "manifold-3d",
3-
"version": "3.3.0",
3+
"version": "3.3.1",
44
"description": "Geometry library for topological robustness",
55
"main": "manifold.js",
66
"bin": {

bindings/wasm/test/examples/gear-bearing.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,20 @@ import {spurGear} from './involute-gear-library';
88

99
const {round, min, cos, tan, sqrt, PI} = Math;
1010

11-
const diameter = 51.7;
12-
const thickness = 15;
13-
const clearance = 0.15;
11+
// Customizable parameters
12+
const diameter = 51.7; // mm
13+
const thickness = 15; // mm
14+
const clearance = 0.15; // mm
1415
const planets = 5;
1516
const planetTeeth = 7;
16-
const sunTeeth = 9;
17-
const pressureDeg = 45;
18-
const holeWidth = 6.7;
19-
setMinCircularAngle(2);
20-
setMinCircularEdgeLength(0.5);
21-
17+
const sunTeeth = 9; // approximate
18+
const pressureDeg = 45; // degrees
2219
const depthRatio = 0.5;
20+
const holeWidth = 6.7; // mm
21+
setMinCircularAngle(2); // degrees
22+
setMinCircularEdgeLength(0.5); // mm
23+
24+
// Calculations
2325
const m = round(planets);
2426
const np = round(planetTeeth);
2527
const k1 = round(2 / m * (sunTeeth + np));

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
flake-utils.lib.eachDefaultSystem
3030
(system:
3131
let
32-
manifold-version = "3.3.0";
32+
manifold-version = "3.3.1";
3333
pkgs = import nixpkgs {
3434
inherit system;
3535
overlays = [

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "manifold3d"
3-
version = "3.3.0"
3+
version = "3.3.1"
44
authors = [
55
{ name="Emmett Lalish", email="elalish@gmail.com" },
66
]
@@ -61,7 +61,7 @@ skip = ["*-win32", "*_i686", "pp*", "*-musllinux*"]
6161
before-all = "git clone --depth 1 --branch v2021.10.0 https://github.com/oneapi-src/oneTBB.git"
6262
[tool.cibuildwheel.config-settings]
6363
"cmake.define.FETCHCONTENT_SOURCE_DIR_TBB" = "./oneTBB"
64-
"cmake.define.FETCHCONTENT_UPDATES_DISCONNECTED" = "ON"
64+
"cmake.define.MANIFOLD_DOWNLOADS" = "OFF"
6565

6666
[tool.cibuildwheel.macos]
6767
environment = "MACOSX_DEPLOYMENT_TARGET=10.14"

scripts/test-cmake.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cd cmake-consumer
55
cat <<EOT > CMakeLists.txt
66
cmake_minimum_required(VERSION 3.18)
77
project(testing LANGUAGES CXX)
8-
find_package(manifold "3.3.0" REQUIRED)
8+
find_package(manifold "3.3.1" REQUIRED)
99
add_executable(testing test.cpp)
1010
target_link_libraries(testing PRIVATE manifold::manifold)
1111
EOT
@@ -14,7 +14,7 @@ cat <<EOT > test.cpp
1414
#include <manifold/manifold.h>
1515
#include <manifold/version.h>
1616
17-
#if MANIFOLD_VERSION < MANIFOLD_VERSION_NUMBER(3, 3, 0)
17+
#if MANIFOLD_VERSION < MANIFOLD_VERSION_NUMBER(3, 3, 1)
1818
# error "Unexpected: minimum version number not available"
1919
#endif
2020

0 commit comments

Comments
 (0)