Commit Graph

1144 Commits (4e9a2a5ef0e8eb1fb93767853dcf75f4e78f0f13)

Author SHA1 Message Date
hithereai d3e9e336ea CLEAN 2023-03-02 22:40:25 +02:00
hithereai 9d71f25f51 more cleaning 2023-03-02 22:35:09 +02:00
hithereai d1982f4e72 more cleaning 2023-03-02 22:32:47 +02:00
hithereai 69dceb10b9 remove @param from old vanilla notebook 2023-03-02 22:29:18 +02:00
hithereai 12bef7ce26 remove stupid old OS check 2023-03-02 22:13:36 +02:00
hithereai ce414e8dac Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408 2023-03-02 18:14:17 +02:00
hithereai 96a055f7b0 Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs 2023-03-02 18:07:52 +02:00
hithereai 03fc980a9c Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408 2023-03-02 17:37:30 +02:00
hithereai b58babd1ab
fix small UI typo: interoplation --> interpolation 2023-03-02 17:35:20 +02:00
hithereai a31a7754d1 Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs 2023-03-02 01:40:55 +02:00
hithereai e8cfb5039f Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408 2023-03-02 01:39:56 +02:00
hithereai a8c39266d6 Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/410 2023-03-02 01:37:51 +02:00
hithereai 19f0878d27 add transform_ prefix to the 2 new 2d-"center" params 2023-03-02 01:25:22 +02:00
Matisse 19a92fa6e2 adding back midas changes 2023-03-01 14:55:37 -08:00
Matisse 23c0863ddf attempt 2
added s & max_f. Variable schedule planner, and prompt printout uses numbers instead of variables t/60 = .6 (at t=6)
2023-03-01 14:49:05 -08:00
kabachuha 51cf6b5250
Merge pull request #405 from reallybigname/automatic1111-webui
Added aspect_ratio schedule/series
2023-03-02 00:40:22 +03:00
kabachuha 2c09c81c10
Merge pull request #404 from hithereai/off_axis_rotation_v1
Keyframable rotation axis center X/Y for 2D mode
2023-03-02 00:07:39 +03:00
rewbs 0384fa29f6 Merge branch 'automatic1111-webui' into parseq-optional-prompts 2023-03-02 06:38:48 +11:00
rewbs ebcb75a0a7 Fix 'UnboundLocalError: local variable 'parseqName' referenced before assignment'. Allow Parseq to delegate prompt management back to Deforum. Summary table in console showing who's doing what between Deforum & Parseq. Initial unit test. 2023-03-02 06:36:33 +11:00
hithereai 1a8e18e92f Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/405 2023-03-01 19:00:46 +02:00
hithereai e677470fa1 typo fix 2023-03-01 18:53:56 +02:00
hithereai d2ec5cbf2a Merge remote-tracking branch 'upstream/automatic1111-webui' into off_axis_rotation_v1 2023-03-01 18:52:11 +02:00
hithereai ab461f3e53 Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos 2023-03-01 18:49:27 +02:00
hithereai 4c9b8b1dca Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs 2023-03-01 18:49:16 +02:00
hithereai 83e9be7a77 Revert "Merge pull request #358 from MatissesProjects/automatic1111-webui"
This reverts commit ff7201b5a5, reversing
changes made to 6215a44d79.
2023-03-01 18:45:12 +02:00
hithereai eca026fefb print aspect ratio in cli's table if it's not static 1 for the whole animation 2023-03-01 18:12:15 +02:00
hithereai d36cef0baa row variant compact for all depth rows (tiny ui change) 2023-03-01 17:52:22 +02:00
reallybigname 5c7808d3ea Added aspect_ratio schedule/series
Added control for 3D depth aspect ratio on a schedule. Now, if you want to recreate the horrible depth aspect ratio stretching deforum used to have, YOU CAN! Or, make it opposite, or make it change, or whatever.
2023-02-28 15:52:05 -08:00
hithereai 58849a67ba change param name and add hints 2023-03-01 01:49:32 +02:00
hithereai dbfd0524dc better order in UI 2023-03-01 00:44:24 +02:00
hithereai 287eada68d working 2023-03-01 00:25:04 +02:00
hithereai 375d6d6b66 Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos 2023-02-28 22:30:22 +02:00
hithereai f297d86a82 Merge remote-tracking branch 'upstream/automatic1111-webui' into hide_guided_imgs 2023-02-28 22:30:11 +02:00
hithereai 09bda85060 done 2023-02-28 22:15:10 +02:00
George Nance 5576a20bf6
Updated Parseq section location in info accord 2023-02-28 12:58:28 -07:00
hithereai cdaf2eefbf align center of cli msg below interp buttons 2023-02-28 21:03:29 +02:00
hithereai d85020a576 better explaining text about the change 2023-02-28 20:57:34 +02:00
hithereai 7f8ed43b77 ignore slow_mo in interp-pics mode logic change 2023-02-28 20:55:53 +02:00
hithereai 25b329f25c better 2023-02-28 02:46:22 +02:00
hithereai 563a02cc06 Update args.py 2023-02-28 02:01:43 +02:00
hithereai 59b9b1cb92 clarify text 2023-02-28 02:01:04 +02:00
hithereai ac893c3420 order and clean 2023-02-28 01:50:39 +02:00
hithereai d3607cd54a clean 2023-02-28 01:41:04 +02:00
hithereai 98f2289c9a fixes 2023-02-28 01:32:48 +02:00
hithereai edbeb6e626 fixes 2023-02-28 01:22:38 +02:00
hithereai 1929c06144 p 2023-02-28 01:16:44 +02:00
hithereai a35e4da802 progress 2023-02-28 00:00:15 +02:00
hithereai 8e2dcbc83c working but not final 2023-02-27 21:53:13 +02:00
hithereai e6ba634b6b progress 2023-02-27 21:26:06 +02:00
hithereai 8fc258c1ff Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos 2023-02-27 20:25:06 +02:00
kabachuha 285a98f375 fix missed midas_weight in depth predict calls 2023-02-27 12:11:44 +03:00
kabachuha 74fc34e37e Revert "Revert "Merge pull request #339 from deforum-art/bad_apple!!""
This reverts commit 483a973e0a.
2023-02-27 11:56:23 +03:00
reallybigname ad9cf71cd0 Merge branch 'automatic1111-webui' of https://github.com/reallybigname/deforum-for-automatic1111-webui into automatic1111-webui 2023-02-26 19:42:55 -08:00
reallybigname 882b917a9a Fixed issue where depth only worked properly at 1:1 aspect ratio
This has been an issue with Deforum as far back as I can remember... If the proportion was too wide, things would stretch unnaturally vertically, and if proportion was too thin, things would stretch horizontally.

I found that changing the aspect ratio in this function to 1, things are always correct, no matter the proportion of the image!

This is a major change to Deforum, but in all of my tests the results are much more consistent and reliable. I've tested extremes, like 3:1, 1:3, 4:1, 1:4, and everything seems even now. Tested different depth setings and FOV, and it all seems right to me now.
2023-02-26 19:42:48 -08:00
hithereai 28468ea9ab Update args.py 2023-02-27 01:30:45 +02:00
hithereai 99b9a9a458 typo 2023-02-27 01:30:06 +02:00
hithereai ce62fecb27 verify uploaded pics are of the same resolution 2023-02-27 01:29:26 +02:00
hithereai f8d22dc2ac progress 2023-02-27 01:23:15 +02:00
hithereai c96e739d17 Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos 2023-02-27 01:05:58 +02:00
hithereai 483a973e0a Revert "Merge pull request #339 from deforum-art/bad_apple!!"
This reverts commit 6215a44d79, reversing
changes made to 27b508bd42.
2023-02-27 00:58:47 +02:00
hithereai 731a6c0151 Merge remote-tracking branch 'upstream/automatic1111-webui' into film_upload_single_photos 2023-02-26 19:05:47 +02:00
kabachuha cf0872ecae Merge branch 'automatic1111-webui' of https://github.com/MatissesProjects/deforum-extensions into pr/358 2023-02-26 18:16:05 +03:00
kabachuha 1b7a78af1d Merge branch 'automatic1111-webui' into pr/358 2023-02-26 18:15:53 +03:00
kabachuha ae50470067 fixup reference in None mode 2023-02-26 17:39:13 +03:00
kabachuha 2453c46142 don't load models on None mode 2023-02-26 15:59:06 +03:00
kabachuha c56d2f5b86 add 'None' mode to just threshold grayscale 2023-02-26 15:07:24 +03:00
kabachuha 513d6b7b65 Merge branch 'automatic1111-webui' into bad_apple!! 2023-02-26 13:57:45 +03:00
kabachuha e49c00343d Revert "args for depth norm control"
This reverts commit 5ad939713b.
2023-02-26 13:56:11 +03:00
Matisse 6297e84a98 small cleanup, seems easier to understand 2023-02-25 17:45:59 -08:00
Matisse 12d01950d8 adding max_f into prompt setup 2023-02-25 17:24:54 -08:00
Matisse f542990140 left and right side can use max_f 2023-02-25 16:47:52 -08:00
Matisse bca9cb0cd5 fix ) not showing up on where
this is due to it being not appended previously, now we can!
2023-02-25 16:34:05 -08:00
Matisse 1943459b99
Merge branch 'deforum-art:automatic1111-webui' into automatic1111-webui 2023-02-25 15:30:29 -08:00
hithereai 234fcfbfc9 Update args.py 2023-02-25 18:55:15 +02:00
hithereai dcb04eca0e Update args.py 2023-02-25 18:53:46 +02:00
hithereai 6bdd2063e5 Update args.py 2023-02-25 18:52:36 +02:00
hithereai b97b144d85 Update args.py 2023-02-25 18:35:58 +02:00
hithereai 2fe0bdee47 cleaning and new box for uploading pics 2023-02-25 17:49:56 +02:00
reallybigname 07be6b01ed Fixed issue that prevented resume when using video mask
- unsharp_mask function was calling args.mask_image when mask_image is a local var at that point
- then, I realized that the routine shouldn't even be called if the amount is 0, so I added an if amount > 0 statement.
2023-02-24 14:02:09 -08:00
kabachuha f6c581e8c0 fix video mask loading
works with totally blank mask frames too

closes #89 and closes #281
2023-02-24 14:54:11 +03:00
kabachuha 12c5c8b2ce add missed controlnet_args to video mask 2023-02-24 14:29:04 +03:00
hithereai 43b1e863be Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358 2023-02-23 23:11:21 +02:00
hithereai e364270bba clean 2023-02-23 23:04:03 +02:00
hithereai a9888879fe shorter code same logic 2023-02-23 23:03:49 +02:00
hithereai 88e2a3e855 fix ui auto-update of fps in upload fps 2023-02-23 23:01:01 +02:00
kabachuha aa7ce2baff
Merge pull request #364 from hithereai/FILM_interp
FILM Interpolation - straight after deforum run, or upload video
2023-02-23 22:59:13 +03:00
madmodder123 b74c4d5d65
Add timestring to output info
Makes it easier to grab for when you wanna enable "Resume from Timestring"
2023-02-22 17:52:32 -08:00
hithereai ad3f1e521f Merge remote-tracking branch 'upstream/automatic1111-webui' into FILM_interp 2023-02-22 21:50:31 +02:00
hithereai b925cf9a50 fix interpolation mode not running at all 2023-02-22 21:47:59 +02:00
hithereai ad9be327c6 auto-keep interp frames if calculated out vid fps > 450 2023-02-21 01:38:31 +02:00
hithereai 55d8497af8 clean 2023-02-21 01:08:24 +02:00
hithereai 4f270f9c75 clean 2023-02-21 01:01:02 +02:00
hithereai 1fd38b17b8 cleean 2023-02-21 00:52:10 +02:00
hithereai cd1cdadd3e interp x min to 2 from 1 2023-02-21 00:49:48 +02:00
hithereai 106cd0c33a clean 2023-02-21 00:45:29 +02:00
hithereai 36a1805498 getting close 2023-02-21 00:34:38 +02:00
hithereai 6a669d0a0a Update frame_interpolation.py 2023-02-21 00:24:01 +02:00
hithereai 523b70044c fixes 2023-02-21 00:13:49 +02:00
hithereai 61d88160b3 cadence minimum to 1 from 2 (wtf?!) 2023-02-20 23:55:55 +02:00
hithereai a790dd3623 fixes 2023-02-20 23:34:21 +02:00