Fixed #2138 Missing morphshapes (incorrect holes calculation)

Fixed #2138 Mask layer was visible when did not contain a masked layer
This commit is contained in:
Jindra Petřík
2023-12-09 11:22:28 +01:00
parent 74ce252dad
commit 81d0c67e31
12 changed files with 650 additions and 92 deletions

View File

@@ -0,0 +1,49 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>morphshape_holes</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css" media="screen">
html, body { height:100%; background-color: #ffffff;}
body { margin:0; padding:0; overflow:hidden; }
#flashContent { width:100%; height:100%; }
</style>
</head>
<body>
<div id="flashContent">
<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="550" height="400" id="morphshape_holes" align="middle">
<param name="movie" value="morphshape_holes.swf" />
<param name="quality" value="high" />
<param name="bgcolor" value="#ffffff" />
<param name="play" value="true" />
<param name="loop" value="true" />
<param name="wmode" value="window" />
<param name="scale" value="showall" />
<param name="menu" value="true" />
<param name="devicefont" value="false" />
<param name="salign" value="" />
<param name="allowScriptAccess" value="sameDomain" />
<!--[if !IE]>-->
<object type="application/x-shockwave-flash" data="morphshape_holes.swf" width="550" height="400">
<param name="movie" value="morphshape_holes.swf" />
<param name="quality" value="high" />
<param name="bgcolor" value="#ffffff" />
<param name="play" value="true" />
<param name="loop" value="true" />
<param name="wmode" value="window" />
<param name="scale" value="showall" />
<param name="menu" value="true" />
<param name="devicefont" value="false" />
<param name="salign" value="" />
<param name="allowScriptAccess" value="sameDomain" />
<!--<![endif]-->
<a href="http://www.adobe.com/go/getflash">
<img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />
</a>
<!--[if !IE]>-->
</object>
<!--<![endif]-->
</object>
</div>
</body>
</html>

Binary file not shown.

View File

@@ -0,0 +1,127 @@
<DOMDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ns.adobe.com/xfl/2008/" currentTimeline="1" xflVersion="2.2" creatorInfo="Adobe Flash Professional CS6" platform="Windows" versionInfo="Saved by Adobe Flash Windows 12.0 build 481" majorVersion="12" buildNumber="481" nextSceneIdentifier="2" playOptionsPlayLoop="false" playOptionsPlayPages="false" playOptionsPlayFrameActions="false">
<timelines>
<DOMTimeline name="Scene 1" currentFrame="19">
<layers>
<DOMLayer name="Layer 2" color="#9933CC" current="true" isSelected="true">
<frames>
<DOMFrame index="0" duration="19" tweenType="shape" keyMode="24066">
<MorphShape>
<morphSegments>
<MorphSegment startPointA="#4.88, #2.D" startPointB="#1A.E, #4.EC" strokeIndex1="0" strokeIndex2="0" fillIndex1="0" fillIndex2="0">
<MorphCurves controlPointA="#B.4, #2.D" anchorPointA="#11.F7, #2.D" controlPointB="#20.58, #4.EC" anchorPointB="#25.CF, #4.EC" isLine="true"/>
<MorphCurves controlPointA="#11.F7, #8.3E" anchorPointA="#11.F7, #D.AC" controlPointB="#25.CF, #9.92" anchorPointB="#25.CF, #E.38" isLine="true"/>
<MorphCurves controlPointA="#B.4, #D.AC" anchorPointA="#4.88, #D.AC" controlPointB="#20.58, #E.38" anchorPointB="#1A.E, #E.38" isLine="true"/>
<MorphCurves controlPointA="#4.88, #8.3E" anchorPointA="#4.88, #2.D" controlPointB="#1A.E, #9.92" anchorPointB="#1A.E, #4.EC" isLine="true"/>
</MorphSegment>
<MorphSegment startPointA="#8.48, #6.04" startPointB="#1D.ED, #7.AA" strokeIndex1="0" strokeIndex2="0" fillIndex1="0" fillIndex2="0">
<MorphCurves controlPointA="#A.BE, #6.04" anchorPointA="#D.33, #6.04" controlPointB="#1F.EE, #7.AA" anchorPointB="#21.EE, #7.AA" isLine="true"/>
<MorphCurves controlPointA="#D.33, #8.7A" anchorPointA="#D.33, #A.EF" controlPointB="#21.EE, #9.C5" anchorPointB="#21.EE, #B.E" isLine="true"/>
<MorphCurves controlPointA="#A.BE, #A.EF" anchorPointA="#8.48, #A.EF" controlPointB="#1F.EE, #B.E" anchorPointB="#1D.ED, #B.E" isLine="true"/>
<MorphCurves controlPointA="#8.48, #8.7A" anchorPointA="#8.48, #6.04" controlPointB="#1D.ED, #9.C5" anchorPointB="#1D.ED, #7.AA" isLine="true"/>
</MorphSegment>
</morphSegments>
<morphHintsList/>
</MorphShape>
<elements>
<DOMShape>
<fills>
<FillStyle index="1">
<SolidColor color="#009900"/>
</FillStyle>
</fills>
<edges>
<Edge fillStyle0="1" edges="!3379 2799S1|2120 2799!2120 2799|2120 1540!2120 1540|3379 1540!3379 1540|3379 2799"/>
<Edge fillStyle1="1" edges="!4599 3500S2|1160 3500!1160 3500|1160 720!1160 720|4599 720!4599 720|4599 3500"/>
</edges>
</DOMShape>
</elements>
</DOMFrame>
<DOMFrame index="19" keyMode="9728">
<elements>
<DOMShape>
<fills>
<FillStyle index="1">
<SolidColor color="#009900"/>
</FillStyle>
</fills>
<edges>
<Edge fillStyle0="1" edges="!7661 3040S1|7661 1962!7661 1962|8686 1962!8686 1962|8686 3040!8686 3040|7661 3040"/>
<Edge fillStyle1="1" edges="!6880 3640S2|6880 1260!6880 1260|9679 1260!9679 1260|9679 3640!9679 3640|6880 3640"/>
</edges>
</DOMShape>
</elements>
</DOMFrame>
</frames>
</DOMLayer>
<DOMLayer name="Layer 1" color="#4FFF4F">
<frames>
<DOMFrame index="0" duration="19" tweenType="shape" keyMode="17922">
<MorphShape>
<morphSegments>
<MorphSegment startPointA="#3.B5, #10.AE" startPointB="#19.09, #11.DA" strokeIndex1="0" strokeIndex2="0" fillIndex1="0" fillIndex2="0">
<MorphCurves controlPointA="#A.45, #10.AE" anchorPointA="#10.D5, #10.AE" controlPointB="#1E.BD, #11.DA" anchorPointB="#24.71, #11.DA" isLine="true"/>
<MorphCurves controlPointA="#10.D5, #16.1C" anchorPointA="#10.D5, #1B.8A" controlPointB="#24.71, #16.DA" anchorPointB="#24.71, #1B.DA" isLine="true"/>
<MorphCurves controlPointA="#A.45, #1B.8A" anchorPointA="#3.B5, #1B.8A" controlPointB="#1E.BD, #1B.DA" anchorPointB="#19.09, #1B.DA" isLine="true"/>
<MorphCurves controlPointA="#3.B5, #16.1C" anchorPointA="#3.B5, #10.AE" controlPointB="#19.09, #16.DA" anchorPointB="#19.09, #11.DA" isLine="true"/>
</MorphSegment>
<MorphSegment startPointA="#7.7E, #13.DB" startPointB="#1C.53, #14.C7" strokeIndex1="0" strokeIndex2="0" fillIndex1="0" fillIndex2="0">
<MorphCurves controlPointA="#A.09, #13.DB" anchorPointA="#C.94, #13.DB" controlPointB="#1E.89, #14.C7" anchorPointB="#20.BE, #14.C7" isLine="true"/>
<MorphCurves controlPointA="#C.94, #16.34" anchorPointA="#C.94, #18.8D" controlPointB="#20.BE, #16.F1" anchorPointB="#20.BE, #19.1A" isLine="true"/>
<MorphCurves controlPointA="#A.09, #18.8D" anchorPointA="#7.7E, #18.8D" controlPointB="#1E.89, #19.1A" anchorPointB="#1C.53, #19.1A" isLine="true"/>
<MorphCurves controlPointA="#7.7E, #16.34" anchorPointA="#7.7E, #13.DB" controlPointB="#1C.53, #16.F1" anchorPointB="#1C.53, #14.C7" isLine="true"/>
</MorphSegment>
<MorphSegment startPointA="#7.7E, #13.DB" startPointB="#1C.53, #14.C7" strokeIndex1="0" strokeIndex2="0" fillIndex1="1" fillIndex2="1">
<MorphCurves controlPointA="#A.09, #13.DB" anchorPointA="#C.94, #13.DB" controlPointB="#1E.89, #14.C7" anchorPointB="#20.BE, #14.C7" isLine="true"/>
<MorphCurves controlPointA="#C.94, #16.34" anchorPointA="#C.94, #18.8D" controlPointB="#20.BE, #16.F1" anchorPointB="#20.BE, #19.1A" isLine="true"/>
<MorphCurves controlPointA="#A.09, #18.8D" anchorPointA="#7.7E, #18.8D" controlPointB="#1E.89, #19.1A" anchorPointB="#1C.53, #19.1A" isLine="true"/>
<MorphCurves controlPointA="#7.7E, #16.34" anchorPointA="#7.7E, #13.DB" controlPointB="#1C.53, #16.F1" anchorPointB="#1C.53, #14.C7" isLine="true"/>
</MorphSegment>
</morphSegments>
<morphHintsList/>
</MorphShape>
<elements>
<DOMShape>
<fills>
<FillStyle index="1">
<SolidColor color="#0000FF"/>
</FillStyle>
<FillStyle index="2">
<SolidColor color="#FF0000"/>
</FillStyle>
</fills>
<edges>
<Edge fillStyle0="1" fillStyle1="2" edges="!3220 5083|3220 6285!3220 6285|1918 6285!1918 6285|1918 5083!1918 5083|3220 5083"/>
<Edge fillStyle1="1" edges="!949 4270|4309 4270!4309 4270|4309 7050!4309 7050|949 7050!949 7050|949 4270"/>
</edges>
</DOMShape>
</elements>
</DOMFrame>
<DOMFrame index="19" keyMode="9728">
<elements>
<DOMShape>
<fills>
<FillStyle index="1">
<SolidColor color="#0000FF"/>
</FillStyle>
<FillStyle index="2">
<SolidColor color="#FF0000"/>
</FillStyle>
</fills>
<edges>
<Edge fillStyle1="1" edges="!9329 7130|6409 7130!6409 7130|6409 4570!6409 4570|9329 4570!9329 4570|9329 7130"/>
<Edge fillStyle0="1" fillStyle1="2" edges="!8382 6426|7251 6426!7251 6426|7251 5319!7251 5319|8382 5319!8382 5319|8382 6426"/>
</edges>
</DOMShape>
</elements>
</DOMFrame>
</frames>
</DOMLayer>
</layers>
</DOMTimeline>
</timelines>
<PrinterSettings/>
<publishHistory>
<PublishItem publishSize="917" publishTime="1702113733"/>
<PublishItem publishSize="1033" publishTime="1702112824"/>
</publishHistory>
</DOMDocument>

View File

@@ -0,0 +1,55 @@
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27 ">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:xmp="http://ns.adobe.com/xap/1.0/">
<xmp:CreatorTool>Adobe Flash Professional CS6 - build 481</xmp:CreatorTool>
<xmp:CreateDate>2023-12-09T01:03:52-08:00</xmp:CreateDate>
<xmp:MetadataDate>2023-12-09T01:04:24-08:00</xmp:MetadataDate>
<xmp:ModifyDate>2023-12-09T01:04:24-08:00</xmp:ModifyDate>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:dc="http://purl.org/dc/elements/1.1/">
<dc:format>application/vnd.adobe.fla</dc:format>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#">
<xmpMM:InstanceID>xmp.iid:CEDF0DBE6596EE118F9EDF8980AE5CDF</xmpMM:InstanceID>
<xmpMM:DocumentID>xmp.did:CEDF0DBE6596EE118F9EDF8980AE5CDF</xmpMM:DocumentID>
<xmpMM:OriginalDocumentID>xmp.did:CEDF0DBE6596EE118F9EDF8980AE5CDF</xmpMM:OriginalDocumentID>
<xmpMM:History>
<rdf:Seq>
<rdf:li rdf:parseType="Resource">
<stEvt:action>created</stEvt:action>
<stEvt:instanceID>xmp.iid:CEDF0DBE6596EE118F9EDF8980AE5CDF</stEvt:instanceID>
<stEvt:when>2023-12-09T01:03:52-08:00</stEvt:when>
<stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
</rdf:li>
</rdf:Seq>
</xmpMM:History>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
<?xpacket end="w"?>

View File

@@ -0,0 +1,206 @@
<flash_profiles>
<flash_profile version="1.0" name="Default" current="true">
<PublishFormatProperties enabled="true">
<defaultNames>1</defaultNames>
<flash>1</flash>
<projectorWin>0</projectorWin>
<projectorMac>0</projectorMac>
<html>1</html>
<gif>0</gif>
<jpeg>0</jpeg>
<png>0</png>
<qt>0</qt>
<rnwk>0</rnwk>
<swc>0</swc>
<flashDefaultName>1</flashDefaultName>
<projectorWinDefaultName>1</projectorWinDefaultName>
<projectorMacDefaultName>1</projectorMacDefaultName>
<htmlDefaultName>1</htmlDefaultName>
<gifDefaultName>1</gifDefaultName>
<jpegDefaultName>1</jpegDefaultName>
<pngDefaultName>1</pngDefaultName>
<qtDefaultName>1</qtDefaultName>
<rnwkDefaultName>1</rnwkDefaultName>
<swcDefaultName>1</swcDefaultName>
<flashFileName>morphshape_holes.swf</flashFileName>
<projectorWinFileName>morphshape_holes.exe</projectorWinFileName>
<projectorMacFileName>morphshape_holes.app</projectorMacFileName>
<htmlFileName>morphshape_holes.html</htmlFileName>
<gifFileName>morphshape_holes.gif</gifFileName>
<jpegFileName>morphshape_holes.jpg</jpegFileName>
<pngFileName>morphshape_holes.png</pngFileName>
<qtFileName>morphshape_holes.mov</qtFileName>
<rnwkFileName>morphshape_holes.smil</rnwkFileName>
<swcFileName>morphshape_holes.swc</swcFileName>
</PublishFormatProperties>
<PublishHtmlProperties enabled="true">
<VersionDetectionIfAvailable>0</VersionDetectionIfAvailable>
<VersionInfo>12,0,0,0;11,2,0,0;11,1,0,0;10,3,0,0;10,2,153,0;10,1,52,0;9,0,124,0;8,0,24,0;7,0,14,0;6,0,79,0;5,0,58,0;4,0,32,0;3,0,8,0;2,0,1,12;1,0,0,1;</VersionInfo>
<UsingDefaultContentFilename>1</UsingDefaultContentFilename>
<UsingDefaultAlternateFilename>1</UsingDefaultAlternateFilename>
<ContentFilename>morphshape_holes.xfl_content.html</ContentFilename>
<AlternateFilename>morphshape_holes.xfl_alternate.html</AlternateFilename>
<UsingOwnAlternateFile>0</UsingOwnAlternateFile>
<OwnAlternateFilename></OwnAlternateFilename>
<Width>550</Width>
<Height>400</Height>
<Align>0</Align>
<Units>0</Units>
<Loop>1</Loop>
<StartPaused>0</StartPaused>
<Scale>0</Scale>
<HorizontalAlignment>1</HorizontalAlignment>
<VerticalAlignment>1</VerticalAlignment>
<Quality>4</Quality>
<DeblockingFilter>0</DeblockingFilter>
<WindowMode>0</WindowMode>
<DisplayMenu>1</DisplayMenu>
<DeviceFont>0</DeviceFont>
<TemplateFileName>C:\Users\MyUser\AppData\Local\Adobe\Flash CS6\en_US\Configuration\HTML\Default.html</TemplateFileName>
<showTagWarnMsg>1</showTagWarnMsg>
</PublishHtmlProperties>
<PublishFlashProperties enabled="true">
<TopDown></TopDown>
<FireFox></FireFox>
<Report>0</Report>
<Protect>0</Protect>
<OmitTraceActions>0</OmitTraceActions>
<Quality>80</Quality>
<DeblockingFilter>0</DeblockingFilter>
<StreamFormat>0</StreamFormat>
<StreamCompress>7</StreamCompress>
<EventFormat>0</EventFormat>
<EventCompress>7</EventCompress>
<OverrideSounds>0</OverrideSounds>
<Version>15</Version>
<ExternalPlayer>FlashPlayer11.2</ExternalPlayer>
<ActionScriptVersion>2</ActionScriptVersion>
<PackageExportFrame>1</PackageExportFrame>
<PackagePaths></PackagePaths>
<AS3PackagePaths>.</AS3PackagePaths>
<AS3ConfigConst>CONFIG::FLASH_AUTHORING=&quot;true&quot;;</AS3ConfigConst>
<DebuggingPermitted>0</DebuggingPermitted>
<DebuggingPassword></DebuggingPassword>
<CompressMovie>1</CompressMovie>
<CompressionType>0</CompressionType>
<InvisibleLayer>1</InvisibleLayer>
<DeviceSound>0</DeviceSound>
<StreamUse8kSampleRate>0</StreamUse8kSampleRate>
<EventUse8kSampleRate>0</EventUse8kSampleRate>
<UseNetwork>0</UseNetwork>
<DocumentClass></DocumentClass>
<AS3Strict>2</AS3Strict>
<AS3Coach>4</AS3Coach>
<AS3AutoDeclare>4096</AS3AutoDeclare>
<AS3Dialect>AS3</AS3Dialect>
<AS3ExportFrame>1</AS3ExportFrame>
<AS3Optimize>1</AS3Optimize>
<ExportSwc>0</ExportSwc>
<ScriptStuckDelay>15</ScriptStuckDelay>
<IncludeXMP>1</IncludeXMP>
<HardwareAcceleration>0</HardwareAcceleration>
<AS3Flags>4102</AS3Flags>
<DefaultLibraryLinkage>rsl</DefaultLibraryLinkage>
<RSLPreloaderMethod>wrap</RSLPreloaderMethod>
<RSLPreloaderSWF>$(AppConfig)/ActionScript 3.0/rsls/loader_animation.swf</RSLPreloaderSWF>
<LibraryPath>
<library-path-entry>
<swc-path>$(AppConfig)/ActionScript 3.0/libs</swc-path>
<linkage>merge</linkage>
</library-path-entry>
<library-path-entry>
<swc-path>$(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc</swc-path>
<linkage usesDefault="true">rsl</linkage>
<rsl-url>http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz</rsl-url>
<policy-file-url>http://fpdownload.adobe.com/pub/swz/crossdomain.xml</policy-file-url>
<rsl-url>textLayout_2.0.0.232.swz</rsl-url>
</library-path-entry>
</LibraryPath>
<LibraryVersions>
<library-version>
<swc-path>$(AppConfig)/ActionScript 3.0/libs/11.0/textLayout.swc</swc-path>
<feature name="tlfText" majorVersion="2" minorVersion="0" build="232"/>
<rsl-url>http://fpdownload.adobe.com/pub/swz/tlf/2.0.0.232/textLayout_2.0.0.232.swz</rsl-url>
<policy-file-url>http://fpdownload.adobe.com/pub/swz/crossdomain.xml</policy-file-url>
<rsl-url>textLayout_2.0.0.232.swz</rsl-url>
</library-version>
</LibraryVersions>
</PublishFlashProperties>
<PublishJpegProperties enabled="true">
<Width>550</Width>
<Height>400</Height>
<Progressive>0</Progressive>
<DPI>4718592</DPI>
<Size>0</Size>
<Quality>80</Quality>
<MatchMovieDim>1</MatchMovieDim>
</PublishJpegProperties>
<PublishRNWKProperties enabled="true">
<exportFlash>1</exportFlash>
<flashBitRate>0</flashBitRate>
<exportAudio>1</exportAudio>
<audioFormat>0</audioFormat>
<singleRateAudio>0</singleRateAudio>
<realVideoRate>100000</realVideoRate>
<speed28K>1</speed28K>
<speed56K>1</speed56K>
<speedSingleISDN>0</speedSingleISDN>
<speedDualISDN>0</speedDualISDN>
<speedCorporateLAN>0</speedCorporateLAN>
<speed256K>0</speed256K>
<speed384K>0</speed384K>
<speed512K>0</speed512K>
<exportSMIL>1</exportSMIL>
</PublishRNWKProperties>
<PublishGifProperties enabled="true">
<Width>550</Width>
<Height>400</Height>
<Animated>0</Animated>
<MatchMovieDim>1</MatchMovieDim>
<Loop>1</Loop>
<LoopCount></LoopCount>
<OptimizeColors>1</OptimizeColors>
<Interlace>0</Interlace>
<Smooth>1</Smooth>
<DitherSolids>0</DitherSolids>
<RemoveGradients>0</RemoveGradients>
<TransparentOption></TransparentOption>
<TransparentAlpha>128</TransparentAlpha>
<DitherOption></DitherOption>
<PaletteOption></PaletteOption>
<MaxColors>255</MaxColors>
<PaletteName></PaletteName>
</PublishGifProperties>
<PublishPNGProperties enabled="true">
<Width>550</Width>
<Height>400</Height>
<OptimizeColors>1</OptimizeColors>
<Interlace>0</Interlace>
<Transparent>0</Transparent>
<Smooth>1</Smooth>
<DitherSolids>0</DitherSolids>
<RemoveGradients>0</RemoveGradients>
<MatchMovieDim>1</MatchMovieDim>
<DitherOption></DitherOption>
<FilterOption></FilterOption>
<PaletteOption></PaletteOption>
<BitDepth>24-bit with Alpha</BitDepth>
<MaxColors>255</MaxColors>
<PaletteName></PaletteName>
</PublishPNGProperties>
<PublishQTProperties enabled="true">
<Width>550</Width>
<Height>400</Height>
<MatchMovieDim>1</MatchMovieDim>
<UseQTSoundCompression>0</UseQTSoundCompression>
<AlphaOption></AlphaOption>
<LayerOption></LayerOption>
<QTSndSettings>00000000</QTSndSettings>
<ControllerOption>0</ControllerOption>
<Looping>0</Looping>
<PausedAtStart>0</PausedAtStart>
<PlayEveryFrame>0</PlayEveryFrame>
<Flatten>1</Flatten>
</PublishQTProperties>
</flash_profile>
</flash_profiles>

View File

@@ -0,0 +1 @@
PROXY-CS5