diff --git a/common/nori/export.go b/common/nori/export.go index 0bba89f..d4a1ed1 100644 --- a/common/nori/export.go +++ b/common/nori/export.go @@ -86,7 +86,7 @@ func (n *Nori) ExportAnimation(num int) (*apng.APNG, error) { rc, src, src.Bounds().Min, - draw.Src, + draw.Over, ) } images = append(images, img) @@ -99,7 +99,7 @@ func (n *Nori) ExportAnimation(num int) (*apng.APNG, error) { return nil, fmt.Errorf("no frames found for animation") } for i, realFrame := range images { - log.Info().Int("frame", num).Interface("rect", or).Interface("frame", realFrame.Bounds()).Msg("") + //log.Info().Int("frame", num).Interface("rect", or).Interface("frame", realFrame.Bounds()).Msg("") src := realFrame big := image.NewNRGBA64(or) draw.Draw( diff --git a/common/nori/image.go b/common/nori/image.go index b0fab41..807c763 100644 --- a/common/nori/image.go +++ b/common/nori/image.go @@ -52,7 +52,7 @@ func (i *Image) Decode(rd *bufio.Reader, palette *PaletteSection) error { green := uint8(((0x3e0 & bgr) >> 5) * 255 / 31) blue := uint8((0x1f & bgr) * 255 / 31) alpha := uint8(0xff) - if red == 0xff && blue == 0xff { + if red == 0xff && green == 0x00 && blue == 0xff { alpha = 0x00 } if red == 0x00 && blue == 0x00 && green == 0xff { @@ -82,7 +82,7 @@ func (i *Image) Decode(rd *bufio.Reader, palette *PaletteSection) error { if rgb[0] == 0x00 && rgb[1] == 0xff && rgb[2] == 0x00 { alpha = 0x00 } - if rgb[0] == 0xff && rgb[2] == 0xff { + if rgb[0] == 0xff && rgb[1] == 0x00 && rgb[2] == 0xff { alpha = 0x00 } cf.Set(idx%int(i.Width), idx/int(i.Width), col) diff --git a/common/nori/nori_test/palette.example/animation_0.png b/common/nori/nori_test/palette.example/animation_0.png index 1c73745..65afefe 100755 Binary files a/common/nori/nori_test/palette.example/animation_0.png and b/common/nori/nori_test/palette.example/animation_0.png differ diff --git a/common/nori/nori_test/palette.example/animation_1.png b/common/nori/nori_test/palette.example/animation_1.png index 12376de..ec26dec 100755 Binary files a/common/nori/nori_test/palette.example/animation_1.png and b/common/nori/nori_test/palette.example/animation_1.png differ diff --git a/common/nori/nori_test/palette.example/animation_10.png b/common/nori/nori_test/palette.example/animation_10.png index d7a63ff..8dc14ed 100755 Binary files a/common/nori/nori_test/palette.example/animation_10.png and b/common/nori/nori_test/palette.example/animation_10.png differ diff --git a/common/nori/nori_test/palette.example/animation_100.png b/common/nori/nori_test/palette.example/animation_100.png index 25e9089..9973931 100755 Binary files a/common/nori/nori_test/palette.example/animation_100.png and b/common/nori/nori_test/palette.example/animation_100.png differ diff --git a/common/nori/nori_test/palette.example/animation_101.png b/common/nori/nori_test/palette.example/animation_101.png index 803163f..3cec1f2 100755 Binary files a/common/nori/nori_test/palette.example/animation_101.png and b/common/nori/nori_test/palette.example/animation_101.png differ diff --git a/common/nori/nori_test/palette.example/animation_102.png b/common/nori/nori_test/palette.example/animation_102.png index ea1205b..bde96b0 100755 Binary files a/common/nori/nori_test/palette.example/animation_102.png and b/common/nori/nori_test/palette.example/animation_102.png differ diff --git a/common/nori/nori_test/palette.example/animation_103.png b/common/nori/nori_test/palette.example/animation_103.png index ea1205b..bde96b0 100755 Binary files a/common/nori/nori_test/palette.example/animation_103.png and b/common/nori/nori_test/palette.example/animation_103.png differ diff --git a/common/nori/nori_test/palette.example/animation_104.png b/common/nori/nori_test/palette.example/animation_104.png index 517b7fa..16d5c82 100755 Binary files a/common/nori/nori_test/palette.example/animation_104.png and b/common/nori/nori_test/palette.example/animation_104.png differ diff --git a/common/nori/nori_test/palette.example/animation_105.png b/common/nori/nori_test/palette.example/animation_105.png index 0a269e8..902b627 100755 Binary files a/common/nori/nori_test/palette.example/animation_105.png and b/common/nori/nori_test/palette.example/animation_105.png differ diff --git a/common/nori/nori_test/palette.example/animation_106.png b/common/nori/nori_test/palette.example/animation_106.png index 7ea04b2..6b999cb 100755 Binary files a/common/nori/nori_test/palette.example/animation_106.png and b/common/nori/nori_test/palette.example/animation_106.png differ diff --git a/common/nori/nori_test/palette.example/animation_107.png b/common/nori/nori_test/palette.example/animation_107.png index 185405e..2db1fcb 100755 Binary files a/common/nori/nori_test/palette.example/animation_107.png and b/common/nori/nori_test/palette.example/animation_107.png differ diff --git a/common/nori/nori_test/palette.example/animation_108.png b/common/nori/nori_test/palette.example/animation_108.png index b8d5622..2f97083 100755 Binary files a/common/nori/nori_test/palette.example/animation_108.png and b/common/nori/nori_test/palette.example/animation_108.png differ diff --git a/common/nori/nori_test/palette.example/animation_109.png b/common/nori/nori_test/palette.example/animation_109.png index 5b05dc2..a0add8c 100755 Binary files a/common/nori/nori_test/palette.example/animation_109.png and b/common/nori/nori_test/palette.example/animation_109.png differ diff --git a/common/nori/nori_test/palette.example/animation_11.png b/common/nori/nori_test/palette.example/animation_11.png index 9da953f..0387e75 100755 Binary files a/common/nori/nori_test/palette.example/animation_11.png and b/common/nori/nori_test/palette.example/animation_11.png differ diff --git a/common/nori/nori_test/palette.example/animation_110.png b/common/nori/nori_test/palette.example/animation_110.png index b4c967d..32340b5 100755 Binary files a/common/nori/nori_test/palette.example/animation_110.png and b/common/nori/nori_test/palette.example/animation_110.png differ diff --git a/common/nori/nori_test/palette.example/animation_111.png b/common/nori/nori_test/palette.example/animation_111.png index 0ce478a..05e313d 100755 Binary files a/common/nori/nori_test/palette.example/animation_111.png and b/common/nori/nori_test/palette.example/animation_111.png differ diff --git a/common/nori/nori_test/palette.example/animation_112.png b/common/nori/nori_test/palette.example/animation_112.png index ebbc538..dced45d 100755 Binary files a/common/nori/nori_test/palette.example/animation_112.png and b/common/nori/nori_test/palette.example/animation_112.png differ diff --git a/common/nori/nori_test/palette.example/animation_113.png b/common/nori/nori_test/palette.example/animation_113.png index 21c5693..85fef28 100755 Binary files a/common/nori/nori_test/palette.example/animation_113.png and b/common/nori/nori_test/palette.example/animation_113.png differ diff --git a/common/nori/nori_test/palette.example/animation_114.png b/common/nori/nori_test/palette.example/animation_114.png index 4e9d3e0..523a84f 100755 Binary files a/common/nori/nori_test/palette.example/animation_114.png and b/common/nori/nori_test/palette.example/animation_114.png differ diff --git a/common/nori/nori_test/palette.example/animation_115.png b/common/nori/nori_test/palette.example/animation_115.png index c697bdb..db5ab26 100755 Binary files a/common/nori/nori_test/palette.example/animation_115.png and b/common/nori/nori_test/palette.example/animation_115.png differ diff --git a/common/nori/nori_test/palette.example/animation_116.png b/common/nori/nori_test/palette.example/animation_116.png index 47d909a..8e40943 100755 Binary files a/common/nori/nori_test/palette.example/animation_116.png and b/common/nori/nori_test/palette.example/animation_116.png differ diff --git a/common/nori/nori_test/palette.example/animation_117.png b/common/nori/nori_test/palette.example/animation_117.png index ff3ed3a..61afbcb 100755 Binary files a/common/nori/nori_test/palette.example/animation_117.png and b/common/nori/nori_test/palette.example/animation_117.png differ diff --git a/common/nori/nori_test/palette.example/animation_118.png b/common/nori/nori_test/palette.example/animation_118.png index 13d9e64..6581409 100755 Binary files a/common/nori/nori_test/palette.example/animation_118.png and b/common/nori/nori_test/palette.example/animation_118.png differ diff --git a/common/nori/nori_test/palette.example/animation_119.png b/common/nori/nori_test/palette.example/animation_119.png index c79e75e..1c5b55d 100755 Binary files a/common/nori/nori_test/palette.example/animation_119.png and b/common/nori/nori_test/palette.example/animation_119.png differ diff --git a/common/nori/nori_test/palette.example/animation_12.png b/common/nori/nori_test/palette.example/animation_12.png index dd2ed69..9472271 100755 Binary files a/common/nori/nori_test/palette.example/animation_12.png and b/common/nori/nori_test/palette.example/animation_12.png differ diff --git a/common/nori/nori_test/palette.example/animation_120.png b/common/nori/nori_test/palette.example/animation_120.png index b2aab1d..7c77180 100755 Binary files a/common/nori/nori_test/palette.example/animation_120.png and b/common/nori/nori_test/palette.example/animation_120.png differ diff --git a/common/nori/nori_test/palette.example/animation_121.png b/common/nori/nori_test/palette.example/animation_121.png index 77fe832..c224ef3 100755 Binary files a/common/nori/nori_test/palette.example/animation_121.png and b/common/nori/nori_test/palette.example/animation_121.png differ diff --git a/common/nori/nori_test/palette.example/animation_122.png b/common/nori/nori_test/palette.example/animation_122.png index 32d96f8..59b27fd 100755 Binary files a/common/nori/nori_test/palette.example/animation_122.png and b/common/nori/nori_test/palette.example/animation_122.png differ diff --git a/common/nori/nori_test/palette.example/animation_123.png b/common/nori/nori_test/palette.example/animation_123.png index 80b1658..3c9c7ac 100755 Binary files a/common/nori/nori_test/palette.example/animation_123.png and b/common/nori/nori_test/palette.example/animation_123.png differ diff --git a/common/nori/nori_test/palette.example/animation_124.png b/common/nori/nori_test/palette.example/animation_124.png index 1c73745..65afefe 100755 Binary files a/common/nori/nori_test/palette.example/animation_124.png and b/common/nori/nori_test/palette.example/animation_124.png differ diff --git a/common/nori/nori_test/palette.example/animation_125.png b/common/nori/nori_test/palette.example/animation_125.png index 12376de..ec26dec 100755 Binary files a/common/nori/nori_test/palette.example/animation_125.png and b/common/nori/nori_test/palette.example/animation_125.png differ diff --git a/common/nori/nori_test/palette.example/animation_126.png b/common/nori/nori_test/palette.example/animation_126.png index 09199e0..16fa7b3 100755 Binary files a/common/nori/nori_test/palette.example/animation_126.png and b/common/nori/nori_test/palette.example/animation_126.png differ diff --git a/common/nori/nori_test/palette.example/animation_127.png b/common/nori/nori_test/palette.example/animation_127.png index d64ab5b..ca8b8c6 100755 Binary files a/common/nori/nori_test/palette.example/animation_127.png and b/common/nori/nori_test/palette.example/animation_127.png differ diff --git a/common/nori/nori_test/palette.example/animation_128.png b/common/nori/nori_test/palette.example/animation_128.png index cef6690..2700336 100755 Binary files a/common/nori/nori_test/palette.example/animation_128.png and b/common/nori/nori_test/palette.example/animation_128.png differ diff --git a/common/nori/nori_test/palette.example/animation_129.png b/common/nori/nori_test/palette.example/animation_129.png index 8b6a03e..21470dc 100755 Binary files a/common/nori/nori_test/palette.example/animation_129.png and b/common/nori/nori_test/palette.example/animation_129.png differ diff --git a/common/nori/nori_test/palette.example/animation_13.png b/common/nori/nori_test/palette.example/animation_13.png index 6f20b9c..c25a2fc 100755 Binary files a/common/nori/nori_test/palette.example/animation_13.png and b/common/nori/nori_test/palette.example/animation_13.png differ diff --git a/common/nori/nori_test/palette.example/animation_130.png b/common/nori/nori_test/palette.example/animation_130.png index 6e87db9..320a8f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_130.png and b/common/nori/nori_test/palette.example/animation_130.png differ diff --git a/common/nori/nori_test/palette.example/animation_131.png b/common/nori/nori_test/palette.example/animation_131.png index 31ac8e2..034930d 100755 Binary files a/common/nori/nori_test/palette.example/animation_131.png and b/common/nori/nori_test/palette.example/animation_131.png differ diff --git a/common/nori/nori_test/palette.example/animation_132.png b/common/nori/nori_test/palette.example/animation_132.png index cef6690..2700336 100755 Binary files a/common/nori/nori_test/palette.example/animation_132.png and b/common/nori/nori_test/palette.example/animation_132.png differ diff --git a/common/nori/nori_test/palette.example/animation_133.png b/common/nori/nori_test/palette.example/animation_133.png index 9a0377c..94a8c81 100755 Binary files a/common/nori/nori_test/palette.example/animation_133.png and b/common/nori/nori_test/palette.example/animation_133.png differ diff --git a/common/nori/nori_test/palette.example/animation_134.png b/common/nori/nori_test/palette.example/animation_134.png index 76c4037..e53d46d 100755 Binary files a/common/nori/nori_test/palette.example/animation_134.png and b/common/nori/nori_test/palette.example/animation_134.png differ diff --git a/common/nori/nori_test/palette.example/animation_135.png b/common/nori/nori_test/palette.example/animation_135.png index 2a0c9b9..01aa42a 100755 Binary files a/common/nori/nori_test/palette.example/animation_135.png and b/common/nori/nori_test/palette.example/animation_135.png differ diff --git a/common/nori/nori_test/palette.example/animation_136.png b/common/nori/nori_test/palette.example/animation_136.png index 04c62bb..0d6022d 100755 Binary files a/common/nori/nori_test/palette.example/animation_136.png and b/common/nori/nori_test/palette.example/animation_136.png differ diff --git a/common/nori/nori_test/palette.example/animation_137.png b/common/nori/nori_test/palette.example/animation_137.png index 9660cc2..8e00b84 100755 Binary files a/common/nori/nori_test/palette.example/animation_137.png and b/common/nori/nori_test/palette.example/animation_137.png differ diff --git a/common/nori/nori_test/palette.example/animation_138.png b/common/nori/nori_test/palette.example/animation_138.png index e4594bf..3eee255 100755 Binary files a/common/nori/nori_test/palette.example/animation_138.png and b/common/nori/nori_test/palette.example/animation_138.png differ diff --git a/common/nori/nori_test/palette.example/animation_139.png b/common/nori/nori_test/palette.example/animation_139.png index e4594bf..3eee255 100755 Binary files a/common/nori/nori_test/palette.example/animation_139.png and b/common/nori/nori_test/palette.example/animation_139.png differ diff --git a/common/nori/nori_test/palette.example/animation_14.png b/common/nori/nori_test/palette.example/animation_14.png index dc12f44..b82f029 100755 Binary files a/common/nori/nori_test/palette.example/animation_14.png and b/common/nori/nori_test/palette.example/animation_14.png differ diff --git a/common/nori/nori_test/palette.example/animation_140.png b/common/nori/nori_test/palette.example/animation_140.png index 9660cc2..8e00b84 100755 Binary files a/common/nori/nori_test/palette.example/animation_140.png and b/common/nori/nori_test/palette.example/animation_140.png differ diff --git a/common/nori/nori_test/palette.example/animation_15.png b/common/nori/nori_test/palette.example/animation_15.png index 33f3f4b..d6027df 100755 Binary files a/common/nori/nori_test/palette.example/animation_15.png and b/common/nori/nori_test/palette.example/animation_15.png differ diff --git a/common/nori/nori_test/palette.example/animation_157.png b/common/nori/nori_test/palette.example/animation_157.png index 325afd2..f51fe32 100755 Binary files a/common/nori/nori_test/palette.example/animation_157.png and b/common/nori/nori_test/palette.example/animation_157.png differ diff --git a/common/nori/nori_test/palette.example/animation_158.png b/common/nori/nori_test/palette.example/animation_158.png index 325afd2..f51fe32 100755 Binary files a/common/nori/nori_test/palette.example/animation_158.png and b/common/nori/nori_test/palette.example/animation_158.png differ diff --git a/common/nori/nori_test/palette.example/animation_159.png b/common/nori/nori_test/palette.example/animation_159.png index f884ac6..e3ebb1a 100755 Binary files a/common/nori/nori_test/palette.example/animation_159.png and b/common/nori/nori_test/palette.example/animation_159.png differ diff --git a/common/nori/nori_test/palette.example/animation_16.png b/common/nori/nori_test/palette.example/animation_16.png index ac1c72a..f215c8d 100755 Binary files a/common/nori/nori_test/palette.example/animation_16.png and b/common/nori/nori_test/palette.example/animation_16.png differ diff --git a/common/nori/nori_test/palette.example/animation_160.png b/common/nori/nori_test/palette.example/animation_160.png index a5fba8a..25e739a 100755 Binary files a/common/nori/nori_test/palette.example/animation_160.png and b/common/nori/nori_test/palette.example/animation_160.png differ diff --git a/common/nori/nori_test/palette.example/animation_161.png b/common/nori/nori_test/palette.example/animation_161.png index a5fba8a..25e739a 100755 Binary files a/common/nori/nori_test/palette.example/animation_161.png and b/common/nori/nori_test/palette.example/animation_161.png differ diff --git a/common/nori/nori_test/palette.example/animation_162.png b/common/nori/nori_test/palette.example/animation_162.png index f884ac6..e3ebb1a 100755 Binary files a/common/nori/nori_test/palette.example/animation_162.png and b/common/nori/nori_test/palette.example/animation_162.png differ diff --git a/common/nori/nori_test/palette.example/animation_17.png b/common/nori/nori_test/palette.example/animation_17.png index 845100e..4260dfc 100755 Binary files a/common/nori/nori_test/palette.example/animation_17.png and b/common/nori/nori_test/palette.example/animation_17.png differ diff --git a/common/nori/nori_test/palette.example/animation_18.png b/common/nori/nori_test/palette.example/animation_18.png index 7273376..6b52649 100755 Binary files a/common/nori/nori_test/palette.example/animation_18.png and b/common/nori/nori_test/palette.example/animation_18.png differ diff --git a/common/nori/nori_test/palette.example/animation_19.png b/common/nori/nori_test/palette.example/animation_19.png index b0b6081..19bbdbb 100755 Binary files a/common/nori/nori_test/palette.example/animation_19.png and b/common/nori/nori_test/palette.example/animation_19.png differ diff --git a/common/nori/nori_test/palette.example/animation_2.png b/common/nori/nori_test/palette.example/animation_2.png index 09199e0..16fa7b3 100755 Binary files a/common/nori/nori_test/palette.example/animation_2.png and b/common/nori/nori_test/palette.example/animation_2.png differ diff --git a/common/nori/nori_test/palette.example/animation_20.png b/common/nori/nori_test/palette.example/animation_20.png index eee55cb..ce121be 100755 Binary files a/common/nori/nori_test/palette.example/animation_20.png and b/common/nori/nori_test/palette.example/animation_20.png differ diff --git a/common/nori/nori_test/palette.example/animation_21.png b/common/nori/nori_test/palette.example/animation_21.png index eee55cb..ce121be 100755 Binary files a/common/nori/nori_test/palette.example/animation_21.png and b/common/nori/nori_test/palette.example/animation_21.png differ diff --git a/common/nori/nori_test/palette.example/animation_22.png b/common/nori/nori_test/palette.example/animation_22.png index 49ecd0b..1efe43a 100755 Binary files a/common/nori/nori_test/palette.example/animation_22.png and b/common/nori/nori_test/palette.example/animation_22.png differ diff --git a/common/nori/nori_test/palette.example/animation_23.png b/common/nori/nori_test/palette.example/animation_23.png index 3d0af5d..e1eccb2 100755 Binary files a/common/nori/nori_test/palette.example/animation_23.png and b/common/nori/nori_test/palette.example/animation_23.png differ diff --git a/common/nori/nori_test/palette.example/animation_24.png b/common/nori/nori_test/palette.example/animation_24.png index 7e40a52..fb71caf 100755 Binary files a/common/nori/nori_test/palette.example/animation_24.png and b/common/nori/nori_test/palette.example/animation_24.png differ diff --git a/common/nori/nori_test/palette.example/animation_25.png b/common/nori/nori_test/palette.example/animation_25.png index 49ecd0b..1efe43a 100755 Binary files a/common/nori/nori_test/palette.example/animation_25.png and b/common/nori/nori_test/palette.example/animation_25.png differ diff --git a/common/nori/nori_test/palette.example/animation_26.png b/common/nori/nori_test/palette.example/animation_26.png index 94729d0..838790e 100755 Binary files a/common/nori/nori_test/palette.example/animation_26.png and b/common/nori/nori_test/palette.example/animation_26.png differ diff --git a/common/nori/nori_test/palette.example/animation_27.png b/common/nori/nori_test/palette.example/animation_27.png index f1600d9..5e77cfd 100755 Binary files a/common/nori/nori_test/palette.example/animation_27.png and b/common/nori/nori_test/palette.example/animation_27.png differ diff --git a/common/nori/nori_test/palette.example/animation_28.png b/common/nori/nori_test/palette.example/animation_28.png index eaeea24..5bc4d72 100755 Binary files a/common/nori/nori_test/palette.example/animation_28.png and b/common/nori/nori_test/palette.example/animation_28.png differ diff --git a/common/nori/nori_test/palette.example/animation_29.png b/common/nori/nori_test/palette.example/animation_29.png index e924893..afb66c7 100755 Binary files a/common/nori/nori_test/palette.example/animation_29.png and b/common/nori/nori_test/palette.example/animation_29.png differ diff --git a/common/nori/nori_test/palette.example/animation_3.png b/common/nori/nori_test/palette.example/animation_3.png index d64ab5b..ca8b8c6 100755 Binary files a/common/nori/nori_test/palette.example/animation_3.png and b/common/nori/nori_test/palette.example/animation_3.png differ diff --git a/common/nori/nori_test/palette.example/animation_30.png b/common/nori/nori_test/palette.example/animation_30.png index e55987a..950d0aa 100755 Binary files a/common/nori/nori_test/palette.example/animation_30.png and b/common/nori/nori_test/palette.example/animation_30.png differ diff --git a/common/nori/nori_test/palette.example/animation_31.png b/common/nori/nori_test/palette.example/animation_31.png index 5275633..0db20c4 100755 Binary files a/common/nori/nori_test/palette.example/animation_31.png and b/common/nori/nori_test/palette.example/animation_31.png differ diff --git a/common/nori/nori_test/palette.example/animation_32.png b/common/nori/nori_test/palette.example/animation_32.png index bad76f4..f2c3ea5 100755 Binary files a/common/nori/nori_test/palette.example/animation_32.png and b/common/nori/nori_test/palette.example/animation_32.png differ diff --git a/common/nori/nori_test/palette.example/animation_33.png b/common/nori/nori_test/palette.example/animation_33.png index cf7edc3..eb39cd6 100755 Binary files a/common/nori/nori_test/palette.example/animation_33.png and b/common/nori/nori_test/palette.example/animation_33.png differ diff --git a/common/nori/nori_test/palette.example/animation_34.png b/common/nori/nori_test/palette.example/animation_34.png index bdd1c47..211a4d9 100755 Binary files a/common/nori/nori_test/palette.example/animation_34.png and b/common/nori/nori_test/palette.example/animation_34.png differ diff --git a/common/nori/nori_test/palette.example/animation_35.png b/common/nori/nori_test/palette.example/animation_35.png index 1d76540..5611273 100755 Binary files a/common/nori/nori_test/palette.example/animation_35.png and b/common/nori/nori_test/palette.example/animation_35.png differ diff --git a/common/nori/nori_test/palette.example/animation_36.png b/common/nori/nori_test/palette.example/animation_36.png index 281eafa..ed231f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_36.png and b/common/nori/nori_test/palette.example/animation_36.png differ diff --git a/common/nori/nori_test/palette.example/animation_37.png b/common/nori/nori_test/palette.example/animation_37.png index f24604b..86cd560 100755 Binary files a/common/nori/nori_test/palette.example/animation_37.png and b/common/nori/nori_test/palette.example/animation_37.png differ diff --git a/common/nori/nori_test/palette.example/animation_38.png b/common/nori/nori_test/palette.example/animation_38.png index 281eafa..ed231f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_38.png and b/common/nori/nori_test/palette.example/animation_38.png differ diff --git a/common/nori/nori_test/palette.example/animation_39.png b/common/nori/nori_test/palette.example/animation_39.png index f24604b..86cd560 100755 Binary files a/common/nori/nori_test/palette.example/animation_39.png and b/common/nori/nori_test/palette.example/animation_39.png differ diff --git a/common/nori/nori_test/palette.example/animation_4.png b/common/nori/nori_test/palette.example/animation_4.png index cef6690..2700336 100755 Binary files a/common/nori/nori_test/palette.example/animation_4.png and b/common/nori/nori_test/palette.example/animation_4.png differ diff --git a/common/nori/nori_test/palette.example/animation_40.png b/common/nori/nori_test/palette.example/animation_40.png index 281eafa..ed231f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_40.png and b/common/nori/nori_test/palette.example/animation_40.png differ diff --git a/common/nori/nori_test/palette.example/animation_41.png b/common/nori/nori_test/palette.example/animation_41.png index f24604b..86cd560 100755 Binary files a/common/nori/nori_test/palette.example/animation_41.png and b/common/nori/nori_test/palette.example/animation_41.png differ diff --git a/common/nori/nori_test/palette.example/animation_42.png b/common/nori/nori_test/palette.example/animation_42.png index 281eafa..ed231f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_42.png and b/common/nori/nori_test/palette.example/animation_42.png differ diff --git a/common/nori/nori_test/palette.example/animation_43.png b/common/nori/nori_test/palette.example/animation_43.png index f24604b..86cd560 100755 Binary files a/common/nori/nori_test/palette.example/animation_43.png and b/common/nori/nori_test/palette.example/animation_43.png differ diff --git a/common/nori/nori_test/palette.example/animation_44.png b/common/nori/nori_test/palette.example/animation_44.png index 281eafa..ed231f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_44.png and b/common/nori/nori_test/palette.example/animation_44.png differ diff --git a/common/nori/nori_test/palette.example/animation_45.png b/common/nori/nori_test/palette.example/animation_45.png index f24604b..86cd560 100755 Binary files a/common/nori/nori_test/palette.example/animation_45.png and b/common/nori/nori_test/palette.example/animation_45.png differ diff --git a/common/nori/nori_test/palette.example/animation_46.png b/common/nori/nori_test/palette.example/animation_46.png index 281eafa..ed231f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_46.png and b/common/nori/nori_test/palette.example/animation_46.png differ diff --git a/common/nori/nori_test/palette.example/animation_47.png b/common/nori/nori_test/palette.example/animation_47.png index f24604b..86cd560 100755 Binary files a/common/nori/nori_test/palette.example/animation_47.png and b/common/nori/nori_test/palette.example/animation_47.png differ diff --git a/common/nori/nori_test/palette.example/animation_48.png b/common/nori/nori_test/palette.example/animation_48.png index 281eafa..ed231f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_48.png and b/common/nori/nori_test/palette.example/animation_48.png differ diff --git a/common/nori/nori_test/palette.example/animation_49.png b/common/nori/nori_test/palette.example/animation_49.png index f24604b..86cd560 100755 Binary files a/common/nori/nori_test/palette.example/animation_49.png and b/common/nori/nori_test/palette.example/animation_49.png differ diff --git a/common/nori/nori_test/palette.example/animation_5.png b/common/nori/nori_test/palette.example/animation_5.png index 8b6a03e..21470dc 100755 Binary files a/common/nori/nori_test/palette.example/animation_5.png and b/common/nori/nori_test/palette.example/animation_5.png differ diff --git a/common/nori/nori_test/palette.example/animation_50.png b/common/nori/nori_test/palette.example/animation_50.png index 281eafa..ed231f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_50.png and b/common/nori/nori_test/palette.example/animation_50.png differ diff --git a/common/nori/nori_test/palette.example/animation_51.png b/common/nori/nori_test/palette.example/animation_51.png index f24604b..86cd560 100755 Binary files a/common/nori/nori_test/palette.example/animation_51.png and b/common/nori/nori_test/palette.example/animation_51.png differ diff --git a/common/nori/nori_test/palette.example/animation_52.png b/common/nori/nori_test/palette.example/animation_52.png index 281eafa..ed231f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_52.png and b/common/nori/nori_test/palette.example/animation_52.png differ diff --git a/common/nori/nori_test/palette.example/animation_53.png b/common/nori/nori_test/palette.example/animation_53.png index f24604b..86cd560 100755 Binary files a/common/nori/nori_test/palette.example/animation_53.png and b/common/nori/nori_test/palette.example/animation_53.png differ diff --git a/common/nori/nori_test/palette.example/animation_54.png b/common/nori/nori_test/palette.example/animation_54.png index 7edbf93..0af5992 100755 Binary files a/common/nori/nori_test/palette.example/animation_54.png and b/common/nori/nori_test/palette.example/animation_54.png differ diff --git a/common/nori/nori_test/palette.example/animation_55.png b/common/nori/nori_test/palette.example/animation_55.png index 762fb4a..ac4a0e2 100755 Binary files a/common/nori/nori_test/palette.example/animation_55.png and b/common/nori/nori_test/palette.example/animation_55.png differ diff --git a/common/nori/nori_test/palette.example/animation_56.png b/common/nori/nori_test/palette.example/animation_56.png index b2a45c2..a67e020 100755 Binary files a/common/nori/nori_test/palette.example/animation_56.png and b/common/nori/nori_test/palette.example/animation_56.png differ diff --git a/common/nori/nori_test/palette.example/animation_57.png b/common/nori/nori_test/palette.example/animation_57.png index 1943010..0726b44 100755 Binary files a/common/nori/nori_test/palette.example/animation_57.png and b/common/nori/nori_test/palette.example/animation_57.png differ diff --git a/common/nori/nori_test/palette.example/animation_58.png b/common/nori/nori_test/palette.example/animation_58.png index 7a9b149..e2bcb69 100755 Binary files a/common/nori/nori_test/palette.example/animation_58.png and b/common/nori/nori_test/palette.example/animation_58.png differ diff --git a/common/nori/nori_test/palette.example/animation_59.png b/common/nori/nori_test/palette.example/animation_59.png index 91eed33..86d526c 100755 Binary files a/common/nori/nori_test/palette.example/animation_59.png and b/common/nori/nori_test/palette.example/animation_59.png differ diff --git a/common/nori/nori_test/palette.example/animation_6.png b/common/nori/nori_test/palette.example/animation_6.png index 6e87db9..320a8f5 100755 Binary files a/common/nori/nori_test/palette.example/animation_6.png and b/common/nori/nori_test/palette.example/animation_6.png differ diff --git a/common/nori/nori_test/palette.example/animation_60.png b/common/nori/nori_test/palette.example/animation_60.png index 1d81370..5c6ad2e 100755 Binary files a/common/nori/nori_test/palette.example/animation_60.png and b/common/nori/nori_test/palette.example/animation_60.png differ diff --git a/common/nori/nori_test/palette.example/animation_61.png b/common/nori/nori_test/palette.example/animation_61.png index bb3694a..198c8a7 100755 Binary files a/common/nori/nori_test/palette.example/animation_61.png and b/common/nori/nori_test/palette.example/animation_61.png differ diff --git a/common/nori/nori_test/palette.example/animation_62.png b/common/nori/nori_test/palette.example/animation_62.png index f0f07f4..ef7f40e 100755 Binary files a/common/nori/nori_test/palette.example/animation_62.png and b/common/nori/nori_test/palette.example/animation_62.png differ diff --git a/common/nori/nori_test/palette.example/animation_63.png b/common/nori/nori_test/palette.example/animation_63.png index ef0526a..eceecaa 100755 Binary files a/common/nori/nori_test/palette.example/animation_63.png and b/common/nori/nori_test/palette.example/animation_63.png differ diff --git a/common/nori/nori_test/palette.example/animation_64.png b/common/nori/nori_test/palette.example/animation_64.png index b263813..615ee1a 100755 Binary files a/common/nori/nori_test/palette.example/animation_64.png and b/common/nori/nori_test/palette.example/animation_64.png differ diff --git a/common/nori/nori_test/palette.example/animation_65.png b/common/nori/nori_test/palette.example/animation_65.png index a8ea2e5..90692df 100755 Binary files a/common/nori/nori_test/palette.example/animation_65.png and b/common/nori/nori_test/palette.example/animation_65.png differ diff --git a/common/nori/nori_test/palette.example/animation_66.png b/common/nori/nori_test/palette.example/animation_66.png index a8ea2e5..90692df 100755 Binary files a/common/nori/nori_test/palette.example/animation_66.png and b/common/nori/nori_test/palette.example/animation_66.png differ diff --git a/common/nori/nori_test/palette.example/animation_67.png b/common/nori/nori_test/palette.example/animation_67.png index b263813..615ee1a 100755 Binary files a/common/nori/nori_test/palette.example/animation_67.png and b/common/nori/nori_test/palette.example/animation_67.png differ diff --git a/common/nori/nori_test/palette.example/animation_68.png b/common/nori/nori_test/palette.example/animation_68.png index ebe7379..0266f4c 100755 Binary files a/common/nori/nori_test/palette.example/animation_68.png and b/common/nori/nori_test/palette.example/animation_68.png differ diff --git a/common/nori/nori_test/palette.example/animation_69.png b/common/nori/nori_test/palette.example/animation_69.png index 053c7ff..bee0d7e 100755 Binary files a/common/nori/nori_test/palette.example/animation_69.png and b/common/nori/nori_test/palette.example/animation_69.png differ diff --git a/common/nori/nori_test/palette.example/animation_7.png b/common/nori/nori_test/palette.example/animation_7.png index 31ac8e2..034930d 100755 Binary files a/common/nori/nori_test/palette.example/animation_7.png and b/common/nori/nori_test/palette.example/animation_7.png differ diff --git a/common/nori/nori_test/palette.example/animation_70.png b/common/nori/nori_test/palette.example/animation_70.png index 03f48f8..558025e 100755 Binary files a/common/nori/nori_test/palette.example/animation_70.png and b/common/nori/nori_test/palette.example/animation_70.png differ diff --git a/common/nori/nori_test/palette.example/animation_71.png b/common/nori/nori_test/palette.example/animation_71.png index 5637c83..50722bd 100755 Binary files a/common/nori/nori_test/palette.example/animation_71.png and b/common/nori/nori_test/palette.example/animation_71.png differ diff --git a/common/nori/nori_test/palette.example/animation_72.png b/common/nori/nori_test/palette.example/animation_72.png index 38cf9c1..cc3ecfd 100755 Binary files a/common/nori/nori_test/palette.example/animation_72.png and b/common/nori/nori_test/palette.example/animation_72.png differ diff --git a/common/nori/nori_test/palette.example/animation_73.png b/common/nori/nori_test/palette.example/animation_73.png index 5637c83..50722bd 100755 Binary files a/common/nori/nori_test/palette.example/animation_73.png and b/common/nori/nori_test/palette.example/animation_73.png differ diff --git a/common/nori/nori_test/palette.example/animation_74.png b/common/nori/nori_test/palette.example/animation_74.png index 03f48f8..558025e 100755 Binary files a/common/nori/nori_test/palette.example/animation_74.png and b/common/nori/nori_test/palette.example/animation_74.png differ diff --git a/common/nori/nori_test/palette.example/animation_75.png b/common/nori/nori_test/palette.example/animation_75.png index 053c7ff..bee0d7e 100755 Binary files a/common/nori/nori_test/palette.example/animation_75.png and b/common/nori/nori_test/palette.example/animation_75.png differ diff --git a/common/nori/nori_test/palette.example/animation_76.png b/common/nori/nori_test/palette.example/animation_76.png index c2d8500..d748e98 100755 Binary files a/common/nori/nori_test/palette.example/animation_76.png and b/common/nori/nori_test/palette.example/animation_76.png differ diff --git a/common/nori/nori_test/palette.example/animation_77.png b/common/nori/nori_test/palette.example/animation_77.png index 060328d..69bf3a9 100755 Binary files a/common/nori/nori_test/palette.example/animation_77.png and b/common/nori/nori_test/palette.example/animation_77.png differ diff --git a/common/nori/nori_test/palette.example/animation_78.png b/common/nori/nori_test/palette.example/animation_78.png index 447c957..cf5a115 100755 Binary files a/common/nori/nori_test/palette.example/animation_78.png and b/common/nori/nori_test/palette.example/animation_78.png differ diff --git a/common/nori/nori_test/palette.example/animation_79.png b/common/nori/nori_test/palette.example/animation_79.png index 9759620..e82f187 100755 Binary files a/common/nori/nori_test/palette.example/animation_79.png and b/common/nori/nori_test/palette.example/animation_79.png differ diff --git a/common/nori/nori_test/palette.example/animation_8.png b/common/nori/nori_test/palette.example/animation_8.png index c049102..0cd5b79 100755 Binary files a/common/nori/nori_test/palette.example/animation_8.png and b/common/nori/nori_test/palette.example/animation_8.png differ diff --git a/common/nori/nori_test/palette.example/animation_80.png b/common/nori/nori_test/palette.example/animation_80.png index ce08ca7..5587b67 100755 Binary files a/common/nori/nori_test/palette.example/animation_80.png and b/common/nori/nori_test/palette.example/animation_80.png differ diff --git a/common/nori/nori_test/palette.example/animation_81.png b/common/nori/nori_test/palette.example/animation_81.png index d3b4baa..708dbb6 100755 Binary files a/common/nori/nori_test/palette.example/animation_81.png and b/common/nori/nori_test/palette.example/animation_81.png differ diff --git a/common/nori/nori_test/palette.example/animation_82.png b/common/nori/nori_test/palette.example/animation_82.png index f102e7c..6be7be0 100755 Binary files a/common/nori/nori_test/palette.example/animation_82.png and b/common/nori/nori_test/palette.example/animation_82.png differ diff --git a/common/nori/nori_test/palette.example/animation_83.png b/common/nori/nori_test/palette.example/animation_83.png index 5148ccc..774bc45 100755 Binary files a/common/nori/nori_test/palette.example/animation_83.png and b/common/nori/nori_test/palette.example/animation_83.png differ diff --git a/common/nori/nori_test/palette.example/animation_84.png b/common/nori/nori_test/palette.example/animation_84.png index 14ffc64..60602d4 100755 Binary files a/common/nori/nori_test/palette.example/animation_84.png and b/common/nori/nori_test/palette.example/animation_84.png differ diff --git a/common/nori/nori_test/palette.example/animation_85.png b/common/nori/nori_test/palette.example/animation_85.png index 7233425..3d0501e 100755 Binary files a/common/nori/nori_test/palette.example/animation_85.png and b/common/nori/nori_test/palette.example/animation_85.png differ diff --git a/common/nori/nori_test/palette.example/animation_86.png b/common/nori/nori_test/palette.example/animation_86.png index c32e027..22ba5de 100755 Binary files a/common/nori/nori_test/palette.example/animation_86.png and b/common/nori/nori_test/palette.example/animation_86.png differ diff --git a/common/nori/nori_test/palette.example/animation_87.png b/common/nori/nori_test/palette.example/animation_87.png index 6b0a347..8f0316b 100755 Binary files a/common/nori/nori_test/palette.example/animation_87.png and b/common/nori/nori_test/palette.example/animation_87.png differ diff --git a/common/nori/nori_test/palette.example/animation_88.png b/common/nori/nori_test/palette.example/animation_88.png index 7d8e503..0f79eb7 100755 Binary files a/common/nori/nori_test/palette.example/animation_88.png and b/common/nori/nori_test/palette.example/animation_88.png differ diff --git a/common/nori/nori_test/palette.example/animation_89.png b/common/nori/nori_test/palette.example/animation_89.png index 8684bf1..28bb6c4 100755 Binary files a/common/nori/nori_test/palette.example/animation_89.png and b/common/nori/nori_test/palette.example/animation_89.png differ diff --git a/common/nori/nori_test/palette.example/animation_9.png b/common/nori/nori_test/palette.example/animation_9.png index ee3057d..3aa6a9d 100755 Binary files a/common/nori/nori_test/palette.example/animation_9.png and b/common/nori/nori_test/palette.example/animation_9.png differ diff --git a/common/nori/nori_test/palette.example/animation_90.png b/common/nori/nori_test/palette.example/animation_90.png index 7407850..c2dcab9 100755 Binary files a/common/nori/nori_test/palette.example/animation_90.png and b/common/nori/nori_test/palette.example/animation_90.png differ diff --git a/common/nori/nori_test/palette.example/animation_91.png b/common/nori/nori_test/palette.example/animation_91.png index d7b555c..76950a8 100755 Binary files a/common/nori/nori_test/palette.example/animation_91.png and b/common/nori/nori_test/palette.example/animation_91.png differ diff --git a/common/nori/nori_test/palette.example/animation_92.png b/common/nori/nori_test/palette.example/animation_92.png index 09c4801..49f1f34 100755 Binary files a/common/nori/nori_test/palette.example/animation_92.png and b/common/nori/nori_test/palette.example/animation_92.png differ diff --git a/common/nori/nori_test/palette.example/animation_93.png b/common/nori/nori_test/palette.example/animation_93.png index 8056603..e02d749 100755 Binary files a/common/nori/nori_test/palette.example/animation_93.png and b/common/nori/nori_test/palette.example/animation_93.png differ diff --git a/common/nori/nori_test/palette.example/animation_94.png b/common/nori/nori_test/palette.example/animation_94.png index 195dfd6..929ace8 100755 Binary files a/common/nori/nori_test/palette.example/animation_94.png and b/common/nori/nori_test/palette.example/animation_94.png differ diff --git a/common/nori/nori_test/palette.example/animation_95.png b/common/nori/nori_test/palette.example/animation_95.png index 0267601..803f6d7 100755 Binary files a/common/nori/nori_test/palette.example/animation_95.png and b/common/nori/nori_test/palette.example/animation_95.png differ diff --git a/common/nori/nori_test/palette.example/animation_96.png b/common/nori/nori_test/palette.example/animation_96.png index 9a0377c..94a8c81 100755 Binary files a/common/nori/nori_test/palette.example/animation_96.png and b/common/nori/nori_test/palette.example/animation_96.png differ diff --git a/common/nori/nori_test/palette.example/animation_97.png b/common/nori/nori_test/palette.example/animation_97.png index 76c4037..e53d46d 100755 Binary files a/common/nori/nori_test/palette.example/animation_97.png and b/common/nori/nori_test/palette.example/animation_97.png differ diff --git a/common/nori/nori_test/palette.example/animation_98.png b/common/nori/nori_test/palette.example/animation_98.png index 2a0c9b9..01aa42a 100755 Binary files a/common/nori/nori_test/palette.example/animation_98.png and b/common/nori/nori_test/palette.example/animation_98.png differ diff --git a/common/nori/nori_test/palette.example/animation_99.png b/common/nori/nori_test/palette.example/animation_99.png index 04c62bb..0d6022d 100755 Binary files a/common/nori/nori_test/palette.example/animation_99.png and b/common/nori/nori_test/palette.example/animation_99.png differ diff --git a/common/nori/nori_test/test1.example/animation_0.png b/common/nori/nori_test/test1.example/animation_0.png index b880919..992a945 100755 Binary files a/common/nori/nori_test/test1.example/animation_0.png and b/common/nori/nori_test/test1.example/animation_0.png differ diff --git a/common/nori/nori_test/test2.example/animation_0.png b/common/nori/nori_test/test2.example/animation_0.png index 9bafcec..8674f75 100755 Binary files a/common/nori/nori_test/test2.example/animation_0.png and b/common/nori/nori_test/test2.example/animation_0.png differ diff --git a/common/nori/reader.go b/common/nori/reader.go index 084a21d..7ec3660 100644 --- a/common/nori/reader.go +++ b/common/nori/reader.go @@ -161,7 +161,7 @@ func (n *Reader) decodePalette() error { if rgb[0] == 0x00 && rgb[1] == 0xff && rgb[2] == 0x00 { alpha = 0x00 } - if rgb[0] == 0xff && rgb[2] == 0xff { + if rgb[0] == 0xff && rgb[1] == 0x00 && rgb[2] == 0xff { alpha = 0x00 } cp.Palette[i] = &color.RGBA{