add rectangle shape

unavi-xyz · Aug 21, 2024 · bb97e11 · bb97e11
1 parent 3ad6898
commit bb97e11
Show file tree

Hide file tree

Showing 31 changed files with 4,515 additions and 1,849 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wasm/example-unavi-scene/src/bindings.rs b/wasm/example-unavi-scene/src/bindings.rs
diff --git a/wasm/example-unavi-shapes/src/bindings.rs b/wasm/example-unavi-shapes/src/bindings.rs
diff --git a/wasm/example-unavi-shapes/src/lib.rs b/wasm/example-unavi-shapes/src/lib.rs
@@ -2,9 +2,9 @@ use bindings::{
     exports::wired::script::types::{Guest, GuestScript},
     unavi::{
         scene::api::{Root, Scene},
-        shapes::api::{Cuboid, Cylinder, Sphere, Vec3},
+        shapes::api::{Cuboid, Cylinder, Rectangle, Sphere},
     },
-    wired::math::types::Transform,
+    wired::math::types::{Transform, Vec2, Vec3},
 };
 
 #[allow(warnings)]
@@ -17,6 +17,7 @@ impl GuestScript for Script {
     fn new() -> Self {
         let scene = Scene::new();
 
+        // 3D
         let cuboid = Cuboid::new(Vec3::new(1.0, 0.5, 1.5)).to_physics_node();
         cuboid.set_transform(Transform::from_translation(Vec3::new(3.0, 0.0, 0.0)));
         scene.add_node(&cuboid);
@@ -32,6 +33,11 @@ impl GuestScript for Script {
         let cylinder = Cylinder::new(0.5, 1.0).to_physics_node();
         scene.add_node(&cylinder);
 
+        // 2D
+        let rectangle = Rectangle::new(Vec2::splat(1.0)).to_physics_node();
+        rectangle.set_transform(Transform::from_translation(Vec3::new(-1.5, 0.0, 0.0)));
+        scene.add_node(&rectangle);
+
         Root::add_scene(&scene);
 
         Script

diff --git a/wasm/example-unavi-ui/Cargo.toml b/wasm/example-unavi-ui/Cargo.toml
@@ -17,6 +17,7 @@ package = "example:unavi-ui"
 
 [package.metadata.component.target.dependencies]
 "unavi:scene" = { path = "../unavi-scene/wit" }
+"unavi:shapes" = { path = "../unavi-shapes/wit" }
 "unavi:ui" = { path = "../unavi-ui/wit" }
 "wired:input" = { path = "../../wired-protocol/spatial/wit/wired-input" }
 "wired:log" = { path = "../../wired-protocol/spatial/wit/wired-log" }

diff --git a/wasm/example-unavi-ui/src/bindings.rs b/wasm/example-unavi-ui/src/bindings.rs
diff --git a/wasm/example-wired-input/src/bindings.rs b/wasm/example-wired-input/src/bindings.rs
diff --git a/wasm/example-wired-physics/src/bindings.rs b/wasm/example-wired-physics/src/bindings.rs
diff --git a/wasm/example-wired-scene/src/bindings.rs b/wasm/example-wired-scene/src/bindings.rs
diff --git a/wasm/test-wired-player/src/bindings.rs b/wasm/test-wired-player/src/bindings.rs
diff --git a/wasm/test-wired-scene/Cargo.toml b/wasm/test-wired-scene/Cargo.toml
@@ -16,6 +16,7 @@ wit-bindgen-rt.workspace = true
 package = "test:wired-scene"
 
 [package.metadata.component.target.dependencies]
+"unavi:shapes" = { path = "../unavi-shapes/wit" }
 "wired:input" = { path = "../../wired-protocol/spatial/wit/wired-input" }
 "wired:log" = { path = "../../wired-protocol/spatial/wit/wired-log" }
 "wired:math" = { path = "../../wired-protocol/spatial/wit/wired-math" }

diff --git a/wasm/test-wired-scene/src/bindings.rs b/wasm/test-wired-scene/src/bindings.rs
diff --git a/wasm/unavi-scene/Cargo.toml b/wasm/unavi-scene/Cargo.toml
@@ -19,7 +19,9 @@ package = "unavi:scene"
 world = "guest"
 
 [package.metadata.component.target.dependencies]
+"unavi:shapes" = { path = "../unavi-shapes/wit" }
 "wired:input" = { path = "../../wired-protocol/spatial/wit/wired-input" }
+"wired:log" = { path = "../../wired-protocol/spatial/wit/wired-log" }
 "wired:math" = { path = "../../wired-protocol/spatial/wit/wired-math" }
 "wired:physics" = { path = "../../wired-protocol/spatial/wit/wired-physics" }
 "wired:scene" = { path = "../../wired-protocol/spatial/wit/wired-scene" }
diff --git a/wasm/unavi-scene/src/bindings.rs b/wasm/unavi-scene/src/bindings.rs
diff --git a/wasm/unavi-scene/wit/world.wit b/wasm/unavi-scene/wit/world.wit
@@ -6,10 +6,6 @@ world guest {
     export api;
 }
 
-world prelude {
-  import api;
-}
-
 interface api {
   use wired:math/types.{transform};
   use wired:scene/node.{node};

diff --git a/wasm/unavi-shapes/Cargo.toml b/wasm/unavi-shapes/Cargo.toml
@@ -10,6 +10,7 @@ license.workspace = true
 crate-type = ["cdylib"]
 
 [dependencies]
+glam.workspace = true
 hexasphere = "14.1.0"
 parry3d = "0.17.0"
 wit-bindgen-rt.workspace = true