Pārlūkot izejas kodu

Envoi et fin OK

François Gautrais 8 gadi atpakaļ
vecāks
revīzija
6a9c883aea
48 mainītis faili ar 992 papildinājumiem un 302 dzēšanām
  1. 6 9
      app/src/main/AndroidManifest.xml
  2. 11 1
      app/src/main/java/app/brest/testmin3d/ARActivity.java
  3. 13 0
      app/src/main/java/app/brest/testmin3d/EndActivity.java
  4. 19 3
      app/src/main/java/app/brest/testmin3d/MenuActivity.java
  5. 81 0
      app/src/main/java/app/brest/testmin3d/TransferActivity.java
  6. 15 2
      app/src/main/java/app/brest/utils/app/brest/game/Game.java
  7. 1 0
      app/src/main/java/app/brest/utils/app/brest/game/Resource.java
  8. 7 0
      app/src/main/java/app/brest/utils/app/brest/game/Stage.java
  9. 2 0
      app/src/main/java/min3d/core/Renderer.java
  10. 3 3
      app/src/main/java/min3d/core/RendererActivity.java
  11. BIN
      app/src/main/res/drawable/aa.jpg
  12. BIN
      app/src/main/res/drawable/aa_texture.jpg
  13. BIN
      app/src/main/res/drawable/aaa.jpg
  14. BIN
      app/src/main/res/drawable/aaa_texture.jpg
  15. BIN
      app/src/main/res/drawable/bb.jpg
  16. BIN
      app/src/main/res/drawable/bb_texture.jpg
  17. BIN
      app/src/main/res/drawable/bbb.jpg
  18. BIN
      app/src/main/res/drawable/bbb_texture.jpg
  19. BIN
      app/src/main/res/drawable/cc.jpg
  20. BIN
      app/src/main/res/drawable/cc_texture.jpg
  21. BIN
      app/src/main/res/drawable/ccc.jpg
  22. BIN
      app/src/main/res/drawable/ccc_texture.jpg
  23. BIN
      app/src/main/res/drawable/send.png
  24. 24 0
      app/src/main/res/layout/activity_end.xml
  25. 39 5
      app/src/main/res/layout/activity_menu.xml
  26. 52 0
      app/src/main/res/layout/activity_transfer.xml
  27. 1 1
      app/src/main/res/raw/a_res
  28. 61 0
      app/src/main/res/raw/aa_obj
  29. 25 0
      app/src/main/res/raw/aa_res
  30. 61 0
      app/src/main/res/raw/aaa_obj
  31. 25 0
      app/src/main/res/raw/aaa_res
  32. 2 2
      app/src/main/res/raw/b_res
  33. 61 0
      app/src/main/res/raw/bb_obj
  34. 25 0
      app/src/main/res/raw/bb_res
  35. 61 0
      app/src/main/res/raw/bbb_obj
  36. 25 0
      app/src/main/res/raw/bbb_res
  37. 2 2
      app/src/main/res/raw/c_res
  38. 61 0
      app/src/main/res/raw/cc_obj
  39. 25 0
      app/src/main/res/raw/cc_res
  40. 61 0
      app/src/main/res/raw/ccc_obj
  41. 25 0
      app/src/main/res/raw/ccc_res
  42. 156 274
      app/src/main/res/raw/game_medium
  43. 7 0
      app/src/main/res/raw/mtl_aa_mtl
  44. 7 0
      app/src/main/res/raw/mtl_aaa_mtl
  45. 7 0
      app/src/main/res/raw/mtl_bb_mtl
  46. 7 0
      app/src/main/res/raw/mtl_bbb_mtl
  47. 7 0
      app/src/main/res/raw/mtl_cc_mtl
  48. 7 0
      app/src/main/res/raw/mtl_ccc_mtl

+ 6 - 9
app/src/main/AndroidManifest.xml

@@ -21,21 +21,17 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".ARActivity" />
-
         <activity
             android:name=".ViewerActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/title_activity_viewer"
-            android:theme="@style/FullscreenTheme" />
+            android:label="@string/title_activity_viewer" />
         <activity
             android:name=".ResourceListActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/title_activity_resource_list"
-            android:theme="@style/FullscreenTheme" />
+            android:label="@string/title_activity_resource_list" />
         <activity
             android:name=".MenuActivity"
-            android:label="@string/title_activity_menu"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:label="@string/title_activity_menu">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -44,8 +40,9 @@
         </activity>
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings"
-            android:theme="@style/FullscreenTheme"></activity>
+            android:label="@string/title_activity_settings" />
+        <activity android:name=".TransferActivity" />
+        <activity android:name=".EndActivity"></activity>
     </application>
 
 </manifest>

+ 11 - 1
app/src/main/java/app/brest/testmin3d/ARActivity.java

@@ -321,16 +321,26 @@ public class ARActivity extends RendererActivity
 
         if(finished)
         {
-
+            Log.e("Finished", "Finished");
         }
 
         if(stageFinished)
         {
             Stage s = mGame.getCurrentStageObj();
             Resource stageRes = s.getResource();
+
+            if(finished)
+            {
+                Intent intent2 = new Intent(this, EndActivity.class);
+                startActivity(intent2);
+            }
+
             Intent intent = new Intent(this, ViewerActivity.class);
             intent.putExtra("resource", stageRes );
             startActivity(intent);
+
+            Intent intent2 = new Intent(this, TransferActivity.class);
+            startActivity(intent2);
         }
 
         Intent intent = new Intent(this, ViewerActivity.class);

+ 13 - 0
app/src/main/java/app/brest/testmin3d/EndActivity.java

@@ -0,0 +1,13 @@
+package app.brest.testmin3d;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+public class EndActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_end);
+    }
+}

+ 19 - 3
app/src/main/java/app/brest/testmin3d/MenuActivity.java

@@ -1,5 +1,6 @@
 package app.brest.testmin3d;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Point;
 import android.os.Bundle;
@@ -10,6 +11,7 @@ import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Display;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.Toast;
@@ -20,7 +22,7 @@ import app.brest.utils.app.brest.game.Game;
 import app.brest.utils.app.brest.game.Resource;
 import app.brest.utils.app.brest.game.Stage;
 
-public class MenuActivity extends AppCompatActivity {
+public class MenuActivity extends Activity {
     protected Game mGame;
     protected ImageButton mICarte;
     protected ImageButton mIInventaire;
@@ -40,7 +42,7 @@ public class MenuActivity extends AppCompatActivity {
         mIOptions = (ImageButton) findViewById(R.id.ib_options);
         mIScanner = (ImageButton) findViewById(R.id.ib_scanner);
         mIBriefing = (ImageButton) findViewById(R.id.ib_briefing);
-
+        mINextStage = (ImageButton) findViewById(R.id.ib_send);
 
         Game g = null;//Game.load(this);
 
@@ -79,13 +81,15 @@ public class MenuActivity extends AppCompatActivity {
         display.getSize(size);
         int width = size.x;
         int height = size.y;
-        int buttonHieght = (height-5*40)/6;
+        int buttonHieght = mGame.canSendData()?((height)-6*40)/7:((height-40)-5*40)/6;
+        ((ViewGroup)mINextStage.getParent()).setVisibility(mGame.canSendData()?View.VISIBLE:View.INVISIBLE);
 
         mICarte.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
         mIInventaire.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
         mIOptions.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
         mIScanner.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
         mIBriefing.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
+        if(mGame.canSendData())mINextStage.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
     }
 
     public void onOptionsClick(View v)
@@ -132,5 +136,17 @@ public class MenuActivity extends AppCompatActivity {
     public void onSendClick(View v)
     {
         //TODO : Transmssion des donnes
+        boolean finished = mGame.nextStage();
+
+        Stage s = mGame.getCurrentStageObj();
+        Resource stageRes = s.getResource();
+
+        Intent intent = new Intent(this, ViewerActivity.class);
+        intent.putExtra("resource", stageRes );
+        startActivity(intent);
+
+
+        Intent intent2 = new Intent(this, TransferActivity.class);
+        startActivity(intent2);
     }
 }

+ 81 - 0
app/src/main/java/app/brest/testmin3d/TransferActivity.java

@@ -0,0 +1,81 @@
+package app.brest.testmin3d;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.graphics.Color;
+import android.os.Handler;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.ImageButton;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+import app.brest.utils.app.brest.game.Game;
+
+public class TransferActivity extends AppCompatActivity {
+
+    private Handler mCustomHandler = new Handler();
+    private ProgressBar mBar;
+    private ImageButton mImage;
+    private int mCurrentPos = 0;
+    private final int MAX_POS=70;
+    private final int PERIODE_SEND=35;
+    private Activity mSelf;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_transfer);
+        mBar = (ProgressBar) findViewById(R.id.pb_bar);
+        mImage = (ImageButton) findViewById(R.id.ib_logo);
+        mBar.setMax(MAX_POS);
+        mBar.getProgressDrawable().setColorFilter(
+                Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+        mSelf=this;
+        mCustomHandler.postDelayed(updateTimerThread, 10);
+    }
+
+    private Runnable updateTimerThread = new Runnable() {
+
+        public void run() {
+
+            mBar.setProgress(mCurrentPos++);
+            mImage.setAlpha(alpha());
+            if(mCurrentPos < MAX_POS) mCustomHandler.postDelayed(this, 10);
+            else
+            {
+                AlertDialog.Builder builder = new AlertDialog.Builder(mSelf);
+
+                builder.setMessage("Données, envoyées, le professeur à envoyer un message")
+                        .setTitle("Données, envoyée");
+                builder.setPositiveButton("Voir", new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        if(Game.game().getCurrentStage()-1==Game.game().getNStages())
+                        {
+                            Game.game().finish();
+                            Toast.makeText(mSelf, "Finished !!!!!!!", Toast.LENGTH_LONG).show();
+                        }
+                        finish();
+                    }
+                });
+
+                AlertDialog dialog = builder.create();
+                dialog.show();
+
+
+            }
+        }
+
+    };
+
+
+    private float alpha()
+    {
+        int ix = mCurrentPos % PERIODE_SEND;
+        float x= ((float)mCurrentPos)/ ((float)PERIODE_SEND);
+        Log.e("func__", "func = "+x+" -> "+(float)(Math.cos(x)*0.8+0.2));
+        return (float)(Math.cos(x)*0.4+0.6);
+    }
+}

+ 15 - 2
app/src/main/java/app/brest/utils/app/brest/game/Game.java

@@ -37,6 +37,7 @@ public class Game  implements Serializable {
     protected ResourceManager  mResources;
     protected String           mName;
     protected Settings         mSettings = new Settings();
+    protected boolean          mFinished= false;
 
     public Game(String name, Activity act)
     {
@@ -64,7 +65,7 @@ public class Game  implements Serializable {
     }
     public Stage getCurrentStageObj()
     {
-        return mStages.get(mCurrentStage-1);
+        return mCurrentStage<=mStages.size()?mStages.get(mCurrentStage-1):null;
     }
 
     public Stage getStage(int i)
@@ -326,7 +327,8 @@ public class Game  implements Serializable {
             if(mCurrentStageAreas.get(i).isOnArea(mPlayer))
             {
 
-                str+="\t" +mCurrentStageAreas.get(i).getResourceName()+" "+mCurrentStageAreas.get(i).getDistanceToNextPlace(mPlayer)+" m\n";
+                if(i<mCurrentStageAreas.size())
+                    str+="\t" +mCurrentStageAreas.get(i).getResourceName()+" "+ mCurrentStageAreas.get(i).getDistanceToNextPlace(mPlayer)+" m\n";
 
             }
         }
@@ -379,4 +381,15 @@ public class Game  implements Serializable {
     {
         return gGame;
     }
+
+
+    public boolean canSendData() {
+        Stage s =getCurrentStageObj();
+        if(s==null) return false;
+        return mResources.getNResourceAcquired()>=s.getNResourceStep() && !isFinished();
+    }
+
+    public boolean isFinished() { return mFinished; }
+
+    public void finish() { mFinished=true; }
 }

+ 1 - 0
app/src/main/java/app/brest/utils/app/brest/game/Resource.java

@@ -114,6 +114,7 @@ public class Resource implements Serializable {
     {
         if(m3DModel==null)
         {
+            Log.e("resource.get3Model", "app.brest.testmin3d:raw/"+mName+"_obj");
             IParser myParser = Parser.createParser(Parser.Type.OBJ, context.getResources(), "app.brest.testmin3d:raw/"+mName+"_obj",true);
             myParser.parse();
 

+ 7 - 0
app/src/main/java/app/brest/utils/app/brest/game/Stage.java

@@ -19,6 +19,7 @@ public class Stage implements Serializable {
         try {
             mStage=obj.getInt("stage");
             mResourceName=obj.getString("resource");
+            mNResourceStep=obj.getInt("n_resource_step");
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -28,6 +29,7 @@ public class Stage implements Serializable {
     protected int mStage;
     protected Resource mResource;
     protected String mResourceName;
+    protected int mNResourceStep;
 
     public int getStage() {
         return mStage;
@@ -45,6 +47,11 @@ public class Stage implements Serializable {
         this.mResource = mResource;
     }
 
+    public int getNResourceStep()
+    {
+        return mNResourceStep;
+    }
+
     public String getResourceName() {
         return mResourceName;
     }

+ 2 - 0
app/src/main/java/min3d/core/Renderer.java

@@ -84,6 +84,8 @@ public class Renderer implements GLSurfaceView.Renderer
 	{
 		Log.i(Min3d.TAG, "Renderer.onSurfaceChanged()");
 
+		Log.i("-----", "Renderer.onSurfaceChanged()");
+
 		setGl(_gl);
 		_surfaceAspectRatio = (float)w / (float)h;
 		

+ 3 - 3
app/src/main/java/min3d/core/RendererActivity.java

@@ -20,8 +20,8 @@ import android.os.Handler;
  */
 public class RendererActivity extends Activity implements ISceneController
 {
-	public static Scene scene;
-	public static Renderer mRender;
+	public Scene scene;
+	public Renderer mRender;
 	protected GLSurfaceView _glSurfaceView;
 	
 	protected Handler _initSceneHander;
@@ -45,7 +45,7 @@ public class RendererActivity extends Activity implements ISceneController
     };
     
 
-	public static void initStatic(Activity a)
+	public void initStatic(Activity a)
 	{
 		Shared.context(a);
 		scene = new Scene(null);

BIN
app/src/main/res/drawable/aa.jpg


BIN
app/src/main/res/drawable/aa_texture.jpg


BIN
app/src/main/res/drawable/aaa.jpg


BIN
app/src/main/res/drawable/aaa_texture.jpg


BIN
app/src/main/res/drawable/bb.jpg


BIN
app/src/main/res/drawable/bb_texture.jpg


BIN
app/src/main/res/drawable/bbb.jpg


BIN
app/src/main/res/drawable/bbb_texture.jpg


BIN
app/src/main/res/drawable/cc.jpg


BIN
app/src/main/res/drawable/cc_texture.jpg


BIN
app/src/main/res/drawable/ccc.jpg


BIN
app/src/main/res/drawable/ccc_texture.jpg


BIN
app/src/main/res/drawable/send.png


+ 24 - 0
app/src/main/res/layout/activity_end.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="app.brest.testmin3d.EndActivity"
+    android:background="#000000">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="Félicitation !"
+        android:id="@+id/textView2"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true"
+        android:textColor="#33b5e5"
+        android:textSize="60dp"
+        android:textStyle="bold" />
+</RelativeLayout>

+ 39 - 5
app/src/main/res/layout/activity_menu.xml

@@ -18,9 +18,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:showDividers="end"
-            android:measureWithLargestChild="true"
+            android:measureWithLargestChild="false"
             android:gravity="center_vertical|center_horizontal"
-            android:weightSum="1">
+            android:weightSum="1"
+            android:paddingTop="20dp"
+            android:layout_marginTop="-20dp">
 
             <LinearLayout
                 android:orientation="horizontal"
@@ -29,12 +31,13 @@
                 android:layout_gravity="center_horizontal"
                 android:id="@+id/ll_0"
                 android:layout_marginLeft="40dp"
-                android:layout_marginRight="40dp">
+                android:layout_marginRight="40dp"
+                android:weightSum="1">
 
                 <ImageButton
                     android:layout_width="118dp"
                     android:layout_height="60dp"
-                    android:id="@+id/imageButton"
+                    android:id="@+id/ib_briefing"
                     android:src="@drawable/info"
                     android:scaleType="fitCenter"
                     android:background="#000000"
@@ -168,7 +171,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="Options"
-                    android:id="@+id/b_option"
+                    android:id="@+id/ib_option"
                     android:textColor="#33b5e5"
                     android:textSize="25dp"
                     android:textStyle="bold"
@@ -176,7 +179,38 @@
                     android:background="#000000" />
             </LinearLayout>
 
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginLeft="40dp"
+                android:layout_marginTop="40dp"
+                android:layout_marginRight="40dp">
+
+                <ImageButton
+                    android:layout_width="110dp"
+                    android:layout_height="60dp"
+                    android:id="@+id/ib_send"
+                    android:background="#000000"
+                    android:src="@drawable/send"
+                    android:scaleType="fitCenter"
+                    android:onClick="onSendClick" />
+
+                <Button
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="Envoyer"
+                    android:id="@+id/button4"
+                    android:background="#000000"
+                    android:textColor="#33b5e5"
+                    android:textSize="25dp"
+                    android:textStyle="bold"
+                    android:onClick="onSendClick" />
+            </LinearLayout>
+
         </LinearLayout>
 
     </FrameLayout>
+
 </LinearLayout>

+ 52 - 0
app/src/main/res/layout/activity_transfer.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="app.brest.testmin3d.TransferActivity"
+    android:background="#000000">
+
+    <ProgressBar
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:id="@+id/pb_bar"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:max="100"
+        android:progress="20" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="Envoi des données au professeur"
+        android:id="@+id/textView"
+        android:layout_above="@+id/pb_bar"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="73dp"
+        android:textColor="#33b5e5"
+        android:background="#000000"
+        android:textSize="25dp"
+        android:textStyle="bold"
+        android:singleLine="false"
+        android:gravity="center_horizontal" />
+
+    <ImageButton
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/ib_logo"
+        android:layout_below="@+id/pb_bar"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="75dp"
+        android:src="@drawable/send"
+        android:scaleType="fitCenter"
+        android:clickable="false"
+        android:background="#000000" />
+
+</RelativeLayout>

+ 1 - 1
app/src/main/res/raw/a_res

@@ -20,6 +20,6 @@
 		1
 	],
 	"stage" : 1,
-	"title" : "A",
+	"title" : "a",
 	"type" : "Image"
 }

+ 61 - 0
app/src/main/res/raw/aa_obj

@@ -0,0 +1,61 @@
+mtllib mtl_aa_mtl
+g default
+v -2.000000 -0.771651 1.286538
+v 2.000000 -0.771651 1.286538
+v -2.000000 -0.728349 1.311538
+v 2.000000 -0.728349 1.311538
+v -2.000000 0.771651 -1.286538
+v 2.000000 0.771651 -1.286538
+v -2.000000 0.728349 -1.311538
+v 2.000000 0.728349 -1.311538
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.375000 0.250000
+vt 0.625000 0.250000
+vt 0.375000 0.500000
+vt 0.625000 0.500000
+vt 0.375000 0.750000
+vt 0.625000 0.750000
+vt 0.375000 1.000000
+vt 0.625000 1.000000
+vt 0.875000 0.000000
+vt 0.875000 0.250000
+vt 0.125000 0.000000
+vt 0.125000 0.250000
+vt -0.004496 0.998008
+vt -0.004496 0.001992
+vt 1.007949 0.001992
+vt 1.007949 0.998008
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+s off
+g pCube1
+usemtl initialShadingGroup
+f 1/1/1 2/2/2 4/4/3 3/3/4
+f 3/15/5 4/16/6 6/17/7 5/18/8
+f 5/5/9 6/6/10 8/8/11 7/7/12
+f 7/7/13 8/8/14 2/10/15 1/9/16
+f 2/2/17 8/11/18 6/12/19 4/4/20
+f 7/13/21 1/1/22 3/3/23 5/14/24

+ 25 - 0
app/src/main/res/raw/aa_res

@@ -0,0 +1,25 @@
+{
+	"comment" : "AA",
+	"name" : "aa",
+	"position" : 
+	[
+		0,
+		0,
+		0
+	],
+	"rotation" : 
+	[
+		0,
+		0,
+		0
+	],
+	"scale" : 
+	[
+		1,
+		1,
+		1
+	],
+	"stage" : 1,
+	"title" : "aa",
+	"type" : "Image"
+}

+ 61 - 0
app/src/main/res/raw/aaa_obj

@@ -0,0 +1,61 @@
+mtllib mtl_aaa_mtl
+g default
+v -2.000000 -0.771651 1.286538
+v 2.000000 -0.771651 1.286538
+v -2.000000 -0.728349 1.311538
+v 2.000000 -0.728349 1.311538
+v -2.000000 0.771651 -1.286538
+v 2.000000 0.771651 -1.286538
+v -2.000000 0.728349 -1.311538
+v 2.000000 0.728349 -1.311538
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.375000 0.250000
+vt 0.625000 0.250000
+vt 0.375000 0.500000
+vt 0.625000 0.500000
+vt 0.375000 0.750000
+vt 0.625000 0.750000
+vt 0.375000 1.000000
+vt 0.625000 1.000000
+vt 0.875000 0.000000
+vt 0.875000 0.250000
+vt 0.125000 0.000000
+vt 0.125000 0.250000
+vt -0.004496 0.998008
+vt -0.004496 0.001992
+vt 1.007949 0.001992
+vt 1.007949 0.998008
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+s off
+g pCube1
+usemtl initialShadingGroup
+f 1/1/1 2/2/2 4/4/3 3/3/4
+f 3/15/5 4/16/6 6/17/7 5/18/8
+f 5/5/9 6/6/10 8/8/11 7/7/12
+f 7/7/13 8/8/14 2/10/15 1/9/16
+f 2/2/17 8/11/18 6/12/19 4/4/20
+f 7/13/21 1/1/22 3/3/23 5/14/24

+ 25 - 0
app/src/main/res/raw/aaa_res

@@ -0,0 +1,25 @@
+{
+	"comment" : "AAA",
+	"name" : "aaa",
+	"position" : 
+	[
+		0,
+		0,
+		0
+	],
+	"rotation" : 
+	[
+		0,
+		0,
+		0
+	],
+	"scale" : 
+	[
+		1,
+		1,
+		1
+	],
+	"stage" : 1,
+	"title" : "aaa",
+	"type" : "Image"
+}

+ 2 - 2
app/src/main/res/raw/b_res

@@ -19,7 +19,7 @@
 		1,
 		1
 	],
-	"stage" : 1,
-	"title" : "B",
+	"stage" : 2,
+	"title" : "b",
 	"type" : "Image"
 }

+ 61 - 0
app/src/main/res/raw/bb_obj

@@ -0,0 +1,61 @@
+mtllib mtl_bb_mtl
+g default
+v -2.000000 -0.771651 1.286538
+v 2.000000 -0.771651 1.286538
+v -2.000000 -0.728349 1.311538
+v 2.000000 -0.728349 1.311538
+v -2.000000 0.771651 -1.286538
+v 2.000000 0.771651 -1.286538
+v -2.000000 0.728349 -1.311538
+v 2.000000 0.728349 -1.311538
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.375000 0.250000
+vt 0.625000 0.250000
+vt 0.375000 0.500000
+vt 0.625000 0.500000
+vt 0.375000 0.750000
+vt 0.625000 0.750000
+vt 0.375000 1.000000
+vt 0.625000 1.000000
+vt 0.875000 0.000000
+vt 0.875000 0.250000
+vt 0.125000 0.000000
+vt 0.125000 0.250000
+vt -0.004496 0.998008
+vt -0.004496 0.001992
+vt 1.007949 0.001992
+vt 1.007949 0.998008
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+s off
+g pCube1
+usemtl initialShadingGroup
+f 1/1/1 2/2/2 4/4/3 3/3/4
+f 3/15/5 4/16/6 6/17/7 5/18/8
+f 5/5/9 6/6/10 8/8/11 7/7/12
+f 7/7/13 8/8/14 2/10/15 1/9/16
+f 2/2/17 8/11/18 6/12/19 4/4/20
+f 7/13/21 1/1/22 3/3/23 5/14/24

+ 25 - 0
app/src/main/res/raw/bb_res

@@ -0,0 +1,25 @@
+{
+	"comment" : "BB",
+	"name" : "bb",
+	"position" : 
+	[
+		0,
+		0,
+		0
+	],
+	"rotation" : 
+	[
+		0,
+		0,
+		0
+	],
+	"scale" : 
+	[
+		1,
+		1,
+		1
+	],
+	"stage" : 2,
+	"title" : "bb",
+	"type" : "Image"
+}

+ 61 - 0
app/src/main/res/raw/bbb_obj

@@ -0,0 +1,61 @@
+mtllib mtl_bbb_mtl
+g default
+v -2.000000 -0.771651 1.286538
+v 2.000000 -0.771651 1.286538
+v -2.000000 -0.728349 1.311538
+v 2.000000 -0.728349 1.311538
+v -2.000000 0.771651 -1.286538
+v 2.000000 0.771651 -1.286538
+v -2.000000 0.728349 -1.311538
+v 2.000000 0.728349 -1.311538
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.375000 0.250000
+vt 0.625000 0.250000
+vt 0.375000 0.500000
+vt 0.625000 0.500000
+vt 0.375000 0.750000
+vt 0.625000 0.750000
+vt 0.375000 1.000000
+vt 0.625000 1.000000
+vt 0.875000 0.000000
+vt 0.875000 0.250000
+vt 0.125000 0.000000
+vt 0.125000 0.250000
+vt -0.004496 0.998008
+vt -0.004496 0.001992
+vt 1.007949 0.001992
+vt 1.007949 0.998008
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+s off
+g pCube1
+usemtl initialShadingGroup
+f 1/1/1 2/2/2 4/4/3 3/3/4
+f 3/15/5 4/16/6 6/17/7 5/18/8
+f 5/5/9 6/6/10 8/8/11 7/7/12
+f 7/7/13 8/8/14 2/10/15 1/9/16
+f 2/2/17 8/11/18 6/12/19 4/4/20
+f 7/13/21 1/1/22 3/3/23 5/14/24

+ 25 - 0
app/src/main/res/raw/bbb_res

@@ -0,0 +1,25 @@
+{
+	"comment" : "BBB",
+	"name" : "bbb",
+	"position" : 
+	[
+		0,
+		0,
+		0
+	],
+	"rotation" : 
+	[
+		0,
+		0,
+		0
+	],
+	"scale" : 
+	[
+		1,
+		1,
+		1
+	],
+	"stage" : 2,
+	"title" : "bbb",
+	"type" : "Image"
+}

+ 2 - 2
app/src/main/res/raw/c_res

@@ -19,7 +19,7 @@
 		1,
 		1
 	],
-	"stage" : 1,
-	"title" : "D",
+	"stage" : 3,
+	"title" : "c",
 	"type" : "Image"
 }

+ 61 - 0
app/src/main/res/raw/cc_obj

@@ -0,0 +1,61 @@
+mtllib mtl_cc_mtl
+g default
+v -2.000000 -0.771651 1.286538
+v 2.000000 -0.771651 1.286538
+v -2.000000 -0.728349 1.311538
+v 2.000000 -0.728349 1.311538
+v -2.000000 0.771651 -1.286538
+v 2.000000 0.771651 -1.286538
+v -2.000000 0.728349 -1.311538
+v 2.000000 0.728349 -1.311538
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.375000 0.250000
+vt 0.625000 0.250000
+vt 0.375000 0.500000
+vt 0.625000 0.500000
+vt 0.375000 0.750000
+vt 0.625000 0.750000
+vt 0.375000 1.000000
+vt 0.625000 1.000000
+vt 0.875000 0.000000
+vt 0.875000 0.250000
+vt 0.125000 0.000000
+vt 0.125000 0.250000
+vt -0.004496 0.998008
+vt -0.004496 0.001992
+vt 1.007949 0.001992
+vt 1.007949 0.998008
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+s off
+g pCube1
+usemtl initialShadingGroup
+f 1/1/1 2/2/2 4/4/3 3/3/4
+f 3/15/5 4/16/6 6/17/7 5/18/8
+f 5/5/9 6/6/10 8/8/11 7/7/12
+f 7/7/13 8/8/14 2/10/15 1/9/16
+f 2/2/17 8/11/18 6/12/19 4/4/20
+f 7/13/21 1/1/22 3/3/23 5/14/24

+ 25 - 0
app/src/main/res/raw/cc_res

@@ -0,0 +1,25 @@
+{
+	"comment" : "CC",
+	"name" : "cc",
+	"position" : 
+	[
+		0,
+		0,
+		0
+	],
+	"rotation" : 
+	[
+		0,
+		0,
+		0
+	],
+	"scale" : 
+	[
+		1,
+		1,
+		1
+	],
+	"stage" : 3,
+	"title" : "cc",
+	"type" : "Image"
+}

+ 61 - 0
app/src/main/res/raw/ccc_obj

@@ -0,0 +1,61 @@
+mtllib mtl_ccc_mtl
+g default
+v -2.000000 -0.771651 1.286538
+v 2.000000 -0.771651 1.286538
+v -2.000000 -0.728349 1.311538
+v 2.000000 -0.728349 1.311538
+v -2.000000 0.771651 -1.286538
+v 2.000000 0.771651 -1.286538
+v -2.000000 0.728349 -1.311538
+v 2.000000 0.728349 -1.311538
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.375000 0.250000
+vt 0.625000 0.250000
+vt 0.375000 0.500000
+vt 0.625000 0.500000
+vt 0.375000 0.750000
+vt 0.625000 0.750000
+vt 0.375000 1.000000
+vt 0.625000 1.000000
+vt 0.875000 0.000000
+vt 0.875000 0.250000
+vt 0.125000 0.000000
+vt 0.125000 0.250000
+vt -0.004496 0.998008
+vt -0.004496 0.001992
+vt 1.007949 0.001992
+vt 1.007949 0.998008
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 -0.500000 0.866025
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.866025 0.500000
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 0.500000 -0.866025
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 0.000000 -0.866025 -0.500000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn 1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+s off
+g pCube1
+usemtl initialShadingGroup
+f 1/1/1 2/2/2 4/4/3 3/3/4
+f 3/15/5 4/16/6 6/17/7 5/18/8
+f 5/5/9 6/6/10 8/8/11 7/7/12
+f 7/7/13 8/8/14 2/10/15 1/9/16
+f 2/2/17 8/11/18 6/12/19 4/4/20
+f 7/13/21 1/1/22 3/3/23 5/14/24

+ 25 - 0
app/src/main/res/raw/ccc_res

@@ -0,0 +1,25 @@
+{
+	"comment" : "CCC",
+	"name" : "ccc",
+	"position" : 
+	[
+		0,
+		0,
+		0
+	],
+	"rotation" : 
+	[
+		0,
+		0,
+		0
+	],
+	"scale" : 
+	[
+		1,
+		1,
+		1
+	],
+	"stage" : 3,
+	"title" : "ccc",
+	"type" : "Image"
+}

+ 156 - 274
app/src/main/res/raw/game_medium

@@ -5,460 +5,342 @@
 			"coordinates" : 
 			[
 				[
-					-1.6639459133148193,
-					48.095634460449219
+					-1.6636830568313599,
+					48.095661163330078
 				],
 				[
-					-1.6637903451919556,
-					48.095420837402344
-				],
-				[
-					-1.6634523868560791,
-					48.09552001953125
+					-1.6633397340774536,
+					48.095485687255859
 				],
 				[
-					-1.6636401414871216,
-					48.095722198486328
+					-1.6637313365936279,
+					48.095291137695312
 				],
 				[
-					-1.6638332605361938,
-					48.095668792724609
+					-1.6639888286590576,
+					48.095600128173828
 				]
 			],
-			"name" : "a",
+			"name" : "aaa",
 			"points" : 
 			[
 				{
 					"angle" : 180,
 					"coordinates" : 
 					[
-						-1.6637152433395386,
-						48.095565795898438
+						-1.6636937856674194,
+						48.095527648925781
 					],
 					"field" : 90,
 					"radius" : 10
 				}
 			],
-			"resource" : "a"
+			"resource" : "aaa"
 		},
 		{
 			"coordinates" : 
 			[
 				[
-					-1.6637957096099854,
-					48.095378875732422
+					-1.6637742519378662,
+					48.095798492431641
 				],
 				[
-					-1.6635328531265259,
-					48.095077514648438
+					-1.6632002592086792,
+					48.095478057861328
 				],
 				[
-					-1.663280725479126,
-					48.095161437988281
+					-1.663779616355896,
+					48.095325469970703
 				],
 				[
-					-1.663506031036377,
-					48.095489501953125
+					-1.6641014814376831,
+					48.095611572265625
 				]
 			],
-			"name" : "b",
+			"name" : "bbb",
 			"points" : 
 			[
 				{
 					"angle" : 180,
 					"coordinates" : 
 					[
-						-1.663554310798645,
-						48.095195770263672
+						-1.663704514503479,
+						48.095546722412109
 					],
 					"field" : 90,
-					"radius" : 5
+					"radius" : 10
 				}
 			],
-			"resource" : "b"
+			"resource" : "bbb"
 		},
 		{
 			"coordinates" : 
 			[
 				[
-					-1.6641980409622192,
-					48.095844268798828
-				],
-				[
-					-1.6636884212493896,
-					48.095703125
+					-1.6681623458862305,
+					48.095981597900391
 				],
 				[
-					-1.6639727354049683,
-					48.095493316650391
+					-1.6673684120178223,
+					48.095310211181641
 				],
 				[
-					-1.6644072532653809,
-					48.095554351806641
+					-1.6690206527709961,
+					48.095279693603516
 				]
 			],
-			"name" : "c",
+			"name" : "ccc",
 			"points" : 
 			[
 				{
 					"angle" : 180,
 					"coordinates" : 
 					[
-						-1.6639620065689087,
-						48.095661163330078
+						-1.6681838035583496,
+						48.095508575439453
 					],
 					"field" : 90,
-					"radius" : 5
+					"radius" : 10
 				}
 			],
-			"resource" : "c"
+			"resource" : "ccc"
 		},
 		{
 			"coordinates" : 
 			[
 				[
-					-1.664203405380249,
-					48.09588623046875
+					-1.6636991500854492,
+					48.095695495605469
 				],
 				[
-					-1.6638654470443726,
-					48.095836639404297
+					-1.6632485389709473,
+					48.095420837402344
 				],
 				[
-					-1.663779616355896,
-					48.096111297607422
+					-1.6637098789215088,
+					48.095291137695312
 				],
 				[
-					-1.6641658544540405,
-					48.096164703369141
+					-1.6639137268066406,
+					48.095584869384766
 				]
 			],
-			"name" : "d",
+			"name" : "aa",
 			"points" : 
 			[
 				{
 					"angle" : 180,
 					"coordinates" : 
 					[
-						-1.6640102863311768,
-						48.096027374267578
+						-1.663704514503479,
+						48.095550537109375
 					],
 					"field" : 90,
-					"radius" : 5
+					"radius" : 10
 				}
 			],
-			"resource" : "d"
+			"resource" : "aa"
 		},
 		{
 			"coordinates" : 
 			[
 				[
-					-1.6641604900360107,
-					48.096408843994141
+					-1.6637098789215088,
+					48.095699310302734
 				],
 				[
-					-1.6635757684707642,
-					48.096351623535156
+					-1.6632002592086792,
+					48.095447540283203
 				],
 				[
-					-1.6637313365936279,
-					48.096099853515625
+					-1.6637688875198364,
+					48.095310211181641
 				],
 				[
-					-1.6643053293228149,
-					48.096176147460938
+					-1.6639244556427002,
+					48.095592498779297
 				]
 			],
-			"name" : "e",
+			"name" : "bb",
 			"points" : 
 			[
 				{
 					"angle" : 180,
 					"coordinates" : 
 					[
-						-1.6639351844787598,
-						48.096210479736328
+						-1.6636991500854492,
+						48.095550537109375
 					],
 					"field" : 90,
-					"radius" : 5
+					"radius" : 10
 				}
 			],
-			"resource" : "e"
+			"resource" : "bb"
 		},
 		{
 			"coordinates" : 
 			[
 				[
-					-1.6651099920272827,
-					48.095935821533203
+					-1.6637259721755981,
+					48.095687866210938
 				],
 				[
-					-1.664503812789917,
-					48.095787048339844
+					-1.663404107093811,
+					48.095500946044922
 				],
 				[
-					-1.6645681858062744,
-					48.095573425292969
+					-1.6636937856674194,
+					48.095386505126953
 				],
 				[
-					-1.6652494668960571,
-					48.095680236816406
+					-1.6639405488967896,
+					48.095611572265625
 				]
 			],
-			"name" : "f",
+			"name" : "cc",
 			"points" : 
 			[
 				{
 					"angle" : 180,
 					"coordinates" : 
 					[
-						-1.6648739576339722,
-						48.095787048339844
+						-1.6636723279953003,
+						48.095546722412109
 					],
 					"field" : 90,
-					"radius" : 5
+					"radius" : 10
 				}
 			],
-			"resource" : "f"
+			"resource" : "cc"
 		},
 		{
 			"coordinates" : 
 			[
 				[
-					-1.6655659675598145,
-					48.096118927001953
-				],
-				[
-					-1.6651207208633423,
-					48.096111297607422
+					-1.6708660125732422,
+					48.097171783447266
 				],
 				[
-					-1.6652119159698486,
-					48.095790863037109
+					-1.6697072982788086,
+					48.096942901611328
 				],
 				[
-					-1.6656410694122314,
-					48.095806121826172
+					-1.6707158088684082,
+					48.096267700195312
 				]
 			],
-			"name" : "g",
+			"name" : "a",
 			"points" : 
 			[
 				{
 					"angle" : 180,
 					"coordinates" : 
 					[
-						-1.6653835773468018,
-						48.095993041992188
+						-1.670372486114502,
+						48.096755981445312
 					],
 					"field" : 90,
-					"radius" : 5
+					"radius" : 10
 				}
 			],
-			"resource" : "g"
-		}
-	],
-	"dir" : "/home/ptitcois/Programmation/histodex",
-	"name" : "game_medium",
-	"resources" : 
-	[
-		{
-			"comment" : "A",
-			"file" : "/home/ptitcois/Documents/projet/test/images/a.png",
-			"name" : "a",
-			"position" : 
-			[
-				0,
-				0,
-				0
-			],
-			"rotation" : 
-			[
-				0,
-				0,
-				0
-			],
-			"scale" : 
-			[
-				1,
-				1,
-				1
-			],
-			"stage" : 1,
-			"title" : "A",
-			"type" : "Image"
-		},
-		{
-			"comment" : "B",
-			"file" : "/home/ptitcois/Documents/projet/test/images/b.png",
-			"name" : "b",
-			"position" : 
-			[
-				0,
-				0,
-				0
-			],
-			"rotation" : 
-			[
-				0,
-				0,
-				0
-			],
-			"scale" : 
-			[
-				1,
-				1,
-				1
-			],
-			"stage" : 1,
-			"title" : "B",
-			"type" : "Image"
-		},
-		{
-			"comment" : "C",
-			"file" : "/home/ptitcois/Documents/projet/test/images/c.png",
-			"name" : "c",
-			"position" : 
-			[
-				0,
-				0,
-				0
-			],
-			"rotation" : 
-			[
-				0,
-				0,
-				0
-			],
-			"scale" : 
-			[
-				1,
-				1,
-				1
-			],
-			"stage" : 1,
-			"title" : "C",
-			"type" : "Image"
-		},
-		{
-			"comment" : "D",
-			"file" : "/home/ptitcois/Documents/projet/test/images/d.png",
-			"name" : "d",
-			"position" : 
-			[
-				0,
-				0,
-				0
-			],
-			"rotation" : 
-			[
-				0,
-				0,
-				0
-			],
-			"scale" : 
-			[
-				1,
-				1,
-				1
-			],
-			"stage" : 1,
-			"title" : "D",
-			"type" : "Image"
-		},
-		{
-			"comment" : "E",
-			"file" : "/home/ptitcois/Documents/projet/test/images/e.png",
-			"name" : "e",
-			"position" : 
-			[
-				0,
-				0,
-				0
-			],
-			"rotation" : 
-			[
-				0,
-				0,
-				0
-			],
-			"scale" : 
-			[
-				1,
-				1,
-				1
-			],
-			"stage" : 1,
-			"title" : "E",
-			"type" : "Image"
+			"resource" : "a"
 		},
 		{
-			"comment" : "F",
-			"file" : "/home/ptitcois/Documents/projet/test/images/f.png",
-			"name" : "f",
-			"position" : 
-			[
-				0,
-				0,
-				0
-			],
-			"rotation" : 
+			"coordinates" : 
 			[
-				0,
-				0,
-				0
+				[
+					-1.6635382175445557,
+					48.095928192138672
+				],
+				[
+					-1.6631734371185303,
+					48.095317840576172
+				],
+				[
+					-1.6643911600112915,
+					48.095127105712891
+				],
+				[
+					-1.6643375158309937,
+					48.095817565917969
+				]
 			],
-			"scale" : 
+			"name" : "b",
+			"points" : 
 			[
-				1,
-				1,
-				1
+				{
+					"angle" : 180,
+					"coordinates" : 
+					[
+						-1.663704514503479,
+						48.095550537109375
+					],
+					"field" : 90,
+					"radius" : 10
+				}
 			],
-			"stage" : 1,
-			"title" : "F",
-			"type" : "Image"
+			"resource" : "b"
 		},
 		{
-			"comment" : "G",
-			"file" : "/home/ptitcois/Documents/projet/test/images/g.png",
-			"name" : "g",
-			"position" : 
-			[
-				0,
-				0,
-				0
-			],
-			"rotation" : 
+			"coordinates" : 
 			[
-				0,
-				0,
-				0
+				[
+					-1.6636776924133301,
+					48.095684051513672
+				],
+				[
+					-1.6634577512741089,
+					48.095516204833984
+				],
+				[
+					-1.6638010740280151,
+					48.095390319824219
+				],
+				[
+					-1.6639673709869385,
+					48.095592498779297
+				]
 			],
-			"scale" : 
+			"name" : "c",
+			"points" : 
 			[
-				1,
-				1,
-				1
+				{
+					"angle" : 180,
+					"coordinates" : 
+					[
+						-1.663704514503479,
+						48.095550537109375
+					],
+					"field" : 90,
+					"radius" : 10
+				}
 			],
-			"stage" : 1,
-			"title" : "G",
-			"type" : "Image"
+			"resource" : "c"
 		}
 	],
-	"stages" : 3,
+	"name" : "game_medium",
+	"stages" : 4,
 	"stages_list" : 
 	[
 		{
+			"n_resource_step" : 2,
 			"resource" : "a",
 			"stage" : 1
 		},
 		{
+			"n_resource_step" : 4,
 			"resource" : "b",
 			"stage" : 2
 		},
 		{
+			"n_resource_step" : 2,
 			"resource" : "c",
 			"stage" : 3
+		},
+		{
+			"n_resource_step" : 1,
+			"resource" : "a",
+			"stage" : 4
 		}
 	]
 }

+ 7 - 0
app/src/main/res/raw/mtl_aa_mtl

@@ -0,0 +1,7 @@
+newmtl initialShadingGroup
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd aa_texture.jpg
+Ni 1.00

+ 7 - 0
app/src/main/res/raw/mtl_aaa_mtl

@@ -0,0 +1,7 @@
+newmtl initialShadingGroup
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd aaa_texture.jpg
+Ni 1.00

+ 7 - 0
app/src/main/res/raw/mtl_bb_mtl

@@ -0,0 +1,7 @@
+newmtl initialShadingGroup
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd bb_texture.jpg
+Ni 1.00

+ 7 - 0
app/src/main/res/raw/mtl_bbb_mtl

@@ -0,0 +1,7 @@
+newmtl initialShadingGroup
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd bbb_texture.jpg
+Ni 1.00

+ 7 - 0
app/src/main/res/raw/mtl_cc_mtl

@@ -0,0 +1,7 @@
+newmtl initialShadingGroup
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd cc_texture.jpg
+Ni 1.00

+ 7 - 0
app/src/main/res/raw/mtl_ccc_mtl

@@ -0,0 +1,7 @@
+newmtl initialShadingGroup
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd ccc_texture.jpg
+Ni 1.00