Innocent

.github/dependabot.yml

@@ -0,0 +1,7 @@
+
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.gitignore

@@ -1,4 +1,5 @@
 target/
 .mvn
 mvnw*
-docs/.obsidian
+docs/.obsidian
+*.jar

README.md

@@ -1,11 +1,10 @@
-
 <table>
  <tr>
   <td>
    <img src="./src/main/resources/applogo/appicon.png" width="40%" />
   </td>
   <td>
-   <h3>Piccaso Code</h3>
+   <h3>Picasso Code</h3>
    <h6>Creativity + Logic + Math</h6>
    <p>A code based image editor created 100% in java</p>
   </td>
@@ -15,39 +14,97 @@
 [![Java CI with Maven](https://github.com/Glimmr-Lang/PicassoCode/actions/workflows/maven.yml/badge.svg)](https://github.com/Glimmr-Lang/PicassoCode/actions/workflows/maven.yml)
 
 ## About
+<<<<<<< HEAD
+<<<<<<< HEAD
+Picasso code is an image editor that uses code to create/edit an image. This allows powerful designs to be created with ease and
+automation. The editor uses *PiccodeScript* as the scripting language for writing the image editing code. 
+=======
+
+Piccasso code is an image editor that uses code to create/edit an image. This allows powerful designs to be created with ease and
+automation. The editor uses _glimr_ as the scripting language for writing the image editing code.
+>>>>>>> 0064ac3 (fix: corrected a spelling error in the readme file)
+=======
+
 Piccasso code is an image editor that uses code to create/edit an image. This allows powerful designs to be created with ease and
-automation. The editor uses *glimr* as the scripting language for writing the image editing code. 
+automation. The editor uses _glimr_ as the scripting language for writing the image editing code.
+=======
+Picasso code is an image editor that uses code to create/edit an image. This allows powerful designs to be created with ease and
+automation. The editor uses *PiccodeScript* as the scripting language for writing the image editing code. 
+>>>>>>> 455b066 (README: Fixed mistakes in the README)
+>>>>>>> 955b7fb (README: Fixed mistakes in the README)
 
 ## Download
->> Coming soon
+
+> > Coming soon
 
 ## Building
 
 ```sh
-$ git clone git@github.com:hexaredecimal/Piccode.git
-$ cd Piccode
+<<<<<<< HEAD
+<<<<<<< HEAD
+$ git clone https://github.com/Glimmr-Lang/PicassoCode.git
+$ cd PicassoCode
 $ mvn package
 ```
 ### Test your build
 ```sh
 $ java -jar target/Piccode-1.0-SNAPSHOT-jar-with-dependencies.jar
+=======
+git clone git@github.com:hexaredecimal/Piccode.git
+cd Piccode
+mvn package
+>>>>>>> 0064ac3 (fix: corrected a spelling error in the readme file)
+=======
+git clone git@github.com:hexaredecimal/Piccode.git
+cd Piccode
+mvn package
+=======
+$ git clone https://github.com/Glimmr-Lang/PicassoCode.git
+$ cd PicassoCode
+$ mvn package
+```
+### Test your build
+```sh
+$ java -jar target/Piccode-1.0-SNAPSHOT-jar-with-dependencies.jar
+>>>>>>> 455b066 (README: Fixed mistakes in the README)
+>>>>>>> 955b7fb (README: Fixed mistakes in the README)
 ```
 
+### Test your build
+
+```sh
+java -jar target/Piccode-1.0-SNAPSHOT-jar-with-dependencies.jar
+```
 
 ## Inspired by
+<<<<<<< HEAD
+<<<<<<< HEAD
+PicassoCode is heavily inspired by the [OpenSCAD](https://openscad.org/) program and tries to mimic its functionality
+=======
+
+Piccassocode is heavily inspired by the [OpenSCAD](https://openscad.org/) program and tries to mimic its functionality
+>>>>>>> 0064ac3 (fix: corrected a spelling error in the readme file)
+=======
+
 Piccassocode is heavily inspired by the [OpenSCAD](https://openscad.org/) program and tries to mimic its functionality
+=======
+PicassoCode is heavily inspired by the [OpenSCAD](https://openscad.org/) program and tries to mimic its functionality
+>>>>>>> 455b066 (README: Fixed mistakes in the README)
+>>>>>>> 955b7fb (README: Fixed mistakes in the README)
 as much as it can while still being an image editor. I was stoked when I tried OpenSCAD for the first time and ended up
-challenging myself to start a new project based araound the idea. A friend suggested something that has to do with graphics
-and my first though was OpenSCAD, but 2D. The idea quickly grew and the small program became an image editor. 
+challenging myself to start a new project based around the idea. A friend suggested something that has to do with graphics
+and my first though was OpenSCAD, but 2D. The idea quickly grew and the small program became an image editor.
 
 ## References
+
 [java image filters](http://www.jhlabs.com/ip/filters/index.html)
 
 [Icons8 Pack](https://icons8.com/icons/parakeet--style-parakeet)
 
 ## License
+
 ```sh
-drawString("
+Render::drawString("
 +-----------------------------------+
 |  ▄▖▘               ▌              |
 |  ▙▌▌▛▘▀▌▛▘▛▘▛▌▛▘▛▌▛▌█▌            |
@@ -56,7 +113,5 @@ drawString("
 +-----------------------------------+
 ", 0, 0) // Released under the MIT LICENSE
 ```
->> Thank you for viewing. 
-
-
 
+> > Thank you for viewing.

examples/starrect.pics

@@ -0,0 +1,44 @@
+
+IO :: import std.io
+Virtual :: import std.virtual
+Render :: import piccode.render
+Pen :: import piccode.pen
+
+drawStar :: (ctx, padding=0) = 
+  ctx
+   |> Pen::drawLine(50+padding, 50+padding, 150-padding, 150-padding)
+   |> Pen::drawLine(150-padding, 50+padding, 50+padding, 150-padding)
+   |> Pen::drawLine(50+padding, 100, 150-padding, 100)
+   |> Pen::drawLine(100, 50+padding, 100, 150-padding)
+
+drawRect :: (ctx, x, y, w, h) = 
+  ctx
+   |> Pen::drawLine(x, y, x + w, y)
+   |> Pen::drawLine(x, y + h, x + w, y + h)
+   |> Pen::drawLine(x, y, x, y + w)
+   |> Pen::drawLine(x + w, y, x + w, y + h)
+
+drawDepth :: (ctx) = 
+  ctx
+   |> Pen::drawLine(150, 50, 200, 70)
+   |> Pen::drawLine(150, 150, 200, 170)
+   |> Pen::drawLine(50, 150, 100, 170)
+
+drawBackLines :: (ctx) = 
+  ctx
+   |> Pen::drawLine(100, 170, 200, 170)
+   |> Pen::drawLine(200, 70, 200, 170)
+
+main :: () = 
+  let 
+    ctx := Render::getContext()
+  in 
+    ctx 
+     |> drawRect(50, 50, 100, 100)
+     |> drawDepth
+	|> drawBackLines
+	|> drawStar(10)
+
+
+
+

piccode/context/ctx.pics

@@ -0,0 +1,39 @@
+
+// Module: Context
+// Contains functions for creating contexts
+Context :: module {
+
+  // Function: fromRect
+  // Creates a new context based on the one provided
+  //
+  // Parameters:
+  //   ctx - (Reference) The graphic context
+  //   x - (Number) The x position
+  //   y - (Number) The y position
+  //   w - (Number) The width
+  //   h - (Number) The height
+  //
+  // Returns:
+  //   - (Reference) A new graphics sub-context derived from the given context.
+  fromRect :: (ctx, x, y, w, h) = pic_nat_gfx_from_rect(ctx, x, y, w, h)
+
+  // Function: from
+  // Creates a new context based on the one provided
+  //
+  // Parameters:
+  //   ctx - (Reference) The graphic context
+  //
+  // Returns:
+  //   - (Reference)  A new graphics context derived from the given context.
+  from :: (ctx) = pic_nat_gfx_from(ctx)
+
+  // Function: drop
+  // Frees the given context
+  //
+  // Parameters:
+  //   ctx - (Reference) The graphic context
+  //
+  // Returns:
+  //   - (Unit) Nothing
+  drop :: (ctx) = pic_nat_gfx_drop(ctx)
+}

piccode/filters/filter.pics

@@ -0,0 +1,5 @@
+
+Filter :: module {
+  apply :: (filter, image) = pic_nat_filter_apply(filter, image)
+}
+

piccode/filters/metal/brushMetal.pics

@@ -0,0 +1,8 @@
+
+
+BrushMetal :: module {
+  new :: () = pic_nat_brush_metal_new()
+  radius :: (filter, radius) = pic_nat_brush_metal_set_rad(filter, radius)
+  amount :: (filter, radius) = pic_nat_brush_metal_set_amount(filter, radius)
+  shine :: (filter, radius) = pic_nat_brush_metal_set_shine(filter, radius)
+}

piccode/image/image.pics

@@ -0,0 +1,17 @@
+
+Image :: module {
+  new :: (w, h) = pic_nat_image_new(w, h)
+  newWithType :: (w, h, type) = pic_nat_image_new_typed(w, h, type)
+  getContext :: (img) = pic_nat_image_get_context(img)
+  fromPath :: (path) = pic_nat_image_new_from_path(path)
+
+  resize :: (img, w, h) = pic_nat_image_resize(img, w, h)
+
+  Type :: module {
+    RGB      := 1
+    ARGB     := 2
+    ARGB_PRE := 3
+    BGR      := 4
+  }
+}
+

piccode/pen/draw.pics

@@ -0,0 +1,66 @@
+
+Pen :: module {
+
+  // Function: drawLine
+  // Draws a line inside the specified context, based on the provided coordinates
+  //
+  // Parameters:
+  //   ctx - (Reference) The graphic context
+  //   startx - (Number) The start x position
+  //   starty - (Number) The start y position
+  //   endx - (Number) The end x position
+  //   endy - (Number) The end y position
+  //
+  // Returns:
+  //   - (Reference) A modified context with the rendered element. 
+  drawLine :: (ctx, startx, starty, endx, endy) = pic_nat_draw_line(ctx, startx, starty, endx, endy)
+
+  // Function: drawRect
+  // Draws a rect inside the specified context, based on the provided coordinates
+  //
+  // Parameters:
+  //   ctx - (Reference) The graphic context
+  //   x - (Number) The x position
+  //   y - (Number) The y position
+  //   w - (Number) The width
+  //   h - (Number) The height
+  //
+  // Returns:
+  //   - (Reference) A modified context with the rendered element. 
+  drawRect :: (ctx, x, y, w, h) = pic_nat_draw_rect(ctx, x, y, w, h)
+
+  // Function: drawRoundRect
+  // Draws a rounded rectangle inside the specified context, based on the provided coordinates
+  //
+  // Parameters:
+  //   ctx - (Reference) The graphic context
+  //   x - (Number) The x position
+  //   y - (Number) The y position
+  //   w - (Number) The width
+  //   h - (Number) The height
+  //   aw - (Number) The arc width
+  //   ah - (Number) The arc height
+  //
+  // Returns:
+  //   - (Reference) A modified context with the rendered element. 
+  drawRoundRect :: (ctx, x, y, w, h, aw, ah) = pic_nat_draw_round_rect(ctx, x, y, w, h, aw, ah)
+
+  // Function: drawOval
+  // Draws a rect inside the specified context, based on the provided coordinates
+  //
+  // Parameters:
+  //   ctx - (Reference) The graphic context
+  //   x - (Number) The x position
+  //   y - (Number) The y position
+  //   w - (Number) The width
+  //   h - (Number) The height
+  //
+  // Returns:
+  //   - (Reference) A modified context with the rendered element. 
+  drawOval :: (ctx, x, y, w, h) = pic_nat_draw_oval(ctx, x, y, w, h)
+
+  drawImage :: (ctx, image, x, y) = pic_nat_draw_image(ctx, image, x, y)
+
+  drawText :: (ctx, text, x, y) = pic_nat_draw_text(ctx, text, x, y)
+}
+

piccode/render/context.pics

@@ -0,0 +1,16 @@
+
+// Module: Render
+// Functions for working with the editor render context
+Render :: module {
+  // Function: getContext
+  // returns the render context (A handle to the Render window on the screen)
+  //
+  // Parameters:
+  //   None
+  //
+  // Returns:
+  //   - (Reference) a handler to the Graphics2D. 
+  getContext :: () = pic_nat_get_gfx()
+
+}
+