From ee5aee20dcdc1cc4160e602173f1a7908c762492 Mon Sep 17 00:00:00 2001 From: Sven Vogel Date: Tue, 6 Jul 2021 14:40:41 +0200 Subject: [PATCH] Bug fixes II. Ready for presentation --- .../PregeneratedMods/effectors/Transfom.cs | 6 +++--- .../reflection/FieldWidgets.cs | 3 ++- Matrix App/adds/DirectBitmap.cs | 2 +- .../bin/Debug/netcoreapp3.1/Matrix App.dll | Bin 354816 -> 354816 bytes .../bin/Debug/netcoreapp3.1/Matrix App.pdb | Bin 38380 -> 38380 bytes .../obj/Debug/netcoreapp3.1/Matrix App.dll | Bin 354816 -> 354816 bytes .../obj/Debug/netcoreapp3.1/Matrix App.pdb | Bin 38380 -> 38380 bytes 7 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Matrix App/PregeneratedMods/effectors/Transfom.cs b/Matrix App/PregeneratedMods/effectors/Transfom.cs index d61e623..fb6dd6c 100644 --- a/Matrix App/PregeneratedMods/effectors/Transfom.cs +++ b/Matrix App/PregeneratedMods/effectors/Transfom.cs @@ -25,7 +25,7 @@ namespace Matrix_App.PregeneratedMods [UiWidget] [UiDescription(title: "Rotation", description: "Rotate counter-clock-wise, repeating the image where needed (at corners)")] - private float rotation = 0.0f; + private int rotation = 0; [UiWidget] [UiDescription(title: "Skew X", description: "Skew the image on the x-axis")] @@ -41,8 +41,8 @@ namespace Matrix_App.PregeneratedMods protected override void ColorFragment(in int x, in int y, in float u, in float v, in int frame, out float r, out float g, out float b) { - var sint = MathF.Sin(rotation * MathF.PI * 2.0f); - var cost = MathF.Cos(rotation * MathF.PI * 2.0f); + var sint = MathF.Sin(rotation / 180.0f * MathF.PI); + var cost = MathF.Cos(rotation / 180.0f * MathF.PI); var tx = x; var ty = y; diff --git a/Matrix App/PregeneratedMods/reflection/FieldWidgets.cs b/Matrix App/PregeneratedMods/reflection/FieldWidgets.cs index b91428f..e46cc80 100644 --- a/Matrix App/PregeneratedMods/reflection/FieldWidgets.cs +++ b/Matrix App/PregeneratedMods/reflection/FieldWidgets.cs @@ -57,7 +57,8 @@ namespace Matrix_App.PregeneratedMods.reflection Width = 360, Dock = DockStyle.Fill, Anchor = AnchorStyles.Top | AnchorStyles.Right, - Value = value + Value = value, + Maximum = 1000 }; upDown.ValueChanged += (a, b) => { diff --git a/Matrix App/adds/DirectBitmap.cs b/Matrix App/adds/DirectBitmap.cs index fb821df..0069b62 100644 --- a/Matrix App/adds/DirectBitmap.cs +++ b/Matrix App/adds/DirectBitmap.cs @@ -23,7 +23,7 @@ namespace Matrix_App Height = height; Bits = new Int32[width * height]; BitsHandle = GCHandle.Alloc(Bits, GCHandleType.Pinned); - Bitmap = new Bitmap(width, height, width * 4, PixelFormat.Format32bppPArgb, BitsHandle.AddrOfPinnedObject()); + Bitmap = new Bitmap(width, height, width * 4, PixelFormat.Format32bppRgb, BitsHandle.AddrOfPinnedObject()); } public void SetPixel(int x, int y, Color colour) diff --git a/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.dll b/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.dll index 84515e2b7ed69dac1140900b635855299e33490c..6c13984dd9c6fc89a079041138f93fde237c5b69 100644 GIT binary patch delta 1046 zcmZXTZAepL6vxlG+nq0Yn>sahf=*o)Q?l^GY$=*AI8YNRviVI5EVEa7(b8>fsOSXO z(wS)`x-xuOvJZ>;V1^Nh8kIvNNTD~Q4-o}LW%k@>w>Ig*f%`lEbN=T(_ugZek2K6j zcC?63zsogREpb?Hy>kFJ+YnP&aSaRm>+jLAGt3`Gw9Ru-UsV{2&3;gkt0B7ifi#O}mz*Znp_ z7{<6XeR8Q@GDsR>3Z6$Pxf%?l)D*pxEP+~-Q?f#wDwe55r9jscw9Ii-3v?stGItVh zQksJ9G=@8e?;SqRM*Kj@>uJExg2q=GFjarcSK5Novl+ee!T*D1RdY{bzazi|M8yy%)$$KUT zY6Rln()fts7-+_;w#KS2Ta@W?ROUX12R zPyNeEV1j&4;+LDoE9KWzqo3EBwJW-xSwpKgtQo7@yIhjEm= z=bOW1N+viA%{Yg$QNHr8Cbub^1^YAoavscGN5zy(FiGZk@T#A-fc=72gdS!AU-@Z^ zxZ--?)K-QT76euFF_U`?+24*XJ#|DkM}#8@hJ=WO*c}nhF7MplzqN7|u%wLq?7)Ay zaIh&CA$WD5C(uAzISjh6` zE9MTZPWrv=@p4aRsj#@j3##q$rK}uvZcQmWf$oiE?2k>%rCsi@YW5Ra(*ynhIz|$} delta 1017 zcmZ9LeMl2=7{{OIw%g3S<}_b3aK7MTiYAJiX)Rl##8N_uga{H}N{#-g=tbLxreh{_ zT{$VUKv$M8!|sn21ZoI@n4#Pd>5n9l0yFzNg!Y_o$0exK+2eZJ4VaCRZaF2vk( zD!sLN@7cRaSkJyZjZqw82L0_MmO6bE~-B`9xRYad{1L&3UPYzs6@RmZWv^| zcts)>CSoTT9)G+NGkd|vOfx<_GP1ov2XC-?1h{Ww$24dEbyYBlb)0Fu&2~McH;eWi zvwlxTCfB@r9Hme#4B$FR}u?JAhZNQv5^4!Uq2|LoAzT)y{s zb^2J)@5ihiWR$2KrpX>Z-U-o`ut(O)&`&MlY>2ju0{_Wdem*jHOYt*0{8?G|jp9ke zMqGZEJ_<=uq!gr-K7ACuQW%qUpg;h$R#N0f#4l%QqQT8htb#h#Ho2+zdWVX9? zpuyoPeYaTubtFD%!`*D9ALYv3`YpLDW}UbxXo@zep~S`qZwuw0QhdfL@tn-+VzJa$ cagv@y&Ww9~dn)PQaa3cGPuoauBAcWB3yFaar2qf` diff --git a/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.pdb b/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.pdb index 9716389d0ac5043f514f13316fee2efd6e7aa0c8..936ff43fd53a3f34e39400820e8a4dee29375df1 100644 GIT binary patch delta 342 zcmaE}n(57IrU^A7%~c{j`lz9W&~W z;J6^^pH-)^Q_|x29L~A%ENO-J1P#*-B$YO6=|!+8?0sN5^;b=4aN@mAdyc79`pq*F ze)+ED-oMuOedU74pBFYSG74i-cz5-nx4VO$=3K$h2UX6thhwMpO;S@z)p%XlkR*EG zbjfB3(+N6^*_&4;E;8UW*5Q?8FlJ(q+#E8=mWhL%MMA)tg+*ZU%qez^m6LBwd8+Ry fX~4k4#2~=H$W$o+bh%c5q&A9xeyXGqTz~-pHkw|z delta 342 zcmaE}n(57IrU^A7`qOLXr8joD?YWfpXtjjQTU|}_D;p;)kzuUaY$_Yi7@Nt&z#z|P z$6(FK!oa}Dz)-{h;oG3`ZGrqEpnMWk-VTj#59D6~%C|w~9YFleALS(Z6}o1=w2#e9 zuhq2u9VoOWu(kCngE*J|@7GKVaum-8IQwqa(u-hGxSQsB_rBLJ%Y$Iy{ z{Z_SE!gPWTWA5gaiHi(44Rv@W7z~*hBsPakvSs36W04RrW?|u*JadX2W5whfQ=aNO gNE$HkFfj-)FfvsN09~%-FR6_ppr0aX1Q%cc0GAMB*Z=?k diff --git a/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.dll b/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.dll index 84515e2b7ed69dac1140900b635855299e33490c..6c13984dd9c6fc89a079041138f93fde237c5b69 100644 GIT binary patch delta 1046 zcmZXTZAepL6vxlG+nq0Yn>sahf=*o)Q?l^GY$=*AI8YNRviVI5EVEa7(b8>fsOSXO z(wS)`x-xuOvJZ>;V1^Nh8kIvNNTD~Q4-o}LW%k@>w>Ig*f%`lEbN=T(_ugZek2K6j zcC?63zsogREpb?Hy>kFJ+YnP&aSaRm>+jLAGt3`Gw9Ru-UsV{2&3;gkt0B7ifi#O}mz*Znp_ z7{<6XeR8Q@GDsR>3Z6$Pxf%?l)D*pxEP+~-Q?f#wDwe55r9jscw9Ii-3v?stGItVh zQksJ9G=@8e?;SqRM*Kj@>uJExg2q=GFjarcSK5Novl+ee!T*D1RdY{bzazi|M8yy%)$$KUT zY6Rln()fts7-+_;w#KS2Ta@W?ROUX12R zPyNeEV1j&4;+LDoE9KWzqo3EBwJW-xSwpKgtQo7@yIhjEm= z=bOW1N+viA%{Yg$QNHr8Cbub^1^YAoavscGN5zy(FiGZk@T#A-fc=72gdS!AU-@Z^ zxZ--?)K-QT76euFF_U`?+24*XJ#|DkM}#8@hJ=WO*c}nhF7MplzqN7|u%wLq?7)Ay zaIh&CA$WD5C(uAzISjh6` zE9MTZPWrv=@p4aRsj#@j3##q$rK}uvZcQmWf$oiE?2k>%rCsi@YW5Ra(*ynhIz|$} delta 1017 zcmZ9LeMl2=7{{OIw%g3S<}_b3aK7MTiYAJiX)Rl##8N_uga{H}N{#-g=tbLxreh{_ zT{$VUKv$M8!|sn21ZoI@n4#Pd>5n9l0yFzNg!Y_o$0exK+2eZJ4VaCRZaF2vk( zD!sLN@7cRaSkJyZjZqw82L0_MmO6bE~-B`9xRYad{1L&3UPYzs6@RmZWv^| zcts)>CSoTT9)G+NGkd|vOfx<_GP1ov2XC-?1h{Ww$24dEbyYBlb)0Fu&2~McH;eWi zvwlxTCfB@r9Hme#4B$FR}u?JAhZNQv5^4!Uq2|LoAzT)y{s zb^2J)@5ihiWR$2KrpX>Z-U-o`ut(O)&`&MlY>2ju0{_Wdem*jHOYt*0{8?G|jp9ke zMqGZEJ_<=uq!gr-K7ACuQW%qUpg;h$R#N0f#4l%QqQT8htb#h#Ho2+zdWVX9? zpuyoPeYaTubtFD%!`*D9ALYv3`YpLDW}UbxXo@zep~S`qZwuw0QhdfL@tn-+VzJa$ cagv@y&Ww9~dn)PQaa3cGPuoauBAcWB3yFaar2qf` diff --git a/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.pdb b/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.pdb index 9716389d0ac5043f514f13316fee2efd6e7aa0c8..936ff43fd53a3f34e39400820e8a4dee29375df1 100644 GIT binary patch delta 342 zcmaE}n(57IrU^A7%~c{j`lz9W&~W z;J6^^pH-)^Q_|x29L~A%ENO-J1P#*-B$YO6=|!+8?0sN5^;b=4aN@mAdyc79`pq*F ze)+ED-oMuOedU74pBFYSG74i-cz5-nx4VO$=3K$h2UX6thhwMpO;S@z)p%XlkR*EG zbjfB3(+N6^*_&4;E;8UW*5Q?8FlJ(q+#E8=mWhL%MMA)tg+*ZU%qez^m6LBwd8+Ry fX~4k4#2~=H$W$o+bh%c5q&A9xeyXGqTz~-pHkw|z delta 342 zcmaE}n(57IrU^A7`qOLXr8joD?YWfpXtjjQTU|}_D;p;)kzuUaY$_Yi7@Nt&z#z|P z$6(FK!oa}Dz)-{h;oG3`ZGrqEpnMWk-VTj#59D6~%C|w~9YFleALS(Z6}o1=w2#e9 zuhq2u9VoOWu(kCngE*J|@7GKVaum-8IQwqa(u-hGxSQsB_rBLJ%Y$Iy{ z{Z_SE!gPWTWA5gaiHi(44Rv@W7z~*hBsPakvSs36W04RrW?|u*JadX2W5whfQ=aNO gNE$HkFfj-)FfvsN09~%-FR6_ppr0aX1Q%cc0GAMB*Z=?k