OSDN Git Service

Move loading message to outside of a loop.
authorAtsuo Igarashi <atsuoigarashi@gmail.com>
Wed, 19 May 2010 05:44:11 +0000 (14:44 +0900)
committerAtsuo Igarashi <atsuoigarashi@gmail.com>
Wed, 19 May 2010 05:44:11 +0000 (14:44 +0900)
Signed-off-by: Atsuo Igarashi <atsuoigarashi@gmail.com>
src/jp/androidgroup/nyartoolkit/ModelRenderer.java

index c316027..ba55e40 100644 (file)
@@ -150,6 +150,11 @@ public class ModelRenderer implements GLSurfaceView.Renderer {
 \r
        \r
        public void initModel(GL10 gl) {\r
+               if (mainHandler != null) {\r
+                       mainHandler.sendMessage\r
+                               (mainHandler.obtainMessage\r
+                                               (NyARToolkitAndroidActivity.SHOW_LOADING));\r
+               }\r
                for (int i = 0; i < PATT_MAX; i++) {\r
                        if (model[i] != null) {\r
                                model[i].Clear(gl);\r
@@ -157,11 +162,6 @@ public class ModelRenderer implements GLSurfaceView.Renderer {
                                deleteFlags |= MODEL_FLAG;\r
                        }\r
                        if (modelName[i] != null) {\r
-                               if (mainHandler != null) {\r
-                                       mainHandler.sendMessage\r
-                                               (mainHandler.obtainMessage\r
-                                                               (NyARToolkitAndroidActivity.SHOW_LOADING));\r
-                               }\r
                                try {\r
                                        model[i] = KGLModelData.createGLModel\r
                                                (gl, null, am, modelName[i], modelScale[i]);\r
@@ -169,14 +169,14 @@ public class ModelRenderer implements GLSurfaceView.Renderer {
                                } catch (KGLException e) {\r
                                        Log.e("ModelRenderer", "KGLModelData error", e);\r
                                }\r
-                               if (mainHandler != null) {\r
-                                       mainHandler.sendMessage\r
-                                               (mainHandler.obtainMessage\r
-                                                               (NyARToolkitAndroidActivity.HIDE_LOADING));\r
-                               }\r
                                deleteFlags &= ~MODEL_FLAG;\r
                        }\r
                }\r
+               if (mainHandler != null) {\r
+                       mainHandler.sendMessage\r
+                               (mainHandler.obtainMessage\r
+                                               (NyARToolkitAndroidActivity.HIDE_LOADING));\r
+               }\r
                modelChangep = false;\r
        }\r
 \r