diff --git a/docs/art-sources/buttons/visual_perspective.svg b/docs/art-sources/buttons/visual_perspective.svg
new file mode 100644
index 000000000..55f08aeb6
--- /dev/null
+++ b/docs/art-sources/buttons/visual_perspective.svg
@@ -0,0 +1,21 @@
+
+
+
+
diff --git a/docs/art-sources/buttons/visual_perspective_grid.svg b/docs/art-sources/buttons/visual_perspective_grid.svg
new file mode 100644
index 000000000..a4354327a
--- /dev/null
+++ b/docs/art-sources/buttons/visual_perspective_grid.svg
@@ -0,0 +1,21 @@
+
+
+
+
diff --git a/docs/art-sources/buttons/visual_perspective_lock_outer.svg b/docs/art-sources/buttons/visual_perspective_lock_outer.svg
new file mode 100644
index 000000000..a8d136425
--- /dev/null
+++ b/docs/art-sources/buttons/visual_perspective_lock_outer.svg
@@ -0,0 +1,29 @@
+
+
+
+
diff --git a/docs/art-sources/buttons/visual_perspective_orgmode_center.svg b/docs/art-sources/buttons/visual_perspective_orgmode_center.svg
new file mode 100644
index 000000000..e833e3e90
--- /dev/null
+++ b/docs/art-sources/buttons/visual_perspective_orgmode_center.svg
@@ -0,0 +1,21 @@
+
+
+
+
diff --git a/docs/art-sources/buttons/visual_perspective_orgmode_keep.svg b/docs/art-sources/buttons/visual_perspective_orgmode_keep.svg
new file mode 100644
index 000000000..de11030f7
--- /dev/null
+++ b/docs/art-sources/buttons/visual_perspective_orgmode_keep.svg
@@ -0,0 +1,21 @@
+
+
+
+
diff --git a/docs/art-sources/buttons/visual_perspective_orgmode_nofax.svg b/docs/art-sources/buttons/visual_perspective_orgmode_nofax.svg
new file mode 100644
index 000000000..d593f87bb
--- /dev/null
+++ b/docs/art-sources/buttons/visual_perspective_orgmode_nofax.svg
@@ -0,0 +1,21 @@
+
+
+
+
diff --git a/docs/art-sources/buttons/visual_perspective_plane.svg b/docs/art-sources/buttons/visual_perspective_plane.svg
new file mode 100644
index 000000000..55e9faf82
--- /dev/null
+++ b/docs/art-sources/buttons/visual_perspective_plane.svg
@@ -0,0 +1,21 @@
+
+
+
+
diff --git a/src/bitmaps/button/visual_perspective_16.png b/src/bitmaps/button/visual_perspective_16.png
new file mode 100644
index 000000000..08d41a73e
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_16.png differ
diff --git a/src/bitmaps/button/visual_perspective_24.png b/src/bitmaps/button/visual_perspective_24.png
new file mode 100644
index 000000000..fd973f9c9
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_24.png differ
diff --git a/src/bitmaps/button/visual_perspective_32.png b/src/bitmaps/button/visual_perspective_32.png
new file mode 100644
index 000000000..582059c8f
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_32.png differ
diff --git a/src/bitmaps/button/visual_perspective_48.png b/src/bitmaps/button/visual_perspective_48.png
new file mode 100644
index 000000000..5ebb5bf93
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_48.png differ
diff --git a/src/bitmaps/button/visual_perspective_64.png b/src/bitmaps/button/visual_perspective_64.png
new file mode 100644
index 000000000..e76e64176
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_64.png differ
diff --git a/src/bitmaps/button/visual_perspective_grid_16.png b/src/bitmaps/button/visual_perspective_grid_16.png
new file mode 100644
index 000000000..eaff0fa18
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_grid_16.png differ
diff --git a/src/bitmaps/button/visual_perspective_grid_24.png b/src/bitmaps/button/visual_perspective_grid_24.png
new file mode 100644
index 000000000..73fc7b430
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_grid_24.png differ
diff --git a/src/bitmaps/button/visual_perspective_grid_32.png b/src/bitmaps/button/visual_perspective_grid_32.png
new file mode 100644
index 000000000..54f5d71fc
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_grid_32.png differ
diff --git a/src/bitmaps/button/visual_perspective_grid_48.png b/src/bitmaps/button/visual_perspective_grid_48.png
new file mode 100644
index 000000000..d0eec03b5
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_grid_48.png differ
diff --git a/src/bitmaps/button/visual_perspective_grid_64.png b/src/bitmaps/button/visual_perspective_grid_64.png
new file mode 100644
index 000000000..b1028c9ef
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_grid_64.png differ
diff --git a/src/bitmaps/button/visual_perspective_lock_outer_16.png b/src/bitmaps/button/visual_perspective_lock_outer_16.png
new file mode 100644
index 000000000..17ba65ce4
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_lock_outer_16.png differ
diff --git a/src/bitmaps/button/visual_perspective_lock_outer_24.png b/src/bitmaps/button/visual_perspective_lock_outer_24.png
new file mode 100644
index 000000000..d2c700a91
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_lock_outer_24.png differ
diff --git a/src/bitmaps/button/visual_perspective_lock_outer_32.png b/src/bitmaps/button/visual_perspective_lock_outer_32.png
new file mode 100644
index 000000000..9f2130afa
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_lock_outer_32.png differ
diff --git a/src/bitmaps/button/visual_perspective_lock_outer_48.png b/src/bitmaps/button/visual_perspective_lock_outer_48.png
new file mode 100644
index 000000000..9b50518d0
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_lock_outer_48.png differ
diff --git a/src/bitmaps/button/visual_perspective_lock_outer_64.png b/src/bitmaps/button/visual_perspective_lock_outer_64.png
new file mode 100644
index 000000000..6caf31562
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_lock_outer_64.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_center_16.png b/src/bitmaps/button/visual_perspective_orgmode_center_16.png
new file mode 100644
index 000000000..32a273f49
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_center_16.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_center_24.png b/src/bitmaps/button/visual_perspective_orgmode_center_24.png
new file mode 100644
index 000000000..56da7f0be
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_center_24.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_center_32.png b/src/bitmaps/button/visual_perspective_orgmode_center_32.png
new file mode 100644
index 000000000..6b10a3131
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_center_32.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_center_48.png b/src/bitmaps/button/visual_perspective_orgmode_center_48.png
new file mode 100644
index 000000000..9319343b3
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_center_48.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_center_64.png b/src/bitmaps/button/visual_perspective_orgmode_center_64.png
new file mode 100644
index 000000000..8cfe74647
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_center_64.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_keep_16.png b/src/bitmaps/button/visual_perspective_orgmode_keep_16.png
new file mode 100644
index 000000000..86f742d83
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_keep_16.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_keep_24.png b/src/bitmaps/button/visual_perspective_orgmode_keep_24.png
new file mode 100644
index 000000000..bc6bfa2bf
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_keep_24.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_keep_32.png b/src/bitmaps/button/visual_perspective_orgmode_keep_32.png
new file mode 100644
index 000000000..b615da0c2
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_keep_32.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_keep_48.png b/src/bitmaps/button/visual_perspective_orgmode_keep_48.png
new file mode 100644
index 000000000..a0d0f2447
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_keep_48.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_keep_64.png b/src/bitmaps/button/visual_perspective_orgmode_keep_64.png
new file mode 100644
index 000000000..5b9fb925e
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_keep_64.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_nofax_16.png b/src/bitmaps/button/visual_perspective_orgmode_nofax_16.png
new file mode 100644
index 000000000..479ba8361
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_nofax_16.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_nofax_24.png b/src/bitmaps/button/visual_perspective_orgmode_nofax_24.png
new file mode 100644
index 000000000..54c31fcec
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_nofax_24.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_nofax_32.png b/src/bitmaps/button/visual_perspective_orgmode_nofax_32.png
new file mode 100644
index 000000000..6d5a6f164
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_nofax_32.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_nofax_48.png b/src/bitmaps/button/visual_perspective_orgmode_nofax_48.png
new file mode 100644
index 000000000..149c52fd4
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_nofax_48.png differ
diff --git a/src/bitmaps/button/visual_perspective_orgmode_nofax_64.png b/src/bitmaps/button/visual_perspective_orgmode_nofax_64.png
new file mode 100644
index 000000000..15245d314
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_orgmode_nofax_64.png differ
diff --git a/src/bitmaps/button/visual_perspective_plane_16.png b/src/bitmaps/button/visual_perspective_plane_16.png
new file mode 100644
index 000000000..f2bb262f0
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_plane_16.png differ
diff --git a/src/bitmaps/button/visual_perspective_plane_24.png b/src/bitmaps/button/visual_perspective_plane_24.png
new file mode 100644
index 000000000..cfb2dc37b
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_plane_24.png differ
diff --git a/src/bitmaps/button/visual_perspective_plane_32.png b/src/bitmaps/button/visual_perspective_plane_32.png
new file mode 100644
index 000000000..a623dde52
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_plane_32.png differ
diff --git a/src/bitmaps/button/visual_perspective_plane_48.png b/src/bitmaps/button/visual_perspective_plane_48.png
new file mode 100644
index 000000000..96891aa0a
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_plane_48.png differ
diff --git a/src/bitmaps/button/visual_perspective_plane_64.png b/src/bitmaps/button/visual_perspective_plane_64.png
new file mode 100644
index 000000000..83d6a341c
Binary files /dev/null and b/src/bitmaps/button/visual_perspective_plane_64.png differ
diff --git a/src/bitmaps/manifest.respack b/src/bitmaps/manifest.respack
index 55c731bd9..25e6fa33d 100644
--- a/src/bitmaps/manifest.respack
+++ b/src/bitmaps/manifest.respack
@@ -541,6 +541,41 @@ button/visual_move_conv_pos_24.png
button/visual_move_conv_pos_32.png
button/visual_move_conv_pos_48.png
button/visual_move_conv_pos_64.png
+button/visual_perspective_16.png
+button/visual_perspective_24.png
+button/visual_perspective_32.png
+button/visual_perspective_48.png
+button/visual_perspective_64.png
+button/visual_perspective_grid_16.png
+button/visual_perspective_grid_24.png
+button/visual_perspective_grid_32.png
+button/visual_perspective_grid_48.png
+button/visual_perspective_grid_64.png
+button/visual_perspective_lock_outer_16.png
+button/visual_perspective_lock_outer_24.png
+button/visual_perspective_lock_outer_32.png
+button/visual_perspective_lock_outer_48.png
+button/visual_perspective_lock_outer_64.png
+button/visual_perspective_orgmode_center_16.png
+button/visual_perspective_orgmode_center_24.png
+button/visual_perspective_orgmode_center_32.png
+button/visual_perspective_orgmode_center_48.png
+button/visual_perspective_orgmode_center_64.png
+button/visual_perspective_orgmode_keep_16.png
+button/visual_perspective_orgmode_keep_24.png
+button/visual_perspective_orgmode_keep_32.png
+button/visual_perspective_orgmode_keep_48.png
+button/visual_perspective_orgmode_keep_64.png
+button/visual_perspective_orgmode_nofax_16.png
+button/visual_perspective_orgmode_nofax_24.png
+button/visual_perspective_orgmode_nofax_32.png
+button/visual_perspective_orgmode_nofax_48.png
+button/visual_perspective_orgmode_nofax_64.png
+button/visual_perspective_plane_16.png
+button/visual_perspective_plane_24.png
+button/visual_perspective_plane_32.png
+button/visual_perspective_plane_48.png
+button/visual_perspective_plane_64.png
button/visual_rotatexy_16.png
button/visual_rotatexy_24.png
button/visual_rotatexy_32.png
diff --git a/src/command/vis_tool.cpp b/src/command/vis_tool.cpp
index fcf02f492..8079381db 100644
--- a/src/command/vis_tool.cpp
+++ b/src/command/vis_tool.cpp
@@ -23,6 +23,7 @@
#include "../visual_tool_clip.h"
#include "../visual_tool_cross.h"
#include "../visual_tool_drag.h"
+#include "../visual_tool_perspective.h"
#include "../visual_tool_rotatexy.h"
#include "../visual_tool_rotatez.h"
#include "../visual_tool_scale.h"
@@ -59,12 +60,39 @@ namespace {
}
bool IsActive(const agi::Context *c) override {
- return c->videoDisplay->ToolIsVectorClipTool(M);
+ return c->videoDisplay->ToolIsType(typeid(VisualToolVectorClip)) && c->videoDisplay->GetSubTool() == M;
}
void operator()(agi::Context *c) override {
c->videoDisplay->SetTool(agi::make_unique(c->videoDisplay, c));
- c->videoDisplay->SetVectorClipTool(M);
+ c->videoDisplay->SetSubTool(M);
+ }
+ };
+
+ template
+ struct visual_tool_persp_setting : public Command {
+ CMD_TYPE(COMMAND_VALIDATE | COMMAND_TOGGLE)
+
+ bool Validate(const agi::Context *c) override {
+ return c->videoDisplay->ToolIsType(typeid(VisualToolPerspective));
+ }
+
+ virtual const bool CheckActive(int subtool) {
+ return subtool & M;
+ }
+
+ virtual const int UpdateSubTool(int subtool) {
+ return subtool ^ M;
+ }
+
+ bool IsActive(const agi::Context *c) override {
+ return Validate(c) && CheckActive(c->videoDisplay->GetSubTool());
+ }
+
+ void operator()(agi::Context *c) override {
+ if (!c->videoDisplay->ToolIsType(typeid(VisualToolPerspective)))
+ c->videoDisplay->SetTool(agi::make_unique(c->videoDisplay, c));
+ c->videoDisplay->SetSubTool(UpdateSubTool(c->videoDisplay->GetSubTool()));
}
};
@@ -100,6 +128,14 @@ namespace {
STR_HELP("Rotate subtitles on their X and Y axes")
};
+ struct visual_mode_perspective final : public visual_tool_command {
+ CMD_NAME("video/tool/perspective")
+ CMD_ICON(visual_perspective)
+ STR_MENU("Apply 3D Perspective")
+ STR_DISP("Apply 3D Perspective")
+ STR_HELP("Rotate and shear subtitles to make them fit a given quad's perspective")
+ };
+
struct visual_mode_scale final : public visual_tool_command {
CMD_NAME("video/tool/scale")
CMD_ICON(visual_scale)
@@ -124,6 +160,113 @@ namespace {
STR_HELP("Clip subtitles to a vectorial area")
};
+ // Perspective settings
+ struct visual_mode_perspective_plane final : public visual_tool_persp_setting {
+ CMD_NAME("video/tool/perspective/plane")
+ CMD_ICON(visual_perspective_plane)
+ STR_MENU("Show Surrounding Plane")
+ STR_DISP("Show Surrounding Plane")
+ STR_HELP("Toggles showing a second quad for the ambient 3D plane.")
+ };
+
+ // Perspective settings
+ struct visual_mode_perspective_lock_inner final : public visual_tool_persp_setting {
+ CMD_NAME("video/tool/perspective/lock_outer")
+ CMD_ICON(visual_perspective_lock_outer)
+ STR_MENU("Lock Outer Quad")
+ STR_DISP("Lock Outer Quad")
+ STR_HELP("When the surrounding plane is also visible, switches which quad is locked. If inactive, the inner quad can only be resized without changing the perspective plane. If active, this holds for the outer quad instead.")
+
+ bool Validate(const agi::Context *c) override {
+ return c->videoDisplay->ToolIsType(typeid(VisualToolPerspective)) && c->videoDisplay->GetSubTool() | PERSP_OUTER;
+ }
+ };
+
+ struct visual_mode_perspective_grid final : public visual_tool_persp_setting {
+ CMD_NAME("video/tool/perspective/grid")
+ CMD_ICON(visual_perspective_grid)
+ STR_MENU("Show Grid")
+ STR_DISP("Show Grid")
+ STR_HELP("Toggles showing a 3D grid in the visual perspective tool")
+ };
+
+ struct visual_mode_perspective_orgmode_center : public visual_tool_persp_setting {
+ CMD_NAME("video/tool/perspective/orgmode/center")
+ CMD_ICON(visual_perspective_orgmode_center)
+ STR_MENU("\\org Mode: Center")
+ STR_DISP("\\org Mode: Center")
+ STR_HELP("Puts \\org at the center of the perspective quad")
+
+ const bool CheckActive(int subtool) override {
+ return (subtool & PERSP_ORGMODE) == PERSP_ORGMODE_CENTER;
+ }
+
+ const int UpdateSubTool(int subtool) override {
+ return (subtool & ~PERSP_ORGMODE) | PERSP_ORGMODE_CENTER;
+ }
+ };
+
+ struct visual_mode_perspective_orgmode_nofax : public visual_tool_persp_setting {
+ CMD_NAME("video/tool/perspective/orgmode/nofax")
+ CMD_ICON(visual_perspective_orgmode_nofax)
+ STR_MENU("\\org Mode: No \\fax")
+ STR_DISP("\\org Mode: No \\fax")
+ STR_HELP("Finds a value for \\org where \\fax can be zero, if possible. Use this mode if your event contains line breaks.")
+
+ const bool CheckActive(int subtool) override {
+ return (subtool & PERSP_ORGMODE) == PERSP_ORGMODE_NOFAX;
+ }
+
+ const int UpdateSubTool(int subtool) override {
+ return (subtool & ~PERSP_ORGMODE) | PERSP_ORGMODE_NOFAX;
+ }
+ };
+
+ struct visual_mode_perspective_orgmode_keep : public visual_tool_persp_setting {
+ CMD_NAME("video/tool/perspective/orgmode/keep")
+ CMD_ICON(visual_perspective_orgmode_keep)
+ STR_MENU("\\org Mode: Keep")
+ STR_DISP("\\org Mode: Keep")
+ STR_HELP("Fixes the position of \\org")
+
+ const bool CheckActive(int subtool) override {
+ return (subtool & PERSP_ORGMODE) == PERSP_ORGMODE_KEEP;
+ }
+
+ const int UpdateSubTool(int subtool) override {
+ return (subtool & ~PERSP_ORGMODE) | PERSP_ORGMODE_KEEP;
+ }
+ };
+
+ struct visual_mode_perspective_orgmode_cycle : public visual_tool_persp_setting {
+ CMD_NAME("video/tool/perspective/orgmode/cycle")
+ STR_MENU("Cycle \\org mode")
+ STR_DISP("Cycle \\org mode")
+ STR_HELP("Cycles through the three \\org modes")
+
+ const bool CheckActive(int subtool) override {
+ return false;
+ }
+
+ const int UpdateSubTool(int subtool) override {
+ int newtool = 0;
+ switch (subtool & PERSP_ORGMODE) {
+ case PERSP_ORGMODE_CENTER:
+ newtool = PERSP_ORGMODE_NOFAX;
+ break;
+ case PERSP_ORGMODE_NOFAX:
+ newtool = PERSP_ORGMODE_KEEP;
+ break;
+ case PERSP_ORGMODE_KEEP:
+ newtool = PERSP_ORGMODE_CENTER;
+ break;
+ default:
+ break;
+ }
+ return (subtool & ~PERSP_ORGMODE) | newtool;
+ }
+ };
+
// Vector clip tools
struct visual_mode_vclip_drag final : public visual_tool_vclip_command {
@@ -191,10 +334,19 @@ namespace cmd {
reg(agi::make_unique());
reg(agi::make_unique());
reg(agi::make_unique());
+ reg(agi::make_unique());
reg(agi::make_unique());
reg(agi::make_unique());
reg(agi::make_unique());
+ reg(agi::make_unique());
+ reg(agi::make_unique());
+ reg(agi::make_unique());
+ reg(agi::make_unique());
+ reg(agi::make_unique());
+ reg(agi::make_unique());
+ reg(agi::make_unique());
+
reg(agi::make_unique());
reg(agi::make_unique());
reg(agi::make_unique());
diff --git a/src/libresrc/default_config.json b/src/libresrc/default_config.json
index 55280b437..bf79b75b0 100644
--- a/src/libresrc/default_config.json
+++ b/src/libresrc/default_config.json
@@ -602,6 +602,12 @@
"Skip Whitespace" : true
},
"Visual" : {
+ "Perspective": {
+ "Outer": false,
+ "Outer Locked": false,
+ "Grid": false,
+ "Org Mode": 0
+ },
"Autohide": false
},
"Align to Video" : {
diff --git a/src/libresrc/default_hotkey.json b/src/libresrc/default_hotkey.json
index 6f4a2c738..db56f32c1 100644
--- a/src/libresrc/default_hotkey.json
+++ b/src/libresrc/default_hotkey.json
@@ -344,7 +344,7 @@
"Alt-Left"
],
"video/tool/clip" : [
- "H"
+ "J"
],
"video/tool/cross" : [
"A"
@@ -352,6 +352,9 @@
"video/tool/drag" : [
"S"
],
+ "video/tool/perspective": [
+ "G"
+ ],
"video/tool/rotate/xy" : [
"F"
],
@@ -359,10 +362,10 @@
"D"
],
"video/tool/scale" : [
- "G"
+ "H"
],
"video/tool/vector_clip" : [
- "J"
+ "K"
]
}
}
diff --git a/src/libresrc/default_toolbar.json b/src/libresrc/default_toolbar.json
index 7b85ee600..ad52b2e5b 100644
--- a/src/libresrc/default_toolbar.json
+++ b/src/libresrc/default_toolbar.json
@@ -73,6 +73,7 @@
"video/tool/drag",
"video/tool/rotate/z",
"video/tool/rotate/xy",
+ "video/tool/perspective",
"video/tool/scale",
"video/tool/clip",
"video/tool/vector_clip",
diff --git a/src/libresrc/osx/default_config.json b/src/libresrc/osx/default_config.json
index 8f5617aeb..f806a15a5 100644
--- a/src/libresrc/osx/default_config.json
+++ b/src/libresrc/osx/default_config.json
@@ -602,6 +602,12 @@
"Skip Whitespace" : true
},
"Visual" : {
+ "Perspective": {
+ "Outer": false,
+ "Outer Locked": false,
+ "Grid": false,
+ "Org Mode": 0
+ },
"Autohide": false
},
"Align to Video" : {
diff --git a/src/libresrc/osx/default_hotkey.json b/src/libresrc/osx/default_hotkey.json
index 64d16bd85..888d3f02b 100644
--- a/src/libresrc/osx/default_hotkey.json
+++ b/src/libresrc/osx/default_hotkey.json
@@ -351,7 +351,7 @@
"Alt-Left"
],
"video/tool/clip" : [
- "H"
+ "J"
],
"video/tool/cross" : [
"A"
@@ -359,6 +359,9 @@
"video/tool/drag" : [
"S"
],
+ "video/tool/perspective": [
+ "G"
+ ],
"video/tool/rotate/xy" : [
"F"
],
@@ -366,10 +369,10 @@
"D"
],
"video/tool/scale" : [
- "G"
+ "H"
],
"video/tool/vector_clip" : [
- "J"
+ "K"
]
}
}
diff --git a/src/meson.build b/src/meson.build
index 42cc6f89f..b01ad5e90 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -144,6 +144,7 @@ aegisub_src = files(
'utils.cpp',
'validators.cpp',
'vector2d.cpp',
+ 'vector3d.cpp',
'version.cpp',
'video_box.cpp',
'video_controller.cpp',
@@ -160,6 +161,7 @@ aegisub_src = files(
'visual_tool_clip.cpp',
'visual_tool_cross.cpp',
'visual_tool_drag.cpp',
+ 'visual_tool_perspective.cpp',
'visual_tool_rotatexy.cpp',
'visual_tool_rotatez.cpp',
'visual_tool_scale.cpp',
diff --git a/src/vector3d.cpp b/src/vector3d.cpp
new file mode 100644
index 000000000..6b295b8bc
--- /dev/null
+++ b/src/vector3d.cpp
@@ -0,0 +1,99 @@
+// Copyright (c) 2022, arch1t3cht
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Aegisub Project http://www.aegisub.org/
+
+/// @file vector3d.cpp
+/// @brief 3D mathematical vector used in visual typesetting
+/// @ingroup utility visual_ts
+///
+
+#include "vector3d.h"
+
+#include "utils.h"
+
+#include
+
+#include
+#include
+
+Vector3D::Vector3D()
+: x(std::numeric_limits::min())
+, y(std::numeric_limits::min())
+, z(std::numeric_limits::min())
+{
+}
+
+Vector3D operator *(float f, Vector3D v) {
+ return Vector3D(v.X() * f, v.Y() * f, v.Z() * f);
+}
+
+Vector3D operator /(float f, Vector3D v) {
+ return Vector3D(f / v.X(), f / v.Y(), f / v.Z());
+}
+
+Vector3D operator +(float f, Vector3D v) {
+ return Vector3D(v.X() + f, v.Y() + f, v.Z() + f);
+}
+
+Vector3D operator -(float f, Vector3D v) {
+ return Vector3D(f - v.X(), f - v.Y(), f - v.Z());
+}
+
+Vector3D Vector3D::Unit() const {
+ float len = Len();
+ if (len == 0)
+ return Vector3D(0, 0, 0);
+ return *this / len;
+}
+
+Vector3D Vector3D::RotateX(float angle) const {
+ return Vector3D(x, y * cos(angle) - z * sin(angle), y * sin(angle) + z * cos(angle));
+}
+
+Vector3D Vector3D::RotateY(float angle) const {
+ return Vector3D(x * cos(angle) - z * sin(angle), y, x * sin(angle) + z * cos(angle));
+}
+
+Vector3D Vector3D::RotateZ(float angle) const {
+ return Vector3D(x * cos(angle) - y * sin(angle), x * sin(angle) + y * cos(angle), z);
+}
+
+Vector3D Vector3D::Max(Vector3D param) const {
+ return Vector3D(std::max(x, param.x), std::max(y, param.y), std::max(z, param.z));
+}
+
+Vector3D Vector3D::Min(Vector3D param) const {
+ return Vector3D(std::min(x, param.x), std::min(y, param.y), std::max(z, param.z));
+}
+
+Vector3D Vector3D::Round(float step) const {
+ return Vector3D(floorf(x / step + .5f) * step, floorf(y / step + .5f) * step, floorf(z / step + .5f));
+}
+
+Vector3D::operator bool() const {
+ return *this != Vector3D();
+}
+
+std::string Vector3D::PStr(char sep) const {
+ return "(" + Str(sep) + ")";
+}
+
+std::string Vector3D::DStr(char sep) const {
+ return agi::format("%d%c%d%c%d", (int)x, sep, (int)y, sep, (int)z);
+}
+
+std::string Vector3D::Str(char sep) const {
+ return float_to_string(x,2) + sep + float_to_string(y,2) + sep + float_to_string(z, 2);
+}
diff --git a/src/vector3d.h b/src/vector3d.h
new file mode 100644
index 000000000..384d29112
--- /dev/null
+++ b/src/vector3d.h
@@ -0,0 +1,83 @@
+// Copyright (c) 2022, arch1t3cht
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Aegisub Project http://www.aegisub.org/
+
+/// @file vector3d.h
+/// @see vector3d.cpp
+/// @ingroup utility visual_ts
+///
+
+#pragma once
+
+#include
+#include
+#include "vector2d.h"
+
+class Vector3D {
+ float x, y, z;
+
+public:
+ float X() const { return x; }
+ float Y() const { return y; }
+ float Z() const { return z; }
+ Vector2D XY() const { return Vector2D(x, y); }
+
+ Vector3D();
+ Vector3D(Vector2D xy) : x(xy.X()), y(xy.Y()), z(0.) { }
+ Vector3D(Vector2D xy, float z) : x(xy.X()), y(xy.Y()), z(z) { }
+ Vector3D(float x, float y, float z) : x(x), y(y), z(z) { }
+
+ bool operator ==(const Vector3D r) const { return x == r.x && y == r.y; }
+ bool operator !=(const Vector3D r) const { return x != r.x || y != r.y; }
+ explicit operator bool() const;
+
+ Vector3D operator -() const { return Vector3D(-x, -y, -z); }
+ Vector3D operator +(const Vector3D r) const { return Vector3D(x + r.x, y + r.y, z + r.z); }
+ Vector3D operator -(const Vector3D r) const { return Vector3D(x - r.x, y - r.y, z - r.z); }
+ Vector3D operator *(const Vector3D r) const { return Vector3D(x * r.x, y * r.y, z * r.z); }
+ Vector3D operator /(const Vector3D r) const { return Vector3D(x / r.x, y / r.y, z / r.z); }
+ Vector3D operator +(float param) const { return Vector3D(x + param, y + param, z + param); }
+ Vector3D operator -(float param) const { return Vector3D(x - param, y - param, z - param); }
+ Vector3D operator *(float param) const { return Vector3D(x * param, y * param, z * param); }
+ Vector3D operator /(float param) const { return Vector3D(x / param, y / param, z / param); }
+
+ Vector3D Unit() const;
+
+ Vector3D RotateX(float angle) const;
+ Vector3D RotateY(float angle) const;
+ Vector3D RotateZ(float angle) const;
+
+ Vector3D Max(Vector3D param) const;
+ Vector3D Min(Vector3D param) const;
+ Vector3D Round(float step) const;
+
+ Vector3D Cross(const Vector3D param) const { return Vector3D(y * param.z - z * param.y, z * param.x - x * param.z, x * param.y - y * param.x); }
+ float Dot(const Vector3D param) const { return x * param.x + y * param.y + z * param.z; }
+
+ float Len() const { return sqrt(x*x + y*y + z*z); }
+ float SquareLen() const { return x*x + y*y + z*z; }
+
+ /// Get as string with given separator
+ std::string Str(char sep = ',') const;
+ /// Get as string surrounded by parentheses with given separator
+ std::string PStr(char sep = ',') const;
+ /// Get as string with given separator with values rounded to ints
+ std::string DStr(char sep = ',') const;
+};
+
+Vector3D operator * (float f, Vector3D v);
+Vector3D operator / (float f, Vector3D v);
+Vector3D operator + (float f, Vector3D v);
+Vector3D operator - (float f, Vector3D v);
diff --git a/src/video_display.cpp b/src/video_display.cpp
index 263837f09..8636fba47 100644
--- a/src/video_display.cpp
+++ b/src/video_display.cpp
@@ -519,23 +519,10 @@ void VideoDisplay::SetTool(std::unique_ptr new_tool) {
}
}
-bool VideoDisplay::SetVectorClipTool(VisualToolVectorClipMode vcliptoolmode) const {
- if (ToolIsType(typeid(VisualToolVectorClip))) {
- static_cast(tool.get())->SetMode(vcliptoolmode);
- return true;
- } else {
- return false;
- }
-}
-
bool VideoDisplay::ToolIsType(std::type_info const& type) const {
return tool && typeid(*tool) == type;
}
-bool VideoDisplay::ToolIsVectorClipTool(VisualToolVectorClipMode vcliptoolmode) const {
- return ToolIsType(typeid(VisualToolVectorClip)) && static_cast(tool.get());
-}
-
Vector2D VideoDisplay::GetMousePosition() const {
return last_mouse_pos ? tool->ToScriptCoords(last_mouse_pos) : last_mouse_pos;
}
diff --git a/src/video_display.h b/src/video_display.h
index 13bbf98b2..70f2f8b76 100644
--- a/src/video_display.h
+++ b/src/video_display.h
@@ -181,13 +181,11 @@ public:
void SetTool(std::unique_ptr new_tool);
- /// Will only set the vector clip mode if the vector clip tool is active already,
- /// otherwise it just returns false.
- bool SetVectorClipTool(VisualToolVectorClipMode vcliptoolmode) const;
+ void SetSubTool(int subtool) const { tool->SetSubTool(subtool); };
bool ToolIsType(std::type_info const& type) const;
- bool ToolIsVectorClipTool(VisualToolVectorClipMode vcliptoolmode) const;
+ int GetSubTool() const { return tool->GetSubTool(); };
/// Discard all OpenGL state
void Unload();
diff --git a/src/visual_tool.cpp b/src/visual_tool.cpp
index ba58d6a66..24d1f40bb 100644
--- a/src/visual_tool.cpp
+++ b/src/visual_tool.cpp
@@ -23,6 +23,7 @@
#include "ass_dialogue.h"
#include "ass_file.h"
#include "ass_style.h"
+#include "auto4_base.h"
#include "compat.h"
#include "include/aegisub/context.h"
#include "options.h"
@@ -31,11 +32,15 @@
#include "video_display.h"
#include "visual_tool_clip.h"
#include "visual_tool_drag.h"
+#include "visual_tool_perspective.h"
#include "visual_tool_vector_clip.h"
#include
#include
#include
+#include
+
+#include
#include
@@ -212,6 +217,9 @@ void VisualTool::OnMouseEvent(wxMouseEvent &event) {
else
SetSelection(active_feature, true);
}
+ } else {
+ for (auto sel : sel_features)
+ EndDrag(sel);
}
active_feature = nullptr;
@@ -222,6 +230,7 @@ void VisualTool::OnMouseEvent(wxMouseEvent &event) {
else if (holding) {
if (!event.LeftIsDown()) {
holding = false;
+ EndHold();
parent->ReleaseMouse();
parent->SetFocus();
@@ -475,6 +484,98 @@ void VisualToolBase::GetLineScale(AssDialogue *diag, Vector2D &scale) {
scale = Vector2D(x, y);
}
+void VisualToolBase::GetLineOutline(AssDialogue *diag, Vector2D &outline) {
+ float x = 0.f, y = 0.f;
+
+ if (AssStyle *style = c->ass->GetStyle(diag->Style)) {
+ x = style->outline_w;
+ y = style->outline_w;
+ }
+
+ auto blocks = diag->ParseTags();
+
+ if (param_vec tag = find_tag(blocks, "\\bord")) {
+ x = tag->front().Get(x);
+ y = tag->front().Get(y);
+ }
+ if (param_vec tag = find_tag(blocks, "\\xbord"))
+ x = tag->front().Get(x);
+ if (param_vec tag = find_tag(blocks, "\\ybord"))
+ y = tag->front().Get(y);
+
+ outline = Vector2D(x, y);
+}
+
+void VisualToolBase::GetLineShadow(AssDialogue *diag, Vector2D &shadow) {
+ float x = 0.f, y = 0.f;
+
+ if (AssStyle *style = c->ass->GetStyle(diag->Style)) {
+ x = style->shadow_w;
+ y = style->shadow_w;
+ }
+
+ auto blocks = diag->ParseTags();
+
+ if (param_vec tag = find_tag(blocks, "\\shad")) {
+ x = tag->front().Get(x);
+ y = tag->front().Get(y);
+ }
+ if (param_vec tag = find_tag(blocks, "\\xshad"))
+ x = tag->front().Get(x);
+ if (param_vec tag = find_tag(blocks, "\\yshad"))
+ y = tag->front().Get(y);
+
+ shadow = Vector2D(x, y);
+}
+
+int VisualToolBase::GetLineAlignment(AssDialogue *diag) {
+ int an = 0;
+
+ if (AssStyle *style = c->ass->GetStyle(diag->Style))
+ an = style->alignment;
+ auto blocks = diag->ParseTags();
+ if (param_vec tag = find_tag(blocks, "\\an"))
+ an = tag->front().Get(an);
+
+ return an;
+}
+
+void VisualToolBase::GetLineBaseExtents(AssDialogue *diag, double &width, double &height, double &descent, double &extlead) {
+ width = 0.;
+ height = 0.;
+ descent = 0.;
+ extlead = 0.;
+
+ AssStyle style;
+ if (AssStyle *basestyle = c->ass->GetStyle(diag->Style)) {
+ style = AssStyle(basestyle->GetEntryData());
+ style.scalex = 100.;
+ style.scaley = 100.;
+ }
+
+ auto blocks = diag->ParseTags();
+ if (param_vec tag = find_tag(blocks, "\\fs"))
+ style.fontsize = tag->front().Get(style.fontsize);
+ if (param_vec tag = find_tag(blocks, "\\fn"))
+ style.font = tag->front().Get(style.font);
+
+ std::string text = diag->GetStrippedText();
+ std::vector textlines;
+ boost::replace_all(text, "\\N", "\n");
+ agi::Split(textlines, text, '\n');
+ for (std::string line : textlines) {
+ double linewidth = 0;
+ double lineheight = 0;
+ if (!Automation4::CalculateTextExtents(&style, line, linewidth, lineheight, descent, extlead)) {
+ // meh... let's make some ballpark estimates
+ linewidth = style.fontsize * line.length();
+ lineheight = style.fontsize;
+ }
+ width = std::max(width, linewidth);
+ height += lineheight;
+ }
+}
+
void VisualToolBase::GetLineClip(AssDialogue *diag, Vector2D &p1, Vector2D &p2, bool &inverse) {
inverse = false;
@@ -527,16 +628,35 @@ void VisualToolBase::SetSelectedOverride(std::string const& tag, std::string con
SetOverride(line, tag, value);
}
+void VisualToolBase::RemoveOverride(AssDialogue *line, std::string const& tag) {
+ if (!line) return;
+ auto blocks = line->ParseTags();
+ for (auto ovr : blocks | agi::of_type()) {
+ for (size_t i = 0; i < ovr->Tags.size(); i++) {
+ if (tag == ovr->Tags[i].Name) {
+ ovr->Tags.erase(ovr->Tags.begin() + i);
+ i--;
+ }
+ }
+ }
+ line->UpdateText(blocks);
+}
+
void VisualToolBase::SetOverride(AssDialogue* line, std::string const& tag, std::string const& value) {
if (!line) return;
std::string removeTag;
+ std::string removeTag2;
if (tag == "\\1c") removeTag = "\\c";
else if (tag == "\\frz") removeTag = "\\fr";
else if (tag == "\\pos") removeTag = "\\move";
else if (tag == "\\move") removeTag = "\\pos";
else if (tag == "\\clip") removeTag = "\\iclip";
else if (tag == "\\iclip") removeTag = "\\clip";
+ else if (tag == "\\xbord" || tag == "\\ybord") removeTag = "\\bord";
+ else if (tag == "\\xshad" || tag == "\\yshad") removeTag = "\\shad";
+ else if (tag == "\\bord") { removeTag = "\\xbord"; removeTag2 = "\\ybord"; }
+ else if (tag == "\\shad") { removeTag = "\\xshad"; removeTag2 = "\\yshad"; }
// Get block at start
auto blocks = line->ParseTags();
@@ -547,7 +667,7 @@ void VisualToolBase::SetOverride(AssDialogue* line, std::string const& tag, std:
// Remove old of same
for (size_t i = 0; i < ovr->Tags.size(); i++) {
std::string const& name = ovr->Tags[i].Name;
- if (tag == name || removeTag == name) {
+ if (tag == name || removeTag == name || removeTag2 == name) {
ovr->Tags.erase(ovr->Tags.begin() + i);
i--;
}
@@ -564,4 +684,5 @@ void VisualToolBase::SetOverride(AssDialogue* line, std::string const& tag, std:
template class VisualTool;
template class VisualTool;
template class VisualTool;
+template class VisualTool;
template class VisualTool;
diff --git a/src/visual_tool.h b/src/visual_tool.h
index 15d0b007d..5e62920ae 100644
--- a/src/visual_tool.h
+++ b/src/visual_tool.h
@@ -128,9 +128,20 @@ protected:
void GetLineRotation(AssDialogue *diag, float &rx, float &ry, float &rz);
void GetLineShear(AssDialogue *diag, float& fax, float& fay);
void GetLineScale(AssDialogue *diag, Vector2D &scale);
+ void GetLineOutline(AssDialogue *diag, Vector2D &outline);
+ void GetLineShadow(AssDialogue *diag, Vector2D &shadow);
+ float GetLineFontSize(AssDialogue *diag);
+ int GetLineAlignment(AssDialogue *diag);
+ /// @brief Compute text extents of the given line without any formatting
+ ///
+ /// Formatting tags are stripped and \fs tags are respected, but \fscx and \fscy are kept as 100 even if
+ /// they are different in the style.
+ /// Returns a rough estimate when getting the precise extents fails
+ void GetLineBaseExtents(AssDialogue *diag, double &width, double &height, double &descent, double &extlead);
void GetLineClip(AssDialogue *diag, Vector2D &p1, Vector2D &p2, bool &inverse);
std::string GetLineVectorClip(AssDialogue *diag, int &scale, bool &inverse);
+ void RemoveOverride(AssDialogue *line, std::string const& tag);
void SetOverride(AssDialogue* line, std::string const& tag, std::string const& value);
void SetSelectedOverride(std::string const& tag, std::string const& value);
@@ -148,6 +159,8 @@ public:
virtual void SetClientSize(int w, int h);
virtual void SetDisplayArea(int x, int y, int w, int h);
virtual void SetToolbar(wxToolBar *) { }
+ virtual void SetSubTool(int subtool) { }
+ virtual int GetSubTool() { return 0; }
virtual ~VisualToolBase() = default;
};
@@ -166,6 +179,8 @@ private:
virtual bool InitializeHold() { return false; }
/// @brief Called on every mouse event during a hold
virtual void UpdateHold() { }
+ /// @brief Called when the hold ended
+ virtual void EndHold() { }
/// @brief Called at the beginning of a drag
/// @param feature The visual feature clicked on
@@ -174,6 +189,9 @@ private:
/// @brief Called on every mouse event during a drag
/// @param feature The current feature to process; not necessarily the one clicked on
virtual void UpdateDrag(FeatureType *feature) { }
+ /// @brief Called at the end of a drag
+ /// @param feature The current feature to process; not necessarily the one clicked on
+ virtual void EndDrag(FeatureType *feature) { }
protected:
std::set sel_features; ///< Currently selected visual features
diff --git a/src/visual_tool_perspective.cpp b/src/visual_tool_perspective.cpp
new file mode 100644
index 000000000..4bf75ef74
--- /dev/null
+++ b/src/visual_tool_perspective.cpp
@@ -0,0 +1,894 @@
+// Copyright (c) 2022, arch1t3cht
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Aegisub Project http://www.aegisub.org/
+
+/// @file visual_tool_perspective.cpp
+/// @brief 3D perspective visual typesetting tool
+/// @ingroup visual_ts
+
+#include "visual_tool_perspective.h"
+
+#include "command/command.h"
+#include "compat.h"
+#include "include/aegisub/context.h"
+#include "options.h"
+#include "selection_controller.h"
+#include "vector3d.h"
+#include "ass_file.h"
+#include "ass_dialogue.h"
+#include "ass_style.h"
+#include "video_display.h"
+
+#include
+#include
+#include
+
+#include
+#include
+
+static const float pi = 3.1415926536f;
+static const float deg2rad = pi / 180.f;
+static const float rad2deg = 180.f / pi;
+static const float screen_z = 312.5;
+static const char *ambient_plane_key = "_aegi_perspective_ambient_plane";
+
+static const int BUTTON_ID_BASE = 1400;
+
+enum VisualToolPerspectiveFeatureType {
+ FEATURE_INNER = 0,
+ FEATURE_OUTER = 1,
+ FEATURE_CENTER = 2,
+ FEATURE_ORG = 3,
+};
+
+void Solve2x2(float a11, float a12, float a21, float a22, float b1, float b2, float &x1, float &x2) {
+ // Simple pivoting
+ if (abs(a11) < abs(a21)) {
+ std::swap(b1, b2);
+ std::swap(a11, a21);
+ std::swap(a12, a22);
+ }
+ // LU decomposition
+ // i = 1
+ a21 = a21 / a11;
+ // i = 2
+ a22 = a22 - a21 * a12;
+ // forward substitution
+ float z1 = b1;
+ float z2 = b2 - a21 * z1;
+ // backward substitution
+ x2 = z2 / a22;
+ x1 = (z1 - a12 * x2) / a11;
+}
+
+Vector2D QuadMidpoint(std::vector quad) {
+ Vector2D diag1 = quad[2] - quad[0];
+ Vector2D diag2 = quad[1] - quad[3];
+ Vector2D b = quad[3] - quad[0];
+ float center_la1, center_la2;
+ Solve2x2(diag1.X(), diag2.X(), diag1.Y(), diag2.Y(), b.X(), b.Y(), center_la1, center_la2);
+ return quad[0] + center_la1 * diag1;
+}
+
+void UnwrapQuadRel(std::vector quad, float &x1, float &x2, float &x3, float &x4, float &y1, float &y2, float &y3, float &y4) {
+ x1 = quad[0].X();
+ x2 = quad[1].X() - x1;
+ x3 = quad[2].X() - x1;
+ x4 = quad[3].X() - x1;
+ y1 = quad[0].Y();
+ y2 = quad[1].Y() - y1;
+ y3 = quad[2].Y() - y1;
+ y4 = quad[3].Y() - y1;
+}
+
+Vector2D XYToUV(std::vector quad, Vector2D xy) {
+ float x1, x2, x3, x4, y1, y2, y3, y4;
+ UnwrapQuadRel(quad, x1, x2, x3, x4, y1, y2, y3, y4);
+ float x = xy.X() - x1;
+ float y = xy.Y() - y1;
+ // Dumped from Mathematica
+ float u = -(((x3*y2 - x2*y3)*(x4*y - x*y4)*(x4*(-y2 + y3) + x3*(y2 - y4) + x2*(-y3 + y4)))/(x3*x3*(x4*y2*y2*(-y + y4) + y4*(x*y2*(y2 - y4) + x2*(y - y2)*y4)) + x3*(x4*x4*y2*y2*(y - y3) + 2*x4*(x2*y*y3*(y2 - y4) + x*y2*(-y2 + y3)*y4) + x2*y4*(x2*(-y + y3)*y4 + 2*x*y2*(-y3 + y4))) + y3*(x*x4*x4*y2*(y2 - y3) + x2*x4*x4*(y2*y3 + y*(-2*y2 + y3)) - x2*x2*(x4*y*(y3 - 2*y4) + x4*y3*y4 + x*y4*(-y3 + y4)))));
+ float v = ((x2*y - x*y2)*(x4*y3 - x3*y4)*(x4*(y2 - y3) + x2*(y3 - y4) + x3*(-y2 + y4)))/(x3*(x4*x4*y2*y2*(-y + y3) + x2*y4*(2*x*y2*(y3 - y4) + x2*(y - y3)*y4) - 2*x4*(x2*y*y3*(y2 - y4) + x*y2*(-y2 + y3)*y4)) + x3*x3*(x4*y2*y2*(y - y4) + y4*(x2*(-y + y2)*y4 + x*y2*(-y2 + y4))) + y3*(x*x4*x4*y2*(-y2 + y3) + x2*x4*x4*(2*y*y2 - y*y3 - y2*y3) + x2*x2*(x4*y*(y3 - 2*y4) + x4*y3*y4 + x*y4*(-y3 + y4))));
+ return Vector2D(u, v);
+}
+
+Vector2D UVToXY(std::vector quad, Vector2D uv) {
+ float x1, x2, x3, x4, y1, y2, y3, y4;
+ UnwrapQuadRel(quad, x1, x2, x3, x4, y1, y2, y3, y4);
+ float u = uv.X();
+ float v = uv.Y();
+ // Also dumped from Mathematica
+ float d = (x4*((-1 + u + v)*y2 + y3 - v*y3) + x3*(y2 - u*y2 + (-1 + v)*y4) + x2*((-1 + u)*y3 - (-1 + u + v)*y4));
+ float x = (v*x4*(x3*y2 - x2*y3) + u*x2*(x4*y3 - x3*y4)) / d;
+ float y = (v*y4*(x3*y2 - x2*y3) + u*y2*(x4*y3 - x3*y4)) / d;
+ return Vector2D(x + x1, y + y1);
+}
+
+std::vector MakeRect(Vector2D a, Vector2D b) {
+ return std::vector({
+ Vector2D(a.X(), a.Y()),
+ Vector2D(b.X(), a.Y()),
+ Vector2D(b.X(), b.Y()),
+ Vector2D(a.X(), b.Y()),
+ });
+}
+
+void VisualToolPerspective::AddTool(std::string command_name, VisualToolPerspectiveSetting setting) {
+ cmd::Command *command = cmd::get(command_name);
+ int icon_size = OPT_GET("App/Toolbar Icon Size")->GetInt();
+ toolBar->AddTool(BUTTON_ID_BASE + setting, command->StrDisplay(c), command->Icon(icon_size), command->GetTooltip("Video"), wxITEM_CHECK);
+}
+
+VisualToolPerspective::VisualToolPerspective(VideoDisplay *parent, agi::Context *context)
+: VisualTool(parent, context)
+, optOuter(OPT_SET("Tool/Visual/Perspective/Outer"))
+, optOuterLocked(OPT_SET("Tool/Visual/Perspective/Outer Locked"))
+, optGrid(OPT_SET("Tool/Visual/Perspective/Grid"))
+, optOrgMode(OPT_SET("Tool/Visual/Perspective/Org Mode"))
+{
+ old_outer.resize(4);
+ old_inner.resize(4);
+
+ settings = 0;
+ if (optOuter->GetBool()) settings |= PERSP_OUTER;
+ if (optOuterLocked->GetBool()) settings |= PERSP_LOCK_OUTER;
+ if (optGrid->GetBool()) settings |= PERSP_GRID;
+ settings |= optOrgMode->GetInt();
+
+ MakeFeatures();
+}
+
+void VisualToolPerspective::SetToolbar(wxToolBar *toolBar) {
+ this->toolBar = toolBar;
+
+ toolBar->AddSeparator();
+
+ AddTool("video/tool/perspective/plane", PERSP_OUTER);
+ AddTool("video/tool/perspective/lock_outer", PERSP_LOCK_OUTER);
+ AddTool("video/tool/perspective/grid", PERSP_GRID);
+ AddTool("video/tool/perspective/orgmode/center", PERSP_ORGMODE);
+
+ SetSubTool(settings);
+
+ toolBar->Realize();
+ toolBar->Show(true);
+ toolBar->Bind(wxEVT_TOOL, &VisualToolPerspective::OnSubTool, this);
+}
+
+void VisualToolPerspective::OnSubTool(wxCommandEvent &e) {
+ int id = e.GetId() - BUTTON_ID_BASE;
+ if (id == PERSP_ORGMODE) {
+ cmd::call("video/tool/perspective/orgmode/cycle", c);
+ } else {
+ SetSubTool(GetSubTool() ^ id);
+ }
+}
+
+void VisualToolPerspective::SetSubTool(int subtool) {
+ if (toolBar == nullptr) {
+ throw agi::InternalError("Vector clip toolbar hasn't been set yet!");
+ }
+ for (int i = 1; i < PERSP_LAST; i <<= 1)
+ toolBar->ToggleTool(BUTTON_ID_BASE + i, i & subtool);
+
+ toolBar->EnableTool(BUTTON_ID_BASE + PERSP_LOCK_OUTER, subtool & PERSP_OUTER);
+
+ cmd::Command *orgmode;
+ switch (subtool & PERSP_ORGMODE) {
+ case PERSP_ORGMODE_CENTER:
+ orgmode = cmd::get("video/tool/perspective/orgmode/center");
+ break;
+ case PERSP_ORGMODE_NOFAX:
+ orgmode = cmd::get("video/tool/perspective/orgmode/nofax");
+ break;
+ case PERSP_ORGMODE_KEEP:
+ orgmode = cmd::get("video/tool/perspective/orgmode/keep");
+ break;
+ default:
+ throw agi::InternalError("Invalid perspective subtool");
+ }
+ wxString orgmodehelp = orgmode->StrDisplay(c) + wxString(". Click to cycle.\n") + orgmode->GetTooltip("Video");
+ toolBar->SetToolShortHelp(BUTTON_ID_BASE + PERSP_ORGMODE, orgmodehelp);
+ toolBar->SetToolLongHelp(BUTTON_ID_BASE + PERSP_ORGMODE, orgmodehelp);
+ toolBar->SetToolNormalBitmap(BUTTON_ID_BASE + PERSP_ORGMODE, orgmode->Icon(OPT_GET("App/Toolbar Icon Size")->GetInt()));
+ toolBar->ToggleTool(BUTTON_ID_BASE + PERSP_ORGMODE, false);
+
+ settings = subtool;
+
+ optOuter->SetBool(HasOuter());
+ optOuterLocked->SetBool(OuterLocked());
+ optGrid->SetBool(settings & PERSP_GRID);
+ optOrgMode->SetInt(GetOrgMode());
+
+ MakeFeatures();
+ parent->Render();
+}
+
+int VisualToolPerspective::GetSubTool() {
+ return settings;
+}
+
+bool VisualToolPerspective::HasOuter() {
+ return GetSubTool() & PERSP_OUTER;
+}
+
+bool VisualToolPerspective::OuterLocked() {
+ return HasOuter() && (GetSubTool() & PERSP_LOCK_OUTER);
+}
+
+int VisualToolPerspective::GetOrgMode() {
+ return GetSubTool() & PERSP_ORGMODE;
+}
+
+bool VisualToolPerspective::HasOrgf() {
+ return GetOrgMode() == PERSP_ORGMODE_KEEP;
+}
+
+std::vector VisualToolPerspective::FeaturePositions(std::vector features) const {
+ std::vector result;
+ for (size_t i = 0; i < 4; i++) {
+ result.push_back(features[i]->pos);
+ }
+ return result;
+}
+
+void VisualToolPerspective::UpdateInner() {
+ std::vector uv = MakeRect(c1, c2);
+ std::vector quad = FeaturePositions(outer_corners);
+ for (int i = 0; i < 4; i++)
+ inner_corners[i]->pos = UVToXY(quad, uv[i]);
+}
+
+void VisualToolPerspective::UpdateOuter() {
+ if (!HasOuter())
+ return;
+ std::vector uv = MakeRect(-c1 / (c2 - c1), (1 - c1) / (c2 - c1));
+ std::vector quad = FeaturePositions(inner_corners);
+ for (int i = 0; i < 4; i++)
+ outer_corners[i]->pos = UVToXY(quad, uv[i]);
+}
+
+void VisualToolPerspective::MakeFeatures() {
+ sel_features.clear();
+ features.clear();
+ active_feature = nullptr;
+
+ inner_corners.clear();
+ outer_corners.clear();
+ orgf = nullptr;
+
+ centerf = new Feature(this, FEATURE_CENTER, 0);
+ centerf->type = DRAG_BIG_TRIANGLE;
+ features.push_back(*centerf);
+
+ if (HasOrgf()) {
+ orgf = new Feature(this, FEATURE_ORG, 0);
+ orgf->type = DRAG_BIG_TRIANGLE;
+ features.push_back(*orgf);
+ }
+
+ for (int i = 0; i < 4; i++) {
+ inner_corners.push_back(new Feature(this, FEATURE_INNER, i));
+ inner_corners.back()->type = DRAG_SMALL_CIRCLE;
+ features.push_back(*inner_corners.back());
+
+ if (HasOuter()) {
+ outer_corners.push_back(new Feature(this, FEATURE_OUTER, i));
+ outer_corners.back()->type = DRAG_SMALL_CIRCLE;
+ features.push_back(*outer_corners.back());
+ }
+ }
+
+ DoRefresh();
+}
+
+void VisualToolPerspective::Draw() {
+ if (!active_line) return;
+
+ wxColour line_color = to_wx(line_color_primary_opt->GetColor());
+ wxColour line_color_secondary = to_wx(line_color_secondary_opt->GetColor());
+
+ // Draw Quad
+ gl.SetLineColour(line_color);
+ for (int i = 0; i < 4; i++) {
+ if (HasOuter()) {
+ gl.DrawDashedLine(outer_corners[i]->pos, outer_corners[(i + 1) % 4]->pos, 6);
+ gl.DrawLine(inner_corners[i]->pos, inner_corners[(i + 1) % 4]->pos);
+ } else {
+ gl.DrawDashedLine(inner_corners[i]->pos, inner_corners[(i + 1) % 4]->pos, 6);
+ }
+ }
+
+ DrawAllFeatures();
+
+ if (GetSubTool() & PERSP_GRID) {
+ // Draw Grid - Copied and modified from visual_tool_rotatexy.cpp
+
+ // Number of lines on each side of each axis
+ static const int radius = 15;
+ // Total number of lines, including center axis line
+ static const int line_count = radius * 2 + 1;
+ // Distance between each line in pixels
+ static const int spacing = 20;
+ // Length of each grid line in pixels from axis to one end
+ static const int half_line_length = spacing * (radius + 1);
+ static const float fade_factor = 0.9f / radius;
+
+ // Transform grid
+ gl.SetOrigin(FromScriptCoords(org));
+ gl.SetScale(100 * video_res / script_res);
+ gl.SetRotation(angle_x, angle_y, angle_z);
+ gl.SetScale(fsc);
+ gl.SetShear(fax, fay);
+ Vector2D glScale = textheight * Vector2D(1, 1) / spacing / 4;
+ gl.SetScale(100 * glScale);
+
+ // Draw grid
+ gl.SetLineColour(line_color_secondary, 0.5f, 2);
+ gl.SetModeLine();
+ float r = line_color_secondary.Red() / 255.f;
+ float g = line_color_secondary.Green() / 255.f;
+ float b = line_color_secondary.Blue() / 255.f;
+
+ std::vector colors(line_count * 8 * 4);
+ for (int i = 0; i < line_count * 8; ++i) {
+ colors[i * 4 + 0] = r;
+ colors[i * 4 + 1] = g;
+ colors[i * 4 + 2] = b;
+ colors[i * 4 + 3] = (i + 3) % 4 > 1 ? 0 : (1.f - abs(i / 8 - radius) * fade_factor);
+ }
+
+ std::vector points(line_count * 8 * 2);
+ for (int i = 0; i < line_count; ++i) {
+ int pos = spacing * (i - radius);
+
+ points[i * 16 + 0] = pos;
+ points[i * 16 + 1] = half_line_length;
+
+ points[i * 16 + 2] = pos;
+ points[i * 16 + 3] = 0;
+
+ points[i * 16 + 4] = pos;
+ points[i * 16 + 5] = 0;
+
+ points[i * 16 + 6] = pos;
+ points[i * 16 + 7] = -half_line_length;
+
+ points[i * 16 + 8] = half_line_length;
+ points[i * 16 + 9] = pos;
+
+ points[i * 16 + 10] = 0;
+ points[i * 16 + 11] = pos;
+
+ points[i * 16 + 12] = 0;
+ points[i * 16 + 13] = pos;
+
+ points[i * 16 + 14] = -half_line_length;
+ points[i * 16 + 15] = pos;
+ }
+
+ Vector2D offset = (ToScriptCoords(QuadMidpoint(FeaturePositions(inner_corners))) - org) / glScale;
+ for (int i = 0; i < line_count * 8; ++i) {
+ points[i * 2 + 0] += offset.X();
+ points[i * 2 + 1] += offset.Y();
+ }
+
+ gl.DrawLines(2, points, 4, colors);
+
+ gl.ResetTransform();
+ }
+}
+
+void VisualToolPerspective::OnDoubleClick() {
+ std::vector active_features = (HasOuter() && !OuterLocked()) ? outer_corners : inner_corners;
+ int maxi = -1;
+ float mind = -1;
+ for (size_t i = 0; i < active_features.size(); i++) {
+ float d = (active_features[i]->pos - mouse_pos).Len();
+ if (maxi == -1 || d < mind) {
+ maxi = i;
+ mind = d;
+ }
+ }
+ active_features[maxi]->pos = mouse_pos;
+ UpdateDrag(active_features[maxi]);
+ Commit();
+}
+
+void VisualToolPerspective::OnMouseEvent(wxMouseEvent &event) {
+ // Override this so we can find out which modifier keys were held
+ shift_down = event.ShiftDown();
+ ctrl_down = event.CmdDown();
+ alt_down = event.AltDown();
+ VisualTool::OnMouseEvent(event);
+ shift_down = false;
+ ctrl_down = false;
+ alt_down = false;
+};
+
+void VisualToolPerspective::UpdateDrag(Feature *feature) {
+ if (feature == centerf) {
+ Vector2D oldCenter = QuadMidpoint(FeaturePositions(inner_corners));
+ if (HasOuter() && !OuterLocked()) {
+ std::vector quad = FeaturePositions(outer_corners);
+ Vector2D olduv = XYToUV(quad, oldCenter);
+ Vector2D newuv = XYToUV(quad, centerf->pos);
+ c1 = c1 + newuv - olduv;
+ c2 = c2 + newuv - olduv;
+ UpdateInner();
+ } else {
+ Vector2D diff = centerf->pos - oldCenter;
+ for (int i = 0; i < 4; i++) {
+ inner_corners[i]->pos = inner_corners[i]->pos + diff;
+ }
+ UpdateOuter();
+ }
+ } else if (HasOrgf() && feature == orgf) {
+ org = ToScriptCoords(feature->pos);
+ }
+
+ std::vector changed_quad;
+ std::vector changed_quad_old;
+ if (feature->group == FEATURE_INNER) {
+ changed_quad = inner_corners;
+ changed_quad_old = old_inner;
+ } else if (HasOuter() && feature->group == FEATURE_OUTER) {
+ changed_quad = outer_corners;
+ changed_quad_old = old_outer;
+ }
+
+ if (!changed_quad.empty() && !ctrl_down) {
+ // Validate: If the quad isn't convex, the intersection of the diagonals will not lie inside it.
+ Vector2D diag1 = changed_quad[2]->pos - changed_quad[0]->pos;
+ Vector2D diag2 = changed_quad[1]->pos - changed_quad[3]->pos;
+ Vector2D b = changed_quad[3]->pos - changed_quad[0]->pos;
+ float center_la1, center_la2;
+ Solve2x2(diag1.X(), diag2.X(), diag1.Y(), diag2.Y(), b.X(), b.Y(), center_la1, center_la2);
+ if (center_la1 < 0 || center_la1 > 1 || -center_la2 < 0 || -center_la2 > 1) {
+ TextToPersp();
+ return;
+ }
+ }
+
+ int i = feature->index;
+
+ if (ctrl_down && !changed_quad.empty()) {
+ if (alt_down) {
+ if (shift_down) {
+ int bestsnap = -1;
+ float mindist = -1;
+ for (int j = 0; j < 4; j++) {
+ float dist = (feature->pos - changed_quad_old[j]).SquareLen();
+ if (bestsnap == -1 || dist < mindist) {
+ bestsnap = j;
+ mindist = dist;
+ }
+ }
+ feature->pos = changed_quad_old[bestsnap];
+ } else {
+ Vector2D center = QuadMidpoint(changed_quad_old);
+ Vector2D diff = feature->pos - center;
+ Vector2D snapDirection1 = (changed_quad_old[0] - center).Unit();
+ Vector2D snapDirection2 = (changed_quad_old[1] - center).Unit();
+ Vector2D snap1 = diff.Dot(snapDirection1) * snapDirection1;
+ Vector2D snap2 = diff.Dot(snapDirection2) * snapDirection2;
+ diff = (snap1 - diff).SquareLen() <= (snap2 - diff).SquareLen() ? snap1 : snap2;
+ feature->pos = center + diff;
+ }
+ }
+
+ Vector2D relUV = XYToUV(changed_quad_old, feature->pos) - Vector2D(0.5, 0.5);
+
+ for (int j = 0; j < 4; j++) {
+ Vector2D flipi(i == 1 || i == 2 ? -1 : 1, i >= 2 ? -1 : 1);
+ Vector2D flipj(j == 1 || j == 2 ? -1 : 1, j >= 2 ? -1 : 1);
+ changed_quad[j]->pos = UVToXY(changed_quad_old, Vector2D(0.5, 0.5) + relUV * flipi * flipj);
+ }
+
+ if (HasOuter()) {
+ if (feature->group == FEATURE_INNER) {
+ if (!OuterLocked()) {
+ c1 = XYToUV(FeaturePositions(outer_corners), inner_corners[0]->pos);
+ c2 = XYToUV(FeaturePositions(outer_corners), inner_corners[2]->pos);
+ UpdateInner();
+ } else {
+ UpdateOuter();
+ }
+ } else if (feature->group == FEATURE_OUTER) {
+ if (OuterLocked()) {
+ c1 = XYToUV(FeaturePositions(outer_corners), inner_corners[0]->pos);
+ c2 = XYToUV(FeaturePositions(outer_corners), inner_corners[2]->pos);
+ UpdateOuter();
+ } else {
+ UpdateInner();
+ }
+ }
+ }
+ } else if (!changed_quad.empty() && HasOuter()) {
+ // Normally dragging one corner
+ if (feature->group == FEATURE_INNER) {
+ if (!OuterLocked()) {
+ Vector2D newuv = XYToUV(FeaturePositions(outer_corners), feature->pos);
+ c1 = Vector2D(i == 0 || i == 3 ? newuv.X() : c1.X(), i < 2 ? newuv.Y() : c1.Y());
+ c2 = Vector2D(i == 0 || i == 3 ? c2.X() : newuv.X(), i < 2 ? c2.Y() : newuv.Y());
+ UpdateInner();
+ } else {
+ UpdateOuter();
+ }
+ } else if (feature->group == FEATURE_OUTER) {
+ if (OuterLocked()) {
+ Vector2D d1 = -c1 / (c2 - c1);
+ Vector2D d2 = (1 - c1) / (c2 - c1);
+ Vector2D newuv = XYToUV(FeaturePositions(inner_corners), feature->pos);
+ d1 = Vector2D(i == 0 || i == 3 ? newuv.X() : d1.X(), i < 2 ? newuv.Y() : d1.Y());
+ d2 = Vector2D(i == 0 || i == 3 ? d2.X() : newuv.X(), i < 2 ? d2.Y() : newuv.Y());
+ c1 = -d1 / (d2 - d1);
+ c2 = (1 - d1) / (d2 - d1);
+ UpdateOuter();
+ } else {
+ UpdateInner();
+ }
+ }
+ }
+
+ if (!InnerToText())
+ TextToPersp();
+ SetFeaturePositions();
+}
+
+void VisualToolPerspective::EndDrag(Feature *feature) {
+ SaveFeaturePositions();
+ SaveOuterToLines();
+}
+
+void VisualToolPerspective::WrapSetOverride(AssDialogue* line, std::string const& tag, float value, int precision, float defaultval) {
+ std::string format = agi::format("%%.%df", precision);
+ std::string formatted = agi::format(format.c_str(), value);
+ std::string default_formatted = agi::format(format.c_str(), defaultval);
+ if (formatted == default_formatted || (defaultval == 0 && agi::format(format.c_str(), -value) == default_formatted))
+ RemoveOverride(line, tag);
+ else
+ SetOverride(line, tag, formatted);
+}
+
+bool VisualToolPerspective::InnerToText() {
+ Vector2D q0 = ToScriptCoords(inner_corners[0]->pos);
+ Vector2D q1 = ToScriptCoords(inner_corners[1]->pos);
+ Vector2D q2 = ToScriptCoords(inner_corners[2]->pos);
+ Vector2D q3 = ToScriptCoords(inner_corners[3]->pos);
+
+ // Find a parallelogram projecting to the quad. This is independent of translation.
+ float z1, z3;
+ Vector2D diag = q2 - q0;
+ Vector2D side2 = q1 - q2;
+ Vector2D side3 = q3 - q2;
+ Solve2x2(side2.X(), side3.X(), side2.Y(), side3.Y(), -diag.X(), -diag.Y(), z1, z3);
+
+ Vector2D midpoint = QuadMidpoint(std::vector({q0, q1, q2, q3}));
+
+ if (GetOrgMode() == PERSP_ORGMODE_CENTER) {
+ org = midpoint;
+ } else if (GetOrgMode() == PERSP_ORGMODE_NOFAX) {
+ Vector2D v1 = q1 - q0;
+ Vector2D v3 = q3 - q0;
+ // Look for a translation after which the quad will unproject to a rectangle.
+ // Specifically, look for a vector t such that this happens after moving q0 to t.
+ // The set of such vectors is cut out by the equation a (x^2 + y^2) - b1 x - b2 y + c
+ // with the following coefficients.
+ float a = (1 - z1) * (1 - z3);
+ Vector2D b = z1 * v1 + z3 * v3 - z1 * z3 * (v1 + v3);
+ float c = z1 * z3 * v1.Dot(v3) + (z1 - 1) * (z3 - 1) * screen_z * screen_z;
+
+ // Our default value for t, which would put \org at the center of the quad.
+ // We'll try to find a value for \org that's as close as possible to it.
+ Vector2D t = q0 - midpoint;
+
+ // Handle all the edge cases. These can actually come up in practice, like when
+ // starting from text without any perspective.
+ if (a == 0) {
+ // If b = 0 we get a trivial or impossible equation, so just keep the previous \org.
+ if (b.SquareLen() != 0) {
+ // The equation cuts out a line. Find the point closest to the previous t.
+ t = t + b * ((c - t.Dot(b)) / b.SquareLen());
+ }
+ } else {
+ // The equation cuts out a circle.
+ // Complete the square to find center and radius.
+ Vector2D circleCenter = b / (2 * a);
+ float sqradius = (b.SquareLen() / (4 * a) - c) / a;
+
+ if (sqradius <= 0) {
+ // This is actually very rare.
+ org = circleCenter;
+ } else {
+ // Find the point on the circle closest to the current \org.
+ float radius = sqrt(sqradius);
+ Vector2D center2t = t - circleCenter;
+ if (center2t.Len() == 0) {
+ t = circleCenter + Vector2D(radius, 0);
+ } else {
+ t = circleCenter + center2t / center2t.Len() * radius;
+ }
+ }
+ }
+
+ org = q0 - t;
+ }
+
+ // Normalize to org
+ q0 = q0 - org;
+ q1 = q1 - org;
+ q2 = q2 - org;
+ q3 = q3 - org;
+
+ Vector3D r0 = Vector3D(q0, screen_z);
+ Vector3D r1 = z1 * Vector3D(q1, screen_z);
+ Vector3D r2 = (z1 + z3 - 1) * Vector3D(q2, screen_z);
+ Vector3D r3 = z3 * Vector3D(q3, screen_z);
+ std::vector r({r0, r1, r2, r3});
+
+ // Find the z coordinate of the point projecting to the origin
+ float orgla0, orgla1;
+ Vector3D side0 = r1 - r0;
+ Vector3D side1 = r3 - r0;
+ Solve2x2(side0.X(), side1.X(), side0.Y(), side1.Y(), -r0.X(), -r0.Y(), orgla0, orgla1);
+ float orgz = (r0 + orgla0 * side0 + orgla1 * side1).Z();
+
+ // Normalize so the origin has z=screen_z, and move the screen plane to z=0
+ for (int i = 0; i < 4; i++)
+ r[i] = r[i] * screen_z / orgz - Vector3D(0, 0, screen_z);
+
+ // Find the rotations
+ Vector3D n = (r[1] - r[0]).Cross(r[3] - r[0]);
+ float roty = atan(n.X() / n.Z());
+ if (n.Z() < 0)
+ roty += pi;
+ n = n.RotateY(roty);
+ float rotx = atan(n.Y() / n.Z());
+
+ // Rotate into the z=0 plane
+ for (int i = 0; i < 4; i++)
+ r[i] = r[i].RotateY(roty).RotateX(rotx);
+
+ Vector3D ab = r[1] - r[0];
+ float rotz = atan(ab.Y() / ab.X());
+ if (ab.X() < 0)
+ rotz += pi;
+
+ // Rotate to make the top side be horizontal
+ for (int i = 0; i < 4; i++)
+ r[i] = r[i].RotateZ(-rotz);
+
+ // We now have a horizontal parallelogram in the plane, so find the shear and the dimensions
+ ab = r[1] - r[0];
+ Vector3D ad = r[3] - r[0];
+ float rawfax = ad.X() / ad.Y();
+
+ float quadwidth = ab.Len();
+ float quadheight = abs(ad.Y());
+ float scalex = quadwidth / textwidth;
+ float scaley = quadheight / textheight;
+
+ float shiftv = align <= 3 ? 1 : (align <= 6 ? 0.5 : 0);
+ float shifth = align % 3 == 0 ? 1 : (align % 3 == 2 ? 0.5 : 0);
+ pos = org + r[0].XY() + Vector2D(quadwidth * shifth, quadheight * shiftv);
+ angle_x = rotx * rad2deg;
+ angle_y = -roty * rad2deg;
+ angle_z = -rotz * rad2deg;
+ Vector2D oldfsc = fsc;
+ fsc = 100 * Vector2D(scalex, scaley);
+ fax = rawfax * scaley / scalex;
+ fay = 0;
+
+ bord = bord * fsc / oldfsc;
+ shad = shad * fsc / oldfsc;
+
+ // Give up if any of these numbers were invalid
+ std::vector allvalues({fax, fsc.X(), fsc.Y(), angle_z, angle_x, angle_y, bord.X(), bord.Y(), shad.X(), shad.Y(), org.X(), org.Y(), pos.X(), pos.Y()});
+ for (float f : allvalues) {
+ if (!isfinite(f)) return false;
+ }
+
+ for (auto line : c->selectionController->GetSelectedSet()) {
+ auto style = c->ass->GetStyle(line->Style);
+ // Maybe just set the tags manually so the line doesn't need to be parsed again for every tag?
+ WrapSetOverride(line, "\\fax", fax, 6);
+ WrapSetOverride(line, "\\fay", 0, 6);
+ WrapSetOverride(line, "\\fscx", fsc.X(), 2, style->scalex);
+ WrapSetOverride(line, "\\fscy", fsc.Y(), 2, style->scaley);
+ WrapSetOverride(line, "\\frz", angle_z, 4, style->angle);
+ WrapSetOverride(line, "\\frx", angle_x, 4);
+ WrapSetOverride(line, "\\fry", angle_y, 4);
+ RemoveOverride(line, "\\bord");
+ RemoveOverride(line, "\\shad");
+ WrapSetOverride(line, "\\xbord", bord.X(), 2, style->outline_w);
+ WrapSetOverride(line, "\\ybord", bord.Y(), 2, style->outline_w);
+ WrapSetOverride(line, "\\xshad", shad.X(), 2, style->shadow_w);
+ WrapSetOverride(line, "\\yshad", shad.Y(), 2, style->shadow_w);
+ SetOverride(line, "\\org", org.PStr());
+ SetOverride(line, "\\pos", pos.PStr());
+ }
+ return true;
+}
+
+void VisualToolPerspective::SaveFeaturePositions() {
+ for (int i = 0; i < 4; i++) {
+ old_inner[i] = inner_corners[i]->pos;
+ if (HasOuter())
+ old_outer[i] = outer_corners[i]->pos;
+ }
+}
+
+void VisualToolPerspective::SaveOuterToLines() {
+ if (HasOuter()) {
+ std::string plane_descriptor;
+ for (int i = 0; i < 4; i++) {
+ Vector2D saved_corner = ToScriptCoords(outer_corners[i]->pos);
+ if (!isfinite(saved_corner.X()) || !isfinite(saved_corner.Y()))
+ return;
+ plane_descriptor += agi::format("%.2f;%.2f", saved_corner.X(), saved_corner.Y());
+ if (i < 3) plane_descriptor += "|";
+ }
+ uint32_t plane_extra = c->ass->AddExtradata(ambient_plane_key, plane_descriptor);
+
+ for (auto line : c->selectionController->GetSelectedSet()) {
+ // Let's reinvent the wheel a bit since extradata tooling is nonexistent
+ std::vector extra = line->ExtradataIds.get();
+ std::vector entries = c->ass->GetExtradata(extra);
+ for (int i = entries.size() - 1; i >= 0; i--) {
+ if (entries[i].key == ambient_plane_key)
+ extra.erase(extra.begin() + i, extra.begin() + i + 1);
+ }
+ extra.push_back(plane_extra);
+ line->ExtradataIds = extra;
+ }
+ }
+}
+
+void VisualToolPerspective::SetFeaturePositions() {
+ centerf->pos = QuadMidpoint(FeaturePositions(inner_corners));
+ if (orgf != nullptr)
+ orgf->pos = FromScriptCoords(org);
+}
+
+void VisualToolPerspective::TextToPersp() {
+ if (!active_line) return;
+
+ org = GetLineOrigin(active_line);
+ pos = GetLinePosition(active_line);
+ if (!org)
+ org = pos;
+
+ GetLineRotation(active_line, angle_x, angle_y, angle_z);
+ GetLineShear(active_line, fax, fay);
+ GetLineScale(active_line, fsc);
+ GetLineOutline(active_line, bord);
+ GetLineShadow(active_line, shad);
+
+ align = GetLineAlignment(active_line);
+
+ double descend, extlead;
+ GetLineBaseExtents(active_line, textwidth, textheight, descend, extlead);
+ textwidth = std::max(textwidth, 1.);
+ textheight = std::max(textheight, 1.);
+ double textleft, texttop = 0.;
+
+ switch ((align - 1) % 3) {
+ case 1:
+ textleft = -textwidth / 2;
+ break;
+ case 2:
+ textleft = -textwidth;
+ break;
+ default:
+ break;
+ }
+ switch ((align - 1) / 3) {
+ case 0:
+ texttop = -textheight;
+ break;
+ case 1:
+ texttop = -textheight / 2;
+ break;
+ default:
+ break;
+ }
+
+ std::vector textrect = MakeRect(Vector2D(0, 0), Vector2D(textwidth, textheight));
+ for (int i = 0; i < 4; i++) {
+ Vector2D p = textrect[i];
+ // Apply \fax and \fay
+ p = Vector2D(p.X() + p.Y() * fax, p.X() * fay + p.Y());
+ // Translate to alignment point
+ p = p + Vector2D(textleft, texttop);
+ // Apply scaling
+ p = Vector2D(p.X() * fsc.X() / 100., p.Y() * fsc.Y() / 100.);
+ // Translate relative to origin
+ p = p + pos - org;
+ // Rotate ZXY
+ Vector3D q(p);
+ q = q.RotateZ(-angle_z * deg2rad);
+ q = q.RotateX(-angle_x * deg2rad);
+ q = q.RotateY(angle_y * deg2rad);
+ // Project
+ q = (screen_z / (q.Z() + screen_z)) * q;
+ // Move to origin
+ Vector2D r = q.XY() + org;
+ inner_corners[i]->pos = FromScriptCoords(r);
+ }
+
+ for (auto const& extra : c->ass->GetExtradata(active_line->ExtradataIds)) {
+ if (extra.key == ambient_plane_key) {
+ std::vector fields;
+ agi::Split(fields, extra.value, '|');
+ if (fields.size() != 4)
+ break;
+
+ std::vector saved_outer;
+ for (int i = 0; i < 4; i++) {
+ std::vector ordinates;
+ agi::Split(ordinates, fields[i], ';');
+ if (ordinates.size() != 2)
+ break;
+
+ double x, y;
+ if (!agi::util::try_parse(ordinates[0], &x)) break;
+ if (!agi::util::try_parse(ordinates[1], &y)) break;
+
+ saved_outer.emplace_back(x, y);
+ }
+ if (saved_outer.size() != 4) break;
+
+ Vector2D d1 = XYToUV(saved_outer, ToScriptCoords(inner_corners[0]->pos));
+ Vector2D d2 = XYToUV(saved_outer, ToScriptCoords(inner_corners[2]->pos));
+ if (isfinite(d1.X()) && isfinite(d1.Y()) && isfinite(d2.X()) && isfinite(d2.Y())) {
+ c1 = d1;
+ c2 = d2;
+ }
+ }
+ }
+
+ UpdateOuter();
+}
+
+void VisualToolPerspective::DoRefresh() {
+ TextToPersp();
+ SetFeaturePositions();
+ SaveFeaturePositions();
+}
+
+VisualToolPerspectiveDraggableFeature::VisualToolPerspectiveDraggableFeature(VisualToolPerspective *tool, int group, int index) : tool(tool), group(group), index(index) {}
+
+void VisualToolPerspectiveDraggableFeature::UpdateDrag(Vector2D d, bool single_axis) {
+ if (tool->ctrl_down && tool->alt_down)
+ single_axis = false; // This is handled manually later on
+
+ if (single_axis && !(group == FEATURE_CENTER && !(tool->HasOuter() && !tool->OuterLocked()))) {
+ // Snap to the axes *inside* of the quad's perspective plane.
+ std::vector quad = tool->old_inner;
+ Vector2D posUV = XYToUV(quad, pos);
+ Vector2D axis1 = UVToXY(quad, posUV + Vector2D(1, 0)) - pos;
+ Vector2D axis2 = UVToXY(quad, posUV + Vector2D(0, 1)) - pos;
+
+ // Normalize and project
+ axis1 = axis1.Unit();
+ axis2 = axis2.Unit();
+ Vector2D snap1 = d.Dot(axis1) * axis1;
+ Vector2D snap2 = d.Dot(axis2) * axis2;
+ d = (snap1 - d).SquareLen() <= (snap2 - d).SquareLen() ? snap1 : snap2;
+ single_axis = false;
+ }
+ VisualDraggableFeature::UpdateDrag(d, single_axis);
+}
diff --git a/src/visual_tool_perspective.h b/src/visual_tool_perspective.h
new file mode 100644
index 000000000..82647a7b6
--- /dev/null
+++ b/src/visual_tool_perspective.h
@@ -0,0 +1,135 @@
+// Copyright (c) 2022, arch1t3cht
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Aegisub Project http://www.aegisub.org/
+
+/// @file visual_tool_perspective.h
+/// @see visual_tool_perspective.cpp
+/// @ingroup visual_ts
+///
+
+#include "visual_feature.h"
+#include "visual_tool.h"
+#include "options.h"
+
+class wxToolBar;
+
+/// Button IDs
+enum VisualToolPerspectiveSetting {
+ PERSP_OUTER = 1 << 0,
+ PERSP_LOCK_OUTER = 1 << 1,
+ PERSP_GRID = 1 << 2,
+ PERSP_LAST = 1 << 3, // End of simple toggle-able options
+ PERSP_ORGMODE_CENTER = 0 << 4, // Always puts \org at the center of the quad. Default.
+ PERSP_ORGMODE_NOFAX = 1 << 4, // Picks a position for \org where \fax = 0, when possible
+ PERSP_ORGMODE_KEEP = 2 << 4, // Takes the previous \org position as \org
+ PERSP_ORGMODE = PERSP_ORGMODE_CENTER | PERSP_ORGMODE_NOFAX | PERSP_ORGMODE_KEEP,
+};
+
+class VisualToolPerspective;
+
+class VisualToolPerspectiveDraggableFeature final : public VisualDraggableFeature {
+ VisualToolPerspective *tool;
+
+public:
+ int group;
+ int index;
+
+ VisualToolPerspectiveDraggableFeature(VisualToolPerspective *tool, int group, int index);
+ void UpdateDrag(Vector2D d, bool single_axis);
+};
+
+class VisualToolPerspective final : public VisualTool {
+ wxToolBar *toolBar = nullptr; /// The subtoolbar
+ int settings = 0;
+
+ agi::OptionValue* optOuter;
+ agi::OptionValue* optOuterLocked;
+ agi::OptionValue* optGrid;
+ agi::OptionValue* optOrgMode;
+
+ // All current transform coefficients. Used for drawing the grid.
+ float angle_x = 0.f;
+ float angle_y = 0.f;
+ float angle_z = 0.f;
+
+ float fax = 0.f;
+ float fay = 0.f;
+
+ int align = 0;
+
+ double textwidth = 0.f;
+ double textheight = 0.f;
+
+ Vector2D fsc;
+
+ Vector2D org;
+ Vector2D pos;
+
+ // Store these here to reduce rounding errors compounding on updates
+ Vector2D bord;
+ Vector2D shad;
+
+ // Corner coordinates of the transform quad relative to the ambient quad.
+ Vector2D c1 = Vector2D(.25, .25);
+ Vector2D c2 = Vector2D(.75, .75);
+
+ Feature *centerf;
+ Feature *orgf;
+ Vector2D old_centerf;
+
+ std::vector inner_corners;
+ std::vector outer_corners;
+
+ std::vector FeaturePositions(std::vector features) const;
+ void UpdateInner();
+ void UpdateOuter();
+ void TextToPersp();
+ bool InnerToText();
+
+ void WrapSetOverride(AssDialogue* line, std::string const& tag, float value, int precision, float defaultval=0);
+
+ void OnMouseEvent(wxMouseEvent &event) override;
+ void DoRefresh() override;
+ void Draw() override;
+ void OnDoubleClick() override;
+ void UpdateDrag(Feature *feature) override;
+ void EndDrag(Feature *feature) override;
+ void MakeFeatures();
+ void SetFeaturePositions();
+ void SaveFeaturePositions();
+ void SaveOuterToLines();
+
+ void AddTool(std::string command_name, VisualToolPerspectiveSetting mode);
+
+public:
+ bool ctrl_down = false;
+ bool shift_down = false;
+ bool alt_down = false;
+
+ std::vector old_inner;
+ std::vector old_outer;
+
+ VisualToolPerspective(VideoDisplay *parent, agi::Context *context);
+
+ bool HasOuter();
+ bool OuterLocked();
+ int GetOrgMode();
+ bool HasOrgf();
+
+ void SetToolbar(wxToolBar *tb) override;
+ void OnSubTool(wxCommandEvent &);
+ void SetSubTool(int subtool) override;
+ int GetSubTool() override;
+};
diff --git a/src/visual_tool_rotatexy.cpp b/src/visual_tool_rotatexy.cpp
index acb389acd..98ae6f1a0 100644
--- a/src/visual_tool_rotatexy.cpp
+++ b/src/visual_tool_rotatexy.cpp
@@ -49,7 +49,9 @@ void VisualToolRotateXY::Draw() {
// Transform grid
gl.SetOrigin(org->pos);
+ gl.SetScale(100 * video_res / script_res);
gl.SetRotation(angle_x, angle_y, angle_z);
+ gl.SetScale(fsc);
gl.SetShear(fax, fay);
// Draw grid
@@ -197,4 +199,5 @@ void VisualToolRotateXY::DoRefresh() {
GetLineRotation(active_line, angle_x, angle_y, angle_z);
GetLineShear(active_line, fax, fay);
+ GetLineScale(active_line, fsc);
}
diff --git a/src/visual_tool_rotatexy.h b/src/visual_tool_rotatexy.h
index a4c00a373..86c4803b8 100644
--- a/src/visual_tool_rotatexy.h
+++ b/src/visual_tool_rotatexy.h
@@ -29,6 +29,7 @@ class VisualToolRotateXY final : public VisualTool {
float fax = 0.f;
float fay = 0.f;
+ Vector2D fsc;
float orig_x = 0.f; ///< x rotation at the beginning of the current hold
float orig_y = 0.f; ///< y rotation at the beginning of the current hold
diff --git a/src/visual_tool_vector_clip.cpp b/src/visual_tool_vector_clip.cpp
index 811c4cadd..d90c4eec9 100644
--- a/src/visual_tool_vector_clip.cpp
+++ b/src/visual_tool_vector_clip.cpp
@@ -42,15 +42,7 @@ VisualToolVectorClip::VisualToolVectorClip(VideoDisplay *parent, agi::Context *c
// as is done in toolbar.cpp feels like too big of a hack. At least this way the button's actions
// are not purely controlled by the order they're added in.
void VisualToolVectorClip::AddTool(std::string command_name, VisualToolVectorClipMode mode) {
- cmd::Command *command;
- try {
- command = cmd::get(command_name);
- }
- catch (cmd::CommandNotFound const&) {
- // Toolbar names are all hardcoded so this should never happen
- throw agi::InternalError("Toolbar named " + command_name + " not found.");
- }
-
+ cmd::Command *command = cmd::get(command_name);
int icon_size = OPT_GET("App/Toolbar Icon Size")->GetInt();
toolBar->AddTool(BUTTON_ID_BASE + mode, command->StrDisplay(c), command->Icon(icon_size), command->GetTooltip("Video"), wxITEM_CHECK);
}
@@ -75,24 +67,23 @@ void VisualToolVectorClip::SetToolbar(wxToolBar *toolBar) {
toolBar->ToggleTool(BUTTON_ID_BASE + VCLIP_DRAG, true);
toolBar->Realize();
toolBar->Show(true);
- toolBar->Bind(wxEVT_TOOL, [=](wxCommandEvent& e) { SetMode((VisualToolVectorClipMode) (e.GetId() - BUTTON_ID_BASE)); });
- SetMode(VCLIP_LINE);
-#undef ICON
+ toolBar->Bind(wxEVT_TOOL, [=](wxCommandEvent& e) { SetSubTool(e.GetId() - BUTTON_ID_BASE); });
+ SetSubTool(VCLIP_LINE);
}
-void VisualToolVectorClip::SetMode(VisualToolVectorClipMode new_mode) {
+void VisualToolVectorClip::SetSubTool(int subtool) {
if (toolBar == nullptr) {
throw agi::InternalError("Vector clip toolbar hasn't been set yet!");
}
// Manually enforce radio behavior as we want one selection in the bar
// rather than one per group
for (int i = 0; i < VCLIP_LAST; i++)
- toolBar->ToggleTool(BUTTON_ID_BASE + i, i == new_mode);
+ toolBar->ToggleTool(BUTTON_ID_BASE + i, i == subtool);
- mode = new_mode;
+ mode = subtool;
}
-VisualToolVectorClipMode VisualToolVectorClip::GetMode() {
+int VisualToolVectorClip::GetSubTool() {
return mode;
}
@@ -452,7 +443,7 @@ void VisualToolVectorClip::UpdateHold() {
// End freedraw
if (!holding && (mode == VCLIP_FREEHAND || mode == VCLIP_FREEHAND_SMOOTH)) {
- SetMode(VCLIP_DRAG);
+ SetSubTool(VCLIP_DRAG);
MakeFeatures();
}
}
diff --git a/src/visual_tool_vector_clip.h b/src/visual_tool_vector_clip.h
index c1ce99ed6..2cc8bab7b 100644
--- a/src/visual_tool_vector_clip.h
+++ b/src/visual_tool_vector_clip.h
@@ -49,7 +49,7 @@ struct VisualToolVectorClipDraggableFeature final : public VisualDraggableFeatur
class VisualToolVectorClip final : public VisualTool {
Spline spline; /// The current spline
wxToolBar *toolBar = nullptr; /// The subtoolbar
- VisualToolVectorClipMode mode = VCLIP_DRAG; /// 0-7
+ int mode = VCLIP_DRAG; /// 0-7
bool inverse = false; /// is iclip?
std::set box_added;
@@ -75,9 +75,6 @@ public:
VisualToolVectorClip(VideoDisplay *parent, agi::Context *context);
void SetToolbar(wxToolBar *tb) override;
- /// @brief Set the mode. Only valid if the tool is already active.
- /// @param mode
- void SetMode(VisualToolVectorClipMode mode);
-
- VisualToolVectorClipMode GetMode();
+ void SetSubTool(int subtool) override;
+ int GetSubTool() override;
};