diff --git a/src/dice/Dice.js b/src/dice/Dice.js index 89fa803..8fd90df 100644 --- a/src/dice/Dice.js +++ b/src/dice/Dice.js @@ -1,12 +1,12 @@ import * as BABYLON from "babylonjs"; -import d4Source from "./meshes/d4.glb"; -import d6Source from "./meshes/d6.glb"; -import d8Source from "./meshes/d8.glb"; -import d10Source from "./meshes/d10.glb"; -import d12Source from "./meshes/d12.glb"; -import d20Source from "./meshes/d20.glb"; -import d100Source from "./meshes/d100.glb"; +import d4Source from "./shared/d4.glb"; +import d6Source from "./shared/d6.glb"; +import d8Source from "./shared/d8.glb"; +import d10Source from "./shared/d10.glb"; +import d12Source from "./shared/d12.glb"; +import d20Source from "./shared/d20.glb"; +import d100Source from "./shared/d100.glb"; import { lerp } from "../helpers/shared"; diff --git a/src/dice/diceTray/DiceTray.js b/src/dice/diceTray/DiceTray.js index 8e7bcf6..d38d648 100644 --- a/src/dice/diceTray/DiceTray.js +++ b/src/dice/diceTray/DiceTray.js @@ -1,7 +1,7 @@ import * as BABYLON from "babylonjs"; -import singleMeshSource from "../meshes/diceTraySingle.glb"; -import doubleMeshSource from "../meshes/diceTrayDouble.glb"; +import singleMeshSource from "./single.glb"; +import doubleMeshSource from "./double.glb"; import singleAlbedo from "./singleAlbedo.jpg"; import singleMetalRoughness from "./singleMetalRoughness.jpg"; diff --git a/src/dice/meshes/diceTrayDouble.glb b/src/dice/diceTray/double.glb similarity index 100% rename from src/dice/meshes/diceTrayDouble.glb rename to src/dice/diceTray/double.glb diff --git a/src/dice/meshes/diceTraySingle.glb b/src/dice/diceTray/single.glb similarity index 100% rename from src/dice/meshes/diceTraySingle.glb rename to src/dice/diceTray/single.glb diff --git a/src/dice/meshes/d10.glb b/src/dice/shared/d10.glb similarity index 100% rename from src/dice/meshes/d10.glb rename to src/dice/shared/d10.glb diff --git a/src/dice/meshes/d100.glb b/src/dice/shared/d100.glb similarity index 100% rename from src/dice/meshes/d100.glb rename to src/dice/shared/d100.glb diff --git a/src/dice/meshes/d12.glb b/src/dice/shared/d12.glb similarity index 100% rename from src/dice/meshes/d12.glb rename to src/dice/shared/d12.glb diff --git a/src/dice/meshes/d20.glb b/src/dice/shared/d20.glb similarity index 100% rename from src/dice/meshes/d20.glb rename to src/dice/shared/d20.glb diff --git a/src/dice/meshes/d4.glb b/src/dice/shared/d4.glb similarity index 100% rename from src/dice/meshes/d4.glb rename to src/dice/shared/d4.glb diff --git a/src/dice/meshes/d6.glb b/src/dice/shared/d6.glb similarity index 100% rename from src/dice/meshes/d6.glb rename to src/dice/shared/d6.glb diff --git a/src/dice/meshes/d8.glb b/src/dice/shared/d8.glb similarity index 100% rename from src/dice/meshes/d8.glb rename to src/dice/shared/d8.glb diff --git a/src/dice/walnut/WalnutDice.js b/src/dice/walnut/WalnutDice.js index 0ba0ae5..628a4cc 100644 --- a/src/dice/walnut/WalnutDice.js +++ b/src/dice/walnut/WalnutDice.js @@ -4,10 +4,33 @@ import albedo from "./albedo.jpg"; import metalRoughness from "./metalRoughness.jpg"; import normal from "./normal.jpg"; +import d4Source from "./d4.glb"; +import d6Source from "./d6.glb"; +import d8Source from "./d8.glb"; +import d10Source from "./d10.glb"; +import d12Source from "./d12.glb"; +import d20Source from "./d20.glb"; +import d100Source from "./d100.glb"; + +const sourceOverrides = { + d4: d4Source, + d6: d6Source, + d8: d8Source, + d10: d10Source, + d12: d12Source, + d20: d20Source, + d100: d100Source, +}; + class WalnutDice extends Dice { static meshes; static material; + static getDicePhysicalProperties(diceType) { + let properties = super.getDicePhysicalProperties(diceType); + return { mass: properties.mass * 1.4, friction: properties.friction }; + } + static async load(scene) { if (!this.material) { this.material = this.loadMaterial( @@ -17,7 +40,11 @@ class WalnutDice extends Dice { ); } if (!this.meshes) { - this.meshes = await this.loadMeshes(this.material, scene); + this.meshes = await this.loadMeshes( + this.material, + scene, + sourceOverrides + ); } } diff --git a/src/dice/walnut/albedo.jpg b/src/dice/walnut/albedo.jpg index 8471dea..c9621bc 100755 Binary files a/src/dice/walnut/albedo.jpg and b/src/dice/walnut/albedo.jpg differ diff --git a/src/dice/walnut/d10.glb b/src/dice/walnut/d10.glb new file mode 100644 index 0000000..fb99084 Binary files /dev/null and b/src/dice/walnut/d10.glb differ diff --git a/src/dice/walnut/d100.glb b/src/dice/walnut/d100.glb new file mode 100644 index 0000000..2a48b50 Binary files /dev/null and b/src/dice/walnut/d100.glb differ diff --git a/src/dice/walnut/d12.glb b/src/dice/walnut/d12.glb new file mode 100644 index 0000000..e4a4846 Binary files /dev/null and b/src/dice/walnut/d12.glb differ diff --git a/src/dice/walnut/d20.glb b/src/dice/walnut/d20.glb new file mode 100644 index 0000000..8971663 Binary files /dev/null and b/src/dice/walnut/d20.glb differ diff --git a/src/dice/walnut/d4.glb b/src/dice/walnut/d4.glb new file mode 100644 index 0000000..6f873ef Binary files /dev/null and b/src/dice/walnut/d4.glb differ diff --git a/src/dice/walnut/d6.glb b/src/dice/walnut/d6.glb new file mode 100644 index 0000000..af0209c Binary files /dev/null and b/src/dice/walnut/d6.glb differ diff --git a/src/dice/walnut/d8.glb b/src/dice/walnut/d8.glb new file mode 100644 index 0000000..af4910c Binary files /dev/null and b/src/dice/walnut/d8.glb differ diff --git a/src/dice/walnut/metalRoughness.jpg b/src/dice/walnut/metalRoughness.jpg index db97cb1..4491ce2 100755 Binary files a/src/dice/walnut/metalRoughness.jpg and b/src/dice/walnut/metalRoughness.jpg differ diff --git a/src/dice/walnut/preview.png b/src/dice/walnut/preview.png index a6dc0c4..2961f2a 100644 Binary files a/src/dice/walnut/preview.png and b/src/dice/walnut/preview.png differ