Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@muukii
muukii committed Jun 10, 2024
1 parent 04422b5 commit b1aad66
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 21 deletions.
48 changes: 30 additions & 18 deletions Dev/Brightroom.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@
4B36195126105E3900877B21 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B600B29216B7C9E001E1456 /* Assets.xcassets */; };
4B36195626107ADB00877B21 /* path-data in Resources */ = {isa = PBXBuildFile; fileRef = 4B36195526107ADB00877B21 /* path-data */; };
4B3957C92C16D9ED000BD249 /* DemoFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3957C82C16D9ED000BD249 /* DemoFilterView.swift */; };
4B3957D12C16DAC3000BD249 /* sun-hdr-rec2020.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020.avif */; };
4B3957D22C16DAC3000BD249 /* sun-hdr-p3.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CA2C16DABA000BD249 /* sun-hdr-p3.avif */; };
4B3957D32C16DAC3000BD249 /* sun-hdr-srgb.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CC2C16DABA000BD249 /* sun-hdr-srgb.avif */; };
4B3957D42C16DAC4000BD249 /* sun-hdr-rec2020.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020.avif */; };
4B3957D52C16DAC4000BD249 /* sun-hdr-p3.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CA2C16DABA000BD249 /* sun-hdr-p3.avif */; };
4B3957D62C16DAC4000BD249 /* sun-hdr-srgb.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CC2C16DABA000BD249 /* sun-hdr-srgb.avif */; };
4B3957D12C16DAC3000BD249 /* sun-hdr-rec2020-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020-avif.avif */; };
4B3957D22C16DAC3000BD249 /* sun-hdr-p3-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CA2C16DABA000BD249 /* sun-hdr-p3-avif.avif */; };
4B3957D32C16DAC3000BD249 /* sun-hdr-srgb-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CC2C16DABA000BD249 /* sun-hdr-srgb-avif.avif */; };
4B3957D42C16DAC4000BD249 /* sun-hdr-rec2020-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020-avif.avif */; };
4B3957D52C16DAC4000BD249 /* sun-hdr-p3-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CA2C16DABA000BD249 /* sun-hdr-p3-avif.avif */; };
4B3957D62C16DAC4000BD249 /* sun-hdr-srgb-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CC2C16DABA000BD249 /* sun-hdr-srgb-avif.avif */; };
4B3957DA2C16DD42000BD249 /* sun-hdr-rec2020-heic.heic in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957D72C16DD42000BD249 /* sun-hdr-rec2020-heic.heic */; };
4B3957DB2C16DD42000BD249 /* sun-hdr-srgb-heic.heic in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957D82C16DD42000BD249 /* sun-hdr-srgb-heic.heic */; };
4B3957DC2C16DD42000BD249 /* sun-hdr-p3-heic.heic in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957D92C16DD42000BD249 /* sun-hdr-p3-heic.heic */; };
4B4103582611EAA80061A218 /* ImitationTinderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4103572611EAA80061A218 /* ImitationTinderViewController.swift */; };
4B4103602611EAB20061A218 /* DemoImitationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41035F2611EAB20061A218 /* DemoImitationsViewController.swift */; };
4B46E71B2B762E20003179C2 /* MondrianLayout in Frameworks */ = {isa = PBXBuildFile; productRef = 4B46E71A2B762E20003179C2 /* MondrianLayout */; };
Expand Down Expand Up @@ -606,9 +609,12 @@
4B36194B26105BEB00877B21 /* RendererTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RendererTests.swift; sourceTree = "<group>"; };
4B36195526107ADB00877B21 /* path-data */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = "path-data"; sourceTree = "<group>"; };
4B3957C82C16D9ED000BD249 /* DemoFilterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoFilterView.swift; sourceTree = "<group>"; };
4B3957CA2C16DABA000BD249 /* sun-hdr-p3.avif */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-p3.avif"; sourceTree = "<group>"; };
4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020.avif */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-rec2020.avif"; sourceTree = "<group>"; };
4B3957CC2C16DABA000BD249 /* sun-hdr-srgb.avif */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-srgb.avif"; sourceTree = "<group>"; };
4B3957CA2C16DABA000BD249 /* sun-hdr-p3-avif.avif */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-p3-avif.avif"; sourceTree = "<group>"; };
4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020-avif.avif */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-rec2020-avif.avif"; sourceTree = "<group>"; };
4B3957CC2C16DABA000BD249 /* sun-hdr-srgb-avif.avif */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-srgb-avif.avif"; sourceTree = "<group>"; };
4B3957D72C16DD42000BD249 /* sun-hdr-rec2020-heic.heic */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-rec2020-heic.heic"; sourceTree = "<group>"; };
4B3957D82C16DD42000BD249 /* sun-hdr-srgb-heic.heic */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-srgb-heic.heic"; sourceTree = "<group>"; };
4B3957D92C16DD42000BD249 /* sun-hdr-p3-heic.heic */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-p3-heic.heic"; sourceTree = "<group>"; };
4B4103572611EAA80061A218 /* ImitationTinderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImitationTinderViewController.swift; sourceTree = "<group>"; };
4B41035F2611EAB20061A218 /* DemoImitationsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoImitationsViewController.swift; sourceTree = "<group>"; };
4B524FE229B8F6A600C1A416 /* Brightroom */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Brightroom; path = ..; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1155,9 +1161,12 @@
4B3957CD2C16DABA000BD249 /* hdr-images */ = {
isa = PBXGroup;
children = (
4B3957CA2C16DABA000BD249 /* sun-hdr-p3.avif */,
4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020.avif */,
4B3957CC2C16DABA000BD249 /* sun-hdr-srgb.avif */,
4B3957D92C16DD42000BD249 /* sun-hdr-p3-heic.heic */,
4B3957D72C16DD42000BD249 /* sun-hdr-rec2020-heic.heic */,
4B3957D82C16DD42000BD249 /* sun-hdr-srgb-heic.heic */,
4B3957CA2C16DABA000BD249 /* sun-hdr-p3-avif.avif */,
4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020-avif.avif */,
4B3957CC2C16DABA000BD249 /* sun-hdr-srgb-avif.avif */,
);
path = "hdr-images";
sourceTree = "<group>";
Expand Down Expand Up @@ -1943,9 +1952,9 @@
4BA41C86260CE817005E6FA7 /* orientation_down.HEIC in Resources */,
4BA41C85260CE817005E6FA7 /* orientation_left.HEIC in Resources */,
4BA41C84260CE817005E6FA7 /* orientation_left_mirrored.HEIC in Resources */,
4B3957D42C16DAC4000BD249 /* sun-hdr-rec2020.avif in Resources */,
4B3957D52C16DAC4000BD249 /* sun-hdr-p3.avif in Resources */,
4B3957D62C16DAC4000BD249 /* sun-hdr-srgb.avif in Resources */,
4B3957D42C16DAC4000BD249 /* sun-hdr-rec2020-avif.avif in Resources */,
4B3957D52C16DAC4000BD249 /* sun-hdr-p3-avif.avif in Resources */,
4B3957D62C16DAC4000BD249 /* sun-hdr-srgb-avif.avif in Resources */,
4BA41C82260CE817005E6FA7 /* orientation_up_mirrored.HEIC in Resources */,
4BB7B9CC277A452A0014B62A /* LUT_64_Gloss.png in Resources */,
4B600B2A216B7C9E001E1456 /* Assets.xcassets in Resources */,
Expand All @@ -1971,12 +1980,15 @@
4BA41C90260CE817005E6FA7 /* orientation_left.HEIC in Resources */,
4BED4A0A261CA5B00011A98F /* LUT_64_1.jpg in Resources */,
4BA41C8E260CE817005E6FA7 /* orientation_right_mirrored.HEIC in Resources */,
4B3957DC2C16DD42000BD249 /* sun-hdr-p3-heic.heic in Resources */,
4BA41C92260CE817005E6FA7 /* orientation_right.HEIC in Resources */,
4BA41C93260CE817005E6FA7 /* orientation_up.HEIC in Resources */,
4B3957DB2C16DD42000BD249 /* sun-hdr-srgb-heic.heic in Resources */,
4B3957DA2C16DD42000BD249 /* sun-hdr-rec2020-heic.heic in Resources */,
4BA41C94260CE817005E6FA7 /* orientation_down_mirrored.HEIC in Resources */,
4B3957D12C16DAC3000BD249 /* sun-hdr-rec2020.avif in Resources */,
4B3957D22C16DAC3000BD249 /* sun-hdr-p3.avif in Resources */,
4B3957D32C16DAC3000BD249 /* sun-hdr-srgb.avif in Resources */,
4B3957D12C16DAC3000BD249 /* sun-hdr-rec2020-avif.avif in Resources */,
4B3957D22C16DAC3000BD249 /* sun-hdr-p3-avif.avif in Resources */,
4B3957D32C16DAC3000BD249 /* sun-hdr-srgb-avif.avif in Resources */,
4BA41C8D260CE817005E6FA7 /* orientation_up_mirrored.HEIC in Resources */,
4BB7B9CD277A452A0014B62A /* LUT_64_Gloss.png in Resources */,
4BA41C8F260CE817005E6FA7 /* orientation_left_mirrored.HEIC in Resources */,
Expand Down
0 Dev/Bundle/hdr-images/sun-hdr-p3.avif → Dev/Bundle/hdr-images/sun-hdr-p3-avif.avif
View file
File renamed without changes.
Binary file added Dev/Bundle/hdr-images/sun-hdr-p3-heic.heic
View file
Binary file not shown.
0 Dev/Bundle/hdr-images/sun-hdr-rec2020.avif → ...ndle/hdr-images/sun-hdr-rec2020-avif.avif
View file
File renamed without changes.
Binary file added Dev/Bundle/hdr-images/sun-hdr-rec2020-heic.heic
View file
Binary file not shown.
0 Dev/Bundle/hdr-images/sun-hdr-srgb.avif → Dev/Bundle/hdr-images/sun-hdr-srgb-avif.avif
View file
File renamed without changes.
Binary file added Dev/Bundle/hdr-images/sun-hdr-srgb-heic.heic
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Dev/Sources/SharedForDemo/Mocks.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ enum Mocks {
}

static func hdrImage() -> UIImage {
UIImage(named: "sun-hdr-p3")!
UIImage(named: "sun-hdr-p3-avif.avif")!
}

static func makeEditingStack(image: UIImage) -> EditingStack {
Expand Down
11 changes: 9 additions & 2 deletions Dev/Sources/SwiftUIDemo/ContentView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,17 @@ struct ContentView: View {
}

Section("HDR") {
Button("Local") {
Button("AVIF") {
fullScreenView = .init {
DemoCropView(
editingStack: { Mocks.makeEditingStack(image: UIImage(named: "sun-hdr-p3-avif.avif")!) }
)
}
}
Button("HEIC") {
fullScreenView = .init {
DemoCropView(
editingStack: { Mocks.makeEditingStack(image: Mocks.hdrImage()) }
editingStack: { Mocks.makeEditingStack(image: UIImage(named: "sun-hdr-p3-heic.heic")!) }
)
}
}
Expand Down

0 comments on commit b1aad66

Please sign in to comment.