Merge pull request #12 from heckj/main

prep work for more commits

Author: tayloraswift

.github/workflows/build.yml

@@ -1,55 +1,31 @@
-
 name: build
 
 on:
     push:
-        branches: [ master ]
+        branches: [ main ]
     pull_request:
-        branches: [ master ]
+        branches: [ main ]
 
 jobs:
     build-macos:
-        runs-on: ${{ matrix.os }}
-        strategy:
-            matrix:
-                os: [macos-12, macos-11]
+        runs-on: macos-14
         steps:
-            -   uses: actions/checkout@v2
-            -   name: build 
-                run: |
-                    swift --version
-                    swift build
+          - uses: actions/checkout@v3
+          - uses: SwiftyLab/setup-swift@latest
+            with:
+              swift-version: "5.10.0"
+          - name: build
+            run: |
+              swift --version
+              swift build
     build-linux:
-        runs-on: ${{ matrix.os }}
-        strategy:
-            matrix:
-                os: [ubuntu-20.04, ubuntu-18.04]
-                swift: [5.6.2, 5.5.3]
+        runs-on: ubuntu-22.04
         steps:
-            -   uses: actions/checkout@v2
-            
-            -   name: cache swift toolchains
-                uses: actions/cache@v2
-                with:
-                    path: swift-${{ matrix.swift }}.tar.gz
-                    key: ${{ matrix.os }}:swift:${{ matrix.swift }}
-                    
-            -   name: cache status
-                id:   cache_status
-                uses: andstor/file-existence-action@v1
-                with:
-                    files: swift-${{ matrix.swift }}.tar.gz
-            
-            -   name: download swift toolchain 
-                if: steps.cache_status.outputs.files_exists == 'false'
-                run: curl https://download.swift.org/swift-${{ matrix.swift }}-release/$(echo ${{ matrix.os }} | sed 's/[^a-zA-Z0-9]//g')/swift-${{ matrix.swift }}-RELEASE/swift-${{ matrix.swift }}-RELEASE-$(echo ${{ matrix.os }} | sed 's/[^a-zA-Z0-9\.]//g').tar.gz --output swift-${{ matrix.swift }}.tar.gz
-            
-            -   name: set up swift
-                run: |
-                    mkdir -p $GITHUB_WORKSPACE/swift-${{ matrix.swift }}
-                    tar -xzf swift-${{ matrix.swift }}.tar.gz -C $GITHUB_WORKSPACE/swift-${{ matrix.swift }} --strip 1
-                    echo "$GITHUB_WORKSPACE/swift-${{ matrix.swift }}/usr/bin" >> $GITHUB_PATH
-            -   name: build 
-                run: |
-                    swift --version
-                    swift build
+            - uses: actions/checkout@v3
+            - uses: SwiftyLab/setup-swift@latest
+              with:
+                swift-version: "5.10.0"
+            - name: build
+              run: |
+                swift --version
+                swift build

.gitignore

@@ -1,3 +1,4 @@
 /.build
 /.vscode
 /Packages
+.swiftpm

.mailmap

@@ -0,0 +1,3 @@
+Dianna <kelvin13ma@gmail.com>
+Dianna <mdianna1989@gmail.com>
+Joseph Heck <heckj@mac.com>

NOTICE

@@ -1,12 +1,13 @@
-the `swift-noise` package was created by kelvin ma (@taylorswift). 
+the `swift-noise` package was created by Dianna (@taylorswift).
 
 you are welcome to contribute to this project at: 
 
-    https://github.com/kelvin13/swift-noise
+    https://github.com/tayloraswift/swift-noise
 
 we do not maintain any other mirrors of this repository, and such 
 forks of this repository may not carry the most up-to-date code.
 
 contributors: 
 
-1.  kelvin ma (@taylorswift, 2017–22)
+1.  Dianna (@taylorswift, 2017–22)
+2.  Joseph Heck (@heckj)

Package.resolved

@@ -1,28 +1,34 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.8
 
 import PackageDescription
 
 let package = Package(
     name: "swift-noise",
+    platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
     products: 
     [
         .library(name: "Noise", targets: ["Noise"]),
         .executable(name: "noise-tests", targets: ["NoiseTests"])
     ],
     dependencies: 
     [
-        .package(url: "https://github.com/kelvin13/swift-png", .upToNextMinor(from: "4.0.1"))
+        .package(url: "https://github.com/tayloraswift/swift-png", from: "4.4.0")
     ],
     targets: 
     [
-        .target(name: "Noise"),
+        .target(
+            name: "Noise"
+        ),
 
-        .executableTarget(name: "NoiseTests", 
-            dependencies: 
-            [
-                .target(name: "Noise"), 
-                .product(name: "PNG", package: "swift-png"), 
-            ],
-            path: "Tests/NoiseTests")
+        .executableTarget(name: "NoiseTests",
+                          dependencies: [
+                            .target(name: "Noise"),
+                            .product(name: "PNG", package: "swift-png"),
+                          ],
+                          path: "Tests/NoiseTests",
+                          exclude:[
+                            "calibrate.blend",
+                            "calibrate.blend1"
+                          ])
     ]
 )

Package.swift

@@ -13,7 +13,7 @@ func grayscale_noise_png(noise:Noise, width:Int, height:Int, value_offset:Double
 
     do
     {
-        let image:PNG.Data.Rectangular = .init(packing: v, size: (width, height), 
+        let image:PNG.Image = .init(packing: v, size: (width, height), 
             layout: .init(format: .v8(fill: nil, key: nil)))
         try image.compress(path: path, level: 9)
     }

Tests/NoiseTests/calibrate.swift

@@ -30,7 +30,7 @@ func benchmark<Generator>(noise generator:Generator, name:String, offset:Double
     }
     print("\(name): \(clock() - t0)")
 
-    let image:PNG.Data.Rectangular = .init(packing: pixbuf, size: (viewer_size, viewer_size), 
+    let image:PNG.Image = .init(packing: pixbuf, size: (viewer_size, viewer_size),
         layout: .init(format: .v8(fill: nil, key: nil)))
     try image.compress(path: "tests/\(name).png", level: 9)
 }
@@ -42,7 +42,7 @@ for point:(x:Double, y:Double) in poisson.generate(radius: 10, width: viewer_siz
     pixbuf[Int(point.y) * viewer_size + Int(point.x)] = 255
 }
 print("disk2d: \(clock() - t0)")
-let image:PNG.Data.Rectangular = .init(packing: pixbuf, size: (viewer_size, viewer_size), 
+let image:PNG.Image = .init(packing: pixbuf, size: (viewer_size, viewer_size), 
         layout: .init(format: .v8(fill: nil, key: nil)))
 try image.compress(path: "tests/disk2d.png", level: 9)
 

Tests/NoiseTests/main.swift

@@ -32,7 +32,7 @@ func color_noise_png(r_noise:Noise, g_noise:Noise, b_noise:Noise,
 
     do
     {
-        let image:PNG.Data.Rectangular = .init(packing: rgba, size: (width, height), 
+        let image:PNG.Image = .init(packing: rgba, size: (width, height),
             layout: .init(format: .rgb8(palette: [], fill: nil, key: nil)))
         try image.compress(path: path, level: 9)
     }
@@ -175,7 +175,7 @@ func banner_disk2d(width:Int, height:Int, seed:Int)
 
     do
     {
-        let image:PNG.Data.Rectangular = .init(packing: rgba, size: (width, height), 
+        let image:PNG.Image = .init(packing: rgba, size: (width, height), 
             layout: .init(format: .rgb8(palette: [], fill: nil, key: nil)))
         try image.compress(path: "tests/banner_disk2d.png", level: 9)
     }
@@ -230,7 +230,7 @@ func banner_voronoi2d(width:Int, height:Int, seed:Int)
 
     do
     {
-        let image:PNG.Data.Rectangular = .init(packing: rgba, size: (width, height), 
+        let image:PNG.Image = .init(packing: rgba, size: (width, height),
             layout: .init(format: .rgb8(palette: [], fill: nil, key: nil)))
         try image.compress(path: "tests/banner_voronoi2d.png", level: 9)
     }