合成時の不具合修正
Window close時の処理修正
base/trunk/src/src/jp/kirikiri/tvp2/visual/TempBitmapHolder.java (diff) base/trunk/src/src/jp/kirikiri/tvp2/visual/BaseBitmap.java (diff) base/trunk/src/src/jp/kirikiri/tvp2/msg/Message.java (diff)| @@ -9,6 +9,9 @@ | ||
| 9 | 9 | import jp.kirikiri.tvp2.base.CompactEventCallbackInterface; |
| 10 | 10 | |
| 11 | 11 | public class TempBitmapHolder implements CompactEventCallbackInterface { |
| 12 | + static final private int INIT_SIZE = 32; | |
| 13 | + static final private int INIT_BPP = 32; | |
| 14 | + static final private int INIT_COLOR = 0x00FFFFFF; //TVP_RGBA2COLOR(255, 255, 255, 0)); | |
| 12 | 15 | |
| 13 | 16 | static private TempBitmapHolder TempBitmapHolder; |
| 14 | 17 | static public void initialize() { |
| @@ -24,12 +27,12 @@ | ||
| 24 | 27 | private boolean mTempCompactInit; |
| 25 | 28 | |
| 26 | 29 | private TempBitmapHolder() throws TJSException { |
| 27 | - mBitmap = new BaseBitmap(32,32,32); | |
| 30 | + mBitmap = new BaseBitmap(INIT_SIZE,INIT_SIZE,INIT_BPP); | |
| 28 | 31 | mTemporaries = new ArrayList<BaseBitmap>(); |
| 29 | 32 | //mTempLevel = 0; |
| 30 | 33 | //mTempCompactInit = false; |
| 31 | 34 | // the default image must be a transparent, white colored rectangle |
| 32 | - mBitmap.fill( new Rect(0, 0, 32, 32), 0x00FFFFFF ); //TVP_RGBA2COLOR(255, 255, 255, 0)); | |
| 35 | + mBitmap.fill( new Rect(0, 0, INIT_SIZE, INIT_SIZE), INIT_COLOR ); | |
| 33 | 36 | } |
| 34 | 37 | |
| 35 | 38 | protected void finalize() { |
| @@ -54,7 +57,7 @@ | ||
| 54 | 57 | mTempLevel++; |
| 55 | 58 | if(mTempLevel > mTemporaries.size()) { |
| 56 | 59 | // increase buffer size |
| 57 | - BaseBitmap bmp = new BaseBitmap(w, h, 32); | |
| 60 | + BaseBitmap bmp = new BaseBitmap(w, h, INIT_BPP); | |
| 58 | 61 | mTemporaries.add(bmp); |
| 59 | 62 | return bmp; |
| 60 | 63 | } else { |
| @@ -1244,7 +1244,7 @@ | ||
| 1244 | 1244 | if(refrect.top >= refrect.bottom) return false; // not drawable |
| 1245 | 1245 | |
| 1246 | 1246 | independ(); |
| 1247 | - return mBitmap.copyRect( rect, ref.getBitmap(), refrect, method, opa, hda ); | |
| 1247 | + return mBitmap.copyRect( rect, ref.getBitmap(), refrect, method, opa, hda ); | |
| 1248 | 1248 | } |
| 1249 | 1249 | |
| 1250 | 1250 | public void saveAsBMP(String name, String type) throws TJSException { |
| @@ -55,7 +55,7 @@ | ||
| 55 | 55 | |
| 56 | 56 | |
| 57 | 57 | static public final String VersionInformation = "羽々斬(吉里吉里2互換エンジン) 実行コア/%1 TJS2J/%2 Copyright (C) 2011 T.Imoto and contributors All rights reserved."; |
| 58 | - static public final String VersionInformation2 = "羽々斬は吉里吉里2のソースコードを元に開発されています。吉里吉里2の開発者達に感謝を。"; | |
| 58 | + static public final String VersionInformation2 = "羽々斬は吉里吉里2のソースコードを元に開発されています。"; | |
| 59 | 59 | static public final String DownloadPageURL = "http://kirikiri.jp/"; |
| 60 | 60 | static public final String InternalError = "内部エラーが発生しました: at %1 line %2"; |
| 61 | 61 | static public final String InvalidParam = "不正なパラメータです"; |
jin1016