X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FTogaGem.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fjp%2Fsourceforge%2Fmikutoga%2Fvmd%2Fparser%2FVmdCameraParser.java;h=119d5999518a87cd2678e4db1ca729e60f4da981;hp=2bf60a5e38be7bd1277328c670864e4e6e0df566;hb=90d9e42204acd76cdea8f6fa1ed8712b7c398beb;hpb=a66827c2872c53a9541549da063fdb3c229ac6cc

diff --git a/src/main/java/jp/sourceforge/mikutoga/vmd/parser/VmdCameraParser.java b/src/main/java/jp/sourceforge/mikutoga/vmd/parser/VmdCameraParser.java
index 2bf60a5..119d599 100644
--- a/src/main/java/jp/sourceforge/mikutoga/vmd/parser/VmdCameraParser.java
+++ b/src/main/java/jp/sourceforge/mikutoga/vmd/parser/VmdCameraParser.java
@@ -11,7 +11,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import jp.sfjp.mikutoga.bin.parser.CommonParser;
 import jp.sfjp.mikutoga.bin.parser.MmdFormatException;
-import jp.sourceforge.mikutoga.vmd.VmdConst;
 
 /**
  * VMDモーションファイルのカメラモーションパーサ。
@@ -26,7 +25,7 @@ class VmdCameraParser extends CommonParser{
     private final byte[] xyzIntplt = new byte[BZXYZ_SIZE];
     private final byte[] etcIntplt = new byte[BZETC_SIZE];
 
-    private VmdCameraHandler handler = null;
+    private VmdCameraHandler handler = VmdUnifiedHandler.EMPTY;
 
 
     /**
@@ -44,7 +43,12 @@ class VmdCameraParser extends CommonParser{
      * @param cameraHandler ハンドラ
      */
     void setCameraHandler(VmdCameraHandler cameraHandler){
-        this.handler = cameraHandler;
+        if(cameraHandler == null){
+            this.handler = VmdUnifiedHandler.EMPTY;
+        }else{
+            this.handler = cameraHandler;
+        }
+
         return;
     }
 
@@ -56,11 +60,6 @@ class VmdCameraParser extends CommonParser{
     void parse() throws IOException, MmdFormatException {
         int cameraMotionNo = parseLeInt();
 
-        if(this.handler == null){
-            skip(VmdConst.CAMERA_DATA_SZ * cameraMotionNo);
-            return;
-        }
-
         this.handler.loopStart(VmdCameraHandler.CAMERA_LIST, cameraMotionNo);
 
         for(int ct = 0; ct < cameraMotionNo; ct++){
@@ -102,11 +101,6 @@ class VmdCameraParser extends CommonParser{
      */
     private void parseCameraXyzInterpolation()
             throws IOException, MmdFormatException{
-        if(this.handler == null){
-            skip(this.xyzIntplt.length);
-            return;
-        }
-
         parseByteArray(this.xyzIntplt);
 
         int idx = 0;
@@ -142,11 +136,6 @@ class VmdCameraParser extends CommonParser{
      */
     private void parseCameraEtcInterpolation()
             throws IOException, MmdFormatException{
-        if(this.handler == null){
-            skip(this.etcIntplt.length);
-            return;
-        }
-
         parseByteArray(this.etcIntplt);
 
         int idx = 0;