Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Harley-xk/MaLiang
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.6.5
Choose a base ref
...
head repository: Harley-xk/MaLiang
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Mar 23, 2020

  1. add icons

    Harley-xk committed Mar 23, 2020
    Copy the full SHA
    ea46970 View commit details

Commits on Mar 25, 2020

  1. Copy the full SHA
    bd33f27 View commit details
  2. Copy the full SHA
    44235b5 View commit details
  3. example for pencil mode

    Harley-xk committed Mar 25, 2020
    Copy the full SHA
    f03db8c View commit details
  4. bump up version to 2.7.0

    Harley-xk committed Mar 25, 2020
    Copy the full SHA
    f1f4b5f View commit details
  5.  Pencil

    Harley-xk committed Mar 25, 2020
    Copy the full SHA
    5e6c939 View commit details

Commits on Apr 2, 2020

  1. Copy the full SHA
    6aedede View commit details
  2. bump up to 2.7.1

    Harley-xk committed Apr 2, 2020
    Copy the full SHA
    efe60d9 View commit details
  3. Copy the full SHA
    d2a5815 View commit details
  4. Merge pull request #77 from Harley-xk/develop

    fix simulator debugging
    Harley-xk authored Apr 2, 2020
    Copy the full SHA
    34ea62e View commit details

Commits on May 28, 2020

  1. fix opacity

    Harley-xk committed May 28, 2020
    1
    Copy the full SHA
    563681e View commit details
  2. bump up to 2.8.0

    Harley-xk committed May 28, 2020
    Copy the full SHA
    a556092 View commit details

Commits on Jun 1, 2020

  1. Change init sequence for MTLTexture pixel format.

    Eunchul Jeon committed Jun 1, 2020
    Copy the full SHA
    ca6e553 View commit details

Commits on Jun 2, 2020

  1. Merge pull request #83 from jsharp83/fix_rendertarget_format

    Change init sequence for MTLTexture pixel format.
    Harley-xk authored Jun 2, 2020
    Copy the full SHA
    4d5c18e View commit details

Commits on Jul 10, 2020

  1. Copy the full SHA
    1557d59 View commit details

Commits on Sep 18, 2020

  1. Swift 5 - fix warnings

    Harley-xk committed Sep 18, 2020
    Copy the full SHA
    e704afb View commit details

Commits on Oct 10, 2020

  1. Copy the full SHA
    9e23bf1 View commit details
  2. bump up to 2.8.1

    Harley-xk committed Oct 10, 2020
    Copy the full SHA
    b08a4e5 View commit details

Commits on Oct 16, 2020

  1. Copy the full SHA
    3b8b213 View commit details
  2. bump version to 2.8.3

    Harley-xk committed Oct 16, 2020
    Copy the full SHA
    856b280 View commit details

Commits on Oct 26, 2020

  1. Copy the full SHA
    a7cfc03 View commit details
  2. Copy the full SHA
    9db7023 View commit details
  3. Copy the full SHA
    ab743ff View commit details
  4. Example for Chartlet Brush

    Harley-xk committed Oct 26, 2020
    Copy the full SHA
    72f00cc View commit details
  5. fix opacity for glowing pen

    Harley-xk committed Oct 26, 2020
    Copy the full SHA
    e56881a View commit details
  6. bump versiong to 2.9.0

    Harley-xk committed Oct 26, 2020
    Copy the full SHA
    367eeb2 View commit details

Commits on Nov 10, 2020

  1. Copy the full SHA
    45d2c89 View commit details

Commits on Dec 10, 2020

  1. Copy the full SHA
    ec4041d View commit details

Commits on Dec 16, 2020

  1. Copy the full SHA
    de7a71a View commit details
  2. bump up version to 2.9.1

    Harley-xk committed Dec 16, 2020
    Copy the full SHA
    b3be255 View commit details
  3. fix compilor error

    Harley-xk committed Dec 16, 2020
    Copy the full SHA
    4ea7be1 View commit details
  4. bump up to 2.9.2

    Harley-xk committed Dec 16, 2020
    Copy the full SHA
    ef2d501 View commit details
Showing with 666 additions and 242 deletions.
  1. +0 −1 .swift-version
  2. +1 −1 .travis.yml
  3. +2 −2 Example/MaLiang.xcodeproj/project.pbxproj
  4. +21 −0 Example/MaLiang/Images.xcassets/rect-1.imageset/Contents.json
  5. BIN Example/MaLiang/Images.xcassets/rect-1.imageset/rect-1.png
  6. +21 −0 Example/MaLiang/Images.xcassets/rect-2.imageset/Contents.json
  7. BIN Example/MaLiang/Images.xcassets/rect-2.imageset/rect-2.png
  8. +21 −0 Example/MaLiang/Images.xcassets/rect-3.imageset/Contents.json
  9. BIN Example/MaLiang/Images.xcassets/rect-3.imageset/rect-3.png
  10. +85 −71 Example/MaLiang/Main.storyboard
  11. +2 −1 Example/MaLiang/Painting Sanples/PaintingPreview.swift
  12. +15 −5 Example/MaLiang/Painting Sanples/ViewController.swift
  13. +16 −2 Example/Pods/Pods.xcodeproj/project.pbxproj
  14. +1 −1 Example/Pods/Target Support Files/MaLiang/MaLiang-Info.plist
  15. +2 −1 MaLiang.podspec
  16. +81 −1 MaLiang/Classes/Brush/Brush.swift
  17. +117 −0 MaLiang/Classes/Brush/ChartletBrush.swift
  18. +1 −1 MaLiang/Classes/Brush/GlowingBrush.swift
  19. +5 −4 MaLiang/Classes/Brush/Printer.swift
  20. +52 −77 MaLiang/Classes/Canvas/Canvas.swift
  21. +14 −8 MaLiang/Classes/Data & Documents/CanvasData.swift
  22. +30 −0 MaLiang/Classes/Elements/ElementGroup.swift
  23. +9 −2 MaLiang/Classes/Elements/LineStrip.swift
  24. +2 −2 MaLiang/Classes/Math & Utils/Maths.swift
  25. +53 −12 MaLiang/Classes/MetalBase/MLColor.swift
  26. +7 −0 MaLiang/Classes/MetalBase/MLError.swift
  27. +11 −41 MaLiang/Classes/MetalBase/MetalView.swift
  28. +2 −3 MaLiang/Classes/MetalBase/RenderTarget.swift
  29. +88 −0 MaLiang/Classes/MetalBase/Renderer.swift
  30. +2 −2 MaLiang/Classes/MetalBase/Shaders.metal
  31. +5 −4 README.md
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: swift
os: osx
osx_image: xcode10.2
osx_image: xcode11.3

podfile: Example/Podfile
script: xcodebuild -workspace Example/MaLiang.xcworkspace -scheme MaLiang-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
4 changes: 2 additions & 2 deletions Example/MaLiang.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -416,7 +416,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -466,7 +466,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
21 changes: 21 additions & 0 deletions Example/MaLiang/Images.xcassets/rect-1.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "rect-1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Example/MaLiang/Images.xcassets/rect-2.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "rect-2.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Example/MaLiang/Images.xcassets/rect-3.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "rect-3.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading