Skip to content

Commit 7a58a7e

Browse files
PonyCuiPonyCui
authored
Merge pull request svga#69 from yyued/2.5.0_matte-dev
2.5.0 matte dev
2 parents 5936c01 + 33ea6b3 commit 7a58a7e

File tree

14 files changed

+1166
-975
lines changed

14 files changed

+1166
-975
lines changed

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ SPEC CHECKSUMS:
6464

6565
PODFILE CHECKSUM: 7f6714245d47e69d2933463289e4c4d6de65b831
6666

67-
COCOAPODS: 1.6.0.beta.2
67+
COCOAPODS: 1.6.1

‎SVGAPlayer.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
63712E6821787A45001AE014 /* SVGAAudioEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 63712E6721787A45001AE014 /* SVGAAudioEntity.m */; };
1313
63E817012178809D001D2D62 /* SVGAAudioLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 63E817002178809D001D2D62 /* SVGAAudioLayer.m */; };
1414
71418C93225E6F710029C69E /* mutiMatte.svga in Resources */ = {isa = PBXBuildFile; fileRef = 71418C92225E6F710029C69E /* mutiMatte.svga */; };
15+
71A8679122B7785100176CD6 /* matteRect.svga in Resources */ = {isa = PBXBuildFile; fileRef = 71A8679022B7785100176CD6 /* matteRect.svga */; };
16+
71A8679322B7853600176CD6 /* matteBitmap.svga in Resources */ = {isa = PBXBuildFile; fileRef = 71A8679222B7853600176CD6 /* matteBitmap.svga */; };
17+
71A8679B22B8CF7400176CD6 /* Goddess.svga in Resources */ = {isa = PBXBuildFile; fileRef = 71A8679A22B8CF7400176CD6 /* Goddess.svga */; };
1518
80D4C7254846B96B9C6EED83 /* libPods-SVGAPlayer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DDA5FF396660C7C932DF9B8 /* libPods-SVGAPlayer.a */; };
1619
904D41F81D223DD20085A21A /* SVGABezierPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 904D41F71D223DD20085A21A /* SVGABezierPath.m */; };
1720
9052FC631E6EB8D4007BC925 /* SVGAExporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9052FC621E6EB8D4007BC925 /* SVGAExporter.m */; };
@@ -65,6 +68,9 @@
6568
63E816FF2178809D001D2D62 /* SVGAAudioLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAAudioLayer.h; sourceTree = "<group>"; };
6669
63E817002178809D001D2D62 /* SVGAAudioLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SVGAAudioLayer.m; sourceTree = "<group>"; };
6770
71418C92225E6F710029C69E /* mutiMatte.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = mutiMatte.svga; sourceTree = "<group>"; };
71+
71A8679022B7785100176CD6 /* matteRect.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = matteRect.svga; sourceTree = "<group>"; };
72+
71A8679222B7853600176CD6 /* matteBitmap.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = matteBitmap.svga; sourceTree = "<group>"; };
73+
71A8679A22B8CF7400176CD6 /* Goddess.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = Goddess.svga; sourceTree = "<group>"; };
6874
8AD65028FA2D122A34DC4A63 /* Pods-SVGAPlayer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SVGAPlayer.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SVGAPlayer/Pods-SVGAPlayer.debug.xcconfig"; sourceTree = "<group>"; };
6975
904D41F61D223DD20085A21A /* SVGABezierPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGABezierPath.h; sourceTree = "<group>"; };
7076
904D41F71D223DD20085A21A /* SVGABezierPath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVGABezierPath.m; sourceTree = "<group>"; };
@@ -241,6 +247,9 @@
241247
90D7C9FA1F7E2AA3006E74F0 /* Samples */ = {
242248
isa = PBXGroup;
243249
children = (
250+
71A8679A22B8CF7400176CD6 /* Goddess.svga */,
251+
71A8679022B7785100176CD6 /* matteRect.svga */,
252+
71A8679222B7853600176CD6 /* matteBitmap.svga */,
244253
71418C92225E6F710029C69E /* mutiMatte.svga */,
245254
63712E6421787950001AE014 /* heartbeat.svga */,
246255
90D7CA1A1F7FB114006E74F0 /* rose_1.5.0.svga */,
@@ -356,8 +365,11 @@
356365
63712E6521787950001AE014 /* heartbeat.svga in Resources */,
357366
90A676EB1D13A6DF008A69F3 /* Main.storyboard in Resources */,
358367
90CB64F91EF297E800DAA382 /* SVGAPlayer React-Info.plist in Resources */,
368+
71A8679122B7785100176CD6 /* matteRect.svga in Resources */,
369+
71A8679322B7853600176CD6 /* matteBitmap.svga in Resources */,
359370
90D7CA1C1F7FB114006E74F0 /* rose_1.5.0.svga in Resources */,
360371
90D7CA1B1F7FB114006E74F0 /* rose_2.0.0.svga in Resources */,
372+
71A8679B22B8CF7400176CD6 /* Goddess.svga in Resources */,
361373
);
362374
runOnlyForDeploymentPostprocessing = 0;
363375
};

‎SVGAPlayer/Base.lproj/Main.storyboard‎

Lines changed: 123 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,139 @@
2121
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
2222
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2323
<subviews>
24-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cmN-DO-oLC" customClass="SVGAPlayer">
24+
<view contentMode="scaleAspectFit" translatesAutoresizingMaskIntoConstraints="NO" id="cmN-DO-oLC" customClass="SVGAPlayer">
2525
<rect key="frame" x="16" y="162" width="343" height="343"/>
26-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
26+
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
2727
<constraints>
2828
<constraint firstAttribute="width" secondItem="cmN-DO-oLC" secondAttribute="height" multiplier="1:1" id="xm5-jB-e5a"/>
2929
</constraints>
3030
</view>
31+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wYi-Zk-AVg">
32+
<rect key="frame" x="30" y="587" width="315" height="80"/>
33+
<subviews>
34+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nzQ-nh-YFU">
35+
<rect key="frame" x="135.5" y="18" width="44" height="44"/>
36+
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
37+
<constraints>
38+
<constraint firstAttribute="width" constant="44" id="BBw-Gf-lHK"/>
39+
<constraint firstAttribute="height" constant="44" id="PZv-dO-Dxw"/>
40+
</constraints>
41+
<userDefinedRuntimeAttributes>
42+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
43+
<integer key="value" value="6"/>
44+
</userDefinedRuntimeAttribute>
45+
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
46+
</userDefinedRuntimeAttributes>
47+
<connections>
48+
<action selector="onChangeColor:" destination="BYZ-38-t0r" eventType="touchUpInside" id="qR9-fm-dml"/>
49+
</connections>
50+
</button>
51+
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1KI-hV-KzV">
52+
<rect key="frame" x="79.5" y="18" width="44" height="44"/>
53+
<color key="backgroundColor" red="0.0" green="0.59215686274509804" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
54+
<constraints>
55+
<constraint firstAttribute="height" constant="44" id="P2X-tz-zcv"/>
56+
<constraint firstAttribute="width" constant="44" id="TwF-QM-bTJ"/>
57+
</constraints>
58+
<userDefinedRuntimeAttributes>
59+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
60+
<integer key="value" value="6"/>
61+
</userDefinedRuntimeAttribute>
62+
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
63+
</userDefinedRuntimeAttributes>
64+
<connections>
65+
<action selector="onChangeColor:" destination="BYZ-38-t0r" eventType="touchUpInside" id="bz7-1Y-Odw"/>
66+
</connections>
67+
</button>
68+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZFx-1M-QhD">
69+
<rect key="frame" x="23.5" y="18" width="44" height="44"/>
70+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
71+
<constraints>
72+
<constraint firstAttribute="height" constant="44" id="Ozd-yt-2wZ"/>
73+
<constraint firstAttribute="width" constant="44" id="eOU-Cz-Va3"/>
74+
</constraints>
75+
<userDefinedRuntimeAttributes>
76+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
77+
<integer key="value" value="6"/>
78+
</userDefinedRuntimeAttribute>
79+
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
80+
</userDefinedRuntimeAttributes>
81+
<connections>
82+
<action selector="onChangeColor:" destination="BYZ-38-t0r" eventType="touchUpInside" id="L4f-gv-JP2"/>
83+
</connections>
84+
</button>
85+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9P0-Rv-Pwe">
86+
<rect key="frame" x="247.5" y="18" width="44" height="44"/>
87+
<color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
88+
<constraints>
89+
<constraint firstAttribute="height" constant="44" id="ZTT-TU-aMl"/>
90+
<constraint firstAttribute="width" constant="44" id="wtj-BS-0wu"/>
91+
</constraints>
92+
<userDefinedRuntimeAttributes>
93+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
94+
<integer key="value" value="6"/>
95+
</userDefinedRuntimeAttribute>
96+
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
97+
</userDefinedRuntimeAttributes>
98+
<connections>
99+
<action selector="onChangeColor:" destination="BYZ-38-t0r" eventType="touchUpInside" id="UeC-V2-v5z"/>
100+
</connections>
101+
</button>
102+
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="V7z-xZ-hZc">
103+
<rect key="frame" x="191.5" y="18" width="44" height="44"/>
104+
<color key="backgroundColor" red="0.0078431372549019607" green="0.80000000000000004" blue="0.46274509803921571" alpha="1" colorSpace="calibratedRGB"/>
105+
<constraints>
106+
<constraint firstAttribute="width" constant="44" id="bbS-rX-Yel"/>
107+
<constraint firstAttribute="height" constant="44" id="ixM-sM-yua"/>
108+
</constraints>
109+
<userDefinedRuntimeAttributes>
110+
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
111+
<integer key="value" value="6"/>
112+
</userDefinedRuntimeAttribute>
113+
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
114+
</userDefinedRuntimeAttributes>
115+
<connections>
116+
<action selector="onChangeColor:" destination="BYZ-38-t0r" eventType="touchUpInside" id="6ER-sX-gVb"/>
117+
</connections>
118+
</button>
119+
</subviews>
120+
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
121+
<constraints>
122+
<constraint firstItem="1KI-hV-KzV" firstAttribute="centerY" secondItem="wYi-Zk-AVg" secondAttribute="centerY" id="4yE-m6-GTl"/>
123+
<constraint firstItem="ZFx-1M-QhD" firstAttribute="centerX" secondItem="wYi-Zk-AVg" secondAttribute="centerX" multiplier="0.29" id="73h-vL-GYo"/>
124+
<constraint firstItem="9P0-Rv-Pwe" firstAttribute="centerY" secondItem="wYi-Zk-AVg" secondAttribute="centerY" id="9Vu-MU-riY"/>
125+
<constraint firstAttribute="height" constant="80" id="GB4-Jm-gUd"/>
126+
<constraint firstItem="V7z-xZ-hZc" firstAttribute="centerX" secondItem="wYi-Zk-AVg" secondAttribute="centerX" multiplier="1.35" id="Gm0-rp-tEs"/>
127+
<constraint firstItem="V7z-xZ-hZc" firstAttribute="centerY" secondItem="wYi-Zk-AVg" secondAttribute="centerY" id="TEd-cI-bF0"/>
128+
<constraint firstItem="ZFx-1M-QhD" firstAttribute="centerY" secondItem="wYi-Zk-AVg" secondAttribute="centerY" id="dg1-pi-u5L"/>
129+
<constraint firstItem="1KI-hV-KzV" firstAttribute="centerX" secondItem="wYi-Zk-AVg" secondAttribute="centerX" multiplier="0.65" id="gWN-yB-hcj"/>
130+
<constraint firstItem="nzQ-nh-YFU" firstAttribute="centerX" secondItem="wYi-Zk-AVg" secondAttribute="centerX" id="hxT-ei-gFa"/>
131+
<constraint firstItem="nzQ-nh-YFU" firstAttribute="centerY" secondItem="wYi-Zk-AVg" secondAttribute="centerY" id="pCt-mM-cFi"/>
132+
<constraint firstItem="9P0-Rv-Pwe" firstAttribute="centerX" secondItem="wYi-Zk-AVg" secondAttribute="centerX" multiplier="1.71" id="r4N-pw-XTz"/>
133+
</constraints>
134+
</view>
135+
<slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="iu9-fO-pPv">
136+
<rect key="frame" x="24" y="549" width="327" height="31"/>
137+
<constraints>
138+
<constraint firstAttribute="height" constant="30" id="0iR-Ol-uxF"/>
139+
</constraints>
140+
<connections>
141+
<action selector="onSlide:" destination="BYZ-38-t0r" eventType="valueChanged" id="ra7-7t-qog"/>
142+
</connections>
143+
</slider>
31144
</subviews>
32-
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
145+
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
33146
<constraints>
147+
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="wYi-Zk-AVg" secondAttribute="bottom" id="1Yo-HY-RGm"/>
148+
<constraint firstItem="wYi-Zk-AVg" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="30" id="Anv-E0-INT"/>
34149
<constraint firstItem="cmN-DO-oLC" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="HF3-PL-7Ua"/>
150+
<constraint firstAttribute="trailing" secondItem="wYi-Zk-AVg" secondAttribute="trailing" constant="30" id="RKP-BR-fhw"/>
35151
<constraint firstItem="cmN-DO-oLC" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="V4O-Ov-ZmN"/>
36152
<constraint firstItem="cmN-DO-oLC" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="aSq-Gs-nkk"/>
153+
<constraint firstItem="iu9-fO-pPv" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="10" id="bJf-cY-y2d"/>
154+
<constraint firstAttribute="trailingMargin" secondItem="iu9-fO-pPv" secondAttribute="trailing" constant="10" id="oNb-um-6Qz"/>
37155
<constraint firstAttribute="trailingMargin" secondItem="cmN-DO-oLC" secondAttribute="trailing" id="vsb-Wl-Nhq"/>
156+
<constraint firstItem="wYi-Zk-AVg" firstAttribute="top" secondItem="iu9-fO-pPv" secondAttribute="bottom" constant="8" id="wjk-LT-TP4"/>
38157
</constraints>
39158
</view>
40159
<navigationItem key="navigationItem" title="Samples" id="fYC-8C-nQt">
@@ -50,7 +169,7 @@
50169
</viewController>
51170
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
52171
</objects>
53-
<point key="canvasLocation" x="-15" y="36"/>
172+
<point key="canvasLocation" x="-15.199999999999999" y="35.532233883058474"/>
54173
</scene>
55174
<!--Navigation Controller-->
56175
<scene sceneID="r3U-AC-YtV">

‎SVGAPlayer/Samples/Goddess.svga‎

655 KB
Binary file not shown.

‎SVGAPlayer/Samples/matteBitmap.svga‎

69.7 KB
Binary file not shown.

‎SVGAPlayer/Samples/matteBitmap_1.x.svga‎

70.2 KB
Binary file not shown.

‎SVGAPlayer/Samples/matteRect.svga‎

623 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)