Merge pull request #169 from erdo100/visualisation_carom_balls

Visualisation carom balls
ekiefl · Jan 1, 2025 · 67ff6bf · 67ff6bf
2 parents d76a79e + ab2668f
commit 67ff6bf
Show file tree

Hide file tree

Showing 17 changed files with 1,157 additions and 10 deletions.
diff --git a/pooltool/layouts.py b/pooltool/layouts.py
@@ -17,7 +17,7 @@
 
 DEFAULT_STANDARD_BALLSET = get_ballset("pooltool_pocket")
 DEFAULT_SNOOKER_BALLSET = get_ballset("generic_snooker")
-DEFAULT_THREECUSH_BALLSET = None
+DEFAULT_THREECUSH_BALLSET = get_ballset("billiard")
 DEFAULT_SUMTOTHREE_BALLSET = None
 
 

diff --git a/pooltool/models/balls/billiard/red.blend b/pooltool/models/balls/billiard/red.blend
diff --git a/pooltool/models/balls/billiard/red.glb b/pooltool/models/balls/billiard/red.glb
diff --git a/pooltool/models/balls/billiard/red.png b/pooltool/models/balls/billiard/red.png
diff --git a/pooltool/models/balls/billiard/red.svg b/pooltool/models/balls/billiard/red.svg
diff --git a/pooltool/models/balls/billiard/shadow.blend b/pooltool/models/balls/billiard/shadow.blend
diff --git a/pooltool/models/balls/billiard/shadow.glb b/pooltool/models/balls/billiard/shadow.glb
diff --git a/pooltool/models/balls/billiard/white.blend b/pooltool/models/balls/billiard/white.blend
diff --git a/pooltool/models/balls/billiard/white.glb b/pooltool/models/balls/billiard/white.glb
diff --git a/pooltool/models/balls/billiard/white.png b/pooltool/models/balls/billiard/white.png
diff --git a/pooltool/models/balls/billiard/white.svg b/pooltool/models/balls/billiard/white.svg
diff --git a/pooltool/models/balls/billiard/yellow.blend b/pooltool/models/balls/billiard/yellow.blend
diff --git a/pooltool/models/balls/billiard/yellow.glb b/pooltool/models/balls/billiard/yellow.glb
diff --git a/pooltool/models/balls/billiard/yellow.png b/pooltool/models/balls/billiard/yellow.png
diff --git a/pooltool/models/balls/billiard/yellow.svg b/pooltool/models/balls/billiard/yellow.svg
diff --git a/pooltool/objects/ball/params.py b/pooltool/objects/ball/params.py
@@ -165,12 +165,12 @@ class PrebuiltBallParams(StrEnum):
     ),
     PrebuiltBallParams.BILLIARD_GENERIC: BallParams(
         m=0.210,
-        R=0.03048,
-        u_s=0.5,
+        R=0.0615 / 2,
+        u_s=0.2,
         u_r=0.01,
         u_sp_proportionality=10 * 2 / 5 / 9,
         e_c=0.85,
-        f_c=0.5,
+        f_c=0.15,
         g=9.81,
     ),
 }

diff --git a/pooltool/objects/table/collection.py b/pooltool/objects/table/collection.py
@@ -58,20 +58,21 @@ class TableName(StrEnum):
         lights_height=1.99,
         model_descr=TableModelDescr(name="snooker_generic"),
     ),
+    # https://web.archive.org/web/20130801042614/http://www.umb.org/Rules/Carom_Rules.pdf
     TableName.BILLIARD_WIP: BilliardTableSpecs(
-        l=3.05,
-        w=3.05 / 2,
+        l=2.84,
+        w=2.84 / 2,
         cushion_width=2 * 2.54 / 100,
-        cushion_height=0.64 * 2 * 0.028575,
+        cushion_height=0.037,
         height=0.708,
         lights_height=1.99,
         model_descr=TableModelDescr.null(),
     ),
     TableName.SUMTOTHREE_WIP: BilliardTableSpecs(
-        l=3.05 / 2.5,
-        w=3.05 / 2 / 2.5,
+        l=2.84,
+        w=2.84 / 2,
         cushion_width=2 * 2.54 / 100,
-        cushion_height=0.64 * 2 * 0.028575,
+        cushion_height=0.037,
         height=0.708,
         lights_height=1.99,
         model_descr=TableModelDescr.null(),