Skip to content

Commit 5c4b6a6

Browse files
Hri7566Hri7566
committed
Final
1 parent 46b0af4 commit 5c4b6a6

File tree

11 files changed

+101
-54
lines changed

11 files changed

+101
-54
lines changed

‎BadPaint/BadPaint.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,9 @@
8181
<ItemGroup>
8282
<None Include="App.config" />
8383
</ItemGroup>
84-
<ItemGroup>
85-
<None Include="Resources\dirt01.jpg" />
86-
</ItemGroup>
8784
<ItemGroup>
8885
<None Include="Resources\carpet.jpg" />
8986
</ItemGroup>
90-
<ItemGroup>
91-
<None Include="Resources\FillTool_204_32.bmp" />
92-
</ItemGroup>
9387
<ItemGroup>
9488
<None Include="Resources\Fill.png" />
9589
</ItemGroup>
@@ -102,5 +96,11 @@
10296
<ItemGroup>
10397
<None Include="Resources\Open_6529.png" />
10498
</ItemGroup>
99+
<ItemGroup>
100+
<None Include="Resources\arcade_carpet_1_512.png" />
101+
</ItemGroup>
102+
<ItemGroup>
103+
<None Include="Resources\carpet_2_256.png" />
104+
</ItemGroup>
105105
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106106
</Project>

‎BadPaint/Properties/Resources.Designer.cs‎

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BadPaint/Properties/Resources.resx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,22 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="Open_6529" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Resources\Open_6529.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
124+
<data name="arcade_carpet_1_512" type="System.Resources.ResXFileRef, System.Windows.Forms">
125+
<value>..\Resources\arcade_carpet_1_512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126+
</data>
121127
<data name="Save_6530" type="System.Resources.ResXFileRef, System.Windows.Forms">
122128
<value>..\Resources\Save_6530.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123129
</data>
124-
<data name="FillTool_204_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>..\Resources\FillTool_204_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126-
</data>
127130
<data name="carpet" type="System.Resources.ResXFileRef, System.Windows.Forms">
128131
<value>..\Resources\carpet.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
129132
</data>
130133
<data name="Fill" type="System.Resources.ResXFileRef, System.Windows.Forms">
131134
<value>..\Resources\Fill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
132135
</data>
133-
<data name="Open_6529" type="System.Resources.ResXFileRef, System.Windows.Forms">
134-
<value>..\Resources\Open_6529.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
136+
<data name="carpet_2_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
137+
<value>..\Resources\carpet_2_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
135138
</data>
136139
</root>

‎BadPaint/Resources/FillTool_204_32.bmp‎

-1.05 KB
Binary file not shown.

‎BadPaint/Resources/arcade_carpet_1_512.png‎

89.5 KB
Loading

‎BadPaint/Resources/carpet_2_256.png‎

12.1 KB
Loading

‎BadPaint/Resources/dirt01.jpg‎

-261 KB
Binary file not shown.

‎BadPaint/frmBadPaint.Designer.cs‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BadPaint/frmBadPaint.cs‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
using System;
22
using System.Collections.Generic;
33
using System.ComponentModel;
4-
using System.Data;
54
using System.Drawing;
6-
using System.Linq;
7-
using System.Text;
8-
using System.Threading.Tasks;
95
using System.Windows.Forms;
106
using System.Drawing.Imaging;
11-
using System.Drawing.Drawing2D;
127

138
namespace BadPaint
149
{
@@ -21,8 +16,8 @@ public partial class frmBadPaint : Form
2116
public Pen currentPen;
2217

2318
public int cursorX, cursorY = -1;
24-
public bool mouseHeld = false;
25-
public int lineWidth = 7;
19+
public bool drawing = false;
20+
public int lineWidth = 5;
2621

2722
public List<List<Color>> palettes;
2823
public List<PictureBox> paletteBoxes;
@@ -33,6 +28,9 @@ public frmBadPaint()
3328
{
3429
InitializeComponent();
3530

31+
// Set line width component value
32+
nudLineWidth.Value = lineWidth;
33+
3634
// Setup image buffer
3735
imageBuffer = new Bitmap(pnlCanvas.Width, pnlCanvas.Height);
3836

@@ -74,11 +72,19 @@ public frmBadPaint()
7472
// Setup palettes
7573
palettes = new List<List<Color>>();
7674
addPalettes();
75+
76+
// Count colors (debug)
77+
int count = 0;
78+
foreach (List<Color> pal in palettes)
79+
{
80+
count += pal.Count;
81+
}
82+
Console.WriteLine(count);
7783
}
7884

7985
private void pnlCanvas_MouseDown(object sender, MouseEventArgs e)
8086
{
81-
mouseHeld = true;
87+
drawing = true;
8288

8389
if (e.Button == MouseButtons.Right)
8490
{
@@ -97,14 +103,14 @@ private void pnlCanvas_MouseDown(object sender, MouseEventArgs e)
97103

98104
private void pnlCanvas_MouseUp(object sender, MouseEventArgs e)
99105
{
100-
mouseHeld = false;
101-
cursorX = -1;
102-
cursorY = -1;
106+
drawing = false;
107+
cursorX = 0;
108+
cursorY = 0;
103109
}
104110

105111
private void pnlCanvas_MouseMove(object sender, MouseEventArgs e)
106112
{
107-
if (cursorX != -1 && cursorY != -1 && mouseHeld)
113+
if (cursorX != 0 && cursorY != 0 && drawing)
108114
{
109115
// Draw line
110116
graphics.DrawLine(currentPen, new Point(cursorX, cursorY), e.Location);
@@ -286,8 +292,17 @@ private void boxOpen_Click(object sender, EventArgs e)
286292
}
287293
}
288294

295+
private void pnlConfig_Paint(object sender, PaintEventArgs e)
296+
{
297+
298+
}
299+
289300
public void addPalettes()
290301
{
302+
// Generate palette information
303+
// Web color list from Wikipedia
304+
// https://en.wikipedia.org/wiki/Web_colors
305+
291306
// HTML
292307
palettes.Add(new List<Color> { Color.White, Color.Silver, Color.Gray, Color.Black, Color.Red, Color.Maroon, Color.Yellow, Color.Olive, Color.Lime, Color.Green, Color.Aqua, Color.Teal, Color.Blue, Color.Navy, Color.Fuchsia, Color.Purple });
293308

‎BadPaint/frmBadPaint.resx‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<data name="boxFill.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
131131
<value>
132132
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
133-
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA6/AAAOvwE4BVMkAAABt0lE
133+
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA68AAAOvAGVvHJJAAABt0lE
134134
QVQ4T7WQTStEURjHzyApK6UG4955i8X1UiYLG02x9FIW1jIfwMvInQXJNyAsRJkZOxs7GwnNpEkyxdjQ
135135
bJSXsbCRRlH4netoxqVseOrf85xznt//nPOIPw2n01np8XgWvV7vDfmOvOl2uzvU8e8BMI82NE2rw6Cf
136136
Oo9eqU/QDGYVqvXnkLfqul6LAoD3rKepfdR9aIt1xufz6ar9e9D0SEMXjTn0ImFlaIm9OXRuGEa5Qr4G
@@ -139,28 +139,6 @@
139139
UnXtnVpJeDkMfI0uLINI9BLTIYVbBhmae+1wsYCOMDi1DCbJcv0ZGIyibTnln2DOhhwTq3mgpHoBOZpX
140140
uBDBYLCMpiRDnLebSBjlSkcWD/l3llckMMhikFD4RwDX0HjC8HYAe8mNaFzCrAPW0CQkb5Z5ak1TaCEw
141141
qQAw0RnwE0ox3BZ1/B8hxDtffKitU71fhAAAAABJRU5ErkJggg==
142-
</value>
143-
</data>
144-
<data name="boxFill.InitialImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
145-
<value>
146-
Qk02BAAAAAAAADYAAAAoAAAAEAAAABAAAAABACAAAAAAAAAAAADEDgAAxA4AAAAAAAAAAAAAAAAAAAAA
147-
AAAAAAAAAAAAAAAAAAD29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
148-
AAAAAAAAAAAAAPb29v/29vb/ycnJ/2RkZP9CQkL/QkJC/7Ozs//29vb/9vb2//b29v/29vb/9vb2/wAA
149-
AAAAAAAAAAAAAPb29v/29vb/kZGR/0JCQv9CQkL/QkJC/0JCQv9CQkL/s7Oz//b29v/29vb/nJyc//b2
150-
9v8AAAAAAAAAAAAAAAD29vb/kZGR/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv+zs7P/9vb2/0JC
151-
Qv/29vb/AAAAAAAAAAD29vb/ycnJ/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/7Oz
152-
s/9CQkL/9vb2/wAAAAAAAAAA9vb2/2RkZP9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC
153-
Qv9CQkL/QkJC//b29v8AAAAA7+/vEPb29v9CQkL/hoaG/8nJyf+Ghob/QkJC/0JCQv9CQkL/QkJC/0JC
154-
Qv9CQkL/QkJC/0JCQv/29vb/AAAAAO/v7xD29vb/QkJC/+Dg4P9CQkL/4ODg/0JCQv9CQkL/QkJC/4SD
155-
g/+amZn/QkJC/0JCQv9CQkL/9vb2/wAAAAAAAAAA9vb2/7Ozs//29vb/QkJC//b29v9CQkL/QkJC/4SD
156-
g//x7/D/WFhY/0JCQv9CQkL/ZGRk//b29v8AAAAAAAAAAPb29v/29vb/9vb2/0JCQv/29vb/QkJC/1hY
157-
WP/m5OX/8e/w/4+Ojv+Pjo7/r66v/8nJyf/29vb/AAAAAAAAAAAAAAAA9vb2//b29v9CQkL/9vb2/0JC
158-
Qv+ko6T/8e/w//Hv8P/x7/D/0M/P/5ycnP/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/QkJC//b2
159-
9v9CQkL/xcTF//Hv8P/x7/D/urm6/5ycnP/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2/0JC
160-
Qv++vr7/s7Oz/3l4eP+amZn/hYSE/8nJyf/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb2
161-
9v9vb2//ZGRk/76+vv/Jycn/ycnJ/9TU1P/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
162-
AAD29vb/6+vr/29vb/9CQkL/QkJC/29vb//r6+v/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
163-
AAAAAAAAAAAAAPb29v/29vb/9vb2//b29v/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
164142
</value>
165143
</data>
166144
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

0 commit comments

Comments
 (0)