Skip to content

Commit baae8b9

Browse files
kinda works but tilt and flip broken
1 parent 39f27c6 commit baae8b9

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

editor/src/messages/portfolio/portfolio_message_handler.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,9 +1192,15 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
11921192
.calculate_offset_transform(viewport.center_in_viewport_space().into(), &document.document_ptz);
11931193
let pointer_position = document_to_viewport.inverse().transform_point2(ipp.mouse.position);
11941194

1195-
let resolution = glam::UVec2::splat(11);
1195+
const PREVIEW_RESOLUTION: u32 = 11;
1196+
let resolution = glam::UVec2::splat(PREVIEW_RESOLUTION);
1197+
let pointer_offset = -(glam::DVec2::splat(PREVIEW_RESOLUTION as f64 / 2.0) / document.document_ptz.zoom());
11961198

1197-
let result = self.executor.submit_eyedropper_preview(document_id, resolution, timing_information, pointer_position);
1199+
let pointer_position = pointer_position + pointer_offset;
1200+
1201+
let result = self
1202+
.executor
1203+
.submit_eyedropper_preview(document_id, resolution, document.document_ptz.zoom(), timing_information, pointer_position);
11981204

11991205
match result {
12001206
Err(description) => {

editor/src/node_graph_executor.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,16 +194,17 @@ impl NodeGraphExecutor {
194194
}
195195

196196
#[cfg(not(target_family = "wasm"))]
197-
pub(crate) fn submit_eyedropper_preview(&mut self, document_id: DocumentId, resolution: UVec2, time: TimingInformation, pointer: DVec2) -> Result<Message, String> {
198-
// footprint from pointer position and resolution
197+
pub(crate) fn submit_eyedropper_preview(&mut self, document_id: DocumentId, resolution: UVec2, zoom: f64, time: TimingInformation, pointer: DVec2) -> Result<Message, String> {
198+
let transform = DAffine2::from_translation(pointer).inverse();
199+
199200
let viewport = Footprint {
200-
transform: DAffine2::from_translation(pointer).inverse(),
201+
transform,
201202
resolution,
202203
..Default::default()
203204
};
204205
let render_config = RenderConfig {
205206
viewport,
206-
scale: 1.,
207+
scale: zoom,
207208
time,
208209
pointer,
209210
export_format: graphene_std::application_io::ExportFormat::Raster,

0 commit comments

Comments
 (0)