iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Made ctrl restrict XY rotation and scaling to only one axis. 

Originally committed to SVN as r1354.
This commit is contained in:
Rodrigo Braz Monteiro 2007-07-04 20:45:01 +00:00
parent 93571ce295
commit 4f7bb0f6a8
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
aegisub/visual_tool_rotatexy.cpp
View File

@ -198,9 +198,17 @@ void VisualToolRotateXY::UpdateHold() {
float screenAngleX = (orgy-mouseY*sh/h)*2.0;
float screenAngleY = (mouseX*sw/w-orgx)*2.0;
// Deltas
float deltaX = screenAngleX - startAngleX;
float deltaY = screenAngleY - startAngleY;
if (ctrlDown) {
if (fabs(deltaX) >= fabs(deltaY)) deltaY = 0;
else deltaX = 0;
}
// Calculate
curAngleX = screenAngleX - startAngleX + origAngleX;
curAngleY = screenAngleY - startAngleY + origAngleY;
curAngleX = deltaX + origAngleX;
curAngleY = deltaY + origAngleY;
while (curAngleX < 0.0) curAngleX += 360.0;
while (curAngleX >= 360.0) curAngleX -= 360.0;
while (curAngleY < 0.0) curAngleY += 360.0;

12
aegisub/visual_tool_scale.cpp
View File

@ -151,9 +151,17 @@ void VisualToolScale::InitializeHold() {
///////////////
// Update hold
void VisualToolScale::UpdateHold() {
// Deltas
int deltaX = mouseX - startX;
int deltaY = startY - mouseY;
if (ctrlDown) {
if (abs(deltaX) >= abs(deltaY)) deltaY = 0;
else deltaX = 0;
}
// Calculate
curScaleX = (float(mouseX - startX)/0.8f) + origScaleX;
curScaleY = (float(startY - mouseY)/0.8f) + origScaleY;
curScaleX = (float(deltaX)/0.8f) + origScaleX;
curScaleY = (float(deltaY)/0.8f) + origScaleY;
if (curScaleX < 0.0f) curScaleX = 0.0f;
if (curScaleY < 0.0f) curScaleY = 0.0f;