feat: render programmable 3d scenes cameras and picking

This commit is contained in:
2026-11-10 23:19:26 +08:00
parent 040b779f5f
commit ad2c01bc29
33 changed files with 2463 additions and 42 deletions
+55
View File
@@ -48,6 +48,20 @@ pub const TYPE_NAMES: &[&str] = &[
"Scene2D",
"CanvasViewport",
"Camera2D",
"RayHit3D",
"CameraGesture",
"Vec3",
"Triangle3D",
"Geometry3D",
"Mesh3D",
"Box3D",
"Group3D",
"Scene3D",
"DirectionalLight",
"PerspectiveCamera",
"OrthographicCamera",
"OrbitController",
"Viewport3D",
"Button",
"Page",
"Window",
@@ -152,6 +166,11 @@ enum Operation {
Scene2D,
CanvasViewport,
Camera2D,
SceneObject(crate::scene3d_model::Constructor),
Viewport3D,
CameraControl,
Translate3D,
Rotate3D,
Button,
Page,
SetText,
@@ -192,6 +211,10 @@ impl Operation {
TextOf => (2, 4),
Scroll => (3, 3),
CanvasViewport => (3, 3),
Viewport3D => (3, 3),
SceneObject(kind) => kind.arity(),
CameraControl => (2, 2),
Translate3D | Rotate3D => (3, 3),
Camera2D => (0, 3),
Scene2D => (0, MAX_UI_NODES),
Text => (1, 3),
@@ -465,6 +488,7 @@ fn new_typed_block(
Kind::Overlay => "Overlay",
Kind::Scene2D => "Scene2D",
Kind::CanvasViewport { .. } => "CanvasViewport",
Kind::Viewport3D { .. } => "Viewport3D",
Kind::Button => "Button",
Kind::Page => "Page",
};
@@ -1237,6 +1261,12 @@ impl UiBridge {
if matches!(input.kind.as_str(), "viewport-pan" | "viewport-zoom") {
return self.dispatch_viewport_view(vm, input);
}
if matches!(
input.kind.as_str(),
"scene-pan" | "scene-orbit" | "scene-zoom"
) {
return self.dispatch_scene_view(vm, input);
}
if matches!(
input.kind.as_str(),
"tab-activate" | "tab-close" | "tab-detach" | "tab-drop"
@@ -1326,6 +1356,31 @@ impl UiBridge {
};
let result = (|| {
let data = vm.payload::<crate::mount::Mount>(mount, "Mount")?.clone();
if data.geometry.scene3d_viewport
&& input.kind == "click"
&& let Some(point) = input.point
{
let function = vm.allocate(ContextNativeFunction::new(
"3D pointer click",
crate::scene3d_model::PointerPick {
mount,
desktop,
point: crate::geometry::Point::new(point[0], point[1]),
},
vec![mount, desktop],
))?;
let result = vm.call_with_limits(
function,
&[],
endor_core::ExecutionLimits {
max_frames: 128,
max_instructions: 1_000_000,
},
);
vm.release(function)?;
vm.release_value(result?)?;
return Ok(());
}
if !data.mounted {
bail!("event targets an obsolete presentation");
}
+31 -2
View File
@@ -95,6 +95,19 @@ pub fn install(vm: &mut Vm, roots: &mut Vec<ObjectRef>) -> Result<UiBridge> {
("Scene2D", "ContainerBlock", Some("scene2D")),
("CanvasViewport", "ContainerBlock", Some("canvasViewport")),
("Camera2D", "Object", Some("camera2D")),
("Vec3", "Object", Some("vec3")),
("Triangle3D", "Object", Some("triangle3D")),
("Geometry3D", "Object", Some("geometry3D")),
("Mesh3D", "Object", Some("mesh3D")),
("Box3D", "Mesh3D", Some("box3D")),
("Group3D", "Object", Some("group3D")),
("Scene3D", "Object", Some("scene3D")),
("DirectionalLight", "Object", Some("directionalLight")),
("PerspectiveCamera", "Object", Some("perspectiveCamera")),
("OrthographicCamera", "Object", Some("orthographicCamera")),
("OrbitController", "Object", Some("orbitController")),
("Viewport3D", "Block", Some("viewport3D")),
("RayHit3D", "Object", None),
("Button", "ContainerBlock", Some("button")),
("Page", "ContainerBlock", Some("page")),
("Window", "Object", Some("window-create")),
@@ -143,10 +156,13 @@ pub fn install(vm: &mut Vm, roots: &mut Vec<ObjectRef>) -> Result<UiBridge> {
"scene2D" => Operation::Scene2D,
"canvasViewport" => Operation::CanvasViewport,
"camera2D" => Operation::Camera2D,
"viewport3D" => Operation::Viewport3D,
"button" => Operation::Button,
"page" => Operation::Page,
"window-create" => Operation::NewWindow,
_ => return Err(invalid("unknown native type allocator").into()),
name => crate::scene3d_model::Constructor::from_function(name)
.map(Operation::SceneObject)
.ok_or(invalid("unknown native type allocator"))?,
};
let factory = vm.allocate(ContextNativeFunction::new(
constructor_name,
@@ -185,6 +201,7 @@ pub fn install(vm: &mut Vm, roots: &mut Vec<ObjectRef>) -> Result<UiBridge> {
("Arrangement", vec!["children"]),
("DisplayList", vec!["commands"]),
("PaintCommand", vec![]),
("CameraGesture", vec![]),
] {
let fields = fields
.into_iter()
@@ -249,11 +266,16 @@ pub fn install(vm: &mut Vm, roots: &mut Vec<ObjectRef>) -> Result<UiBridge> {
"scene2D" => Some(Operation::Scene2D),
"canvasViewport" => Some(Operation::CanvasViewport),
"camera2D" => Some(Operation::Camera2D),
"viewport3D" => Some(Operation::Viewport3D),
"button" => Some(Operation::Button),
"page" => Some(Operation::Page),
"window-create" => Some(Operation::NewWindow),
"event" | "object-list" => None,
_ => return Err(invalid("unknown deferred factory").into()),
name => Some(
crate::scene3d_model::Constructor::from_function(name)
.map(Operation::SceneObject)
.ok_or(invalid("unknown deferred factory"))?,
),
};
if let Some(operation) = operation {
let options = operation_signature(vm.object_store(), desktop, operation)?;
@@ -352,6 +374,13 @@ pub fn install(vm: &mut Vm, roots: &mut Vec<ObjectRef>) -> Result<UiBridge> {
}
for (type_name, name, operation) in [
("Block", "bind", Operation::Bind),
("OrbitController", "update", Operation::CameraControl),
("Mesh3D", "translate", Operation::Translate3D),
("Group3D", "translate", Operation::Translate3D),
("PerspectiveCamera", "translate", Operation::Translate3D),
("OrthographicCamera", "translate", Operation::Translate3D),
("Mesh3D", "rotate", Operation::Rotate3D),
("Group3D", "rotate", Operation::Rotate3D),
("Block", "mounts", Operation::Mounts),
("Block", "invalidate", Operation::Invalidate),
("Block", "onClick", Operation::OnClick),
+67
View File
@@ -20,6 +20,38 @@ impl NativeCallable for Function {
let camera = new_camera2d(cx, &self.session, self.requested_type, args)?;
return Ok(NativeResult::Return(Value::Object(camera)));
}
if let SceneObject(kind) = self.operation {
let desktop = self
.session
.lock()
.map_err(|_| invalid("UI session poisoned"))?
.desktop;
let definition =
self.requested_type
.unwrap_or(desktop_type(cx.store(), kind.name(), desktop)?);
let object = crate::scene3d_model::allocate(cx, desktop, definition, kind, args)?;
return Ok(NativeResult::Return(Value::Object(object)));
}
if matches!(self.operation, CameraControl) {
crate::scene3d_model::control(
cx,
self.owner
.ok_or(invalid("controller requires a receiver"))?,
object(args.first())?,
object(args.get(1))?,
)?;
return Ok(NativeResult::Return(Value::Nil));
}
if matches!(self.operation, Translate3D | Rotate3D) {
crate::scene3d_model::transform(
cx,
self.owner
.ok_or(invalid("3D transform requires a receiver"))?,
args,
matches!(self.operation, Rotate3D),
)?;
return Ok(NativeResult::Return(Value::Nil));
}
if matches!(self.operation, Implement | Implements | Supports) {
let capability = object(args.get(1))?;
let value = match self.operation {
@@ -387,6 +419,41 @@ impl NativeCallable for Function {
data.camera = Some(new_camera2d(cx, &self.session, None, &[])?);
Some(data)
}
Viewport3D => {
let desktop = self
.session
.lock()
.map_err(|_| invalid("UI session poisoned"))?
.desktop;
let definition = desktop_type(cx.store(), "PerspectiveCamera", desktop)?;
let camera = crate::scene3d_model::allocate(
cx,
desktop,
definition,
crate::scene3d_model::Constructor::Perspective,
&[],
)?;
let mut data = Data::new(
Kind::Viewport3D {
width: dimension(args.first())?,
height: dimension(args.get(1))?,
},
vec![],
0.,
0.,
);
data.camera = Some(camera);
data.scene3d = Some(object(args.get(2))?);
let definition = desktop_type(cx.store(), "OrbitController", desktop)?;
data.controller = Some(crate::scene3d_model::allocate(
cx,
desktop,
definition,
crate::scene3d_model::Constructor::Orbit,
&[],
)?);
Some(data)
}
Button => {
let label = new_block(
cx,
+97
View File
@@ -2,6 +2,103 @@
use super::*;
impl UiBridge {
pub(super) fn dispatch_scene_view(
&self,
vm: &mut Vm,
input: &crate::events::Input,
) -> Result<()> {
let (weak, desktop) = {
let state = self
.session
.lock()
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?;
anyhow::ensure!(
state.published_version == input.layout_version,
"obsolete 3D camera view"
);
(
*state
.mounts
.active
.get(&input.mount)
.ok_or_else(|| anyhow::anyhow!("3D viewport unavailable"))?,
state.desktop,
)
};
let mount = vm
.upgrade(weak)?
.ok_or_else(|| anyhow::anyhow!("3D viewport Mount expired"))?;
let result = (|| {
let occurrence = vm.payload::<crate::mount::Mount>(mount, "Mount")?.clone();
anyhow::ensure!(
occurrence.mounted
&& occurrence.version == input.layout_version
&& occurrence.geometry.scene3d_viewport,
"obsolete 3D viewport"
);
let (_, data) = block::resolve(vm.object_store(), occurrence.block)?;
let data = block::visual_data(vm.object_store(), data)?;
let camera = data
.camera
.ok_or_else(|| anyhow::anyhow!("missing 3D camera"))?;
let controller = data
.controller
.ok_or_else(|| anyhow::anyhow!("3D controller disabled"))?;
let node = block::snapshot(vm.object_store(), occurrence.block)?;
let inset = crate::layout::insets(&node);
let geometry = &occurrence.geometry;
let outer = geometry.view.unwrap_or_default();
let delta = input
.delta
.ok_or_else(|| anyhow::anyhow!("3D camera delta required"))?;
let point = input
.point
.map(|p| outer.inverse(crate::geometry::Point::new(p[0], p[1])))
.unwrap_or(crate::geometry::Point::new(
geometry.x + inset.left,
geometry.y + inset.top,
));
let gesture = vm.new_object()?;
let result = (|| {
vm.attach_type(
gesture,
desktop_type(vm.object_store(), "CameraGesture", desktop)?,
)?;
vm.set_attr(gesture, "kind", Value::Text(input.kind.clone()))?;
for (name, value) in [
("dx", delta[0] / outer.zoom),
("dy", delta[1] / outer.zoom),
("factor", delta[0]),
("width", (geometry.width - inset.horizontal()).max(0.)),
("height", (geometry.height - inset.vertical()).max(0.)),
("pointX", point.x - geometry.x - inset.left),
("pointY", point.y - geometry.y - inset.top),
] {
vm.set_attr(gesture, name, crate::native_visual::value(value))?;
}
let function = vm.bind_attr(controller, "update")?;
let result = match function {
Value::Object(function) => vm.call_with_limits(
function,
&[Value::Object(camera), Value::Object(gesture)],
endor_core::ExecutionLimits {
max_frames: 128,
max_instructions: 1_000_000,
},
),
_ => Err(invalid("controller.update is not callable")),
};
vm.release_value(function)?;
vm.release_value(result?)?;
Ok(())
})();
vm.release(gesture)?;
result
})();
vm.release(mount)?;
result
}
pub(super) fn dispatch_viewport_view(
&self,
vm: &mut Vm,
+33
View File
@@ -11,6 +11,12 @@ pub(super) fn method_signature(
use Operation::*;
let nominal = |name| desktop_type(store, name, desktop).map(Nominal);
let (arguments, returns, effect) = match operation {
Translate3D | Rotate3D => (vec![Number, Number, Number], Unit, CallEffect::Mutating),
CameraControl => (
vec![nominal("Object")?, nominal("CameraGesture")?],
Unit,
CallEffect::Mutating,
),
Bind => (
vec![TextType, Function],
nominal("Subscription")?,
@@ -152,6 +158,33 @@ pub(super) fn operation_signature(
CallEffect::ReadOnly,
),
Page => (vec![], None, nominal("Page")?, CallEffect::ReadOnly),
Viewport3D => (
vec![Number, Number, nominal("Scene3D")?],
None,
nominal("Viewport3D")?,
CallEffect::ReadOnly,
),
SceneObject(kind) => {
let parameters = kind
.parameters()
.iter()
.map(|name| match *name {
"Number" => Ok(Number),
"String" => Ok(TextType),
name => nominal(name),
})
.collect::<Result<Vec<_>, VmError>>()?;
(
parameters,
if kind.variadic() {
Some(nominal("Object")?)
} else {
None
},
nominal(kind.name())?,
CallEffect::ReadOnly,
)
}
Scene2D => (
vec![],
Some(nominal("Block")?),
+20
View File
@@ -81,6 +81,20 @@ impl UiNode {
.all(|(a, b)| Arc::ptr_eq(a, b))
};
match (&self.kind, &other.kind) {
(
UiKind::Viewport3D {
width: a,
height: b,
view: c,
controls: g,
},
UiKind::Viewport3D {
width: d,
height: e,
view: f,
controls: h,
},
) => a == d && b == e && c == f && g == h,
(
UiKind::CanvasViewport {
width: a,
@@ -180,6 +194,12 @@ impl UiNode {
#[derive(Debug, Clone, PartialEq)]
pub enum UiKind {
Viewport3D {
width: f32,
height: f32,
view: Arc<crate::scene3d::View>,
controls: bool,
},
Scene2D {
positions: Vec<[f32; 2]>,
children: Vec<Arc<UiNode>>,